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

Fix errors from missing or added brackets (and a letter!)

This commit is contained in:
Ryan Collins 2015-03-29 17:58:51 -04:00
parent 3eddfb8115
commit b807bc03ca
5 changed files with 73 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp
View File

@ -259,7 +259,7 @@ void CInterpreterCPU::InPermLoop (void)
{ {
if (g_Plugins->Gfx()->UpdateScreen != NULL) if (g_Plugins->Gfx()->UpdateScreen != NULL)
{ {
_Plugins->Gfx()->UpdateScreen(); g_Plugins->Gfx()->UpdateScreen();
} }
//CurrentFrame = 0; //CurrentFrame = 0;
//CurrentPercent = 0; //CurrentPercent = 0;

1
Source/Project64/N64 System/Mips/Dma.cpp
View File

@ -275,6 +275,7 @@ void CDMA::SP_DMA_WRITE (void)
if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0)
{ {
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
}
if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0)
{ {

16
Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
View File

@ -3783,7 +3783,7 @@ void CMipsMemoryVM::Compile_LWC1 (void)
UnMap_FPR(Opcode.ft-1,TRUE); UnMap_FPR(Opcode.ft-1,TRUE);
} }
} }
if (RegInStack(Opcode.ft,CRegInfo::FPU_Double) || RegInStack(Opcode.ft,CRegInfo::FPU_Qword) if (RegInStack(Opcode.ft,CRegInfo::FPU_Double) || RegInStack(Opcode.ft,CRegInfo::FPU_Qword))
{ {
UnMap_FPR(Opcode.ft,TRUE); UnMap_FPR(Opcode.ft,TRUE);
} }
@ -5435,31 +5435,31 @@ void CMipsMemoryVM::ChangeMiIntrMask (void)
{ {
g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI; g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI;
} }
if ( ( RegModValue & MI_INTR_MASK_SET_AI ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_SET_AI ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI; g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI;
} }
if ( ( RegModValue & MI_INTR_MASK_CLR_VI ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_CLR_VI ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI; g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI;
} }
if ( ( RegModValue & MI_INTR_MASK_SET_VI ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_SET_VI ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI; g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI;
} }
if ( ( RegModValue & MI_INTR_MASK_CLR_PI ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_CLR_PI ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI; g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI;
} }
if ( ( RegModValue & MI_INTR_MASK_SET_PI ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_SET_PI ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI; g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI;
} }
if ( ( RegModValue & MI_INTR_MASK_CLR_DP ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_CLR_DP ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP; g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP;
} }
if ( ( RegModValue & MI_INTR_MASK_SET_DP ) != 0 )) if ( ( RegModValue & MI_INTR_MASK_SET_DP ) != 0 )
{ {
g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP; g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP;
} }

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

