Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9850 from Tilka/so_lt 
PowerPC: move SO bit to a more convenient location
  • Loading branch information
@Tilka
Tilka committed Jun 28, 2021
2 parents aff39af + a68c1bf commit 156f625
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 56 deletions.
20 changes: 11 additions & 9 deletions Source/Core/Core/PowerPC/ConditionRegister.h
View file
Expand Up @@ -20,12 +20,15 @@ enum CRBits
CR_EQ_BIT = 1,
CR_GT_BIT = 2,
CR_LT_BIT = 3,

CR_EMU_SO_BIT = 59,
CR_EMU_LT_BIT = 62,
};

// Optimized CR implementation. Instead of storing CR in its PowerPC format
// (4 bit value, SO/EQ/LT/GT), we store instead a 64 bit value for each of
// the 8 CR register parts. This 64 bit value follows this format:
// - SO iff. bit 61 is set
// - SO iff. bit 59 is set
// - EQ iff. lower 32 bits == 0
// - GT iff. (s64)cr_val > 0
// - LT iff. bit 62 is set
Expand All @@ -46,10 +49,10 @@ struct ConditionRegister
static u64 PPCToInternal(u8 value)
{
u64 cr_val = 0x100000000;
cr_val |= (u64) !!(value & CR_SO) << 61;
cr_val |= (u64) !!(value & CR_SO) << CR_EMU_SO_BIT;
cr_val |= (u64) !(value & CR_EQ);
cr_val |= (u64) !(value & CR_GT) << 63;
cr_val |= (u64) !!(value & CR_LT) << 62;
cr_val |= (u64) !!(value & CR_LT) << CR_EMU_LT_BIT;

return cr_val;
}
Expand All @@ -63,14 +66,13 @@ struct ConditionRegister
const u64 cr_val = fields[cr_field];
u32 ppc_cr = 0;

// SO
ppc_cr |= !!(cr_val & (1ull << 61));
// LT/SO
static_assert(CR_EMU_LT_BIT - CR_EMU_SO_BIT == CR_LT_BIT - CR_SO_BIT);
ppc_cr |= (cr_val >> CR_EMU_SO_BIT) & (PowerPC::CR_LT | PowerPC::CR_SO);
// EQ
ppc_cr |= ((cr_val & 0xFFFFFFFF) == 0) << 1;
ppc_cr |= ((cr_val & 0xFFFFFFFF) == 0) << PowerPC::CR_EQ_BIT;
// GT
ppc_cr |= (static_cast<s64>(cr_val) > 0) << 2;
// LT
ppc_cr |= !!(cr_val & (1ull << 62)) << 3;
ppc_cr |= (static_cast<s64>(cr_val) > 0) << PowerPC::CR_GT_BIT;

