diff options
Diffstat (limited to 'cpu/simple')
| -rw-r--r-- | cpu/simple/cpu.cc | 6 | ||||
| -rw-r--r-- | cpu/simple/cpu.hh | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index b5ba6ecc9..44521a542 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -75,9 +75,11 @@ #endif // FULL_SYSTEM using namespace std; -//The SimpleCPU does alpha only -using namespace AlphaISA; +//The SimpleCPU does alpha only +//Change this to include arch/isa_traits.hh? +//using namespace AlphaISA; +#include "arch/isa_traits.hh" SimpleCPU::TickEvent::TickEvent(SimpleCPU *c, int w) : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c), width(w) diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh index fbfae950f..21944a49f 100644 --- a/cpu/simple/cpu.hh +++ b/cpu/simple/cpu.hh @@ -364,7 +364,12 @@ class SimpleCPU : public BaseCPU } uint64_t readPC() { return cpuXC->readPC(); } + uint64_t readNextPC() { return cpuXC->readNextPC(); } + uint64_t readNextNPC() { return cpuXC->readNextNPC(); } + + void setPC(uint64_t val) { cpuXC->setPC(val); } void setNextPC(uint64_t val) { cpuXC->setNextPC(val); } + void setNextNPC(uint64_t val) { cpuXC->setNextNPC(val); } MiscReg readMiscReg(int misc_reg) { |