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

Core: Change StackPos to be a reference

This commit is contained in:
zilmar 2022-10-10 13:42:52 +10:30
parent 6044222be0
commit 46dcf967e1
3 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp
View File

@ -377,7 +377,7 @@ void CX86RegInfo::Load_FPR_ToTop(int32_t Reg, int32_t RegToLoad, FPU_STATE Forma
{ {
UnMap_FPR(m_x86fpu_MappedTo[(StackTopPos() - 1) & 7], true); UnMap_FPR(m_x86fpu_MappedTo[(StackTopPos() - 1) & 7], true);
m_CodeBlock.Log(" regcache: allocate ST(0) to %s", CRegName::FPR[Reg]); m_CodeBlock.Log(" regcache: allocate ST(0) to %s", CRegName::FPR[Reg]);
m_Assembler.fpuLoadReg(&StackTopPos(), StackPosition(RegToLoad)); m_Assembler.fpuLoadReg(StackTopPos(), StackPosition(RegToLoad));
FpuRoundingModel(StackTopPos()) = RoundDefault; FpuRoundingModel(StackTopPos()) = RoundDefault;
m_x86fpu_MappedTo[StackTopPos()] = Reg; m_x86fpu_MappedTo[StackTopPos()] = Reg;
m_x86fpu_State[StackTopPos()] = Format; m_x86fpu_State[StackTopPos()] = Format;
@ -442,19 +442,19 @@ void CX86RegInfo::Load_FPR_ToTop(int32_t Reg, int32_t RegToLoad, FPU_STATE Forma
{ {
case FPU_Dword: case FPU_Dword:
m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str(), TempReg);
m_Assembler.fpuLoadIntegerDwordFromX86Reg(&StackTopPos(), TempReg); m_Assembler.fpuLoadIntegerDwordFromX86Reg(StackTopPos(), TempReg);
break; break;
case FPU_Qword: case FPU_Qword:
m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_D[RegToLoad], stdstr_f("m_FPR_D[%d]", RegToLoad).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_D[RegToLoad], stdstr_f("m_FPR_D[%d]", RegToLoad).c_str(), TempReg);
m_Assembler.fpuLoadIntegerQwordFromX86Reg(&StackTopPos(), TempReg); m_Assembler.fpuLoadIntegerQwordFromX86Reg(StackTopPos(), TempReg);
break; break;
case FPU_Float: case FPU_Float:
m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str(), TempReg);
m_Assembler.fpuLoadDwordFromX86Reg(&StackTopPos(), TempReg); m_Assembler.fpuLoadDwordFromX86Reg(StackTopPos(), TempReg);
break; break;
case FPU_Double: case FPU_Double:
m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_D[RegToLoad], stdstr_f("m_FPR_D[%d]", RegToLoad).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&g_Reg->m_FPR_D[RegToLoad], stdstr_f("m_FPR_D[%d]", RegToLoad).c_str(), TempReg);
m_Assembler.fpuLoadQwordFromX86Reg(&StackTopPos(), TempReg); m_Assembler.fpuLoadQwordFromX86Reg(StackTopPos(), TempReg);
break; break;
default: default:
if (HaveDebugger()) if (HaveDebugger())
@ -1200,7 +1200,7 @@ void CX86RegInfo::UnMap_AllFPRs()
{ {
if (m_x86fpu_MappedTo[(StartPos + i) & 7] != -1) if (m_x86fpu_MappedTo[(StartPos + i) & 7] != -1)
{ {
m_Assembler.fpuIncStack(&StackTopPos()); m_Assembler.fpuIncStack(StackTopPos());
} }
} }
if (StackPos != StackTopPos()) if (StackPos != StackTopPos())
@ -1232,7 +1232,7 @@ void CX86RegInfo::UnMap_FPR(int32_t Reg, bool WriteBackValue)
{ {
if (m_x86fpu_MappedTo[StackTopPos()] == -1 && m_x86fpu_MappedTo[(StackTopPos() + 1) & 7] == Reg) if (m_x86fpu_MappedTo[StackTopPos()] == -1 && m_x86fpu_MappedTo[(StackTopPos() + 1) & 7] == Reg)
{ {
m_Assembler.fpuIncStack(&StackTopPos()); m_Assembler.fpuIncStack(StackTopPos());
} }
else else
{ {
@ -1260,19 +1260,19 @@ void CX86RegInfo::UnMap_FPR(int32_t Reg, bool WriteBackValue)
{ {
case FPU_Dword: case FPU_Dword:
m_Assembler.MoveVariableToX86reg(&_FPR_S[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_S[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&_FPR_S[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_S[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg);
m_Assembler.fpuStoreIntegerDwordFromX86Reg(&StackTopPos(), TempReg, true); m_Assembler.fpuStoreIntegerDwordFromX86Reg(StackTopPos(), TempReg, true);
break; break;
case FPU_Qword: case FPU_Qword:
m_Assembler.MoveVariableToX86reg(&_FPR_D[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_D[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&_FPR_D[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_D[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg);
m_Assembler.fpuStoreIntegerQwordFromX86Reg(&StackTopPos(), TempReg, true); m_Assembler.fpuStoreIntegerQwordFromX86Reg(StackTopPos(), TempReg, true);
break; break;
case FPU_Float: case FPU_Float:
m_Assembler.MoveVariableToX86reg(&_FPR_S[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_S[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&_FPR_S[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_S[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg);
m_Assembler.fpuStoreDwordFromX86Reg(&StackTopPos(), TempReg, true); m_Assembler.fpuStoreDwordFromX86Reg(StackTopPos(), TempReg, true);
break; break;
case FPU_Double: case FPU_Double:
m_Assembler.MoveVariableToX86reg(&_FPR_D[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_D[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg); m_Assembler.MoveVariableToX86reg(&_FPR_D[m_x86fpu_MappedTo[StackTopPos()]], stdstr_f("_FPR_D[%d]", m_x86fpu_MappedTo[StackTopPos()]).c_str(), TempReg);
m_Assembler.fpuStoreQwordFromX86Reg(&StackTopPos(), TempReg, true); m_Assembler.fpuStoreQwordFromX86Reg(StackTopPos(), TempReg, true);
break; break;
default: default:
if (HaveDebugger()) if (HaveDebugger())

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

@ -3386,10 +3386,10 @@ void CX86Ops::fpuAddReg(x86FpuValues x86reg)
} }
} }
void CX86Ops::fpuAddRegPop(int32_t * StackPos, x86FpuValues reg) void CX86Ops::fpuAddRegPop(int32_t & StackPos, x86FpuValues reg)
{ {
CodeLog(" faddp ST(0), %s", fpu_Name(reg)); CodeLog(" faddp ST(0), %s", fpu_Name(reg));
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
switch (reg) switch (reg)
{ {
case x86_ST0: AddCode16(0xC0DE); break; case x86_ST0: AddCode16(0xC0DE); break;
@ -3615,17 +3615,17 @@ void CX86Ops::fpuFree(x86FpuValues Reg)
} }
} }
void CX86Ops::fpuDecStack(int32_t * StackPos) void CX86Ops::fpuDecStack(int32_t & StackPos)
{ {
CodeLog(" fdecstp"); CodeLog(" fdecstp");
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode16(0xF6D9); AddCode16(0xF6D9);
} }
void CX86Ops::fpuIncStack(int32_t * StackPos) void CX86Ops::fpuIncStack(int32_t & StackPos)
{ {
CodeLog(" fincstp"); CodeLog(" fincstp");
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
AddCode16(0xF7D9); AddCode16(0xF7D9);
} }
@ -3636,18 +3636,18 @@ void CX86Ops::fpuLoadControl(void * Variable, const char * VariableName)
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuLoadDword(int32_t * StackPos, void * Variable, const char * VariableName) void CX86Ops::fpuLoadDword(int32_t & StackPos, void * Variable, const char * VariableName)
{ {
CodeLog(" fld dword ptr [%s]", VariableName); CodeLog(" fld dword ptr [%s]", VariableName);
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode16(0x05D9); AddCode16(0x05D9);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuLoadDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadDwordFromX86Reg(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fld dword ptr [%s]", x86_Name(x86reg)); CodeLog(" fld dword ptr [%s]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode8(0xD9); AddCode8(0xD9);
switch (x86reg) switch (x86reg)
{ {
@ -3662,10 +3662,10 @@ void CX86Ops::fpuLoadDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg)
} }
} }
void CX86Ops::fpuLoadDwordFromN64Mem(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadDwordFromN64Mem(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fld dword ptr [%s+N64mem]", x86_Name(x86reg)); CodeLog(" fld dword ptr [%s+N64mem]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
switch (x86reg) switch (x86reg)
{ {
case x86_EAX: AddCode16(0x80D9); break; case x86_EAX: AddCode16(0x80D9); break;
@ -3681,10 +3681,10 @@ void CX86Ops::fpuLoadDwordFromN64Mem(int32_t * StackPos, x86Reg x86reg)
AddCode32((uint32_t)g_MMU->Rdram()); AddCode32((uint32_t)g_MMU->Rdram());
} }
void CX86Ops::fpuLoadInt32bFromN64Mem(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadInt32bFromN64Mem(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fild dword ptr [%s+N64mem]", x86_Name(x86reg)); CodeLog(" fild dword ptr [%s+N64mem]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
switch (x86reg) switch (x86reg)
{ {
case x86_EAX: AddCode16(0x80DB); break; case x86_EAX: AddCode16(0x80DB); break;
@ -3700,18 +3700,18 @@ void CX86Ops::fpuLoadInt32bFromN64Mem(int32_t * StackPos, x86Reg x86reg)
AddCode32((uint32_t)g_MMU->Rdram()); AddCode32((uint32_t)g_MMU->Rdram());
} }
void CX86Ops::fpuLoadIntegerDword(int32_t * StackPos, void * Variable, const char * VariableName) void CX86Ops::fpuLoadIntegerDword(int32_t & StackPos, void * Variable, const char * VariableName)
{ {
CodeLog(" fild dword ptr [%s]", VariableName); CodeLog(" fild dword ptr [%s]", VariableName);
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode16(0x05DB); AddCode16(0x05DB);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuLoadIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadIntegerDwordFromX86Reg(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fild dword ptr [%s]", x86_Name(x86reg)); CodeLog(" fild dword ptr [%s]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode8(0xDB); AddCode8(0xDB);
switch (x86reg) switch (x86reg)
{ {
@ -3726,18 +3726,18 @@ void CX86Ops::fpuLoadIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg)
} }
} }
void CX86Ops::fpuLoadIntegerQword(int32_t * StackPos, void * Variable, const char * VariableName) void CX86Ops::fpuLoadIntegerQword(int32_t & StackPos, void * Variable, const char * VariableName)
{ {
CodeLog(" fild qword ptr [%s]", VariableName); CodeLog(" fild qword ptr [%s]", VariableName);
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode16(0x2DDF); AddCode16(0x2DDF);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuLoadIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadIntegerQwordFromX86Reg(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fild qword ptr [%s]", x86_Name(x86reg)); CodeLog(" fild qword ptr [%s]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode8(0xDF); AddCode8(0xDF);
switch (x86reg) switch (x86reg)
{ {
@ -3752,18 +3752,18 @@ void CX86Ops::fpuLoadIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg)
} }
} }
void CX86Ops::fpuLoadQword(int32_t * StackPos, void * Variable, const char * VariableName) void CX86Ops::fpuLoadQword(int32_t & StackPos, void * Variable, const char * VariableName)
{ {
CodeLog(" fld qword ptr [%s]", VariableName); CodeLog(" fld qword ptr [%s]", VariableName);
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode16(0x05DD); AddCode16(0x05DD);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuLoadQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadQwordFromX86Reg(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fld qword ptr [%s]", x86_Name(x86reg)); CodeLog(" fld qword ptr [%s]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
AddCode8(0xDD); AddCode8(0xDD);
switch (x86reg) switch (x86reg)
{ {
@ -3778,10 +3778,10 @@ void CX86Ops::fpuLoadQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg)
} }
} }
void CX86Ops::fpuLoadQwordFromN64Mem(int32_t * StackPos, x86Reg x86reg) void CX86Ops::fpuLoadQwordFromN64Mem(int32_t & StackPos, x86Reg x86reg)
{ {
CodeLog(" fld qword ptr [%s+N64mem]", x86_Name(x86reg)); CodeLog(" fld qword ptr [%s+N64mem]", x86_Name(x86reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
switch (x86reg) switch (x86reg)
{ {
case x86_EAX: AddCode16(0x80DD); break; case x86_EAX: AddCode16(0x80DD); break;
@ -3797,10 +3797,10 @@ void CX86Ops::fpuLoadQwordFromN64Mem(int32_t * StackPos, x86Reg x86reg)
AddCode32((uint32_t)g_MMU->Rdram()); AddCode32((uint32_t)g_MMU->Rdram());
} }
void CX86Ops::fpuLoadReg(int32_t * StackPos, x86FpuValues Reg) void CX86Ops::fpuLoadReg(int32_t & StackPos, x86FpuValues Reg)
{ {
CodeLog(" fld ST(0), %s", fpu_Name(Reg)); CodeLog(" fld ST(0), %s", fpu_Name(Reg));
*StackPos = (*StackPos - 1) & 7; StackPos = (StackPos - 1) & 7;
switch (Reg) switch (Reg)
{ {
case x86_ST0: AddCode16(0xC0D9); break; case x86_ST0: AddCode16(0xC0D9); break;
@ -3928,20 +3928,20 @@ void CX86Ops::fpuStoreControl(void * Variable, const char * VariableName)
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuStoreDword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop) void CX86Ops::fpuStoreDword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop)
{ {
CodeLog(" fst%s dword ptr [%s]", m_fpupop[pop], VariableName); CodeLog(" fst%s dword ptr [%s]", m_fpupop[pop], VariableName);
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode16(pop ? 0x1DD9 : 0x15D9); AddCode16(pop ? 0x1DD9 : 0x15D9);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuStoreDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool pop) void CX86Ops::fpuStoreDwordFromX86Reg(int32_t & StackPos, x86Reg x86reg, bool pop)
{ {
uint8_t Command = 0; uint8_t Command = 0;
@ -3949,7 +3949,7 @@ void CX86Ops::fpuStoreDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool po
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode8(0xD9); AddCode8(0xD9);
@ -3969,7 +3969,7 @@ void CX86Ops::fpuStoreDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool po
AddCode8(pop ? (Command + 0x8) : Command); AddCode8(pop ? (Command + 0x8) : Command);
} }
void CX86Ops::fpuStoreDwordToN64Mem(int32_t * StackPos, x86Reg x86reg, bool Pop) void CX86Ops::fpuStoreDwordToN64Mem(int32_t & StackPos, x86Reg x86reg, bool Pop)
{ {
int s = Pop ? 0x0800 : 0; int s = Pop ? 0x0800 : 0;
@ -3977,7 +3977,7 @@ void CX86Ops::fpuStoreDwordToN64Mem(int32_t * StackPos, x86Reg x86reg, bool Pop)
if (Pop) if (Pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
switch (x86reg) switch (x86reg)
@ -3996,19 +3996,19 @@ void CX86Ops::fpuStoreDwordToN64Mem(int32_t * StackPos, x86Reg x86reg, bool Pop)
AddCode32((uint32_t)g_MMU->Rdram()); AddCode32((uint32_t)g_MMU->Rdram());
} }
void CX86Ops::fpuStoreIntegerDword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop) void CX86Ops::fpuStoreIntegerDword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop)
{ {
CodeLog(" fist%s dword ptr [%s]", m_fpupop[pop], VariableName); CodeLog(" fist%s dword ptr [%s]", m_fpupop[pop], VariableName);
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode16(pop ? 0x1DDB : 0x15DB); AddCode16(pop ? 0x1DDB : 0x15DB);
AddCode32((uint32_t)Variable); AddCode32((uint32_t)Variable);
} }
void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool pop) void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int32_t & StackPos, x86Reg x86reg, bool pop)
{ {
uint8_t Command = 0; uint8_t Command = 0;
@ -4016,7 +4016,7 @@ void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg,
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode8(0xDB); AddCode8(0xDB);
@ -4036,13 +4036,13 @@ void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg x86reg,
AddCode8(pop ? (Command + 0x8) : Command); AddCode8(pop ? (Command + 0x8) : Command);
} }
void CX86Ops::fpuStoreIntegerQword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop) void CX86Ops::fpuStoreIntegerQword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop)
{ {
CodeLog(" fist%s qword ptr [%s]", m_fpupop[pop], VariableName); CodeLog(" fist%s qword ptr [%s]", m_fpupop[pop], VariableName);
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode16(pop ? 0x3DDF : 0x35DF); AddCode16(pop ? 0x3DDF : 0x35DF);
@ -4054,7 +4054,7 @@ void CX86Ops::fpuStoreIntegerQword(int32_t * StackPos, void * Variable, const ch
} }
} }
void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool pop) void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int32_t & StackPos, x86Reg x86reg, bool pop)
{ {
uint8_t Command = 0; uint8_t Command = 0;
@ -4062,7 +4062,7 @@ void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg,
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode8(0xDF); AddCode8(0xDF);
@ -4082,7 +4082,7 @@ void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg,
AddCode8(pop ? (Command + 0x8) : Command); AddCode8(pop ? (Command + 0x8) : Command);
} }
void CX86Ops::fpuStoreQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool pop) void CX86Ops::fpuStoreQwordFromX86Reg(int32_t & StackPos, x86Reg x86reg, bool pop)
{ {
uint8_t Command = 0; uint8_t Command = 0;
@ -4090,7 +4090,7 @@ void CX86Ops::fpuStoreQwordFromX86Reg(int32_t * StackPos, x86Reg x86reg, bool po
if (pop) if (pop)
{ {
*StackPos = (*StackPos + 1) & 7; StackPos = (StackPos + 1) & 7;
} }
AddCode8(0xDD); AddCode8(0xDD);

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

@ -235,7 +235,7 @@ public:
void fpuAddQword(void * Variable, const char * VariableName); void fpuAddQword(void * Variable, const char * VariableName);
void fpuAddQwordRegPointer(x86Reg X86Pointer); void fpuAddQwordRegPointer(x86Reg X86Pointer);
void fpuAddReg(x86FpuValues reg); void fpuAddReg(x86FpuValues reg);
void fpuAddRegPop(int32_t * StackPos, x86FpuValues reg); void fpuAddRegPop(int32_t & StackPos, x86FpuValues reg);
void fpuComDword(void * Variable, const char * VariableName, bool Pop); void fpuComDword(void * Variable, const char * VariableName, bool Pop);
void fpuComDwordRegPointer(x86Reg X86Pointer, bool Pop); void fpuComDwordRegPointer(x86Reg X86Pointer, bool Pop);
void fpuComQword(void * Variable, const char * VariableName, bool Pop); void fpuComQword(void * Variable, const char * VariableName, bool Pop);
@ -249,21 +249,21 @@ public:
void fpuDivRegPop(x86FpuValues reg); void fpuDivRegPop(x86FpuValues reg);
void fpuExchange(x86FpuValues Reg); void fpuExchange(x86FpuValues Reg);
void fpuFree(x86FpuValues Reg); void fpuFree(x86FpuValues Reg);
void fpuDecStack(int32_t * StackPos); void fpuDecStack(int32_t & StackPos);
void fpuIncStack(int32_t * StackPos); void fpuIncStack(int32_t & StackPos);
void fpuLoadControl(void * Variable, const char * VariableName); void fpuLoadControl(void * Variable, const char * VariableName);
void fpuLoadDword(int32_t * StackPos, void * Variable, const char * VariableName); void fpuLoadDword(int32_t & StackPos, void * Variable, const char * VariableName);
void fpuLoadDwordFromX86Reg(int32_t * StackPos, x86Reg reg); void fpuLoadDwordFromX86Reg(int32_t & StackPos, x86Reg reg);
void fpuLoadDwordFromN64Mem(int32_t * StackPos, x86Reg reg); void fpuLoadDwordFromN64Mem(int32_t & StackPos, x86Reg reg);
void fpuLoadInt32bFromN64Mem(int32_t * StackPos, x86Reg reg); void fpuLoadInt32bFromN64Mem(int32_t & StackPos, x86Reg reg);
void fpuLoadIntegerDword(int32_t * StackPos, void * Variable, const char * VariableName); void fpuLoadIntegerDword(int32_t & StackPos, void * Variable, const char * VariableName);
void fpuLoadIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg Reg); void fpuLoadIntegerDwordFromX86Reg(int32_t & StackPos, x86Reg Reg);
void fpuLoadIntegerQword(int32_t * StackPos, void * Variable, const char * VariableName); void fpuLoadIntegerQword(int32_t & StackPos, void * Variable, const char * VariableName);
void fpuLoadIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg Reg); void fpuLoadIntegerQwordFromX86Reg(int32_t & StackPos, x86Reg Reg);
void fpuLoadQword(int32_t * StackPos, void * Variable, const char * VariableName); void fpuLoadQword(int32_t & StackPos, void * Variable, const char * VariableName);
void fpuLoadQwordFromX86Reg(int32_t * StackPos, x86Reg Reg); void fpuLoadQwordFromX86Reg(int32_t & StackPos, x86Reg Reg);
void fpuLoadQwordFromN64Mem(int32_t * StackPos, x86Reg reg); void fpuLoadQwordFromN64Mem(int32_t & StackPos, x86Reg reg);
void fpuLoadReg(int32_t * StackPos, x86FpuValues Reg); void fpuLoadReg(int32_t & StackPos, x86FpuValues Reg);
void fpuMulDword(void * Variable, const char * VariableName); void fpuMulDword(void * Variable, const char * VariableName);
void fpuMulDwordRegPointer(x86Reg X86Pointer); void fpuMulDwordRegPointer(x86Reg X86Pointer);
void fpuMulQword(void * Variable, const char * VariableName); void fpuMulQword(void * Variable, const char * VariableName);
@ -274,14 +274,14 @@ public:
void fpuRound(); void fpuRound();
void fpuSqrt(); void fpuSqrt();
void fpuStoreControl(void * Variable, const char * VariableName); void fpuStoreControl(void * Variable, const char * VariableName);
void fpuStoreDword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop); void fpuStoreDword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop);
void fpuStoreDwordFromX86Reg(int32_t * StackPos, x86Reg Reg, bool pop); void fpuStoreDwordFromX86Reg(int32_t & StackPos, x86Reg Reg, bool pop);
void fpuStoreDwordToN64Mem(int32_t * StackPos, x86Reg reg, bool Pop); void fpuStoreDwordToN64Mem(int32_t & StackPos, x86Reg reg, bool Pop);
void fpuStoreIntegerDword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop); void fpuStoreIntegerDword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop);
void fpuStoreIntegerDwordFromX86Reg(int32_t * StackPos, x86Reg Reg, bool pop); void fpuStoreIntegerDwordFromX86Reg(int32_t & StackPos, x86Reg Reg, bool pop);
void fpuStoreIntegerQword(int32_t * StackPos, void * Variable, const char * VariableName, bool pop); void fpuStoreIntegerQword(int32_t & StackPos, void * Variable, const char * VariableName, bool pop);
void fpuStoreIntegerQwordFromX86Reg(int32_t * StackPos, x86Reg Reg, bool pop); void fpuStoreIntegerQwordFromX86Reg(int32_t & StackPos, x86Reg Reg, bool pop);
void fpuStoreQwordFromX86Reg(int32_t * StackPos, x86Reg Reg, bool pop); void fpuStoreQwordFromX86Reg(int32_t & StackPos, x86Reg Reg, bool pop);
void fpuStoreStatus(); void fpuStoreStatus();
void fpuSubDword(void * Variable, const char * VariableName); void fpuSubDword(void * Variable, const char * VariableName);
void fpuSubDwordRegPointer(x86Reg X86Pointer); void fpuSubDwordRegPointer(x86Reg X86Pointer);