return ppc_cr;
}
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
View file
Expand Up @@ -13,7 +13,8 @@ void Interpreter::Helper_UpdateCR0(u32 value)
{
s64 sign_extended = (s64)(s32)value;
u64 cr_val = (u64)sign_extended;
cr_val = (cr_val & ~(1ull << 61)) | ((u64)PowerPC::GetXER_SO() << 61);
cr_val = (cr_val & ~(1ull << PowerPC::CR_EMU_SO_BIT)) |
((u64)PowerPC::GetXER_SO() << PowerPC::CR_EMU_SO_BIT);

PowerPC::ppcState.cr.fields[0] = cr_val;
}
Expand Down
30 changes: 15 additions & 15 deletions Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
View file
Expand Up @@ -24,8 +24,8 @@ void Jit64::GetCRFieldBit(int field, int bit, X64Reg out, bool negate)
{
switch (bit)
{
case PowerPC::CR_SO_BIT: // check bit 61 set
BT(64, CROffset(field), Imm8(61));
case PowerPC::CR_SO_BIT: // check bit 59 set
BT(64, CROffset(field), Imm8(PowerPC::CR_EMU_SO_BIT));
SETcc(negate ? CC_NC : CC_C, R(out));
break;

Expand All @@ -40,7 +40,7 @@ void Jit64::GetCRFieldBit(int field, int bit, X64Reg out, bool negate)
break;

case PowerPC::CR_LT_BIT: // check bit 62 set
BT(64, CROffset(field), Imm8(62));
BT(64, CROffset(field), Imm8(PowerPC::CR_EMU_LT_BIT));
SETcc(negate ? CC_NC : CC_C, R(out));
break;

Expand All @@ -59,9 +59,9 @@ void Jit64::SetCRFieldBit(int field, int bit, X64Reg in)

switch (bit)
{
case PowerPC::CR_SO_BIT: // set bit 61 to input
BTR(64, R(RSCRATCH2), Imm8(61));
SHL(64, R(in), Imm8(61));
case PowerPC::CR_SO_BIT: // set bit 59 to input
BTR(64, R(RSCRATCH2), Imm8(PowerPC::CR_EMU_SO_BIT));
SHL(64, R(in), Imm8(PowerPC::CR_EMU_SO_BIT));
OR(64, R(RSCRATCH2), R(in));
break;

Expand All @@ -80,8 +80,8 @@ void Jit64::SetCRFieldBit(int field, int bit, X64Reg in)
break;

case PowerPC::CR_LT_BIT: // set bit 62 to input
BTR(64, R(RSCRATCH2), Imm8(62));
SHL(64, R(in), Imm8(62));
BTR(64, R(RSCRATCH2), Imm8(PowerPC::CR_EMU_LT_BIT));
SHL(64, R(in), Imm8(PowerPC::CR_EMU_LT_BIT));
OR(64, R(RSCRATCH2), R(in));
break;
}
Expand All @@ -95,7 +95,7 @@ void Jit64::ClearCRFieldBit(int field, int bit)
switch (bit)
{
case PowerPC::CR_SO_BIT:
BTR(64, CROffset(field), Imm8(61));
BTR(64, CROffset(field), Imm8(PowerPC::CR_EMU_SO_BIT));
break;

case PowerPC::CR_EQ_BIT:
Expand All @@ -110,7 +110,7 @@ void Jit64::ClearCRFieldBit(int field, int bit)
break;

case PowerPC::CR_LT_BIT:
BTR(64, CROffset(field), Imm8(62));
BTR(64, CROffset(field), Imm8(PowerPC::CR_EMU_LT_BIT));
break;
}
// We don't need to set bit 32; the cases where that's needed only come up when setting bits, not
Expand All @@ -126,7 +126,7 @@ void Jit64::SetCRFieldBit(int field, int bit)
switch (bit)
{
case PowerPC::CR_SO_BIT:
BTS(64, R(RSCRATCH), Imm8(61));
BTS(64, R(RSCRATCH), Imm8(PowerPC::CR_EMU_SO_BIT));
break;

case PowerPC::CR_EQ_BIT:
Expand All @@ -139,7 +139,7 @@ void Jit64::SetCRFieldBit(int field, int bit)
break;

case PowerPC::CR_LT_BIT:
BTS(64, R(RSCRATCH), Imm8(62));
BTS(64, R(RSCRATCH), Imm8(PowerPC::CR_EMU_LT_BIT));
break;
}

Expand All @@ -162,8 +162,8 @@ FixupBranch Jit64::JumpIfCRFieldBit(int field, int bit, bool jump_if_set)
{
switch (bit)
{
case PowerPC::CR_SO_BIT: // check bit 61 set
BT(64, CROffset(field), Imm8(61));
case PowerPC::CR_SO_BIT: // check bit 59 set
BT(64, CROffset(field), Imm8(PowerPC::CR_EMU_SO_BIT));
return J_CC(jump_if_set ? CC_C : CC_NC, true);

case PowerPC::CR_EQ_BIT: // check bits 31-0 == 0
Expand All @@ -175,7 +175,7 @@ FixupBranch Jit64::JumpIfCRFieldBit(int field, int bit, bool jump_if_set)
return J_CC(jump_if_set ? CC_G : CC_LE, true);

case PowerPC::CR_LT_BIT: // check bit 62 set
BT(64, CROffset(field), Imm8(62));
BT(64, CROffset(field), Imm8(PowerPC::CR_EMU_LT_BIT));
return J_CC(jump_if_set ? CC_C : CC_NC, true);

default:
Expand Down
16 changes: 6 additions & 10 deletions Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
View file
Expand Up @@ -301,19 +301,15 @@ void CommonAsmRoutines::GenMfcr()
X64Reg tmp = RSCRATCH2;
X64Reg cr_val = RSCRATCH_EXTRA;
XOR(32, R(dst), R(dst));
// Upper bits of tmp need to be zeroed.
XOR(32, R(tmp), R(tmp));
for (int i = 0; i < 8; i++)
{
static const u32 m_flagTable[8] = {0x0, 0x1, 0x8, 0x9, 0x0, 0x1, 0x8, 0x9};
if (i != 0)
SHL(32, R(dst), Imm8(4));

MOV(64, R(cr_val), PPCSTATE(cr.fields[i]));

// Upper bits of tmp need to be zeroed.
// Note: tmp is used later for address calculations and thus
// can't be zero-ed once. This also prevents partial
// register stalls due to SETcc.
XOR(32, R(tmp), R(tmp));
// EQ: Bits 31-0 == 0; set flag bit 1
TEST(32, R(cr_val), R(cr_val));
SETcc(CC_Z, R(tmp));
Expand All @@ -324,11 +320,11 @@ void CommonAsmRoutines::GenMfcr()
SETcc(CC_G, R(tmp));
LEA(32, dst, MComplex(dst, tmp, SCALE_4, 0));

// SO: Bit 61 set; set flag bit 0
// SO: Bit 59 set; set flag bit 0
// LT: Bit 62 set; set flag bit 3
SHR(64, R(cr_val), Imm8(61));
LEA(64, tmp, MConst(m_flagTable));
OR(32, R(dst), MComplex(tmp, cr_val, SCALE_4, 0));
SHR(64, R(cr_val), Imm8(PowerPC::CR_EMU_SO_BIT));
AND(32, R(cr_val), Imm8(PowerPC::CR_LT | PowerPC::CR_SO));
OR(32, R(dst), R(cr_val));
}
RET();

Expand Down
42 changes: 21 additions & 21 deletions Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
View file
Expand Up @@ -21,15 +21,15 @@ FixupBranch JitArm64::JumpIfCRFieldBit(int field, int bit, bool jump_if_set)

switch (bit)
{
case PowerPC::CR_SO_BIT: // check bit 61 set
return jump_if_set ? TBNZ(XA, 61) : TBZ(XA, 61);
case PowerPC::CR_SO_BIT: // check bit 59 set
return jump_if_set ? TBNZ(XA, PowerPC::CR_EMU_SO_BIT) : TBZ(XA, PowerPC::CR_EMU_SO_BIT);
case PowerPC::CR_EQ_BIT: // check bits 31-0 == 0
return jump_if_set ? CBZ(WA) : CBNZ(WA);
case PowerPC::CR_GT_BIT: // check val > 0
CMP(XA, ARM64Reg::SP);
return B(jump_if_set ? CC_GT : CC_LE);
case PowerPC::CR_LT_BIT: // check bit 62 set
return jump_if_set ? TBNZ(XA, 62) : TBZ(XA, 62);
return jump_if_set ? TBNZ(XA, PowerPC::CR_EMU_LT_BIT) : TBZ(XA, PowerPC::CR_EMU_LT_BIT);
default:
ASSERT_MSG(DYNA_REC, false, "Invalid CR bit");
return {};
Expand Down Expand Up @@ -441,20 +441,20 @@ void JitArm64::crXXX(UGeckoInstruction inst)
switch (bit)
{
case PowerPC::CR_SO_BIT:
AND(XA, XA, 64 - 62, 62, true); // XA & ~(1<<61)
ANDI2R(XA, XA, ~(u64(1) << PowerPC::CR_EMU_SO_BIT));
break;

case PowerPC::CR_EQ_BIT:
FixGTBeforeSettingCRFieldBit(XA);
ORR(XA, XA, 0, 0, true); // XA | 1<<0
ORRI2R(XA, XA, 1);
break;

case PowerPC::CR_GT_BIT:
ORR(XA, XA, 64 - 63, 0, true); // XA | 1<<63
ORRI2R(XA, XA, u64(1) << 63);
break;

case PowerPC::CR_LT_BIT:
AND(XA, XA, 64 - 63, 62, true); // XA & ~(1<<62)
ANDI2R(XA, XA, ~(u64(1) << PowerPC::CR_EMU_LT_BIT));
break;
}
return;
Expand All @@ -476,23 +476,23 @@ void JitArm64::crXXX(UGeckoInstruction inst)
switch (bit)
{
case PowerPC::CR_SO_BIT:
ORR(XA, XA, 64 - 61, 0, true); // XA | 1<<61
ORRI2R(XA, XA, u64(1) << PowerPC::CR_EMU_SO_BIT);
break;

case PowerPC::CR_EQ_BIT:
AND(XA, XA, 32, 31, true); // Clear lower 32bits
ANDI2R(XA, XA, 0xFFFF'FFFF'0000'0000);
break;

case PowerPC::CR_GT_BIT:
AND(XA, XA, 0, 62, true); // XA & ~(1<<63)
ANDI2R(XA, XA, ~(u64(1) << 63));
break;

case PowerPC::CR_LT_BIT:
ORR(XA, XA, 64 - 62, 0, true); // XA | 1<<62
ORRI2R(XA, XA, u64(1) << PowerPC::CR_EMU_LT_BIT);
break;
}

ORR(XA, XA, 32, 0, true); // XA | 1<<32
ORRI2R(XA, XA, u64(1) << 32);
return;
}

Expand All @@ -519,8 +519,8 @@ void JitArm64::crXXX(UGeckoInstruction inst)
ARM64Reg WC = EncodeRegTo32(XC);
switch (bit)
{
case PowerPC::CR_SO_BIT: // check bit 61 set
UBFX(out, XC, 61, 1);
case PowerPC::CR_SO_BIT: // check bit 59 set
UBFX(out, XC, PowerPC::CR_EMU_SO_BIT, 1);
if (negate)
EOR(out, out, 0, 0, true); // XC ^ 1
break;
Expand All @@ -536,7 +536,7 @@ void JitArm64::crXXX(UGeckoInstruction inst)
break;

case PowerPC::CR_LT_BIT: // check bit 62 set
UBFX(out, XC, 62, 1);
UBFX(out, XC, PowerPC::CR_EMU_LT_BIT, 1);
if (negate)
EOR(out, out, 0, 0, true); // XC ^ 1
break;
Expand Down Expand Up @@ -581,8 +581,8 @@ void JitArm64::crXXX(UGeckoInstruction inst)

switch (bit)
{
case PowerPC::CR_SO_BIT: // set bit 61 to input
BFI(XB, XA, 61, 1);
case PowerPC::CR_SO_BIT: // set bit 59 to input
BFI(XB, XA, PowerPC::CR_EMU_SO_BIT, 1);
break;

case PowerPC::CR_EQ_BIT: // clear low 32 bits, set bit 0 to !input
Expand All @@ -597,7 +597,7 @@ void JitArm64::crXXX(UGeckoInstruction inst)
break;

case PowerPC::CR_LT_BIT: // set bit 62 to input
BFI(XB, XA, 62, 1);
BFI(XB, XA, PowerPC::CR_EMU_LT_BIT, 1);
break;
}

Expand Down Expand Up @@ -625,11 +625,11 @@ void JitArm64::mfcr(UGeckoInstruction inst)
// SO
if (i == 0)
{
UBFX(XA, CR, 61, 1);
UBFX(XA, CR, PowerPC::CR_EMU_SO_BIT, 1);
}
else
{
UBFX(XC, CR, 61, 1);
UBFX(XC, CR, PowerPC::CR_EMU_SO_BIT, 1);
ORR(XA, XC, XA, ArithOption(XA, ShiftType::LSL, 4));
}

Expand All @@ -644,7 +644,7 @@ void JitArm64::mfcr(UGeckoInstruction inst)
CSEL(WA, WC, WA, CC_GT);

// LT
UBFX(XC, CR, 62, 1);
UBFX(XC, CR, PowerPC::CR_EMU_LT_BIT, 1);
ORR(WA, WA, WC, ArithOption(WC, ShiftType::LSL, 3));
}

Expand Down

0 comments on commit 156f625

Please sign in to comment.