summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
commite91e6ff9a46ecee70c924e3548c3fa191e83099d (patch)
tree3f6ac83d26d7427ab83f6d00acee51b52e15f1bf
parent22d1a84509dec6544bd91e63597b1b2274c590cc (diff)
downloadgem5-e91e6ff9a46ecee70c924e3548c3fa191e83099d.tar.xz
ARM: Hook the misc instructions into the thumb decoder.
-rw-r--r--src/arch/arm/isa/formats/branch.isa8
-rw-r--r--src/arch/arm/isa/formats/data.isa8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/isa/formats/branch.isa b/src/arch/arm/isa/formats/branch.isa
index 055955520..e47665266 100644
--- a/src/arch/arm/isa/formats/branch.isa
+++ b/src/arch/arm/isa/formats/branch.isa
@@ -172,13 +172,13 @@ def format Thumb32BranchesAndMiscCtrl() {{
case 0x0:
return new NopInst(machInst);
case 0x1:
- return new WarnUnimplemented("yield", machInst);
+ return new YieldInst(machInst);
case 0x2:
- return new WarnUnimplemented("wfe", machInst);
+ return new WfeInst(machInst);
case 0x3:
- return new WarnUnimplemented("wfi", machInst);
+ return new WfiInst(machInst);
case 0x4:
- return new WarnUnimplemented("sev", machInst);
+ return new SevInst(machInst);
default:
break;
}
diff --git a/src/arch/arm/isa/formats/data.isa b/src/arch/arm/isa/formats/data.isa
index a567a92b4..b46fb972d 100644
--- a/src/arch/arm/isa/formats/data.isa
+++ b/src/arch/arm/isa/formats/data.isa
@@ -1225,13 +1225,13 @@ def format Thumb16Misc() {{
case 0x0:
return new NopInst(machInst);
case 0x1:
- return new WarnUnimplemented("yield", machInst);
+ return new YieldInst(machInst);
case 0x2:
- return new WarnUnimplemented("wfe", machInst);
+ return new WfeInst(machInst);
case 0x3:
- return new WarnUnimplemented("wfi", machInst);
+ return new WfiInst(machInst);
case 0x4:
- return new WarnUnimplemented("sev", machInst);
+ return new SevInst(machInst);
default:
return new WarnUnimplemented("unallocated_hint", machInst);
}