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.

diff --git a/src/arch/arm/isa/decoder/arm.isa b/src/arch/arm/isa/decoder/arm.isa
index 29ec46f9bd2f8bbb696162f7c8964dd7743e435f..3f43b23e1c3beac5bb91260f9b8b56a96bc621ca 100644 (file)
--- 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 e88a18d3bd9341dc1af7754045106f7129ca28e8..cf7d1787172b1b2ce2bca774f2cc79c7fd20755a 100644 (file)
--- 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 6c1dd7d57b8fbc3efd6ec279fd40231002171222..3799bdf1fe5d5acc02607fd26ffe5f0a80315441 100644 (file)
--- 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();