From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Tue, 18 Jan 2011 22:30:01 +0000 (-0600)
Subject: ARM: Use an actual NOP instead of a instruction that happens to do nothing
X-Git-Tag: stable_2012_02_02~650
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=965a01d913f71570150c839ffc7376084d0fed88;p=gem5.git

ARM: Use an actual NOP instead of a instruction that happens to do nothing
---

diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index b2989e4b3..c3cb622f4 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -97,7 +97,7 @@ namespace ArmISA
     const Addr PAddrImplMask = (ULL(1) << PABits) - 1;
 
     // return a no-op instruction... used for instruction fetch faults
-    const ExtMachInst NoopMachInst = 0x00000000;
+    const ExtMachInst NoopMachInst = 0xE320F000;
 
     const int LogVMPageSize = 12;       // 4K bytes
     const int VMPageSize = (1 << LogVMPageSize);