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

Core: fix LB_KnownAddress for reading rom

This commit is contained in:
zilmar 2022-07-25 17:22:47 +09:30
parent efb2c39a9d
commit c59a0efcab
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2811,13 +2811,31 @@ void CX86RecompilerOps::LB_KnownAddress(x86Reg Reg, uint32_t VAddr, bool SignExt
case 0x10000000: case 0x10000000:
if ((PAddr - 0x10000000) < g_Rom->GetRomSize()) if ((PAddr - 0x10000000) < g_Rom->GetRomSize())
{ {
m_RegWorkingSet.BeforeCallDirect();
PushImm32("m_TempValue32", (uint32_t)&m_TempValue32);
PushImm32(((PAddr + 2) & ~0x3) & 0x1FFFFFFC);
#ifdef _MSC_VER
MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_RomMemoryHandler, x86_ECX);
Call_Direct((void *)((long**)(MemoryHandler *)&g_MMU->m_RomMemoryHandler)[0][0], "RomMemoryHandler::Read32");
#else
PushImm32((uint32_t)&g_MMU->m_RomMemoryHandler);
Call_Direct(AddressOf(&RomMemoryHandler::Read32), "RomMemoryHandler::Read32");
AddConstToX86Reg(x86_ESP, 16);
#endif
m_RegWorkingSet.AfterCallDirect();
MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg);
uint8_t Shift = (((PAddr & 1) ^ 3) << 3);
if (Shift == 0x10)
{
ShiftLeftSignImmed(Reg, 0x8);
}
if (SignExtend) if (SignExtend)
{ {
MoveSxVariableToX86regByte(((PAddr ^ 3) - 0x10000000) + g_Rom->GetRomAddress(), stdstr_f("Rom + (%X ^ 3)", (PAddr - 0x10000000)).c_str(), Reg); ShiftRightSignImmed(Reg, 0x18);
} }
else else
{ {
MoveZxVariableToX86regByte(((PAddr ^ 3) - 0x10000000) + g_Rom->GetRomAddress(), stdstr_f("Rom + (%X ^ 3)", (PAddr - 0x10000000)).c_str(), Reg); ShiftRightUnsignImmed(Reg, 0x18);
} }
} }
else else
@ -2887,7 +2905,7 @@ void CX86RecompilerOps::LH_KnownAddress(x86Reg Reg, uint32_t VAddr, bool SignExt
{ {
m_RegWorkingSet.BeforeCallDirect(); m_RegWorkingSet.BeforeCallDirect();
PushImm32("m_TempValue32", (uint32_t)&m_TempValue32); PushImm32("m_TempValue32", (uint32_t)&m_TempValue32);
PushImm32(PAddr & 0x1FFFFFFC); PushImm32(((PAddr + 2) & ~0x3) & 0x1FFFFFFC);
#ifdef _MSC_VER #ifdef _MSC_VER
MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_RomMemoryHandler, x86_ECX); MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_RomMemoryHandler, x86_ECX);
Call_Direct((void *)((long**)(MemoryHandler *)&g_MMU->m_RomMemoryHandler)[0][0], "RomMemoryHandler::Read32"); Call_Direct((void *)((long**)(MemoryHandler *)&g_MMU->m_RomMemoryHandler)[0][0], "RomMemoryHandler::Read32");
@ -2897,26 +2915,14 @@ void CX86RecompilerOps::LH_KnownAddress(x86Reg Reg, uint32_t VAddr, bool SignExt
AddConstToX86Reg(x86_ESP, 16); AddConstToX86Reg(x86_ESP, 16);
#endif #endif
m_RegWorkingSet.AfterCallDirect(); m_RegWorkingSet.AfterCallDirect();
uint8_t ShiftValue = (((PAddr & 2) ^ 2) << 3); MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg);
if (ShiftValue != 0) if (SignExtend)
{ {
MoveVariableToX86reg(&m_TempValue32, "m_TempValue32", Reg); ShiftRightSignImmed(Reg, 16);
if (SignExtend)
{
ShiftRightSignImmed(Reg, ShiftValue);
}
else
{
ShiftRightUnsignImmed(Reg, ShiftValue);
}
}
else if (SignExtend)
{
MoveSxVariableToX86regHalf(&m_TempValue32, "m_TempValue32", Reg);
} }
else else
{ {
MoveZxVariableToX86regHalf(&m_TempValue32, "m_TempValue32", Reg); ShiftRightUnsignImmed(Reg, 16);
} }
} }
else else