preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-19 09:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into armjit

Browse Source 
Conflicts:
	Common/ArmEmitter.h
This commit is contained in:
Henrik Rydgard committed 2013-01-13 12:14:32 +01:00
2 parents 8a480cee05 db92bdda17
commit 7484ddfbbc
25 files changed
+181 -142
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/MemMapFunctions.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ u8 *GetPointer(const u32 address)
{
return m_pRAM + (address & RAM_MASK);
}
else if ((address & 0x0F000000) == 0x04000000)
else if ((address & 0x0F800000) == 0x04000000)
{
return m_pVRAM + (address & VRAM_MASK);
}
@@ -72,7 +72,7 @@ inline void ReadFromHardware(T &var, const u32 address)
{
var = *((const T*)&m_pRAM[address & RAM_MASK]);
}
else if ((address & 0x0F000000) == 0x04000000)
else if ((address & 0x0F800000) == 0x04000000)
{
var = *((const T*)&m_pVRAM[address & VRAM_MASK]);
}
@@ -101,7 +101,7 @@ inline void WriteToHardware(u32 address, const T data)
{
*(T*)&m_pRAM[address & RAM_MASK] = data;
}
else if ((address & 0x0F000000) == 0x04000000)
else if ((address & 0x0F800000) == 0x04000000)
{
*(T*)&m_pVRAM[address & VRAM_MASK] = data;
}
@@ -127,7 +127,7 @@ bool IsValidAddress(const u32 address)
{
return true;
}
else if ((address & 0x0F000000) == 0x04000000)
else if ((address & 0x0F800000) == 0x04000000)
{
return true;
}