diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-03 14:25:26 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-03 14:25:26 -0500 |
| commit | 9ad917858763bb44c8e6e22b7bb370fd50d518df (patch) | |
| tree | eac667084b6627aaca784aa2061256a5750726ab /kern/tru64 | |
| parent | 7546fabe68a1dc6ec9b9e020f5e2b1cc0aa31c21 (diff) | |
| parent | 0bf25c595364f7ca9b5e632c84fcf0d35dc3490a (diff) | |
| download | gem5-9ad917858763bb44c8e6e22b7bb370fd50d518df.tar.xz | |
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
--HG--
extra : convert_revision : 8f463682e32a457cd9171c63dcec5209cb850b56
Diffstat (limited to 'kern/tru64')
| -rw-r--r-- | kern/tru64/tru64_system.cc | 4 | ||||
| -rw-r--r-- | kern/tru64/tru64_system.hh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc index 48e02d90b..aa78e8de6 100644 --- a/kern/tru64/tru64_system.cc +++ b/kern/tru64/tru64_system.cc @@ -42,7 +42,7 @@ using namespace std; Tru64System::Tru64System(Tru64System::Params *p) - : System(p) + : AlphaSystem(p) { Addr addr = 0; if (kernelSymtab->findAddress("enable_async_printf", addr)) { @@ -136,7 +136,7 @@ END_INIT_SIM_OBJECT_PARAMS(Tru64System) CREATE_SIM_OBJECT(Tru64System) { - System::Params *p = new System::Params; + AlphaSystem::Params *p = new AlphaSystem::Params; p->name = getInstanceName(); p->boot_cpu_frequency = boot_cpu_frequency; p->memctrl = memctrl; diff --git a/kern/tru64/tru64_system.hh b/kern/tru64/tru64_system.hh index d4eb5a59a..38e6d9dd7 100644 --- a/kern/tru64/tru64_system.hh +++ b/kern/tru64/tru64_system.hh @@ -29,8 +29,9 @@ #ifndef __KERN_TRU64_TRU64_SYSTEM_HH__ #define __KERN_TRU64_TRU64_SYSTEM_HH__ -#include "sim/system.hh" +#include "arch/alpha/system.hh" #include "arch/isa_traits.hh" +#include "sim/system.hh" class ExecContext; @@ -42,7 +43,7 @@ class DebugPrintfEvent; class DumpMbufEvent; class AlphaArguments; -class Tru64System : public System +class Tru64System : public AlphaSystem { private: #ifdef DEBUG |