Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implement the same for ARM64

Browse Source
This commit is contained in:
Henrik Rydgård 2024-06-19 20:00:36 +02:00
parent 0080f71ca4
commit e64d768113
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Core/MIPS/IR/IRInterpreter.cpp
View File

@ -93,30 +93,57 @@ void IRApplyRounding(MIPSState *mips) {
u32 fcr1Bits = mips->fcr31 & 0x01000003;
// If these are 0, we just leave things as they are.
if (fcr1Bits) {
#if PPSSPP_ARCH(SSE2) && 0
int rmode = fcr1Bits & 3;
bool ftz = (fcr1Bits & 0x01000000) != 0;
#if PPSSPP_ARCH(SSE2)
u32 csr = _mm_getcsr() & ~0x6000;
// Translate the rounding mode bits to X86, the same way as in Asm.cpp.
int rnd = fcr1Bits & 3;
if (rnd & 1) {
rnd ^= 2;
if (rmode & 1) {
rmode ^= 2;
}
csr |= rnd << 13;
csr |= rmode << 13;
if (fcr1Bits & 0x01000000) {
if (ftz) {
// Flush to zero
csr |= 0x8000;
}
_mm_setcsr(csr);
#elif PPSSPP_ARCH(ARM64)
// On ARM64 we need to use inline assembly for a portable solution.
// Note that in the JIT, for fcvts, we use specific conversions. However,
// fcvts also has a variant that reads the fpcr, and I think that's what our
// C++ code (the IR interpreter) ends up using.
u64 fpcr; // not really 64-bit, just to match the regsiter size.
asm volatile ("mrs %0, fpcr" : "=r" (fpcr));
// Translate MIPS to ARM rounding mode
static const u8 lookup[4] = {0, 3, 1, 2};
fpcr &= ~(3 << 22); // Clear bits [23:22]
fpcr |= (lookup[rmode] << 22);
if (ftz) {
fpcr |= 1 << 24;
}
// Write back the modified FPCR
asm volatile ("msr fpcr, %0" : : "r" (fpcr));
#endif
}
}
void IRRestoreRounding() {
#if PPSSPP_ARCH(SSE2)
// We should avoid this if we didn't apply rounding in the first place.
// TODO: We should avoid this if we didn't apply rounding in the first place.
// In the meantime, clear out FTZ and rounding mode bits.
u32 csr = _mm_getcsr();
csr &= ~(7 << 13);
_mm_setcsr(csr);
#elif PPSSPP_ARCH(ARM64)
u64 fpcr; // not really 64-bit, just to match the regsiter size.
asm volatile ("mrs %0, fpcr" : "=r" (fpcr));
fpcr &= ~(7 << 22); // Clear bits [23:22] for rounding, 24 for FTZ
// Write back the modified FPCR
asm volatile ("msr fpcr, %0" : : "r" (fpcr));
#endif
}
@ -989,6 +1016,7 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst) {
mips->fs[inst->dest] = my_isinf(src) && src < 0.0f ? -2147483648LL : 2147483647LL;
break;
}
// TODO: Inline assembly to use here would be better.
switch (IRRoundMode(mips->fcr31 & 3)) {
case IRRoundMode::RINT_0: mips->fs[inst->dest] = (int)round_ieee_754(src); break;
case IRRoundMode::CAST_1: mips->fs[inst->dest] = (int)src; break;
@ -1131,11 +1159,9 @@ u32 IRInterpret(MIPSState *mips, const IRInst *inst) {
case IROp::ApplyRoundingMode:
IRApplyRounding(mips);
// TODO: Implement
break;
case IROp::RestoreRoundingMode:
IRRestoreRounding();
// TODO: Implement
break;
case IROp::UpdateRoundingMode:
// TODO: Implement

4
android/jni/TestRunner.cpp
View File

@ -66,6 +66,8 @@ bool TestsAvailable() {
// Hack to easily run the tests on Windows from the submodule
if (File::IsDirectory(Path("../pspautotests"))) {
testDirectory = Path("..");
} else if (File::IsDirectory(Path("pspautotests"))) {
testDirectory = Path(".");
}
return File::Exists(testDirectory / "pspautotests" / "tests");
}
@ -80,6 +82,8 @@ bool RunTests() {
// Hack to easily run the tests on Windows from the submodule
if (File::IsDirectory(Path("../pspautotests"))) {
baseDirectory = Path("..");
} else if (File::IsDirectory(Path("pspautotests"))) {
baseDirectory = Path(".");
}
#endif