diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-30 10:42:55 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-30 10:42:55 -0500 |
| commit | 0b2deb2a8897fa857d2b3e1936401c6666fdc728 (patch) | |
| tree | b4da42277ec3213472f5e2466e26a6966da74e50 /arch/alpha | |
| parent | 2ad1db3fde4f95eaf0b1be77910de0feb2185712 (diff) | |
| download | gem5-0b2deb2a8897fa857d2b3e1936401c6666fdc728.tar.xz | |
Fixes for full system compiling.
arch/alpha/arguments.cc:
There will not be a phys mem ptr in the XC in the newmem. This read will have to go through something else.
arch/alpha/ev5.cc:
Remove instantiations of these functions for the FastCPU, as the FastCPU is not really used. Also this messed up the ability to specify which CPU models are being built.
cpu/exec_context.hh:
Remove getPhysMemPtr() function.
cpu/exetrace.cc:
Include sim/system.hh, and sort the includes.
cpu/simple/cpu.cc:
Fixes for full system compilation.
kern/system_events.cc:
Remove include of encumbered FullCPU. The branch prediction will need to be fixed up in a more generic way in the future.
--HG--
extra : convert_revision : a8bbf562a277aa80e8f40112570c0a825298a05c
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/arguments.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/ev5.cc | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc index a782ea330..338581e32 100644 --- a/arch/alpha/arguments.cc +++ b/arch/alpha/arguments.cc @@ -60,7 +60,9 @@ AlphaArguments::getArg(bool fp) } else { Addr sp = xc->readIntReg(30); Addr paddr = vtophys(xc, sp + (number-6) * sizeof(uint64_t)); - return xc->getPhysMemPtr()->phys_read_qword(paddr); + // @todo: This read must go through the system or something else. +// return xc->getPhysMemPtr()->phys_read_qword(paddr); + return 0; } } diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index a5a8851c2..12f7659e6 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -36,7 +36,6 @@ #include "cpu/base.hh" #include "cpu/cpu_exec_context.hh" #include "cpu/exec_context.hh" -#include "cpu/fast/cpu.hh" #include "kern/kernel_stats.hh" #include "sim/debug.hh" #include "sim/sim_events.hh" @@ -575,12 +574,4 @@ CPUExecContext::simPalCheck(int palFunc) return true; } -//Forward instantiation for FastCPU object -template -void AlphaISA::processInterrupts(FastCPU *xc); - -//Forward instantiation for FastCPU object -template -void AlphaISA::zeroRegisters(FastCPU *xc); - #endif // FULL_SYSTEM |