ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9478 from JosJuice/double-assert-attempt-2 

JitArm64: Fix false positive "turned singles into doubles" asserts
This commit is contained in:
Markus Wick 2021-01-27 20:20:59 +01:00 committed by GitHub
parent b1fdd14ed1 5d19558623
commit 7290cd0032
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
View File

@ -120,11 +120,13 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
} }
} }
if (single || packed)
{
ASSERT_MSG(DYNA_REC, inputs_are_singles == inputs_are_singles_func(), ASSERT_MSG(DYNA_REC, inputs_are_singles == inputs_are_singles_func(),
"Register allocation turned singles into doubles in the middle of fp_arith"); "Register allocation turned singles into doubles in the middle of fp_arith");
if (single || packed)
fpr.FixSinglePrecision(d); fpr.FixSinglePrecision(d);
}
} }
void JitArm64::fp_logic(UGeckoInstruction inst) void JitArm64::fp_logic(UGeckoInstruction inst)
@ -219,7 +221,7 @@ void JitArm64::fselx(UGeckoInstruction inst)
const u32 d = inst.FD; const u32 d = inst.FD;
const bool a_single = fpr.IsSingle(a, true); const bool a_single = fpr.IsSingle(a, true);
if (fpr.IsSingle(a, true)) if (a_single)
{ {
const ARM64Reg VA = fpr.R(a, RegType::LowerPairSingle); const ARM64Reg VA = fpr.R(a, RegType::LowerPairSingle);
m_float_emit.FCMPE(EncodeRegToSingle(VA)); m_float_emit.FCMPE(EncodeRegToSingle(VA));
@ -230,6 +232,9 @@ void JitArm64::fselx(UGeckoInstruction inst)
m_float_emit.FCMPE(EncodeRegToDouble(VA)); m_float_emit.FCMPE(EncodeRegToDouble(VA));
} }
ASSERT_MSG(DYNA_REC, a_single == fpr.IsSingle(a, true),
"Register allocation turned singles into doubles in the middle of fselx");
const bool b_and_c_singles = fpr.IsSingle(b, true) && fpr.IsSingle(c, true); const bool b_and_c_singles = fpr.IsSingle(b, true) && fpr.IsSingle(c, true);
const RegType type = b_and_c_singles ? RegType::LowerPairSingle : RegType::LowerPair; const RegType type = b_and_c_singles ? RegType::LowerPairSingle : RegType::LowerPair;
const auto reg_encoder = b_and_c_singles ? EncodeRegToSingle : EncodeRegToDouble; const auto reg_encoder = b_and_c_singles ? EncodeRegToSingle : EncodeRegToDouble;
@ -240,9 +245,7 @@ void JitArm64::fselx(UGeckoInstruction inst)
m_float_emit.FCSEL(reg_encoder(VD), reg_encoder(VC), reg_encoder(VB), CC_GE); m_float_emit.FCSEL(reg_encoder(VD), reg_encoder(VC), reg_encoder(VB), CC_GE);
ASSERT_MSG(DYNA_REC, ASSERT_MSG(DYNA_REC, b_and_c_singles == (fpr.IsSingle(b, true) && fpr.IsSingle(c, true)),
a_single == fpr.IsSingle(a, true) &&
b_and_c_singles == (fpr.IsSingle(b, true) && fpr.IsSingle(c, true)),
"Register allocation turned singles into doubles in the middle of fselx"); "Register allocation turned singles into doubles in the middle of fselx");
} }