diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/pc_event.cc | 4 | ||||
| -rw-r--r-- | cpu/pc_event.hh | 4 | ||||
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.hh | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc index a86c017d4..8f046a7a4 100644 --- a/cpu/pc_event.cc +++ b/cpu/pc_event.cc @@ -77,7 +77,7 @@ PCEventQueue::schedule(PCEvent *event) bool PCEventQueue::doService(ExecContext *xc) { - Addr pc = xc->regs.pc; + Addr pc = xc->regs.pc & ~0x3; int serviced = 0; range_t range = equal_range(pc); for (iterator i = range.first; i != range.second; ++i) { @@ -85,7 +85,7 @@ PCEventQueue::doService(ExecContext *xc) // another event. This for example, prevents two invocations // of the SkipFuncEvent. Maybe we should have separate PC // event queues for each processor? - if (pc != xc->regs.pc) + if (pc != (xc->regs.pc & ~0x3)) continue; DPRINTF(PCEvent, "PC based event serviced at %#x: %s\n", diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh index 131016fc6..9983d679b 100644 --- a/cpu/pc_event.hh +++ b/cpu/pc_event.hh @@ -143,7 +143,7 @@ PCEvent::schedule(Addr pc) { if (evpc != badpc) panic("cannot switch PC"); - evpc = pc; + evpc = pc & ~0x3; return schedule(); } @@ -158,7 +158,7 @@ PCEvent::schedule(PCEventQueue *q, Addr pc) panic("cannot switch addresses"); queue = q; - evpc = pc; + evpc = pc & ~0x3; return schedule(); } diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh index 6ab231e7e..451c801ee 100644 --- a/cpu/simple_cpu/simple_cpu.hh +++ b/cpu/simple_cpu/simple_cpu.hh @@ -40,7 +40,6 @@ // forward declarations #ifdef FULL_SYSTEM class Processor; -class Kernel; class AlphaITB; class AlphaDTB; class PhysicalMemory; |