The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Typecast function pointer argument of CALL() to void*, since this is not an automatic conversion for GCC.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@267 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-08-22 11:21:51 +00:00
parent 936bfbd867
commit 418e37029c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
View File

@ -93,7 +93,7 @@ void Generate()
//MOV(32, R(EBX), Imm32((u32)&Memory::base)); //MOV(32, R(EBX), Imm32((u32)&Memory::base));
const u8 *outerLoop = GetCodePtr(); const u8 *outerLoop = GetCodePtr();
CALL(&CoreTiming::Advance); CALL(reinterpret_cast<void *>(&CoreTiming::Advance));
FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time
dispatcher = GetCodePtr(); dispatcher = GetCodePtr();
@ -104,7 +104,7 @@ void Generate()
FixupBranch bail = J_CC(CC_BE); FixupBranch bail = J_CC(CC_BE);
if (Core::bReadTrace || Core::bWriteTrace) if (Core::bReadTrace || Core::bWriteTrace)
{ {
CALL(&Core::SyncTrace); CALL(reinterpret_cast<void *>(&Core::SyncTrace));
// CMP(32, R(EAX),Imm32(0)); // CMP(32, R(EAX),Imm32(0));
// bail2 = J_CC(); // bail2 = J_CC();
} }
@ -138,7 +138,7 @@ void Generate()
//Ok, no block, let's jit //Ok, no block, let's jit
PUSH(32, M(&PowerPC::ppcState.pc)); PUSH(32, M(&PowerPC::ppcState.pc));
CALL(&Jit); CALL(reinterpret_cast<void *>(&Jit));
ADD(32, R(ESP), Imm8(4)); ADD(32, R(ESP), Imm8(4));
JMP(dispatcherNoCheck); // no point in special casing this JMP(dispatcherNoCheck); // no point in special casing this
@ -147,7 +147,7 @@ void Generate()
MOV(32, R(EAX), M(&PC)); MOV(32, R(EAX), M(&PC));
MOV(32, M(&NPC), R(EAX)); MOV(32, M(&NPC), R(EAX));
OR(32, M(&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE)); OR(32, M(&PowerPC::ppcState.Exceptions), Imm32(EXCEPTION_FPU_UNAVAILABLE));
CALL(&PowerPC::CheckExceptions); CALL(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
MOV(32, R(EAX), M(&NPC)); MOV(32, R(EAX), M(&NPC));
MOV(32, M(&PC), R(EAX)); MOV(32, M(&PC), R(EAX));
JMP(dispatcher); JMP(dispatcher);
@ -155,14 +155,14 @@ void Generate()
SetJumpTarget(bail); SetJumpTarget(bail);
doTiming = GetCodePtr(); doTiming = GetCodePtr();
CALL(&CoreTiming::Advance); CALL(reinterpret_cast<void *>(&CoreTiming::Advance));
testExceptions = GetCodePtr(); testExceptions = GetCodePtr();
TEST(32, M(&PowerPC::ppcState.Exceptions), Imm32(0xFFFFFFFF)); TEST(32, M(&PowerPC::ppcState.Exceptions), Imm32(0xFFFFFFFF));
FixupBranch skipExceptions = J_CC(CC_Z); FixupBranch skipExceptions = J_CC(CC_Z);
MOV(32, R(EAX), M(&PC)); MOV(32, R(EAX), M(&PC));
MOV(32, M(&NPC), R(EAX)); MOV(32, M(&NPC), R(EAX));
CALL(&PowerPC::CheckExceptions); CALL(reinterpret_cast<void *>(&PowerPC::CheckExceptions));
MOV(32, R(EAX), M(&NPC)); MOV(32, R(EAX), M(&NPC));
MOV(32, M(&PC), R(EAX)); MOV(32, M(&PC), R(EAX));
SetJumpTarget(skipExceptions); SetJumpTarget(skipExceptions);