/[pcsx2_0.9.7]/trunk/pcsx2/Memory.cpp
ViewVC logotype

Diff of /trunk/pcsx2/Memory.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/pcsx2/Memory.cpp	2010/09/07 11:08:22	62
+++ trunk/pcsx2/Memory.cpp	2010/11/12 01:10:22	273
@@ -150,7 +150,7 @@
 	// IOP memory
 	// (used by the EE Bios Kernel during initial hardware initialization, Apps/Games
 	//  are "supposed" to use the thread-safe SIF instead.)
-	vtlb_MapBlock(psxM,0x1c000000,0x00800000);
+	vtlb_MapBlock(iopMem->Main,0x1c000000,0x00800000);
 
 	// Generic Handlers; These fallback to mem* stuff...
 	vtlb_MapHandler(tlb_fallback_7,0x14000000,0x10000);
@@ -647,7 +647,9 @@
 	// rest of the emu is not really set up to support a "soft" reset of that sort
 	// we opt for the hard/safe version.
 
+	pxAssume( eeMem != NULL );
 	memzero( *eeMem );
+
 #ifdef ENABLECACHE
 	memset(pCache,0,sizeof(_cacheS)*64);
 #endif

 

  ViewVC Help
Powered by ViewVC 1.1.22