From: Gabe Black <gblack@eecs.umich.edu>
Date: Thu, 31 May 2007 20:45:04 +0000 (+0000)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta4~393
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c432588981c2903fda4b00bf03ada3c2c04063f7;p=gem5.git

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
---

c432588981c2903fda4b00bf03ada3c2c04063f7
diff --cc src/cpu/simple/base.cc
index d2718c5f9,aa341487c..5e078c502
--- a/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);