diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2010-03-17 11:23:24 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2010-03-17 11:23:24 +0000 |
| commit | 3eebd28a6b0d5bf4124c6150fff8a1edff903da4 (patch) | |
| tree | 540355bfe06257b41825a40163a2ee94f146beb3 /Source/Core | |
| parent | fa9ae47d02afddd4a9c7bed6d36f0e079a54e3e0 (diff) | |
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
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5207 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/CoreParameter.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 21179d769e..d63b86dde6 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -91,9 +91,7 @@ void SCoreStartupParameter::LoadDefaults() // These work fine in 32bit OSX // Since the reason why 64bit OSX fails out is due to casting (u32)(u64) // Since all 64bit applications are above the 32bit memory boundary - bJITLoadStoreOff = true; bJITLoadStorePairedOff = true; - //bJITLoadStoreFloatingOff = true; #endif //#elif defined(__linux__) // Similar to OSX, something with LoadStorePaired seems to cause diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index e27fbdeefd..56ea8a0c45 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -317,7 +317,8 @@ void Jit64::stX(UGeckoInstruction inst) case 38: accessSize = 8; break; //stb 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 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. } - +#endif // Optimized stack access? if (accessSize == 32 && !gpr.R(a).IsImm() && a == 1 && js.st.isFirstBlockOfFunction && jo.optimizeStack) { diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp index 5e2c42f897..0eb6fba00c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp @@ -42,23 +42,23 @@ static int temp32; void CommonAsmRoutines::GenFifoWrite(int size)
{
// Assume value in ABI_PARAM1
- PUSH(ESI);
+ PUSH(RSI);
if (size != 32)
PUSH(EDX);
BSWAP(size, ABI_PARAM1);
- MOV(32, R(EAX), Imm32((u32)(u64)GPFifo::m_gatherPipe));
- MOV(32, R(ESI), M(&GPFifo::m_gatherPipeCount));
+ 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(32, R(ESI), Imm8(size >> 3));
- MOV(32, M(&GPFifo::m_gatherPipeCount), R(ESI));
+ ADD(64, R(RSI), Imm8(size >> 3));
+ MOV(64, M(&GPFifo::m_gatherPipeCount), R(RSI));
if (size != 32)
POP(EDX);
- POP(ESI);
+ POP(RSI);
RET();
}
void CommonAsmRoutines::GenFifoFloatWrite()
|