summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/formats/branch.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:07 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:07 -0500
commit566b2ff20c311375a1d25cde735ddfb70706b581 (patch)
tree4657d5202cab9ad9e5dadf4b8d8cf7b67cfae415 /src/arch/arm/isa/formats/branch.isa
parentb9cfe9a3dba31afa5aca75e76b91441473a764d6 (diff)
downloadgem5-566b2ff20c311375a1d25cde735ddfb70706b581.tar.xz
ARM: Decode the nop instruction.
Diffstat (limited to 'src/arch/arm/isa/formats/branch.isa')
-rw-r--r--src/arch/arm/isa/formats/branch.isa2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/arm/isa/formats/branch.isa b/src/arch/arm/isa/formats/branch.isa
index 865a73b32..999126081 100644
--- a/src/arch/arm/isa/formats/branch.isa
+++ b/src/arch/arm/isa/formats/branch.isa
@@ -157,7 +157,7 @@ def format Thumb32BranchesAndMiscCtrl() {{
} else {
switch (op2) {
case 0x0:
- return new WarnUnimplemented("nop", machInst);
+ return new NopInst(machInst);
case 0x1:
return new WarnUnimplemented("yield", machInst);
case 0x2: