Simplify filter accepts function to just return 'condition' instead of branching to return true/false. No functional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198221 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2013-12-30 17:22:20 +00:00
parent b2299f0c80
commit d2f307195a

View File

@ -78,12 +78,9 @@ public:
ModRMFilter(), ModRMFilter(),
R(r) { R(r) {
} }
bool accepts(uint8_t modRM) const { bool accepts(uint8_t modRM) const {
if (R == ((modRM & 0xc0) == 0xc0)) return (R == ((modRM & 0xc0) == 0xc0));
return true;
else
return false;
} }
}; };
@ -109,13 +106,10 @@ public:
C0_FF(c0_ff), C0_FF(c0_ff),
NNN_or_ModRM(nnn_or_modRM) { NNN_or_ModRM(nnn_or_modRM) {
} }
bool accepts(uint8_t modRM) const { bool accepts(uint8_t modRM) const {
if ((C0_FF && modRM >= 0xc0 && (modRM == NNN_or_ModRM)) || return ((C0_FF && modRM >= 0xc0 && (modRM == NNN_or_ModRM)) ||
(!C0_FF && modRM < 0xc0 && ((modRM & 0x38) >> 3) == NNN_or_ModRM)) (!C0_FF && modRM < 0xc0 && ((modRM & 0x38) >> 3) == NNN_or_ModRM));
return true;
else
return false;
} }
}; };
@ -133,12 +127,9 @@ public:
/// refers to the first register in the register set. /// refers to the first register in the register set.
AddRegEscapeFilter(uint8_t modRM) : ModRM(modRM) { AddRegEscapeFilter(uint8_t modRM) : ModRM(modRM) {
} }
bool accepts(uint8_t modRM) const { bool accepts(uint8_t modRM) const {
if (modRM >= ModRM && modRM < ModRM + 8) return (modRM >= ModRM && modRM < ModRM + 8);
return true;
else
return false;
} }
}; };
@ -159,14 +150,11 @@ public:
R(r), R(r),
NNN(nnn) { NNN(nnn) {
} }
bool accepts(uint8_t modRM) const { bool accepts(uint8_t modRM) const {
if (((R && ((modRM & 0xc0) == 0xc0)) || return (((R && ((modRM & 0xc0) == 0xc0)) ||
(!R && ((modRM & 0xc0) != 0xc0))) && (!R && ((modRM & 0xc0) != 0xc0))) &&
(((modRM & 0x38) >> 3) == NNN)) (((modRM & 0x38) >> 3) == NNN));
return true;
else
return false;
} }
}; };
@ -183,12 +171,9 @@ public:
ModRMFilter(), ModRMFilter(),
ModRM(modRM) { ModRM(modRM) {
} }
bool accepts(uint8_t modRM) const { bool accepts(uint8_t modRM) const {
if (ModRM == modRM) return (ModRM == modRM);
return true;
else
return false;
} }
}; };