From 244191f18fb486c05e88ce76a36936a29c89afdf Mon Sep 17 00:00:00 2001 From: "dok.slade" Date: Sun, 8 Aug 2010 18:53:00 +0000 Subject: [PATCH] Fixed some mistakes from r6076: * Fixed missing UnlockAllX * Fixed 64-bits compilation git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6077 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/ABI.cpp | 7 +++++++ Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/ABI.cpp index 2dbe1c57bf..d18e5b1e41 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/ABI.cpp @@ -267,6 +267,13 @@ void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2 CALL(func); } +void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) +{ + if (!arg1.IsSimpleReg(ABI_PARAM1)) + MOV(32, R(ABI_PARAM1), arg1); + CALL(func); +} + unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize) { return frameSize; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index f8c5a6986b..e5dd61bf19 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -251,7 +251,7 @@ void Jit64::lXXx(UGeckoInstruction inst) MEMCHECK_END gpr.UnlockAll(); - gpr.UnlockAll(); + gpr.UnlockAllX(); } // Zero cache line.