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

Core: Update NonMemory Access to pifram

This commit is contained in:
zilmar 2022-10-17 11:31:54 +10:30
parent 53e00b8023
commit 96244cd6fd
3 changed files with 51 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64-core/N64System/MemoryHandler/PifRamHandler.cpp
View File

@ -61,15 +61,12 @@ bool PifRamHandler::Write32(uint32_t Address, uint32_t Value, uint32_t Mask)
if (Address < 0x1FC007C0)
{
if (BreakOnUnhandledMemory())
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
//Write to pif rom ignored
}
else if (Address < 0x1FC00800)
{
uint32_t SwappedMask = swap32by8(Mask);
Value = ((*(uint32_t *)(&m_PifRam[Address - 0x1FC007C0])) & ~SwappedMask) | (Value & SwappedMask);
Value = ((*(uint32_t *)(&m_PifRam[Address - 0x1FC007C0])) & ~SwappedMask) | (swap32by8(Value) & SwappedMask);
*(uint32_t *)(&m_PifRam[Address - 0x1FC007C0]) = Value;
if (Address == 0x1FC007FC)
{
@ -390,8 +387,8 @@ void PifRamHandler::ControlWrite()
switch (m_PifRam[0x3F])
{
case 0x02:
// Format the 'challenge' message into 30 nibbles for X-Scale's CIC code
{
// Format the 'challenge' message into 30 nibbles for X-Scale's CIC code
char Challenge[30], Response[30];
for (int32_t i = 0; i < 15; i++)
{
@ -412,8 +409,8 @@ void PifRamHandler::ControlWrite()
ResponseValue = (ResponseValue << 8) | ((Response[((z + 8) - 1) * 2] << 4) + Response[((z + 8) - 1) * 2 + 1]);
}
memcpy(&m_PifRam[56], &ResponseValue, sizeof(uint64_t));
break;
}
break;
case 0x08:
m_PifRam[0x3F] = 0;
g_Reg->MI_INTR_REG |= MI_INTR_SI;

97
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -392,12 +392,6 @@ bool CMipsMemoryVM::LB_Memory(uint64_t VAddr, uint8_t & Value)
Value = *(uint8_t *)(MemoryPtr + (VAddr32 ^ 3));
return true;
}
uint32_t BaseAddress = m_TLB_ReadMap[VAddr32 >> 12];
if (BaseAddress == -1)
{
GenerateTLBReadException(VAddr, __FUNCTION__);
return false;
}
return LB_NonMemory(VAddr32, Value);
}
@ -425,12 +419,6 @@ bool CMipsMemoryVM::LH_Memory(uint64_t VAddr, uint16_t & Value)
Value = *(uint16_t *)(MemoryPtr + (VAddr32 ^ 2));
return true;
}
uint32_t BaseAddress = m_TLB_ReadMap[VAddr32 >> 12];
if (BaseAddress == -1)
{
GenerateTLBReadException(VAddr, __FUNCTION__);
return false;
}
return LH_NonMemory(VAddr32, Value);
}
@ -518,11 +506,6 @@ bool CMipsMemoryVM::SB_Memory(uint64_t VAddr, uint32_t Value)
*(uint8_t *)(MemoryPtr + (VAddr32 ^ 3)) = (uint8_t)Value;
return true;
}
if (m_TLB_WriteMap[VAddr32 >> 12] == -1)
{
GenerateTLBWriteException(VAddr, __FUNCTION__);
return false;
}
return SB_NonMemory(VAddr32, Value);
}
@ -550,12 +533,6 @@ bool CMipsMemoryVM::SH_Memory(uint64_t VAddr, uint32_t Value)
*(uint16_t *)(MemoryPtr + (VAddr32 ^ 2)) = (uint16_t)Value;
return true;
}
uint32_t BaseAddress = m_TLB_ReadMap[VAddr32 >> 12];
if (BaseAddress == -1)
{
GenerateTLBWriteException(VAddr, __FUNCTION__);
return false;
}
return SH_NonMemory(VAddr32, Value);
}
@ -649,28 +626,33 @@ bool CMipsMemoryVM::LB_NonMemory(uint32_t VAddr, uint8_t & Value)
GenerateTLBReadException(VAddr, __FUNCTION__);
return false;
}
uint32_t PAddr = BaseAddress + VAddr;
if (PAddr < 0x800000)
uint32_t ReadAddress = PAddr & ~3;
uint32_t Value32;
switch (PAddr & 0xFFF00000)
{
Value = 0;
}
else if (PAddr >= 0x10000000 && PAddr < 0x16000000)
{
uint32_t Value32;
if (!m_RomMemoryHandler.Read32(PAddr, Value32))
case 0x1FC00000: m_PifRamHandler.Read32(ReadAddress, Value32); break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
{
return false;
if (!m_RomMemoryHandler.Read32(PAddr, Value32))
{
return false;
}
Value = ((Value32 >> (((PAddr & 1) ^ 3) << 3)) & 0xff);
return true;
}
Value = ((Value32 >> (((PAddr & 1) ^ 3) << 3)) & 0xff);
}
else
{
if (BreakOnUnhandledMemory())
else
{
g_Notify->BreakPoint(__FILE__, __LINE__);
if (BreakOnUnhandledMemory())
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
Value32 = 0;
}
Value = 0;
}
Value = ((Value32 >> (((PAddr & 3) ^ 3) << 3)) & 0xff);
return true;
}
@ -682,28 +664,33 @@ bool CMipsMemoryVM::LH_NonMemory(uint32_t VAddr, uint16_t & Value)
GenerateTLBReadException(VAddr, __FUNCTION__);
return false;
}
uint32_t PAddr = BaseAddress + VAddr;
if (PAddr < 0x800000)
uint32_t ReadAddress = PAddr & ~1;
uint32_t Value32;
switch (PAddr & 0xFFF00000)
{
Value = 0;
}
else if (PAddr >= 0x10000000 && PAddr < 0x16000000)
{
uint32_t Value32;
if (!m_RomMemoryHandler.Read32(PAddr, Value32))
case 0x1FC00000: m_PifRamHandler.Read32(ReadAddress, Value32); break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
{
return false;
if (!m_RomMemoryHandler.Read32(PAddr, Value32))
{
return false;
}
Value = ((Value32 >> 16) & 0xffff);
return true;
}
Value = ((Value32 >> 16) & 0xffff);
}
else
{
if (BreakOnUnhandledMemory())
else
{
g_Notify->BreakPoint(__FILE__, __LINE__);
if (BreakOnUnhandledMemory())
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
Value32 = 0;
}
Value = 0;
}
Value = ((Value32 >> (((PAddr ^ 1) & 1) << 4)) & 0xffff);
return true;
}
@ -734,7 +721,7 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t VAddr, uint32_t & Value)
case 0x1FC00000: m_PifRamHandler.Read32(PAddr, Value); break;
case 0x1FF00000: m_CartridgeDomain1Address3Handler.Read32(PAddr, Value); break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x16000000)
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
{
m_RomMemoryHandler.Read32(PAddr, Value);
}
@ -797,6 +784,7 @@ bool CMipsMemoryVM::SB_NonMemory(uint32_t VAddr, uint32_t Value)
*(uint8_t *)(m_RDRAM + (PAddr ^ 3)) = (uint8_t)Value;
}
break;
case 0x1FC00000: m_PifRamHandler.Write32(PAddr & ~3, Value << ((3 - (PAddr & 3)) * 8), 0xFFFFFFFF); break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
{
@ -846,6 +834,7 @@ bool CMipsMemoryVM::SH_NonMemory(uint32_t VAddr, uint32_t Value)
}
}
break;
case 0x1FC00000: m_PifRamHandler.Write32(PAddr & ~3, Value << ((2 - (PAddr & 2)) * 8), 0xFFFFFFFF); break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
{

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

@ -10171,7 +10171,7 @@ void CX86RecompilerOps::SB_Const(uint32_t Value, uint32_t VAddr)
}
break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
if (PAddr >= 0x10000000 && PAddr < 0x13F00000)
{
m_RegWorkingSet.BeforeCallDirect();
m_Assembler.PushImm32(0xFFFFFFFF);
@ -10281,7 +10281,7 @@ void CX86RecompilerOps::SH_Const(uint32_t Value, uint32_t VAddr)
}
break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
if (PAddr >= 0x10000000 && PAddr < 0x13F00000)
{
m_RegWorkingSet.BeforeCallDirect();
m_Assembler.PushImm32(0xFFFFFFFF);
@ -10792,7 +10792,7 @@ void CX86RecompilerOps::SW_Const(uint32_t Value, uint32_t VAddr)
break;
}
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
if (PAddr >= 0x10000000 && PAddr < 0x13F00000)
{
m_RegWorkingSet.BeforeCallDirect();
m_Assembler.PushImm32(0xFFFFFFFF);
@ -11192,7 +11192,7 @@ void CX86RecompilerOps::SW_Register(CX86Ops::x86Reg Reg, uint32_t VAddr)
m_Assembler.MoveX86regToVariable(Reg, PAddr + g_MMU->Rdram(), VarName);
break;
default:
if (PAddr >= 0x10000000 && PAddr < 0x20000000)
if (PAddr >= 0x10000000 && PAddr < 0x13F00000)
{
m_RegWorkingSet.BeforeCallDirect();
m_Assembler.PushImm32(0xFFFFFFFF);