Minor compile fix. Not sure why this is broken.

[gem5.git] / src / cpu / base_dyn_inst_impl.hh

diff --git a/src/cpu/base_dyn_inst_impl.hh b/src/cpu/base_dyn_inst_impl.hh
index a344990b4d18eb4e3d24bdcd635607bd12863803..d6cdff5c597bb5b020d63f9ae296c6b0f3585b17 100644 (file)
--- a/src/cpu/base_dyn_inst_impl.hh
+++ b/src/cpu/base_dyn_inst_impl.hh
@@ -36,15 +36,12 @@
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 
-#include "arch/faults.hh"
+#include "sim/faults.hh"
 #include "cpu/exetrace.hh"
 #include "mem/request.hh"
 
 #include "cpu/base_dyn_inst.hh"
 
-using namespace std;
-using namespace TheISA;
-
 #define NOHASH
 #ifndef NOHASH
 
@@ -65,7 +62,7 @@ my_hash_t thishash;
 #endif
 
 template <class Impl>
-BaseDynInst<Impl>::BaseDynInst(ExtMachInst machInst, Addr inst_PC,
+BaseDynInst<Impl>::BaseDynInst(TheISA::ExtMachInst machInst, Addr inst_PC,
                                Addr pred_PC, InstSeqNum seq_num,
                                ImplCPU *cpu)
   : staticInst(machInst), traceData(NULL), cpu(cpu)
@@ -73,8 +70,8 @@ BaseDynInst<Impl>::BaseDynInst(ExtMachInst machInst, Addr inst_PC,
     seqNum = seq_num;
 
     PC = inst_PC;
-    nextPC = PC + sizeof(MachInst);
-    nextNPC = nextPC + sizeof(MachInst);
+    nextPC = PC + sizeof(TheISA::MachInst);
+    nextNPC = nextPC + sizeof(TheISA::MachInst);
     predPC = pred_PC;
 
     initVars();
@@ -196,7 +193,7 @@ BaseDynInst<Impl>::prefetch(Addr addr, unsigned flags)
     // note this is a local, not BaseDynInst::fault
     Fault trans_fault = cpu->translateDataReadReq(req);
 
-    if (trans_fault == NoFault && !(req->flags & UNCACHEABLE)) {
+    if (trans_fault == NoFault && !(req->isUncacheable())) {
         // It's a valid address to cacheable space.  Record key MemReq
         // parameters so we can generate another one just like it for
         // the timing access without calling translate() again (which
@@ -250,7 +247,7 @@ void
 BaseDynInst<Impl>::dump()
 {
     cprintf("T%d : %#08d `", threadNumber, PC);
-    cout << staticInst->disassemble(PC);
+    std::cout << staticInst->disassemble(PC);
     cprintf("'\n");
 }