From 20d25b9da77cc681ef7d5bb101438bc0b0c6827c Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Tue, 5 Jun 2012 13:52:30 -0400
Subject: ISA: Back-out NoopMachInst as a StaticInstPtr change.

---
 src/cpu/o3/fetch_impl.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/cpu')

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 40fe5ae01..b6eb25c08 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -661,7 +661,8 @@ DefaultFetch<Impl>::finishTranslation(Fault fault, RequestPtr mem_req)
 
         DPRINTF(Fetch, "[tid:%i]: Translation faulted, building noop.\n", tid);
         // We will use a nop in ordier to carry the fault.
-        DynInstPtr instruction = buildInst(tid, TheISA::NoopStaticInst,
+        DynInstPtr instruction = buildInst(tid,
+                decoder[tid]->decode(TheISA::NoopMachInst, fetchPC.instAddr()),
                 NULL, fetchPC, fetchPC, false);
 
         instruction->setPredTarg(fetchPC);
-- 
cgit v1.2.3