From da61c4b3ee4571d43f7133640eeda2cf51e21cd9 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 25 Feb 2009 10:18:36 -0800
Subject: CPU: Don't fetch when executing a macroop. If the CPL changes mid
 macroop, the end of the instruction might not be priveleged enough to execute
 the beginning.

---
 src/cpu/simple/timing.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cpu/simple/timing.cc')

diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 3f5778138..f398365d3 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -667,7 +667,7 @@ TimingSimpleCPU::fetch()
 
     bool fromRom = isRomMicroPC(thread->readMicroPC());
 
-    if (!fromRom) {
+    if (!fromRom && !curMacroStaticInst) {
         Request *ifetch_req = new Request();
         ifetch_req->setThreadContext(_cpuId, /* thread ID */ 0);
         setupFetchRequest(ifetch_req);
-- 
cgit v1.2.3