39c39
< #include "arch/faults.hh"
---
> #include "sim/faults.hh"
45,47d44
< using namespace std;
< using namespace TheISA;
<
68c65
< BaseDynInst<Impl>::BaseDynInst(ExtMachInst machInst, Addr inst_PC,
---
> BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC,
76,77c73,74
< nextPC = PC + sizeof(MachInst);
< nextNPC = nextPC + sizeof(MachInst);
---
> nextPC = PC + sizeof(TheISA::MachInst);
> nextNPC = nextPC + sizeof(TheISA::MachInst);
253c250
< cout << staticInst->disassemble(PC);
---
> std::cout << staticInst->disassemble(PC);