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 #9810 from JosJuice/fprf-cmp-mask 

Jits: Fix fcmpX FPRF mask
This commit is contained in:
Tilka 2021-06-27 19:32:19 +01:00 committed by GitHub
parent 4166567f92 891a46596d
commit aff39af5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/PowerPC/Gekko.h
View File

@ -401,6 +401,7 @@ union UReg_MSR
#define FPRF_SHIFT 12 #define FPRF_SHIFT 12
#define FPRF_WIDTH 5 #define FPRF_WIDTH 5
#define FPRF_MASK (0x1F << FPRF_SHIFT) #define FPRF_MASK (0x1F << FPRF_SHIFT)
#define FPCC_MASK (0xF << FPRF_SHIFT)
// FPSCR exception flags // FPSCR exception flags
enum FPSCRExceptionFlag : u32 enum FPSCRExceptionFlag : u32

5
Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
View File

@ -7,6 +7,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FloatUtils.h" #include "Common/FloatUtils.h"
#include "Core/PowerPC/Gekko.h"
#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
@ -169,7 +170,7 @@ void Interpreter::Helper_FloatCompareOrdered(UGeckoInstruction inst, double fa,
const u32 compare_value = static_cast<u32>(compare_result); const u32 compare_value = static_cast<u32>(compare_result);
// Clear and set the FPCC bits accordingly. // Clear and set the FPCC bits accordingly.
FPSCR.FPRF = (FPSCR.FPRF & ~0xF) | compare_value; FPSCR.FPRF = (FPSCR.FPRF & ~FPCC_MASK) | compare_value;
PowerPC::ppcState.cr.SetField(inst.CRFD, compare_value); PowerPC::ppcState.cr.SetField(inst.CRFD, compare_value);
} }
@ -203,7 +204,7 @@ void Interpreter::Helper_FloatCompareUnordered(UGeckoInstruction inst, double fa
const u32 compare_value = static_cast<u32>(compare_result); const u32 compare_value = static_cast<u32>(compare_result);
// Clear and set the FPCC bits accordingly. // Clear and set the FPCC bits accordingly.
FPSCR.FPRF = (FPSCR.FPRF & ~0xF) | compare_value; FPSCR.FPRF = (FPSCR.FPRF & ~FPCC_MASK) | compare_value;
PowerPC::ppcState.cr.SetField(inst.CRFD, compare_value); PowerPC::ppcState.cr.SetField(inst.CRFD, compare_value);
} }

2
Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
View File

@ -631,7 +631,7 @@ void Jit64::FloatCompare(UGeckoInstruction inst, bool upper)
RegCache::Realize(Ra, Rb); RegCache::Realize(Ra, Rb);
if (fprf) if (fprf)
AND(32, PPCSTATE(fpscr), Imm32(~FPRF_MASK)); AND(32, PPCSTATE(fpscr), Imm32(~FPCC_MASK));
if (upper) if (upper)
{ {

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

@ -402,7 +402,7 @@ void JitArm64::fcmpX(UGeckoInstruction inst)
{ {
fpscr_reg = gpr.GetReg(); fpscr_reg = gpr.GetReg();
LDR(IndexType::Unsigned, fpscr_reg, PPC_REG, PPCSTATE_OFF(fpscr)); LDR(IndexType::Unsigned, fpscr_reg, PPC_REG, PPCSTATE_OFF(fpscr));
ANDI2R(fpscr_reg, fpscr_reg, ~FPRF_MASK); ANDI2R(fpscr_reg, fpscr_reg, ~FPCC_MASK);
} }
FixupBranch pNaN, pLesser, pGreater; FixupBranch pNaN, pLesser, pGreater;