dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14188 from JosJuice/jit64-flush-carry

Browse Source 
Jit64: Flush carry flag in FallBackToInterpreter
This commit is contained in:
JosJuice 2025-12-01 19:58:38 +01:00 committed by GitHub
commit 582d5cfe96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -351,6 +351,7 @@ void Jit64::Shutdown()
void Jit64::FallBackToInterpreter(UGeckoInstruction inst) void Jit64::FallBackToInterpreter(UGeckoInstruction inst)
{ {
FlushCarry();
gpr.Flush(BitSet32(0xFFFFFFFF), RegCache::IgnoreDiscardedRegisters::Yes); gpr.Flush(BitSet32(0xFFFFFFFF), RegCache::IgnoreDiscardedRegisters::Yes);
fpr.Flush(BitSet32(0xFFFFFFFF), RegCache::IgnoreDiscardedRegisters::Yes); fpr.Flush(BitSet32(0xFFFFFFFF), RegCache::IgnoreDiscardedRegisters::Yes);

1
Source/Core/Core/PowerPC/Jit64/Jit.h
View File

@ -124,6 +124,7 @@ public:
void FinalizeCarryOverflow(bool oe, bool inv = false); void FinalizeCarryOverflow(bool oe, bool inv = false);
void FinalizeCarry(Gen::CCFlags cond); void FinalizeCarry(Gen::CCFlags cond);
void FinalizeCarry(bool ca); void FinalizeCarry(bool ca);
void FlushCarry();
void ComputeRC(preg_t preg, bool needs_test = true, bool needs_sext = true); void ComputeRC(preg_t preg, bool needs_test = true, bool needs_sext = true);
void FinalizeImmediateRC(s32 value); void FinalizeImmediateRC(s32 value);

19
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -137,6 +137,25 @@ void Jit64::FinalizeCarryOverflow(bool oe, bool inv)
FinalizeCarry(inv ? CC_NC : CC_C); FinalizeCarry(inv ? CC_NC : CC_C);
} }
void Jit64::FlushCarry()
{
switch (js.carryFlag)
{
case CarryFlag::InPPCState:
break;
case CarryFlag::InHostCarry:
JitSetCAIf(CC_C);
UnlockFlags();
break;
case CarryFlag::InHostCarryInverted:
JitSetCAIf(CC_NC);
UnlockFlags();
break;
}
js.carryFlag = CarryFlag::InPPCState;
}
// Be careful; only set needs_test to false if we can be absolutely sure flags don't need // Be careful; only set needs_test to false if we can be absolutely sure flags don't need
// to be recalculated and haven't been clobbered. Keep in mind not all instructions set // to be recalculated and haven't been clobbered. Keep in mind not all instructions set
// sufficient flags -- for example, the flags from SHL/SHR are *not* sufficient for LT/GT // sufficient flags -- for example, the flags from SHL/SHR are *not* sufficient for LT/GT