@ -208,7 +208,7 @@ void CPifRam::PifRamWrite (void)
for (CurPos = 0; CurPos < 0x40; CurPos++) for (CurPos = 0; CurPos < 0x40; CurPos++)
{ {
switch (m_PifRam[CurPos] switch (m_PifRam[CurPos])
{ {
case 0x00: case 0x00:
Channel += 1; Channel += 1;

83
Source/Project64/N64 System/Recompiler/Code Block.cpp
View File

@ -48,7 +48,9 @@ CCodeBlock::CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos) :
m_MemLocation[1] = m_MemLocation[0] + 1; m_MemLocation[1] = m_MemLocation[0] + 1;
m_MemContents[0] = *m_MemLocation[0]; m_MemContents[0] = *m_MemLocation[0];
m_MemContents[1] = *m_MemLocation[1]; m_MemContents[1] = *m_MemLocation[1];
} else { }
else
{
memset(m_MemLocation,0,sizeof(m_MemLocation)); memset(m_MemLocation,0,sizeof(m_MemLocation));
memset(m_MemContents,0,sizeof(m_MemContents)); memset(m_MemContents,0,sizeof(m_MemContents));
} }
@ -189,7 +191,9 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
} }
} }
} }
} else { }
else
{
CurrentSection->m_EndSection = true; CurrentSection->m_EndSection = true;
break; break;
} }
@ -265,12 +269,16 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
CPU_Message(__FUNCTION__ ": Jump End Block"); CPU_Message(__FUNCTION__ ": Jump End Block");
JumpSection->m_EndSection = true; JumpSection->m_EndSection = true;
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
JumpSection->SetJumpAddress(TestPC, TargetPC,false); JumpSection->SetJumpAddress(TestPC, TargetPC,false);
} }
JumpSection->SetDelaySlot(); JumpSection->SetDelaySlot();
SetSection(JumpSection->m_JumpSection,JumpSection,TargetPC,true,TestPC); SetSection(JumpSection->m_JumpSection,JumpSection,TargetPC,true,TestPC);
} else { }
else
{
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
} }
} }
@ -331,7 +339,10 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
{ {
continue; continue;
} }
if (!CreateBlockLinkage(Section)) { return false; } if (!CreateBlockLinkage(Section))
{
return false;
}
break; break;
} }
if (CurrentSection->m_EndPC == (DWORD)-1) if (CurrentSection->m_EndPC == (DWORD)-1)
@ -363,8 +374,14 @@ void CCodeBlock::LogSectionInfo ( void )
bool CCodeBlock::AnalyseBlock ( void ) bool CCodeBlock::AnalyseBlock ( void )
{ {
if (!g_System->bLinkBlocks()) { return true; } if (!g_System->bLinkBlocks())
if (!CreateBlockLinkage(m_EnterSection)) { return false; } {
return true;
}
if (!CreateBlockLinkage(m_EnterSection))
{
return false;
}
DetermineLoops(); DetermineLoops();
LogSectionInfo(); LogSectionInfo();
return true; return true;
@ -380,7 +397,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
PermLoop = false; PermLoop = false;
OPCODE Command; OPCODE Command;
if (!g_MMU->LW_VAddr(PC, Command.Hex)) { if (!g_MMU->LW_VAddr(PC, Command.Hex))
{
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
return false; return false;
} }
@ -432,7 +450,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
if (TargetPC == PC + 8) if (TargetPC == PC + 8)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
if (TargetPC == PC && !DelaySlotEffectsCompare(PC,Command.rs,0)) if (TargetPC == PC && !DelaySlotEffectsCompare(PC,Command.rs,0))
{ {
PermLoop = true; PermLoop = true;
@ -447,14 +467,18 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
if (TargetPC == PC + 8) if (TargetPC == PC + 8)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
if (TargetPC == PC) if (TargetPC == PC)
{ {
if (Command.rs == 0) if (Command.rs == 0)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
EndBlock = true; EndBlock = true;
} else { }
else
{
if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt)) if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt))
{ {
PermLoop = true; PermLoop = true;
@ -509,7 +533,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
if (TargetPC == PC + 8) if (TargetPC == PC + 8)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
if (Command.rs != 0 || Command.rt != 0) if (Command.rs != 0 || Command.rt != 0)
{ {
ContinuePC = PC + 8; ContinuePC = PC + 8;
@ -529,7 +555,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
if (TargetPC == PC + 8) if (TargetPC == PC + 8)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
if (TargetPC == PC) if (TargetPC == PC)
{ {
if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt)) if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt))
@ -549,7 +577,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
default: default:
if ( (Command.rs & 0x10 ) != 0 ) if ( (Command.rs & 0x10 ) != 0 )
{ {
switch( Command.funct ) { switch ( Command.funct )
{
case R4300i_COP0_CO_TLBR: case R4300i_COP0_CO_TLBWI: case R4300i_COP0_CO_TLBR: case R4300i_COP0_CO_TLBWI:
case R4300i_COP0_CO_TLBWR: case R4300i_COP0_CO_TLBP: case R4300i_COP0_CO_TLBWR: case R4300i_COP0_CO_TLBP:
break; break;
@ -560,7 +589,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
return false; return false;
} }
} else { }
else
{
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
return false; return false;
} }
@ -568,7 +599,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
} }
break; break;
case R4300i_CP1: case R4300i_CP1:
switch (Command.fmt) { switch (Command.fmt)
{
case R4300i_COP1_MF: case R4300i_COP1_DMF: case R4300i_COP1_CF: case R4300i_COP1_MT: case R4300i_COP1_MF: case R4300i_COP1_DMF: case R4300i_COP1_CF: case R4300i_COP1_MT:
case R4300i_COP1_DMT: case R4300i_COP1_CT: case R4300i_COP1_S: case R4300i_COP1_D: case R4300i_COP1_DMT: case R4300i_COP1_CT: case R4300i_COP1_S: case R4300i_COP1_D:
case R4300i_COP1_W: case R4300i_COP1_L: case R4300i_COP1_W: case R4300i_COP1_L:
@ -581,7 +613,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
if (TargetPC == PC + 8) if (TargetPC == PC + 8)
{ {
TargetPC = (DWORD)-1; TargetPC = (DWORD)-1;
} else { }
else
{
if (TargetPC == PC) if (TargetPC == PC)
{ {
g_Notify->BreakPoint(__FILEW__,__LINE__); g_Notify->BreakPoint(__FILEW__,__LINE__);
@ -674,14 +708,21 @@ bool CCodeBlock::Compile()
EnterCodeBlock(); EnterCodeBlock();
if (g_SyncSystem) { if (g_SyncSystem)
//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B) { X86BreakPoint(__FILEW__,__LINE__); } {
//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B)
//{
// X86BreakPoint(__FILEW__,__LINE__);
//}
//MoveConstToVariable((DWORD)BlockInfo.CompiledLocation,&CurrentBlock,"CurrentBlock"); //MoveConstToVariable((DWORD)BlockInfo.CompiledLocation,&CurrentBlock,"CurrentBlock");
} }
if (g_System->bLinkBlocks()) { if (g_System->bLinkBlocks())
{
while (m_EnterSection->GenerateX86Code(NextTest())); while (m_EnterSection->GenerateX86Code(NextTest()));
} else { }
else
{
if (!m_EnterSection->GenerateX86Code(NextTest())) if (!m_EnterSection->GenerateX86Code(NextTest()))
{ {
return false; return false;