summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/formats/data.isa
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/isa/formats/data.isa')
-rw-r--r--src/arch/arm/isa/formats/data.isa16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/arch/arm/isa/formats/data.isa b/src/arch/arm/isa/formats/data.isa
index ffe5f45e3..3ee178f0e 100644
--- a/src/arch/arm/isa/formats/data.isa
+++ b/src/arch/arm/isa/formats/data.isa
@@ -1040,25 +1040,13 @@ def format Thumb16SpecDataAndBx() {{
return new MovReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
case 0x3:
if (bits(machInst, 7) == 0) {
- ConditionCode condCode;
- if(machInst.itstateMask) {
- condCode = (ConditionCode)(uint8_t)machInst.itstateCond;
- } else {
- condCode = COND_UC;
- }
return new BxReg(machInst,
(IntRegIndex)(uint32_t)bits(machInst, 6, 3),
- condCode);
+ COND_UC);
} else {
- ConditionCode condCode;
- if(machInst.itstateMask) {
- condCode = (ConditionCode)(uint8_t)machInst.itstateCond;
- } else {
- condCode = COND_UC;
- }
return new BlxReg(machInst,
(IntRegIndex)(uint32_t)bits(machInst, 6, 3),
- condCode);
+ COND_UC);
}
}
}