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

Core: SW_Register needs to protect the register

This commit is contained in:
zilmar 2023-01-23 15:30:39 +10:30
parent 0e52bfb185
commit fb6bda321c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10079,9 +10079,10 @@ void CX86RecompilerOps::SB_Const(uint32_t Value, uint32_t VAddr)
void CX86RecompilerOps::SB_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr) void CX86RecompilerOps::SB_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
if (VAddr < 0x80000000 || VAddr >= 0xC0000000) if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false); asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false);
m_Assembler.MoveConstToX86reg(AddressReg, VAddr); m_Assembler.MoveConstToX86reg(AddressReg, VAddr);
CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 8); CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 8);
@ -10189,10 +10190,10 @@ void CX86RecompilerOps::SH_Const(uint32_t Value, uint32_t VAddr)
void CX86RecompilerOps::SH_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr) void CX86RecompilerOps::SH_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
if (VAddr < 0x80000000 || VAddr >= 0xC0000000) if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false); asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false);
m_Assembler.MoveConstToX86reg(AddressReg, VAddr); m_Assembler.MoveConstToX86reg(AddressReg, VAddr);
CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 16); CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 16);
@ -10706,9 +10707,10 @@ void CX86RecompilerOps::SW_Const(uint32_t Value, uint32_t VAddr)
void CX86RecompilerOps::SW_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr) void CX86RecompilerOps::SW_Register(const asmjit::x86::Gp & Reg, uint32_t VAddr)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
if (VAddr < 0x80000000 || VAddr >= 0xC0000000) if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
{ {
m_RegWorkingSet.SetX86Protected(GetIndexFromX86Reg(Reg), true);
asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false); asmjit::x86::Gp AddressReg = Map_TempReg(x86Reg_Unknown, -1, false, false);
m_Assembler.MoveConstToX86reg(AddressReg, VAddr); m_Assembler.MoveConstToX86reg(AddressReg, VAddr);
CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 32); CompileStoreMemoryValue(AddressReg, Reg, x86Reg_Unknown, 0, 32);