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

[Project64] Change Pif Ram.cpp to use stdtypes

This commit is contained in:
zilmar 2015-11-09 07:21:28 +11:00
parent dc2a4683da
commit 21b80c240f
1 changed files with 155 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Project64/N64 System/Mips/Pif Ram.cpp
View File

@ -274,23 +274,23 @@ void CPifRam::SI_DMA_READ()
BYTE * PifRamPos = m_PifRam;
BYTE * RDRAM = g_MMU->Rdram();
DWORD & SI_DRAM_ADDR_REG = g_Reg->SI_DRAM_ADDR_REG;
if ((int)SI_DRAM_ADDR_REG > (int)g_System->RdramSize())
uint32_t & SI_DRAM_ADDR_REG = (uint32_t &)g_Reg->SI_DRAM_ADDR_REG;
if ((int32_t)SI_DRAM_ADDR_REG > (int32_t)g_System->RdramSize())
{
if (bShowPifRamErrors())
{
g_Notify->DisplayError(L"SI DMA\nSI_DRAM_ADDR_REG not in RDRam space");
g_Notify->DisplayError(__FUNCTIONW__ L"\nSI_DRAM_ADDR_REG not in RDRam space");
}
return;
}
PifRamRead();
SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
if ((int)SI_DRAM_ADDR_REG < 0)
if ((int32_t)SI_DRAM_ADDR_REG < 0)
{
int count, RdramPos;
int32_t count, RdramPos;
RdramPos = (int)SI_DRAM_ADDR_REG;
RdramPos = (int32_t)SI_DRAM_ADDR_REG;
for (count = 0; count < 0x40; count++, RdramPos++)
{
if (RdramPos < 0)
@ -310,7 +310,7 @@ void CPifRam::SI_DMA_READ()
if (g_LogOptions.LogPRDMAMemStores)
{
int count;
int32_t count;
char HexData[100], AsciiData[100], Addon[20];
LogMessage("\tData DMAed to RDRAM:");
LogMessage("\t--------------------");
@ -346,7 +346,7 @@ void CPifRam::SI_DMA_READ()
if (g_System->bDelaySI())
{
g_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
g_SystemTimer->SetTimer(CSystemTimer::SiTimer, 0x900, false);
}
else
{
@ -358,10 +358,10 @@ void CPifRam::SI_DMA_READ()
void CPifRam::SI_DMA_WRITE()
{
BYTE * PifRamPos = m_PifRam;
uint8_t * PifRamPos = m_PifRam;
DWORD & SI_DRAM_ADDR_REG = g_Reg->SI_DRAM_ADDR_REG;
if ((int)SI_DRAM_ADDR_REG > (int)g_System->RdramSize())
uint32_t & SI_DRAM_ADDR_REG = (uint32_t &)g_Reg->SI_DRAM_ADDR_REG;
if ((int32_t)SI_DRAM_ADDR_REG > (int32_t)g_System->RdramSize())
{
if (bShowPifRamErrors())
{
@ -371,19 +371,19 @@ void CPifRam::SI_DMA_WRITE()
}
SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
BYTE * RDRAM = g_MMU->Rdram();
uint8_t * RDRAM = g_MMU->Rdram();
if ((int)SI_DRAM_ADDR_REG < 0)
if ((int32_t)SI_DRAM_ADDR_REG < 0)
{
int RdramPos = (int)SI_DRAM_ADDR_REG;
int32_t RdramPos = (int32_t)SI_DRAM_ADDR_REG;
for (int count = 0; count < 0x40; count++, RdramPos++)
for (int32_t count = 0; count < 0x40; count++, RdramPos++)
{
if (RdramPos < 0)
{
m_PifRam[count] = 0; continue;
}
m_PifRam[count] = RDRAM[RdramPos ^3];
m_PifRam[count] = RDRAM[RdramPos ^ 3];
}
}
else
@ -396,7 +396,7 @@ void CPifRam::SI_DMA_WRITE()
if (g_LogOptions.LogPRDMAMemLoads)
{
int count;
int32_t count;
char HexData[100], AsciiData[100], Addon[20];
LogMessage("");
LogMessage("\tData DMAed to the Pif Ram:");
@ -435,7 +435,7 @@ void CPifRam::SI_DMA_WRITE()
if (g_System->bDelaySI())
{
g_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
g_SystemTimer->SetTimer(CSystemTimer::SiTimer, 0x900, false);
}
else
{