X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmdec.c;h=c0f2cfd70566a7c286babc758f1cc404c13dc934;hb=6a131b037d9133d6bffcb8e4e67940fcf069e539;hp=629816bc706e5c07575f574325a345d53cfa2a00;hpb=528ad661dd07067cbcd6c1beebad63fc36795759;p=pcsx_rearmed.git

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 629816bc..c0f2cfd7 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -32,7 +32,12 @@
  * 320x240x16@60Hz => 9.216 MB/s
  * so 2.0 to 4.0 should be fine.
  */
-#define MDEC_BIAS 2.0f
+ 
+/*
+ * >= 10 for Galerians
+ * <= 18 for "Disney's Treasure Planet"
+ */
+#define MDEC_BIAS 10
 
 #define DSIZE			8
 #define DSIZE2			(DSIZE * DSIZE)
@@ -219,7 +224,7 @@ struct _pending_dma1 {
 	u32 chcr;
 };
 
-struct {
+static struct {
 	u32 reg0;
 	u32 reg1;
 	u16 * rl;
@@ -436,11 +441,10 @@ static void yuv2rgb24(int *blk, u8 *image) {
 }
 
 void mdecInit(void) {
+	memset(&mdec, 0, sizeof(mdec));
+	memset(iq_y, 0, sizeof(iq_y));
+	memset(iq_uv, 0, sizeof(iq_uv));
 	mdec.rl = (u16 *)&psxM[0x100000];
-	mdec.reg0 = 0;
-	mdec.reg1 = 0;
-	mdec.pending_dma1.adr = 0;
-	mdec.block_buffer_pos = 0;
 }
 
 // command register
@@ -472,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;
 	}
 
@@ -481,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;
@@ -489,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){
@@ -511,29 +514,27 @@ 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);
+	set_event(PSXINT_MDECINDMA, size);
 }
 
 void mdec0Interrupt()
 {
-	HW_DMA0_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(0);
+	if (HW_DMA0_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA0_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(0);
+	}
 }
 
 #define SIZE_OF_24B_BLOCK (16*16*3)
@@ -543,15 +544,16 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 	int blk[DSIZE2 * 6];
 	u8 * image;
 	int size;
-	int dmacnt;
+	u32 words;
 
-	if (chcr != 0x01000200) return;
+	if (chcr != 0x01000200) {
+		log_unhandled("mdec1: invalid dma %08x\n", chcr);
+		return;
+	}
 
-	size = (bcr >> 16) * (bcr & 0xffff);
+	words = (bcr >> 16) * (bcr & 0xffff);
 	/* size in byte */
-	size *= 4;
-	/* I guess the memory speed is limitating */
-	dmacnt = size;
+	size = words * 4;
 
 	if (!(mdec.reg1 & MDEC1_BUSY)) {
 		/* add to pending */
@@ -622,8 +624,10 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 		}
 	}
 	
-	/* define the power of mdec */
-	MDECOUTDMA_INT((int) ((dmacnt* MDEC_BIAS)));
+		/* define the power of mdec */
+		set_event(PSXINT_MDECOUTDMA, words * MDEC_BIAS);
+		/* some CPU stalling */
+		psxRegs.cycle += words;
 	}
 }
 
@@ -652,26 +656,47 @@ void mdec1Interrupt() {
 	 *
 	 */
 
-	/* this else if avoid to read outside memory */
-	if(mdec.rl >= mdec.rl_end) {
-		mdec.reg1 &= ~MDEC1_STP;
-		HW_DMA0_CHCR &= SWAP32(~0x01000000);
-		DMA_INTERRUPT(0);
-		mdec.reg1 &= ~MDEC1_BUSY;
-	} else if (SWAP16(*(mdec.rl)) == MDEC_END_OF_DATA) {
-		mdec.reg1 &= ~MDEC1_STP;
-		HW_DMA0_CHCR &= SWAP32(~0x01000000);
-		DMA_INTERRUPT(0);
-		mdec.reg1 &= ~MDEC1_BUSY;
+	/* MDEC_END_OF_DATA avoids read outside memory */
+	if (mdec.rl >= mdec.rl_end || SWAP16(*(mdec.rl)) == MDEC_END_OF_DATA) {
+		mdec.reg1 &= ~(MDEC1_STP|MDEC1_BUSY);
+		if (HW_DMA0_CHCR & SWAP32(0x01000000))
+		{
+			HW_DMA0_CHCR &= SWAP32(~0x01000000);
+			DMA_INTERRUPT(0);
+		}
 	}
 
-	HW_DMA1_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(1);
-	return;
+	if (HW_DMA1_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA1_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(1);
+	}
 }
 
-int mdecFreeze(gzFile f, int Mode) {
-	gzfreeze(&mdec, sizeof(mdec));
+int mdecFreeze(void *f, int Mode) {
+	u8 *base = (u8 *)psxM;
+	u32 v;
+
+	gzfreeze(&mdec.reg0, sizeof(mdec.reg0));
+	gzfreeze(&mdec.reg1, sizeof(mdec.reg1));
+
+	v = (u8 *)mdec.rl - base;
+	gzfreeze(&v, sizeof(v));
+	mdec.rl = (u16 *)(base + (v & 0x1ffffe));
+	v = (u8 *)mdec.rl_end - base;
+	gzfreeze(&v, sizeof(v));
+	mdec.rl_end = (u16 *)(base + (v & 0x1ffffe));
+
+	v = 0;
+	if (mdec.block_buffer_pos)
+		v = mdec.block_buffer_pos - mdec.block_buffer;
+	gzfreeze(&v, sizeof(v));
+	mdec.block_buffer_pos = 0;
+	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));
 	gzfreeze(iq_y, sizeof(iq_y));
 	gzfreeze(iq_uv, sizeof(iq_uv));