diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-09 15:10:55 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-09 15:10:55 -0500 |
| commit | e30bce8f8e4fdb3dbf4f8161f496c94c85d3d8cf (patch) | |
| tree | 807b9c63a4bb6a1712acbe53419a3726dce3ada7 /cpu | |
| parent | a3aae21d031c93ab1b9a90d435d9590dad2482c4 (diff) | |
| download | gem5-e30bce8f8e4fdb3dbf4f8161f496c94c85d3d8cf.tar.xz | |
Use functions to access XC.
cpu/exec_context.hh:
Include readNextNPC function.
cpu/simple/cpu.cc:
Use functions to set and access nextPC, nextNPC.
--HG--
extra : convert_revision : 22622b9c110e1d99cc9106a2a27c479579d7e1ad
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/exec_context.hh | 5 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index 550a1ca23..d6a3fef8b 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -422,6 +422,11 @@ class ExecContext regs.npc = val; } + uint64_t readNextNPC() + { + return regs.nnpc; + } + void setNextNPC(uint64_t val) { regs.nnpc = val; diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index f1a3ebd0b..c85154521 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -825,8 +825,8 @@ SimpleCPU::tick() #else // go to the next instruction xc->regs.pc = xc->regs.npc; - xc->regs.npc = xc->regs.nnpc; - xc->regs.nnpc += sizeof(MachInst); + xc->setNextPC(xc->readNextNPC()); + xc->setNextNPC(xc->readNextNPC() + sizeof(MachInst)); #endif } |