diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2011-02-23 15:10:49 -0600 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2011-02-23 15:10:49 -0600 |
| commit | 805ad4ba411100123273fad1064362284d4de344 (patch) | |
| tree | 99df4bd1ab769aefa99b300b9de15b0ce927d9c8 /src | |
| parent | 68bd80794c8c72de9c1b447ab21e8c4c0a315ee3 (diff) | |
| download | gem5-805ad4ba411100123273fad1064362284d4de344.tar.xz | |
ARM: Make Noop actually decode to a noop and set it's instflags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm/isa/insts/misc.isa | 3 | ||||
| -rw-r--r-- | src/arch/arm/isa_traits.hh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/arm/isa/insts/misc.isa b/src/arch/arm/isa/insts/misc.isa index dc7a71c0f..ad5021daf 100644 --- a/src/arch/arm/isa/insts/misc.isa +++ b/src/arch/arm/isa/insts/misc.isa @@ -477,7 +477,8 @@ let {{ exec_output += BasicExecute.subst(bkptIop) nopIop = InstObjParams("nop", "NopInst", "PredOp", \ - { "code" : "", "predicate_test" : predicateTest }) + { "code" : "", "predicate_test" : predicateTest }, + ['IsNop']) header_output += BasicDeclare.subst(nopIop) decoder_output += BasicConstructor.subst(nopIop) exec_output += PredOpExecute.subst(nopIop) diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh index c3cb622f4..c89c9abce 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 = 0xE320F000; + const ExtMachInst NoopMachInst = 0x01E320F000ULL; const int LogVMPageSize = 12; // 4K bytes const int VMPageSize = (1 << LogVMPageSize); |