X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fmdec.c;h=612fe974a5b6b87fb32fd25ec248db5b5bffe7a9;hp=167a1cff1145f1844799ef2f41d40e4d5a47d605;hb=b34d6a805a50ee4a897b0a53bbc0b89e3eb7f72e;hpb=dc3178e9ced416632e8b5b5486bb35a561a6b2b9

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 167a1cff..612fe974 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -674,27 +674,26 @@ void mdec1Interrupt() {
 }
 
 int mdecFreeze(void *f, int Mode) {
-	u8 *base = (u8 *)&psxM[0x100000];
+	u8 *base = (u8 *)psxM;
 	u32 v;
 
 	gzfreeze(&mdec.reg0, sizeof(mdec.reg0));
 	gzfreeze(&mdec.reg1, sizeof(mdec.reg1));
 
-	// old code used to save raw pointers..
 	v = (u8 *)mdec.rl - base;
 	gzfreeze(&v, sizeof(v));
-	mdec.rl = (u16 *)(base + (v & 0xffffe));
+	mdec.rl = (u16 *)(base + (v & 0x1ffffe));
 	v = (u8 *)mdec.rl_end - base;
 	gzfreeze(&v, sizeof(v));
-	mdec.rl_end = (u16 *)(base + (v & 0xffffe));
+	mdec.rl_end = (u16 *)(base + (v & 0x1ffffe));
 
 	v = 0;
 	if (mdec.block_buffer_pos)
-		v = mdec.block_buffer_pos - base;
+		v = mdec.block_buffer_pos - mdec.block_buffer;
 	gzfreeze(&v, sizeof(v));
 	mdec.block_buffer_pos = 0;
-	if (v)
-		mdec.block_buffer_pos = base + (v & 0xfffff);
+	if (v && v < sizeof(mdec.block_buffer))
+		mdec.block_buffer_pos = mdec.block_buffer;
 
 	gzfreeze(&mdec.block_buffer, sizeof(mdec.block_buffer));
 	gzfreeze(&mdec.pending_dma1, sizeof(mdec.pending_dma1));