diff options
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/exec_context.hh | 4 | ||||
| -rw-r--r-- | cpu/pc_event.cc | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index 5c1db6297..6964b35b8 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -245,8 +245,8 @@ class ExecContext // stores (WH64?) // Unsuccesful Store Conditionals would have returned above, // and wouldn't fall through - for(int i = 0; i < system->num_cpus; i++){ - cregs = &system->xc_array[i]->regs.miscRegs; + for(int i = 0; i < system->xcvec.size(); i++){ + cregs = &system->xcvec[i]->regs.miscRegs; if((cregs->lock_addr & ~0xf) == (req->paddr & ~0xf)) { cregs->lock_flag = false; } diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc index a275c2c41..7b72f5c08 100644 --- a/cpu/pc_event.cc +++ b/cpu/pc_event.cc @@ -40,7 +40,6 @@ #ifdef FULL_SYSTEM #include "targetarch/arguments.hh" #include "targetarch/pmap.h" -#include "kern/tru64/kernel.hh" #include "mem/functional_mem/memory_control.hh" #include "cpu/full_cpu/cpu.hh" #include "sim/system.hh" @@ -163,6 +162,9 @@ BadAddrEvent::process(ExecContext *xc) DPRINTF(BADADDR, "badaddr arg=%#x good\n", a0); } +void Printf(AlphaArguments args); +void DumpMbuf(AlphaArguments args); + void PrintfEvent::process(ExecContext *xc) { @@ -170,7 +172,7 @@ PrintfEvent::process(ExecContext *xc) DebugOut() << curTick << ": " << xc->cpu->name() << ": "; AlphaArguments args(xc); - Kernel::Printf(args); + Printf(args); } } @@ -182,7 +184,7 @@ DebugPrintfEvent::process(ExecContext *xc) DebugOut() << curTick << ": " << xc->cpu->name() << ": "; AlphaArguments args(xc); - Kernel::Printf(args); + Printf(args); } } @@ -191,7 +193,7 @@ DumpMbufEvent::process(ExecContext *xc) { if (DTRACE(DebugPrintf)) { AlphaArguments args(xc); - Kernel::DumpMbuf(args); + DumpMbuf(args); } } #endif |