diff options
Diffstat (limited to 'src/arch/arm/isa/formats/branch.isa')
-rw-r--r-- | src/arch/arm/isa/formats/branch.isa | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/arch/arm/isa/formats/branch.isa b/src/arch/arm/isa/formats/branch.isa index fccfe2897..f1b17ec90 100644 --- a/src/arch/arm/isa/formats/branch.isa +++ b/src/arch/arm/isa/formats/branch.isa @@ -236,13 +236,6 @@ def format Thumb32BranchesAndMiscCtrl() {{ } case 0x1: { - ConditionCode condCode; - if(machInst.itstateMask) { - condCode = (ConditionCode)(uint8_t)machInst.itstateCond; - } else { - condCode = COND_UC; - } - const uint32_t s = bits(machInst, 26); const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s); @@ -251,19 +244,13 @@ def format Thumb32BranchesAndMiscCtrl() {{ const int32_t imm = sext<25>((s << 24) | (i1 << 23) | (i2 << 22) | (imm10 << 12) | (imm11 << 1)); - return new B(machInst, imm, condCode); + return new B(machInst, imm, COND_UC); } case 0x4: { if (bits(machInst, 0) == 1) { return new Unknown(machInst); } - ConditionCode condCode; - if(machInst.itstateMask) { - condCode = (ConditionCode)(uint8_t)machInst.itstateCond; - } else { - condCode = COND_UC; - } const uint32_t s = bits(machInst, 26); const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s); @@ -272,16 +259,10 @@ def format Thumb32BranchesAndMiscCtrl() {{ const int32_t imm = sext<25>((s << 24) | (i1 << 23) | (i2 << 22) | (imm10h << 12) | (imm10l << 2)); - return new BlxImm(machInst, imm, condCode); + return new BlxImm(machInst, imm, COND_UC); } case 0x5: { - ConditionCode condCode; - if(machInst.itstateMask) { - condCode = (ConditionCode)(uint8_t)machInst.itstateCond; - } else { - condCode = COND_UC; - } const uint32_t s = bits(machInst, 26); const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s); @@ -290,7 +271,7 @@ def format Thumb32BranchesAndMiscCtrl() {{ const int32_t imm = sext<25>((s << 24) | (i1 << 23) | (i2 << 22) | (imm10 << 12) | (imm11 << 1)); - return new Bl(machInst, imm, condCode); + return new Bl(machInst, imm, COND_UC); } default: break; |