Diff of /trunk/pcsx2/IopMem.cpp

Parent Directory | Revision Log | Patch

--- trunk/pcsx2/IopMem.cpp	2010/09/07 03:24:11	31
+++ trunk/pcsx2/IopMem.cpp	2010/09/07 11:08:22	62
@@ -38,7 +38,7 @@
 		m_psxAllMem = vtlb_malloc( m_psxMemSize, 4096 );
 
 	if( m_psxAllMem == NULL)
-		throw Exception::OutOfMemory( "psxMemAlloc > failed allocating memory for the IOP processor." );
+		throw Exception::OutOfMemory( L"IOP system ram (and roms)" );
 
 	u8* curpos = m_psxAllMem;
 	psxM = curpos; curpos += Ps2MemSize::IopRam;
@@ -54,8 +54,8 @@
 // which is performed by MemInit and PsxMemInit()
 void psxMemReset()
 {
-	jASSUME( psxMemWLUT != NULL );
-	jASSUME( m_psxAllMem != NULL );
+	pxAssume( psxMemWLUT != NULL );
+	pxAssume( m_psxAllMem != NULL );
 
 	DbgCon.WriteLn( "IOP Resetting physical ram..." );
 
@@ -87,12 +87,12 @@
 	// Read-only memory areas, so don't map WLUT for these...
 	for (int i=0; i<0x0040; i++)
 	{
-		psxMemWLUT[i + 0x2000 + 0x1fc0] = (uptr)&PS2MEM_ROM[i << 16];
+		psxMemWLUT[i + 0x2000 + 0x1fc0] = (uptr)&eeMem->ROM[i << 16];
 	}
 
 	for (int i=0; i<0x0004; i++)
 	{
-		psxMemWLUT[i + 0x2000 + 0x1e00] = (uptr)&PS2MEM_ROM1[i << 16];
+		psxMemWLUT[i + 0x2000 + 0x1e00] = (uptr)&eeMem->ROM1[i << 16];
 	}
 
 	// sif!! (which is read only? (air))
@@ -468,7 +468,7 @@
 
 				// wtf?  why were we writing to the EE's sif space?  Commenting this out doesn't
 				// break any of my games, and should be more correct, but I guess we'll see.  --air
-				//*(u32*)(PS2MEM_HW+0xf200+(mem&0xf0)) = value;
+				//*(u32*)(eeHw+0xf200+(mem&0xf0)) = value;
 				return;
 			}
 			else if (t == 0x1000)