From 10031a0327f05961b537b4a63ca1a5571cf524e7 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 2 Jun 2010 12:58:18 -0500 Subject: [PATCH] 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. --- src/arch/arm/isa/decoder/arm.isa | 2 +- src/arch/arm/isa/decoder/decoder.isa | 2 ++ src/arch/arm/isa/decoder/thumb.isa | 2 +- 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(); -- 2.30.2