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

Core: x86RecompilerOps rename m_TempValue to m_TempValue32

This commit is contained in:
zilmar 2022-05-16 15:51:37 +09:30
parent 487ed8b54d
commit 1b871fcb15
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
View File

@ -26,7 +26,7 @@ PIPELINE_STAGE CX86RecompilerOps::m_PipelineStage;
uint32_t CX86RecompilerOps::m_CompilePC; uint32_t CX86RecompilerOps::m_CompilePC;
OPCODE CX86RecompilerOps::m_Opcode; OPCODE CX86RecompilerOps::m_Opcode;
uint32_t CX86RecompilerOps::m_BranchCompare = 0; uint32_t CX86RecompilerOps::m_BranchCompare = 0;
uint32_t CX86RecompilerOps::m_TempValue = 0; uint32_t CX86RecompilerOps::m_TempValue32 = 0;
/*int TestValue = 0; /*int TestValue = 0;
void TestFunc() void TestFunc()
@ -3192,7 +3192,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
case 0x04100000: case 0x04100000:
{ {
m_RegWorkingSet.BeforeCallDirect(); m_RegWorkingSet.BeforeCallDirect();
PushImm32("TempValue", (uint32_t)&m_TempValue); PushImm32("m_TempValue32", (uint32_t)&m_TempValue32);
PushImm32(PAddr | 0xA0000000); PushImm32(PAddr | 0xA0000000);
#ifdef _MSC_VER #ifdef _MSC_VER
MoveConstToX86reg((uint32_t)(g_MMU), x86_ECX); MoveConstToX86reg((uint32_t)(g_MMU), x86_ECX);
@ -3203,7 +3203,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
AddConstToX86Reg(x86_ESP, 12); AddConstToX86Reg(x86_ESP, 12);
#endif #endif
m_RegWorkingSet.AfterCallDirect(); m_RegWorkingSet.AfterCallDirect();
MoveVariableToX86reg(&m_TempValue, "TempValue", Reg); MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg);
} }
break; break;
case 0x04300000: case 0x04300000:
@ -3225,7 +3225,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()); m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
m_RegWorkingSet.BeforeCallDirect(); m_RegWorkingSet.BeforeCallDirect();
PushImm32("m_TempValue", (uint32_t)&m_TempValue); PushImm32("m_TempValue32", (uint32_t)&m_TempValue32);
PushImm32(PAddr & 0x1FFFFFFF); PushImm32(PAddr & 0x1FFFFFFF);
#ifdef _MSC_VER #ifdef _MSC_VER
MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_VideoInterfaceHandler, x86_ECX); MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_VideoInterfaceHandler, x86_ECX);
@ -3236,7 +3236,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
AddConstToX86Reg(x86_ESP, 16); AddConstToX86Reg(x86_ESP, 16);
#endif #endif
m_RegWorkingSet.AfterCallDirect(); m_RegWorkingSet.AfterCallDirect();
MoveVariableToX86reg(&m_TempValue, "m_TempValue", Reg); MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg);
} }
break; break;
case 0x04500000: case 0x04500000:
@ -3246,7 +3246,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()); m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
m_RegWorkingSet.BeforeCallDirect(); m_RegWorkingSet.BeforeCallDirect();
PushImm32("m_TempValue", (uint32_t)&m_TempValue); PushImm32("m_TempValue32", (uint32_t)&m_TempValue32);
PushImm32(PAddr & 0x1FFFFFFF); PushImm32(PAddr & 0x1FFFFFFF);
#ifdef _MSC_VER #ifdef _MSC_VER
MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_AudioInterfaceHandler, x86_ECX); MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_AudioInterfaceHandler, x86_ECX);
@ -3257,7 +3257,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
AddConstToX86Reg(x86_ESP, 16); AddConstToX86Reg(x86_ESP, 16);
#endif #endif
m_RegWorkingSet.AfterCallDirect(); m_RegWorkingSet.AfterCallDirect();
MoveVariableToX86reg(&m_TempValue, "m_TempValue", Reg); MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg);
} }
break; break;
case 0x04600000: case 0x04600000:

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

@ -381,7 +381,7 @@ private:
static CX86RegInfo m_RegWorkingSet; static CX86RegInfo m_RegWorkingSet;
static uint32_t m_BranchCompare; static uint32_t m_BranchCompare;
static CCodeSection * m_Section; static CCodeSection * m_Section;
static uint32_t m_TempValue; static uint32_t m_TempValue32;
}; };
#endif #endif