piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Put my JIT fixes in stable

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5214 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2010-03-18 17:58:33 +00:00
parent dff7aa5ed6
commit 559bfa3112
3 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -91,7 +91,6 @@ void SCoreStartupParameter::LoadDefaults()
// These work fine in 32bit OSX // These work fine in 32bit OSX
// Since the reason why 64bit OSX fails out is due to casting (u32)(u64) // Since the reason why 64bit OSX fails out is due to casting (u32)(u64)
// Since all 64bit applications are above the 32bit memory boundary // Since all 64bit applications are above the 32bit memory boundary
bJITLoadStoreOff = true;
bJITLoadStorePairedOff = true; bJITLoadStorePairedOff = true;
#endif #endif
//#elif defined(__linux__) //#elif defined(__linux__)

5
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -317,7 +317,9 @@ void Jit64::stX(UGeckoInstruction inst)
case 38: accessSize = 8; break; //stb case 38: accessSize = 8; break; //stb
default: _assert_msg_(DYNA_REC, 0, "AWETKLJASDLKF"); return; default: _assert_msg_(DYNA_REC, 0, "AWETKLJASDLKF"); return;
} }
#ifndef __APPLE__ && _M_X64
//(Sonicadvance1) This code path fails in OSX, not 100% sure why
if (gpr.R(a).IsImm()) if (gpr.R(a).IsImm())
{ {
// If we already know the address through constant folding, we can do some // If we already know the address through constant folding, we can do some
@ -353,6 +355,7 @@ void Jit64::stX(UGeckoInstruction inst)
} }
// Other IO not worth the trouble. // Other IO not worth the trouble.
} }
#endif
// Optimized stack access? // Optimized stack access?
if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack) if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack)

63
Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
View File

@ -37,6 +37,60 @@ using namespace Gen;
static int temp32; static int temp32;
#ifdef __APPLE__ && _M_X64
void CommonAsmRoutines::GenFifoWrite(int size)
{
// Assume value in ABI_PARAM1
PUSH(RSI);
if (size != 32)
PUSH(EDX);
BSWAP(size, ABI_PARAM1);
MOV(32, R(EAX), Imm32((u64)GPFifo::m_gatherPipe));
MOV(64, R(RSI), M(&GPFifo::m_gatherPipeCount));
if (size != 32) {
MOV(32, R(EDX), R(ABI_PARAM1));
MOV(size, MComplex(RAX, RSI, 1, 0), R(EDX));
} else {
MOV(size, MComplex(RAX, RSI, 1, 0), R(ABI_PARAM1));
}
ADD(64, R(RSI), Imm8(size >> 3));
MOV(64, M(&GPFifo::m_gatherPipeCount), R(RSI));
if (size != 32)
POP(EDX);
POP(RSI);
RET();
}
void CommonAsmRoutines::GenFifoFloatWrite()
{
// Assume value in XMM0
PUSH(RSI);
PUSH(EDX);
MOVSS(M(&temp32), XMM0);
MOV(32, R(EDX), M(&temp32));
BSWAP(32, EDX);
MOV(64, R(RAX), Imm64((u64)GPFifo::m_gatherPipe));
MOV(64, R(RSI), M(&GPFifo::m_gatherPipeCount));
MOV(32, MComplex(RAX, RSI, 1, 0), R(EDX));
ADD(64, R(RSI), Imm8(4));
MOV(64, M(&GPFifo::m_gatherPipeCount), R(RSI));
POP(EDX);
POP(RSI);
RET();
}
void CommonAsmRoutines::GenFifoXmm64Write()
{
// Assume value in XMM0. Assume pre-byteswapped (unlike the others here!)
PUSH(RSI);
MOV(64, R(RAX), Imm32((u64)GPFifo::m_gatherPipe));
MOV(64, R(RSI), M(&GPFifo::m_gatherPipeCount));
MOVQ_xmm(MComplex(RAX, RSI, 1, 0), XMM0);
ADD(64, R(RSI), Imm8(8));
MOV(64, M(&GPFifo::m_gatherPipeCount), R(RSI));
POP(RSI);
RET();
}
#else
void CommonAsmRoutines::GenFifoWrite(int size) void CommonAsmRoutines::GenFifoWrite(int size)
{ {
// Assume value in ABI_PARAM1 // Assume value in ABI_PARAM1
@ -59,7 +113,6 @@ void CommonAsmRoutines::GenFifoWrite(int size)
POP(ESI); POP(ESI);
RET(); RET();
} }
void CommonAsmRoutines::GenFifoFloatWrite() void CommonAsmRoutines::GenFifoFloatWrite()
{ {
// Assume value in XMM0 // Assume value in XMM0
@ -77,7 +130,6 @@ void CommonAsmRoutines::GenFifoFloatWrite()
POP(ESI); POP(ESI);
RET(); RET();
} }
void CommonAsmRoutines::GenFifoXmm64Write() void CommonAsmRoutines::GenFifoXmm64Write()
{ {
// Assume value in XMM0. Assume pre-byteswapped (unlike the others here!) // Assume value in XMM0. Assume pre-byteswapped (unlike the others here!)
@ -86,10 +138,11 @@ void CommonAsmRoutines::GenFifoXmm64Write()
MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount)); MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
MOVQ_xmm(MComplex(RAX, RSI, 1, 0), XMM0); MOVQ_xmm(MComplex(RAX, RSI, 1, 0), XMM0);
ADD(32, R(ESI), Imm8(8)); ADD(32, R(ESI), Imm8(8));
MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI)); MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI));
POP(ESI); POP(ESI);
RET(); RET();
} }
#endif
// Safe + Fast Quantizers, originally from JITIL by magumagu // Safe + Fast Quantizers, originally from JITIL by magumagu