summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:18 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:18 -0500
commit10031a0327f05961b537b4a63ca1a5571cf524e7 (patch)
tree39de3e2c678dab3b4d6cbfed919c322b2b5dab9e
parent22f15ab94e8210ac33d74f4f81046a0aaf09c972 (diff)
downloadgem5-10031a0327f05961b537b4a63ca1a5571cf524e7.tar.xz
ARM: Move some case values out of ##included files.
This will help keep the high level decode together and not have it spread into the subordinate decode stuff. The ##include lines still need to be on a line by themselves, though.
-rw-r--r--src/arch/arm/isa/decoder/arm.isa2
-rw-r--r--src/arch/arm/isa/decoder/decoder.isa2
-rw-r--r--src/arch/arm/isa/decoder/thumb.isa2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/arm/isa/decoder/arm.isa b/src/arch/arm/isa/decoder/arm.isa
index 29ec46f9b..3f43b23e1 100644
--- a/src/arch/arm/isa/decoder/arm.isa
+++ b/src/arch/arm/isa/decoder/arm.isa
@@ -50,7 +50,7 @@
//
//
-0: decode COND_CODE {
+decode COND_CODE {
0xF: ArmUnconditional::armUnconditional();
default: decode ENCODING {
format DataOp {
diff --git a/src/arch/arm/isa/decoder/decoder.isa b/src/arch/arm/isa/decoder/decoder.isa
index e88a18d3b..cf7d17871 100644
--- a/src/arch/arm/isa/decoder/decoder.isa
+++ b/src/arch/arm/isa/decoder/decoder.isa
@@ -41,6 +41,8 @@
// Authors: Gabe Black
decode THUMB default Unknown::unknown() {
+0:
##include "arm.isa"
+1:
##include "thumb.isa"
}
diff --git a/src/arch/arm/isa/decoder/thumb.isa b/src/arch/arm/isa/decoder/thumb.isa
index 6c1dd7d57..3799bdf1f 100644
--- a/src/arch/arm/isa/decoder/thumb.isa
+++ b/src/arch/arm/isa/decoder/thumb.isa
@@ -40,7 +40,7 @@
//
// Authors: Gabe Black
-1: decode BIGTHUMB {
+decode BIGTHUMB {
// 16 bit thumb instructions.
0: decode TOPCODE_15_13 {
0x0, 0x1: Thumb16ShiftAddSubMoveCmp::thumb16ShiftAddMoveCmp();