Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/cpu/simple/base.cc:
    Hand merge

--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d

diff --cc src/cpu/simple/base.cc
index d2718c5f9d39640ac982051cd82057f91b61cb98,aa341487cb3e57fb0f3a3a6c64884f819f142d6e..5e078c502df3fb29beb6b726fcb5d790a8ed954b
--- 1/src/cpu/simple/base.cc
--- 2/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@@ -338,9 -337,9 +340,9 @@@ BaseSimpleCPU::setupFetchRequest(Reques
              thread->readNextPC());
  #endif
  
 -    req->setVirt(0, threadPC & ~3, sizeof(MachInst),
 -                 (FULL_SYSTEM && (threadPC & 1)) ? PHYSICAL : 0,
 -                 threadPC);
 +    const Addr PCMask = ~(sizeof(MachInst) - 1);
 +    Addr fetchPC = thread->readPC() + fetchOffset;
-     req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, thread->readPC());
++    req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, threadPC());
  
      Fault fault = thread->translateInstReq(req);