diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2004-03-11 20:04:41 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2004-03-11 20:04:41 -0500 |
| commit | 256a1ac478f8da64c6d7d64f04decf2976def2cd (patch) | |
| tree | 2156639dd607b3592a42c9cc1b928bac548ae2e0 /kern/linux/linux_system.hh | |
| parent | 3bc8cffc75c2e03a6a8fe5f4425940a16405f672 (diff) | |
| download | gem5-256a1ac478f8da64c6d7d64f04decf2976def2cd.tar.xz | |
merge from head of m5. note: i did not bother to merge the PIO stuff with scsi since we're not going that route anymore anyway. esp because it was giving me an error i couldn't seem to fix.
dev/alpha_console.cc:
missed this >>>> after i merged
kern/linux/linux_system.cc:
get rid of FS_MEASURES and change FnEvent to LinuxFnEvent
kern/linux/linux_system.hh:
get rid of FS_MEASURE
--HG--
extra : convert_revision : 210f46573bba0c772a224ce110af9a9230fabf6a
Diffstat (limited to 'kern/linux/linux_system.hh')
| -rw-r--r-- | kern/linux/linux_system.hh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kern/linux/linux_system.hh b/kern/linux/linux_system.hh index 6aa29249a..eba65d648 100644 --- a/kern/linux/linux_system.hh +++ b/kern/linux/linux_system.hh @@ -34,9 +34,7 @@ #include "sim/system.hh" #include "targetarch/isa_traits.hh" -#ifdef FS_MEASURE #include <map> -#endif class ExecContext; class ElfObject; @@ -49,9 +47,7 @@ class LinuxSkipDelayLoopEvent; class LinuxPrintfEvent; class LinuxDebugPrintfEvent; class LinuxDumpMbufEvent; -#ifdef FS_MEASURE class FnEvent; -#endif class AlphaArguments; class LinuxSystem : public System @@ -65,7 +61,7 @@ class LinuxSystem : public System SymbolTable *bootloaderSymtab; SymbolTable *consoleSymtab; -#ifdef FS_MEASURE + //INSTRUMENTATION CODEGEN BEGIN ONE Statistics::MainBin *esIntrBin; Statistics::MainBin *esRxeofBin; @@ -99,7 +95,6 @@ class LinuxSystem : public System Statistics::MainBin *esTxeofBin; Statistics::MainBin *idleThreadBin; //INSTRUMENTATION CODEGEN END -#endif //FS_MEASURE BreakPCEvent *kernelPanicEvent; BreakPCEvent *consolePanicEvent; @@ -111,7 +106,7 @@ class LinuxSystem : public System LinuxDebugPrintfEvent *debugPrintfEvent; LinuxDebugPrintfEvent *debugPrintfrEvent; LinuxDumpMbufEvent *dumpMbufEvent; -#ifdef FS_MEASURE + //INSTRUMENTATION CODEGEN BEGIN TWO FnEvent *esIntrEvent; FnEvent *esRxeofEvent; @@ -145,7 +140,6 @@ class LinuxSystem : public System FnEvent *esTxeofEvent; FnEvent *idleThreadEvent; //INSTRUMENTATION CODEGEN END -#endif //FS_MEASURE private: @@ -154,10 +148,8 @@ class LinuxSystem : 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; @@ -189,10 +181,8 @@ class LinuxSystem : public System static void Printf(AlphaArguments args); static void DumpMbuf(AlphaArguments args); -#ifdef FS_MEASURE bool findCaller(std::string callee, std::string caller) const; void dumpState(ExecContext *xc) const; -#endif //FS_MEASURE }; #endif // __LINUX_SYSTEM_HH__ |