ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Fix build warning with CX86Ops::CallThis

This commit is contained in:
zilmar 2023-01-03 14:49:35 +10:30
parent 5923d50868
commit b6629ac1d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp
View File

@ -162,13 +162,13 @@ void CX86Ops::CallFunc(uint32_t FunctPtr, const char * FunctName)
} }
#ifdef _MSC_VER #ifdef _MSC_VER
void CX86Ops::CallThis(uint32_t ThisPtr, uint32_t FunctPtr, char * FunctName, uint32_t /*StackSize*/) void CX86Ops::CallThis(uint32_t ThisPtr, uint32_t FunctPtr, const char * FunctName, uint32_t /*StackSize*/)
{ {
mov(asmjit::x86::ecx, ThisPtr); mov(asmjit::x86::ecx, ThisPtr);
CallFunc(FunctPtr, FunctName); CallFunc(FunctPtr, FunctName);
} }
#else #else
void CX86Ops::CallThis(uint32_t ThisPtr, uint32_t FunctPtr, char * FunctName, uint32_t StackSize) void CX86Ops::CallThis(uint32_t ThisPtr, uint32_t FunctPtr, const char * FunctName, uint32_t StackSize)
{ {
push(ThisPtr); push(ThisPtr);
CallFunc(FunctPtr, FunctName); CallFunc(FunctPtr, FunctName);

2
Source/Project64-core/N64System/Recompiler/x86/x86ops.h
View File

@ -39,7 +39,7 @@ public:
void X86HardBreakPoint(); void X86HardBreakPoint();
void X86BreakPoint(const char * FileName, int32_t LineNumber); void X86BreakPoint(const char * FileName, int32_t LineNumber);
void CallFunc(uint32_t FunctPtr, const char * FunctName); void CallFunc(uint32_t FunctPtr, const char * FunctName);
void CallThis(uint32_t ThisPtr, uint32_t FunctPtr, char * FunctName, uint32_t StackSize); void CallThis(uint32_t ThisPtr, uint32_t FunctPtr, const char * FunctName, uint32_t StackSize);
void CompConstToVariable(void * Variable, const char * VariableName, uint32_t Const); void CompConstToVariable(void * Variable, const char * VariableName, uint32_t Const);
void CompConstToX86reg(const asmjit::x86::Gp & Reg, uint32_t Const); void CompConstToX86reg(const asmjit::x86::Gp & Reg, uint32_t Const);
void CompX86regToVariable(const asmjit::x86::Gp & Reg, void * Variable, const char * VariableName); void CompX86regToVariable(const asmjit::x86::Gp & Reg, void * Variable, const char * VariableName);