X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmdec.c;h=612fe974a5b6b87fb32fd25ec248db5b5bffe7a9;hb=65722e0455a2a42eece5e67ce2e92bfac03e1368;hp=61ed5ea53047e2ccbd2178d96689ccacc01e2507;hpb=1ffdacd535251ca7d979e23df81a0f1181d6170c;p=pcsx_rearmed.git

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 61ed5ea5..612fe974 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -33,12 +33,10 @@
  * so 2.0 to 4.0 should be fine.
  */
  
-/* Was set to 2 before but it would cause issues in R-types and Vandal Hearts videos. 
- * Setting it to 6 as dmitrysmagin did fix those... except for Galerians.
- * Galerians needs this to be set to 10 (!!) before it looks properly.
- * I've tried this with a few other games (including R-Types) and so far, this
- * has not backfired.
- * */
+/*
+ * >= 10 for Galerians
+ * <= 18 for "Disney's Treasure Planet"
+ */
 #define MDEC_BIAS 10
 
 #define DSIZE			8
@@ -478,6 +476,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 	int size;
 
 	if (chcr != 0x01000201) {
+		log_unhandled("mdec0: invalid dma %08x\n", chcr);
 		return;
 	}
 
@@ -487,7 +486,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 	size = (bcr >> 16) * (bcr & 0xffff);
 
 	switch (cmd >> 28) {
-		case 0x3: // decode
+		case 0x3: // decode 15/24bpp
 			mdec.rl = (u16 *) PSXM(adr);
 			/* now the mdec is busy till all data are decoded */
 			mdec.reg1 |= MDEC1_BUSY;
@@ -495,10 +494,8 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 			mdec.rl_end = mdec.rl + (size * 2);
 
 			/* sanity check */
-			if(mdec.rl_end <= mdec.rl) {
-				MDECINDMA_INT( size / 4 );
-				return;
-			}
+			if(mdec.rl_end <= mdec.rl)
+				break;
 
 			/* process the pending dma1 */
 			if(mdec.pending_dma1.adr){
@@ -517,23 +514,18 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 				iqtab_init(iq_y, p);
 				iqtab_init(iq_uv, p + 64);
 			}
-
-			MDECINDMA_INT( size / 4 );
-      return;
+			break;
 
 		case 0x6: // cosine table
 			// printf("mdec cosine table\n");
-
-			MDECINDMA_INT( size / 4 );
-      return;
+			break;
 
 		default:
-			// printf("mdec unknown command\n");
+			log_unhandled("mdec: unknown command %08x\n", cmd);
 			break;
 	}
 
-	HW_DMA0_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(0);
+	MDECINDMA_INT(size);
 }
 
 void mdec0Interrupt()
@@ -554,7 +546,10 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 	int size;
 	u32 words;
 
-	if (chcr != 0x01000200) return;
+	if (chcr != 0x01000200) {
+		log_unhandled("mdec1: invalid dma %08x\n", chcr);
+		return;
+	}
 
 	words = (bcr >> 16) * (bcr & 0xffff);
 	/* size in byte */
@@ -629,8 +624,10 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 		}
 	}
 	
-	/* define the power of mdec */
-	MDECOUTDMA_INT(words * MDEC_BIAS);
+		/* define the power of mdec */
+		MDECOUTDMA_INT(words * MDEC_BIAS);
+		/* some CPU stalling */
+		psxRegs.cycle += words;
 	}
 }
 
@@ -677,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));