40a41
> #include "arch/tlb.hh"
234a236
> Addr m5Pc, lgnPc;
235a238
>
237a241,242
> m5Pc = PC & TheISA::PAddrImplMask;
> lgnPc = shared_data->pc & TheISA::PAddrImplMask;
239c244
< if (shared_data->pc != PC)
---
> if (lgnPc != m5Pc)
243,244c248,249
< for (int i = 0; i < TheISA::NumIntRegs; i++) {
< if (thread->readIntReg(i) != shared_data->intregs[i])
---
> for (int i = 0; i < TheISA::NumRegularIntRegs; i++) {
> if (thread->readIntReg(i) != shared_data->intregs[i]) {
245a251
> }
256c262
< outs << endl << endl;;
---
> outs << endl << endl;
258c264
< outs << setfill(' ') << setw(15)
---
> outs << right << setfill(' ') << setw(15)
260c266
< << hex << PC << endl;
---
> << hex << m5Pc << endl;
263c269
< << shared_data->pc << endl << endl;
---
> << lgnPc << endl << endl;
268c274
< << staticInst->disassemble(PC, debugSymbolTable)
---
> << staticInst->disassemble(m5Pc, debugSymbolTable)
276c282
< << legionInst->disassemble(shared_data->pc, debugSymbolTable)
---
> << legionInst->disassemble(lgnPc, debugSymbolTable)
389c395
< int shmfd = shmget(getuid(), sizeof(SharedData), 0777);
---
> int shmfd = shmget('M' << 24 | getuid(), sizeof(SharedData), 0777);
403a410,411
> // step legion forward one cycle so we can get register values
> shared_data->flags = OWN_LEGION;