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

Chaoscode fix for last commit. 

If anyone understands why it made any difference do tell me... it seems both should just return null..



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2181 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-02-09 19:26:14 +00:00
parent 2ff2852771
commit 59a8fd4848
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -780,19 +780,18 @@ u8 *GetPointer(const u32 _Address)
case 0xC1: case 0xC1:
return (u8*)(((char*)m_pRAM) + (_Address & RAM_MASK)); return (u8*)(((char*)m_pRAM) + (_Address & RAM_MASK));
case 0x10: case 0x10:
case 0x11: case 0x11:
case 0x12: case 0x12:
case 0x13: case 0x13:
case 0x7B: case 0x90:
case 0x90: case 0x91:
case 0x91: case 0x92:
case 0x92: case 0x93:
case 0x93: case 0xD0:
case 0xD0: case 0xD1:
case 0xD1: case 0xD2:
case 0xD2: case 0xD3:
case 0xD3:
if (Core::GetStartupParameter().bWii) if (Core::GetStartupParameter().bWii)
return (u8*)(((char*)m_pEXRAM) + (_Address & EXRAM_MASK)); return (u8*)(((char*)m_pEXRAM) + (_Address & EXRAM_MASK));
else else
@ -810,7 +809,9 @@ u8 *GetPointer(const u32 _Address)
case 0xCD: case 0xCD:
_dbg_assert_msg_(MEMMAP, 0, "Memory", "GetPointer from IO Bridge doesnt work"); _dbg_assert_msg_(MEMMAP, 0, "Memory", "GetPointer from IO Bridge doesnt work");
return NULL; return NULL;
case 0xFF: break; case 0x7B:
case 0xFF:
break;
default: default:
if (!PanicYesNo("unknown pointer address report this to the devs %08x\n Continue?", (_Address >> 24))) if (!PanicYesNo("unknown pointer address report this to the devs %08x\n Continue?", (_Address >> 24)))
Crash(); Crash();