sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ARM: Clean up condCodes in IT blocks.

Browse source
This commit is contained in:
Ali Saidi 2012-03-21 10:34:06 -05:00
parent a64319f764
commit ed8ed6e761
3 changed files with 17 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/arch/arm/insts/branch.hh
View file

@ -63,16 +63,15 @@ class BranchImm : public PredOp
// Conditionally Branch to a target computed with an immediate // Conditionally Branch to a target computed with an immediate
class BranchImmCond : public BranchImm class BranchImmCond : public BranchImm
{ {
protected:
// This will mask the condition code stored for PredOp. Ideally these two
// class would cooperate, but they're not set up to do that at the moment.
ConditionCode condCode;
public: public:
BranchImmCond(const char *mnem, ExtMachInst _machInst, OpClass __opClass, BranchImmCond(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
int32_t _imm, ConditionCode _condCode) : int32_t _imm, ConditionCode _condCode) :
BranchImm(mnem, _machInst, __opClass, _imm), condCode(_condCode) BranchImm(mnem, _machInst, __opClass, _imm)
{} {
// Only update if this isn't part of an IT block
if (!machInst.itstateMask)
condCode = _condCode;
}
}; };
// Branch to a target computed with a register // Branch to a target computed with a register
@ -91,16 +90,15 @@ class BranchReg : public PredOp
// Conditionally Branch to a target computed with a register // Conditionally Branch to a target computed with a register
class BranchRegCond : public BranchReg class BranchRegCond : public BranchReg
{ {
protected:
// This will mask the condition code stored for PredOp. Ideally these two
// class would cooperate, but they're not set up to do that at the moment.
ConditionCode condCode;
public: public:
BranchRegCond(const char *mnem, ExtMachInst _machInst, OpClass __opClass, BranchRegCond(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
IntRegIndex _op1, ConditionCode _condCode) : IntRegIndex _op1, ConditionCode _condCode) :
BranchReg(mnem, _machInst, __opClass, _op1), condCode(_condCode) BranchReg(mnem, _machInst, __opClass, _op1)
{} {
// Only update if this isn't part of an IT block
if (!machInst.itstateMask)
condCode = _condCode;
}
}; };
// Branch to a target computed with two registers // Branch to a target computed with two registers

25
src/arch/arm/isa/formats/branch.isa
View file

@ -236,13 +236,6 @@ def format Thumb32BranchesAndMiscCtrl() {{
} }
case 0x1: 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 s = bits(machInst, 26);
const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i1 = !(bits(machInst, 13) ^ s);
const uint32_t i2 = !(bits(machInst, 11) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s);
@ -251,19 +244,13 @@ def format Thumb32BranchesAndMiscCtrl() {{
const int32_t imm = sext<25>((s << 24) | const int32_t imm = sext<25>((s << 24) |
(i1 << 23) | (i2 << 22) | (i1 << 23) | (i2 << 22) |
(imm10 << 12) | (imm11 << 1)); (imm10 << 12) | (imm11 << 1));
return new B(machInst, imm, condCode); return new B(machInst, imm, COND_UC);
} }
case 0x4: case 0x4:
{ {
if (bits(machInst, 0) == 1) { if (bits(machInst, 0) == 1) {
return new Unknown(machInst); 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 s = bits(machInst, 26);
const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i1 = !(bits(machInst, 13) ^ s);
const uint32_t i2 = !(bits(machInst, 11) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s);
@ -272,16 +259,10 @@ def format Thumb32BranchesAndMiscCtrl() {{
const int32_t imm = sext<25>((s << 24) | const int32_t imm = sext<25>((s << 24) |
(i1 << 23) | (i2 << 22) | (i1 << 23) | (i2 << 22) |
(imm10h << 12) | (imm10l << 2)); (imm10h << 12) | (imm10l << 2));
return new BlxImm(machInst, imm, condCode); return new BlxImm(machInst, imm, COND_UC);
} }
case 0x5: 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 s = bits(machInst, 26);
const uint32_t i1 = !(bits(machInst, 13) ^ s); const uint32_t i1 = !(bits(machInst, 13) ^ s);
const uint32_t i2 = !(bits(machInst, 11) ^ s); const uint32_t i2 = !(bits(machInst, 11) ^ s);
@ -290,7 +271,7 @@ def format Thumb32BranchesAndMiscCtrl() {{
const int32_t imm = sext<25>((s << 24) | const int32_t imm = sext<25>((s << 24) |
(i1 << 23) | (i2 << 22) | (i1 << 23) | (i2 << 22) |
(imm10 << 12) | (imm11 << 1)); (imm10 << 12) | (imm11 << 1));
return new Bl(machInst, imm, condCode); return new Bl(machInst, imm, COND_UC);
} }
default: default:
break; break;

16
src/arch/arm/isa/formats/data.isa
View file

@ -1040,25 +1040,13 @@ def format Thumb16SpecDataAndBx() {{
return new MovReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL); return new MovReg(machInst, rdn, INTREG_ZERO, rm, 0, LSL);
case 0x3: case 0x3:
if (bits(machInst, 7) == 0) { if (bits(machInst, 7) == 0) {
ConditionCode condCode;
if(machInst.itstateMask) {
condCode = (ConditionCode)(uint8_t)machInst.itstateCond;
} else {
condCode = COND_UC;
}
return new BxReg(machInst, return new BxReg(machInst,
(IntRegIndex)(uint32_t)bits(machInst, 6, 3), (IntRegIndex)(uint32_t)bits(machInst, 6, 3),
condCode); COND_UC);
} else { } else {
ConditionCode condCode;
if(machInst.itstateMask) {
condCode = (ConditionCode)(uint8_t)machInst.itstateCond;
} else {
condCode = COND_UC;
}
return new BlxReg(machInst, return new BlxReg(machInst,
(IntRegIndex)(uint32_t)bits(machInst, 6, 3), (IntRegIndex)(uint32_t)bits(machInst, 6, 3),
condCode); COND_UC);
} }
} }
} }