From: Gabe Black <gabeblack@google.com>
Date: Wed, 20 Dec 2017 07:48:00 +0000 (-0800)
Subject: cpu: Use the generic nop static inst instead of decoding the arch version.
X-Git-Tag: v19.0.0.0~2414
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ac0a01e2fdeee8f17d15636409acd7208d9187e;p=gem5.git

cpu: Use the generic nop static inst instead of decoding the arch version.

This removes a dependence on the ISA.

Change-Id: I01013bc70558f0831327213912bcac11258066a6
Reviewed-on: https://gem5-review.googlesource.com/6824
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
---

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 7631b4c6a..0cf8a47a7 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -727,9 +727,8 @@ DefaultFetch<Impl>::finishTranslation(const 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,
-                decoder[tid]->decode(TheISA::NoopMachInst, fetchPC.instAddr()),
-                NULL, fetchPC, fetchPC, false);
+        DynInstPtr instruction = buildInst(tid, StaticInst::nopStaticInstPtr,
+                                           NULL, fetchPC, fetchPC, false);
 
         instruction->setPredTarg(fetchPC);
         instruction->fault = fault;