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

[Project64] Check g_DDRom in LW_KnownAddress

This commit is contained in:
zilmar 2016-07-07 21:25:11 +10:00
parent 059b227e13
commit 35c64e5d16
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3266,7 +3266,7 @@ void CX86RecompilerOps::LW_KnownAddress(x86Reg Reg, uint32_t VAddr)
sprintf(VarName, "RDRAM + %X", PAddr);
MoveVariableToX86reg(PAddr + g_MMU->Rdram(), VarName, Reg);
}
else if ((PAddr & 0xFF000000) == 0x06000000 && (PAddr - 0x06000000) < g_DDRom->GetRomSize())
else if (g_DDRom != NULL && ((PAddr & 0xFF000000) == 0x06000000 && (PAddr - 0x06000000) < g_DDRom->GetRomSize()))
{
// read from ddrom
sprintf(VarName, "RDRAM + %X", PAddr);

1
Source/Project64-core/Project64-core.vcxproj
View File

@ -159,6 +159,7 @@
<ClInclude Include="N64System\N64RomClass.h" />
<ClInclude Include="N64System\N64Types.h" />
<ClInclude Include="N64System\ProfilingClass.h" />
<ClInclude Include="N64System\Recompiler\Arm\ArmRegInfo.h" />
<ClInclude Include="N64System\Recompiler\CodeBlock.h" />
<ClInclude Include="N64System\Recompiler\CodeSection.h" />
<ClInclude Include="N64System\Recompiler\ExitInfo.h" />

18
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -88,6 +88,15 @@
<Filter Include="Source Files\N64 System\Recompiler\x64-86">
<UniqueIdentifier>{4a163a31-b1fb-4e50-b229-45d508dfc4a2}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\N64 System\Recompiler\Arm">
<UniqueIdentifier>{30c93ff6-032f-4702-9437-67b799f088af}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\N64 System\Recompiler\Arm">
<UniqueIdentifier>{7ad7bbe7-44ed-4604-95c1-9af746e49e8e}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\N64 System\Recompiler\x64-86">
<UniqueIdentifier>{271c80e0-b4fa-4510-ae8b-1f0f2c88ab39}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@ -632,11 +641,14 @@
<ClInclude Include="N64System\Recompiler\x86\x86RegInfo.h">
<Filter>Header Files\N64 System\Recompiler\x86</Filter>
</ClInclude>
<ClInclude Include="N64System\Recompiler\x64-86\x64RegInfo.h">
<Filter>Source Files\N64 System\Recompiler\x64-86</Filter>
</ClInclude>
<ClInclude Include="N64System\Recompiler\RegBase.h">
<Filter>Header Files\N64 System\Recompiler</Filter>
</ClInclude>
<ClInclude Include="N64System\Recompiler\Arm\ArmRegInfo.h">
<Filter>Header Files\N64 System\Recompiler\Arm</Filter>
</ClInclude>
<ClInclude Include="N64System\Recompiler\x64-86\x64RegInfo.h">
<Filter>Header Files\N64 System\Recompiler\x64-86</Filter>
</ClInclude>
</ItemGroup>
</Project>