summaryrefslogtreecommitdiff
path: root/kern/tru64
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-02-29 20:22:32 -0500
committerNathan Binkert <binkertn@umich.edu>2004-02-29 20:22:32 -0500
commitee967995196739b90c0b1c384d7e245d1dffdc80 (patch)
tree28b9302b5d221b0a079d6a8d7909ed62618b6b12 /kern/tru64
parent31f82cef41962fb57d343f4a8cd468c87d8204dc (diff)
downloadgem5-ee967995196739b90c0b1c384d7e245d1dffdc80.tar.xz
Initial cleanup pass of lisa's function call tracking
code. base/statistics.hh: We're getting rid of FS_MEASURE, but for now, we're going to still use a compile time flag to turn on and off binning of statistics. (The flag is STATS_BINNING) cpu/exec_context.cc: cpu/exec_context.hh: kern/tru64/tru64_system.cc: get rid of FS_MEASURE cpu/simple_cpu/simple_cpu.cc: yank the function call tracking code out of the cpu and move it into the software context class itself. kern/tru64/tru64_system.hh: get rid of FS_MEASURE move all of the tacking stuff to the same place. sim/system.hh: cleanup --HG-- extra : convert_revision : 73d3843afe1b3ba0d5445421c39c1148d3f4e7c0
Diffstat (limited to 'kern/tru64')
-rw-r--r--kern/tru64/tru64_system.cc4
-rw-r--r--kern/tru64/tru64_system.hh23
2 files changed, 10 insertions, 17 deletions
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index 1cd98fdc1..13f28beab 100644
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -604,7 +604,6 @@ Tru64System::breakpoint()
return remoteGDB[0]->trap(ALPHA_KENTRY_INT);
}
-#ifdef FS_MEASURE
void
Tru64System::populateMap(std::string callee, std::string caller)
{
@@ -646,7 +645,6 @@ Tru64System::dumpState(ExecContext *xc) const
}
}
}
-#endif //FS_MEASURE
BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tru64System)
@@ -672,7 +670,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tru64System)
INIT_PARAM(console_code, "file that contains the console code"),
INIT_PARAM(pal_code, "file that contains palcode"),
INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
- "a")
+ "a")
END_INIT_SIM_OBJECT_PARAMS(Tru64System)
diff --git a/kern/tru64/tru64_system.hh b/kern/tru64/tru64_system.hh
index 93cc908e3..bedf1f383 100644
--- a/kern/tru64/tru64_system.hh
+++ b/kern/tru64/tru64_system.hh
@@ -29,15 +29,12 @@
#ifndef __TRU64_SYSTEM_HH__
#define __TRU64_SYSTEM_HH__
+#include <map>
#include <vector>
#include "sim/system.hh"
#include "targetarch/isa_traits.hh"
-#ifdef FS_MEASURE
-#include <map>
-#endif
-
class ExecContext;
class EcoffObject;
class SymbolTable;
@@ -48,9 +45,7 @@ class SkipFuncEvent;
class PrintfEvent;
class DebugPrintfEvent;
class DumpMbufEvent;
-#ifdef FS_MEASURE
class FnEvent;
-#endif
class AlphaArguments;
class Tru64System : public System
@@ -150,11 +145,6 @@ class Tru64System : public System
Addr kernelEntry;
bool bin;
-#ifdef FS_MEASURE
- std::multimap<const std::string, std::string> callerMap;
- void populateMap(std::string caller, std::string callee);
-#endif
-
public:
std::vector<RemoteGDB *> remoteGDB;
std::vector<GDBListener *> gdbListen;
@@ -168,7 +158,7 @@ class Tru64System : public System
const std::string &console_path,
const std::string &palcode,
const std::string &boot_osflags,
- const bool _bin);
+ const bool _bin);
~Tru64System();
int registerExecContext(ExecContext *xc);
@@ -182,10 +172,15 @@ class Tru64System : public System
static void Printf(AlphaArguments args);
static void DumpMbuf(AlphaArguments args);
-#ifdef FS_MEASURE
+
+ // Lisa's fs measure stuff
+ private:
+ std::multimap<const std::string, std::string> callerMap;
+ void populateMap(std::string caller, std::string callee);
+
+ public:
bool findCaller(std::string callee, std::string caller) const;
void dumpState(ExecContext *xc) const;
-#endif //FS_MEASURE
};
#endif // __TRU64_SYSTEM_HH__