summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa_traits.hh
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2012-06-05 13:52:30 -0400
committerAli Saidi <Ali.Saidi@ARM.com>2012-06-05 13:52:30 -0400
commit20d25b9da77cc681ef7d5bb101438bc0b0c6827c (patch)
treeda0bfc97bc139abecaa7dfd4cbe85d7387cb1da7 /src/arch/arm/isa_traits.hh
parentc06970b673181aa1032210b60ad799eb97105ae5 (diff)
downloadgem5-20d25b9da77cc681ef7d5bb101438bc0b0c6827c.tar.xz
ISA: Back-out NoopMachInst as a StaticInstPtr change.
Diffstat (limited to 'src/arch/arm/isa_traits.hh')
-rw-r--r--src/arch/arm/isa_traits.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index 067111b59..43b3674d4 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -95,7 +95,8 @@ namespace ArmISA
const Addr PAddrImplMask = (ULL(1) << PABits) - 1;
- const extern StaticInstPtr NoopStaticInst;
+ // return a no-op instruction... used for instruction fetch faults
+ const ExtMachInst NoopMachInst = 0x01E320F000ULL;
const int LogVMPageSize = 12; // 4K bytes
const int VMPageSize = (1 << LogVMPageSize);