diff -r c693aac74dfd -r ace48739e4b9 src/arch/arm/isa/formats/data.isa --- a/src/arch/arm/isa/formats/data.isa Fri Aug 13 11:53:42 2010 -0500 +++ b/src/arch/arm/isa/formats/data.isa Fri Aug 13 11:54:02 2010 -0500 @@ -1042,11 +1042,11 @@ if (bits(machInst, 7) == 0) { return new BxReg(machInst, (IntRegIndex)(uint32_t)bits(machInst, 6, 3), - COND_UC); + (ArmISA::ConditionCode)(uint8_t)machInst.itstateCond); } else { return new BlxReg(machInst, (IntRegIndex)(uint32_t)bits(machInst, 6, 3), - COND_UC); + (ArmISA::ConditionCode)(uint8_t)machInst.itstateCond); } } }