Merge pull request #6712 from lioncash/const

Jit_Integer: Make arrays const in MultiplyImmediate() and twX()
This commit is contained in:
Markus Wick 2018-04-29 10:38:08 +02:00 committed by GitHub
commit e51cf8870e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -968,8 +968,8 @@ void Jit64::MultiplyImmediate(u32 imm, int a, int d, bool overflow)
// We could handle factors of 2^N*3, 2^N*5, and 2^N*9 using lea+shl, but testing shows // We could handle factors of 2^N*3, 2^N*5, and 2^N*9 using lea+shl, but testing shows
// it seems to be slower overall. // it seems to be slower overall.
static u8 lea_scales[3] = {3, 5, 9}; static constexpr std::array<u8, 3> lea_scales{{3, 5, 9}};
for (int i = 0; i < 3; i++) for (size_t i = 0; i < lea_scales.size(); i++)
{ {
if (imm == lea_scales[i]) if (imm == lea_scales[i])
{ {
@ -1899,10 +1899,10 @@ void Jit64::twX(UGeckoInstruction inst)
CMP(32, gpr.R(a), gpr.R(inst.RB)); CMP(32, gpr.R(a), gpr.R(inst.RB));
} }
constexpr std::array<CCFlags, 5> conditions{{CC_A, CC_B, CC_E, CC_G, CC_L}};
std::vector<FixupBranch> fixups; std::vector<FixupBranch> fixups;
CCFlags conditions[] = {CC_A, CC_B, CC_E, CC_G, CC_L};
for (int i = 0; i < 5; i++) for (size_t i = 0; i < conditions.size(); i++)
{ {
if (inst.TO & (1 << i)) if (inst.TO & (1 << i))
{ {