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

Renable Load Store in JIT since I found the problem. Haven't fixed it since I'm not 100% sure why it fails, but that code is disabled in x64 OSX. Still is faster than disabling the entire thing. Only core part left is Load Store Paired

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5207 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2010-03-17 11:23:24 +00:00
parent fa9ae47d02
commit 3eebd28a6b
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,9 +91,7 @@ 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;
//bJITLoadStoreFloatingOff = true;
#endif #endif
//#elif defined(__linux__) //#elif defined(__linux__)
// Similar to OSX, something with LoadStorePaired seems to cause // Similar to OSX, something with LoadStorePaired seems to cause

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

@ -317,7 +317,8 @@ 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
// This code path fails in OSX, not 100% sure why, seems to be from the gpr.SetImmediate
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,7 +354,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)
{ {

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

@ -42,23 +42,23 @@ static int temp32;
void CommonAsmRoutines::GenFifoWrite(int size) void CommonAsmRoutines::GenFifoWrite(int size)
{ {
// Assume value in ABI_PARAM1 // Assume value in ABI_PARAM1
PUSH(ESI); PUSH(RSI);
if (size != 32) if (size != 32)
PUSH(EDX); PUSH(EDX);
BSWAP(size, ABI_PARAM1); BSWAP(size, ABI_PARAM1);
MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe)); MOV(32, R(EAX), Imm32((u64)GPFifo::m_gatherPipe));
MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount)); MOV(64, R(RSI), M(&GPFifo::m_gatherPipeCount));
if (size != 32) { if (size != 32) {
MOV(32, R(EDX), R(ABI_PARAM1)); MOV(32, R(EDX), R(ABI_PARAM1));
MOV(size, MComplex(RAX, RSI, 1, 0), R(EDX)); MOV(size, MComplex(RAX, RSI, 1, 0), R(EDX));
} else { } else {
MOV(size, MComplex(RAX, RSI, 1, 0), R(ABI_PARAM1)); MOV(size, MComplex(RAX, RSI, 1, 0), R(ABI_PARAM1));
} }
ADD(32, R(ESI), Imm8(size >> 3)); ADD(64, R(RSI), Imm8(size >> 3));
MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI)); MOV(64, M(&GPFifo::m_gatherPipeCount), R(RSI));
if (size != 32) if (size != 32)
POP(EDX); POP(EDX);
POP(ESI); POP(RSI);
RET(); RET();
} }
void CommonAsmRoutines::GenFifoFloatWrite() void CommonAsmRoutines::GenFifoFloatWrite()