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/linux | |
| 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/linux')
| -rw-r--r-- | kern/linux/linux_system.cc | 9 | ||||
| -rw-r--r-- | kern/linux/linux_system.hh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc index eb189658c..d7ec8a327 100644 --- a/kern/linux/linux_system.cc +++ b/kern/linux/linux_system.cc @@ -35,6 +35,7 @@ * up boot time. */ +#include "arch/alpha/system.hh" #include "base/loader/symtab.hh" #include "cpu/exec_context.hh" #include "cpu/base.hh" @@ -53,7 +54,7 @@ using namespace std; using namespace TheISA; LinuxSystem::LinuxSystem(Params *p) - : System(p) + : AlphaSystem(p) { Addr addr = 0; Addr paddr = 0; @@ -73,7 +74,7 @@ LinuxSystem::LinuxSystem(Params *p) paddr = vtophys(physmem, CommandLine()); char *commandline = (char *)physmem->dma_addr(paddr, sizeof(uint64_t)); if (commandline) - strncpy(commandline, params->boot_osflags.c_str(), CommandLineSize); + strncpy(commandline, params()->boot_osflags.c_str(), CommandLineSize); /** * find the address of the est_cycle_freq variable and insert it @@ -146,7 +147,7 @@ LinuxSystem::LinuxSystem(Params *p) printThreadEvent = NULL; } - if (params->bin_int) { + if (params()->bin_int) { intStartEvent = addPalFuncEvent<InterruptStartEvent>("sys_int_21"); if (!intStartEvent) panic("could not find symbol: sys_int_21\n"); @@ -277,7 +278,7 @@ END_INIT_SIM_OBJECT_PARAMS(LinuxSystem) CREATE_SIM_OBJECT(LinuxSystem) { - 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/linux/linux_system.hh b/kern/linux/linux_system.hh index f883bef93..9fecb7290 100644 --- a/kern/linux/linux_system.hh +++ b/kern/linux/linux_system.hh @@ -40,7 +40,7 @@ class PrintThreadInfo; * It points to objects that are the system binaries to load and patches them * appropriately to work in simulator. */ -class LinuxSystem : public System +class LinuxSystem : public AlphaSystem { private: class SkipDelayLoopEvent : public SkipFuncEvent |