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

Core: Have CX86RegInfo::Map_TempReg generate a BreakPoint if it mapping a protected register

This commit is contained in:
zilmar 2024-02-22 19:41:10 +10:30
parent e082cd55df
commit fae0b81e21
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,8 +1215,33 @@ asmjit::x86::Gp CX86RegInfo::Map_TempReg(asmjit::x86::Gp Reg, int32_t MipsReg, b
} }
else if (GetX86Mapped(GetIndexFromX86Reg(Reg)) == Stack_Mapped) else if (GetX86Mapped(GetIndexFromX86Reg(Reg)) == Stack_Mapped)
{ {
if (GetX86Protected(GetIndexFromX86Reg(Reg)))
{
WriteTrace(TraceRegisterCache, TraceError, "Register is protected");
g_Notify->BreakPoint(__FILE__, __LINE__);
return x86Reg_Unknown;
}
UnMap_X86reg(Reg); UnMap_X86reg(Reg);
} }
else if (GetX86Mapped(GetIndexFromX86Reg(Reg)) == NotMapped)
{
if (GetX86Protected(GetIndexFromX86Reg(Reg)))
{
WriteTrace(TraceRegisterCache, TraceError, "Register is protected");
g_Notify->BreakPoint(__FILE__, __LINE__);
return x86Reg_Unknown;
}
}
else if (GetX86Mapped(GetIndexFromX86Reg(Reg)) == Temp_Mapped)
{
//Already mapped as temporary register
}
else
{
WriteTrace(TraceRegisterCache, TraceError, "Failed to map temp reg to %s", CX86Ops::x86_Name(Reg));
g_Notify->BreakPoint(__FILE__, __LINE__);
return x86Reg_Unknown;
}
m_CodeBlock.Log(" regcache: allocate %s as temp storage", CX86Ops::x86_Name(Reg)); m_CodeBlock.Log(" regcache: allocate %s as temp storage", CX86Ops::x86_Name(Reg));
if (MipsReg >= 0) if (MipsReg >= 0)
@ -1782,6 +1807,7 @@ bool CX86RegInfo::UnMap_X86reg(const asmjit::x86::Gp & Reg)
{ {
m_CodeBlock.Log(" regcache: unallocate %s from temp storage", CX86Ops::x86_Name(Reg)); m_CodeBlock.Log(" regcache: unallocate %s from temp storage", CX86Ops::x86_Name(Reg));
SetX86Mapped(RegIndex, NotMapped); SetX86Mapped(RegIndex, NotMapped);
SetX86Protected(RegIndex, false);
return true; return true;
} }
} }
@ -1790,6 +1816,7 @@ bool CX86RegInfo::UnMap_X86reg(const asmjit::x86::Gp & Reg)
m_CodeBlock.Log(" regcache: unallocate %s from memory stack", CX86Ops::x86_Name(Reg)); m_CodeBlock.Log(" regcache: unallocate %s from memory stack", CX86Ops::x86_Name(Reg));
m_Assembler.MoveX86regToVariable(&(g_Recompiler->MemoryStackPos()), "MemoryStack", Reg); m_Assembler.MoveX86regToVariable(&(g_Recompiler->MemoryStackPos()), "MemoryStack", Reg);
SetX86Mapped(RegIndex, NotMapped); SetX86Mapped(RegIndex, NotMapped);
SetX86Protected(RegIndex, false);
return true; return true;
} }
else if (GetX86Mapped(RegIndex) == CX86RegInfo::FPStatusReg_Mapped) else if (GetX86Mapped(RegIndex) == CX86RegInfo::FPStatusReg_Mapped)
@ -1797,6 +1824,7 @@ bool CX86RegInfo::UnMap_X86reg(const asmjit::x86::Gp & Reg)
m_CodeBlock.Log(" regcache: unallocate %s from FP Status Reg", CX86Ops::x86_Name(Reg)); m_CodeBlock.Log(" regcache: unallocate %s from FP Status Reg", CX86Ops::x86_Name(Reg));
m_Assembler.MoveX86regToVariable(&g_Reg->m_FPCR[31], "FPCR[31]", Reg); m_Assembler.MoveX86regToVariable(&g_Reg->m_FPCR[31], "FPCR[31]", Reg);
SetX86Mapped(RegIndex, NotMapped); SetX86Mapped(RegIndex, NotMapped);
SetX86Protected(RegIndex, false);
return true; return true;
} }
else else