From 87b87678257e02548c94998a69db75fae129bbc6 Mon Sep 17 00:00:00 2001 From: jpd002 Date: Tue, 10 Feb 2015 06:37:36 +0000 Subject: [PATCH] PsfAot compilation fixes. git-svn-id: http://svn.purei.org/purei/trunk@1693 b36208d7-6611-0410-8bec-b1987f11c4a2 --- tools/PsfPlayer/Source/win32_ui/Main_Aot.cpp | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/PsfPlayer/Source/win32_ui/Main_Aot.cpp b/tools/PsfPlayer/Source/win32_ui/Main_Aot.cpp index b6a0da6e..f59f8b0d 100644 --- a/tools/PsfPlayer/Source/win32_ui/Main_Aot.cpp +++ b/tools/PsfPlayer/Source/win32_ui/Main_Aot.cpp @@ -111,7 +111,7 @@ unsigned int CompileFunction(CPsfVm& virtualMachine, CMipsJitter* jitter, const Jitter::CObjectFile::INTERNAL_SYMBOL func; jitter->GetCodeGen()->SetExternalSymbolReferencedHandler( - [&] (void* symbol, uint32 offset) + [&] (uintptr_t symbol, uint32 offset) { Jitter::CObjectFile::SYMBOL_REFERENCE ref; ref.offset = offset; @@ -287,16 +287,16 @@ void Compile(const char* databasePathName, const char* cpuArchName, const char* } codeGen->RegisterExternalSymbols(objectFile.get()); - objectFile->AddExternalSymbol("_MemoryUtils_GetByteProxy", &MemoryUtils_GetByteProxy); - objectFile->AddExternalSymbol("_MemoryUtils_GetHalfProxy", &MemoryUtils_GetHalfProxy); - objectFile->AddExternalSymbol("_MemoryUtils_GetWordProxy", &MemoryUtils_GetWordProxy); - objectFile->AddExternalSymbol("_MemoryUtils_SetByteProxy", &MemoryUtils_SetByteProxy); - objectFile->AddExternalSymbol("_MemoryUtils_SetHalfProxy", &MemoryUtils_SetHalfProxy); - objectFile->AddExternalSymbol("_MemoryUtils_SetWordProxy", &MemoryUtils_SetWordProxy); - objectFile->AddExternalSymbol("_LWL_Proxy", &LWL_Proxy); - objectFile->AddExternalSymbol("_LWR_Proxy", &LWR_Proxy); - objectFile->AddExternalSymbol("_SWL_Proxy", &SWL_Proxy); - objectFile->AddExternalSymbol("_SWR_Proxy", &SWR_Proxy); + objectFile->AddExternalSymbol("_MemoryUtils_GetByteProxy", reinterpret_cast(&MemoryUtils_GetByteProxy)); + objectFile->AddExternalSymbol("_MemoryUtils_GetHalfProxy", reinterpret_cast(&MemoryUtils_GetHalfProxy)); + objectFile->AddExternalSymbol("_MemoryUtils_GetWordProxy", reinterpret_cast(&MemoryUtils_GetWordProxy)); + objectFile->AddExternalSymbol("_MemoryUtils_SetByteProxy", reinterpret_cast(&MemoryUtils_SetByteProxy)); + objectFile->AddExternalSymbol("_MemoryUtils_SetHalfProxy", reinterpret_cast(&MemoryUtils_SetHalfProxy)); + objectFile->AddExternalSymbol("_MemoryUtils_SetWordProxy", reinterpret_cast(&MemoryUtils_SetWordProxy)); + objectFile->AddExternalSymbol("_LWL_Proxy", reinterpret_cast(&LWL_Proxy)); + objectFile->AddExternalSymbol("_LWR_Proxy", reinterpret_cast(&LWR_Proxy)); + objectFile->AddExternalSymbol("_SWL_Proxy", reinterpret_cast(&SWL_Proxy)); + objectFile->AddExternalSymbol("_SWR_Proxy", reinterpret_cast(&SWR_Proxy)); //Initialize Jitter Service auto jitter = new CMipsJitter(codeGen);