X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcarthw%2Fsvp%2Fssp16.c;h=8bb2f1c9b17d6b150168d7d713256e09b6820e7e;hb=50483b5330e31812fc75f397ae639f6ab03f7978;hp=8df79ee851b163fc224a83f001daf0715c49e62c;hpb=d26dc685a40a0ee8db48d3375b2f59ad515af8eb;p=picodrive.git

diff --git a/Pico/carthw/svp/ssp16.c b/Pico/carthw/svp/ssp16.c
index 8df79ee..8bb2f1c 100644
--- a/Pico/carthw/svp/ssp16.c
+++ b/Pico/carthw/svp/ssp16.c
@@ -97,7 +97,12 @@
  *   size: 32?
  *   desc: Programmable Memory access Control. Set using 2 16bit writes,
  *         first address, then mode word. After setting PMAC, PMAR sould
- *         be accessed to program it.
+ *         be blind accessed (ld -, PMx  or  ld PMx, -) to program it for
+ *         reading and writing respectively.
+ *         Reading the register also shifts it's state (from "waiting for
+ *         address" to "waiting for mode" and back). Reads always return
+ *         address related to last PMx register accressed.
+ *         (note: addresses do not wrap).
  *
  * 15. "AL"
  *   size: 16
@@ -136,7 +141,6 @@
  * mld (rj), (ri) [, b]
  *   operation: A = 0; P = (rj) * (ri)
  *   notes: based on IIR_4B.SC sample. flags? what is b???
- *   TODO: figure out if (rj) and (ri) get loaded in X and Y
  *
  * mpya (rj), (ri) [, b]
  *   name: multiply and add?
@@ -149,6 +153,8 @@
  * mod cond, op
  *   mod cond, shr  does arithmetic shift
  *
+ * 'ld -, AL' and probably 'ld AL, -' are for dummy assigns
+ *
  * memory map:
  * 000000 - 1fffff   ROM, accessable by both
  * 200000 - 2fffff   unused?
@@ -162,6 +168,12 @@
  * 30fe06 - also sync related.
  * 30fe08 - job number [1-12] for SVP. 0 means no job. Set by 68k, read-cleared by SVP.
  *
+ * TODO:
+ * + figure out if 'op A, P' is 32bit (nearly sure it is)
+ * * what exactly is AL?
+ * * does mld, mpya load their operands into X and Y?
+ * * OP simm
+ *
  * misc:
  * pressing all buttons while resetting game will kick into test mode
  *
@@ -178,6 +190,8 @@
 
 #define u32 unsigned int
 
+//#define USE_DEBUGGER
+
 // 0
 #define rX     ssp->gr[SSP_X].h
 #define rY     ssp->gr[SSP_Y].h
@@ -225,10 +239,10 @@
 
 // it seems SVP code never checks for L and OV, so we leave them out.
 // rST |= (t>>4)&SSP_FLAG_L;
-#define UPD_t_LZVN \
+#define UPD_LZVN \
 	rST &= ~(SSP_FLAG_L|SSP_FLAG_Z|SSP_FLAG_V|SSP_FLAG_N); \
-	if (!t) rST |= SSP_FLAG_Z; \
-	else    rST |= t&SSP_FLAG_N; \
+	if (!rA32) rST |= SSP_FLAG_Z; \
+	else rST |= (rA32>>16)&SSP_FLAG_N;
 
 // standard cond processing.
 // again, only Z and N is checked, as SVP doesn't seem to use any other conds.
@@ -237,7 +251,7 @@
 		case 0x00: cond = 1; break; /* always true */ \
 		case 0x50: cond = !((rST ^ (op<<5)) & SSP_FLAG_Z); break; /* Z matches f(?) bit */ \
 		case 0x70: cond = !((rST ^ (op<<7)) & SSP_FLAG_N); break; /* N matches f(?) bit */ \
-		default:elprintf(EL_SVP, "unimplemented cond @ %04x", GET_PPC_OFFS()); break; \
+		default:elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: unimplemented cond @ %04x", GET_PPC_OFFS()); break; \
 	}
 
 // ops with accumulator.
@@ -246,42 +260,84 @@
 #define OP_LDA(x) \
 	ssp->gr[SSP_A].h = x
 
+#define OP_LDA32(x) \
+	rA32 = x
+
 #define OP_SUBA(x) { \
-	u32 t = (ssp->gr[SSP_A].v >> 16) - (x); \
-	UPD_t_LZVN \
-	ssp->gr[SSP_A].h = t; \
+	rA32 -= (x) << 16; \
+	UPD_LZVN \
+}
+
+#define OP_SUBA32(x) { \
+	rA32 -= (x); \
+	UPD_LZVN \
 }
 
 #define OP_CMPA(x) { \
-	u32 t = (ssp->gr[SSP_A].v >> 16) - (x); \
-	UPD_t_LZVN \
+	u32 t = rA32 - ((x) << 16); \
+	rST &= ~(SSP_FLAG_L|SSP_FLAG_Z|SSP_FLAG_V|SSP_FLAG_N); \
+	if (!t) rST |= SSP_FLAG_Z; \
+	else    rST |= (t>>16)&SSP_FLAG_N; \
+}
+
+#define OP_CMPA32(x) { \
+	u32 t = rA32 - (x); \
+	rST &= ~(SSP_FLAG_L|SSP_FLAG_Z|SSP_FLAG_V|SSP_FLAG_N); \
+	if (!t) rST |= SSP_FLAG_Z; \
+	else    rST |= (t>>16)&SSP_FLAG_N; \
 }
 
 #define OP_ADDA(x) { \
-	u32 t = (ssp->gr[SSP_A].v >> 16) + (x); \
-	UPD_t_LZVN \
-	ssp->gr[SSP_A].h = t; \
+	rA32 += (x) << 16; \
+	UPD_LZVN \
+}
+
+#define OP_ADDA32(x) { \
+	rA32 += (x); \
+	UPD_LZVN \
 }
 
 #define OP_ANDA(x) \
-	ssp->gr[SSP_A].v &= (x) << 16; \
+	rA32 &= (x) << 16; \
+	UPD_ACC_ZN
+
+#define OP_ANDA32(x) \
+	rA32 &= (x); \
 	UPD_ACC_ZN
 
 #define OP_ORA(x) \
-	ssp->gr[SSP_A].v |= (x) << 16; \
+	rA32 |= (x) << 16; \
+	UPD_ACC_ZN
+
+#define OP_ORA32(x) \
+	rA32 |= (x); \
 	UPD_ACC_ZN
 
 #define OP_EORA(x) \
-	ssp->gr[SSP_A].v ^= (x) << 16; \
+	rA32 ^= (x) << 16; \
+	UPD_ACC_ZN
+
+#define OP_EORA32(x) \
+	rA32 ^= (x); \
 	UPD_ACC_ZN
 
 
+#define OP_CHECK32(OP) \
+	if ((op & 0x0f) == SSP_P) { /* A <- P */ \
+	read_P(); /* update P */ \
+	OP(ssp->gr[SSP_P].v); \
+	break; \
+}
+
+
 static ssp1601_t *ssp = NULL;
 static unsigned short *PC;
 static int g_cycles;
-// debug
+
+#ifdef USE_DEBUGGER
 static int running = 0;
 static int last_iram = 0;
+#endif
 
 // -----------------------------------------------------
 // register i/o handlers
@@ -289,33 +345,30 @@ static int last_iram = 0;
 // 0-4, 13
 static u32 read_unknown(void)
 {
-	elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME: unknown read @ %04x", GET_PPC_OFFS());
+	elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME: unknown read @ %04x", GET_PPC_OFFS());
 	return 0;
 }
 
 static void write_unknown(u32 d)
 {
-	elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME: unknown write @ %04x", GET_PPC_OFFS());
+	elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME: unknown write @ %04x", GET_PPC_OFFS());
 }
 
 // 4
 static void write_ST(u32 d)
 {
-	if ((rST ^ d) & 7) {
-		elprintf(EL_SVP, "ssp16: RPL %i -> %i @ %04x", rST&7, d&7, GET_PPC_OFFS());
-//		running = 0;
-	}
+	//if ((rST ^ d) & 0x0007) elprintf(EL_SVP, "ssp RPL %i -> %i @ %04x", rST&7, d&7, GET_PPC_OFFS());
+	if ((rST ^ d) & 0x0f98) elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME ST %04x -> %04x @ %04x", rST, d, GET_PPC_OFFS());
 	rST = d;
 }
 
 // 5
 static u32 read_STACK(void)
 {
-	//elprintf(EL_SVP, "pop  %i @ %04x", rSTACK, GET_PPC_OFFS());
 	--rSTACK;
 	if ((short)rSTACK < 0) {
 		rSTACK = 5;
-		elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME: stack underflow! (%i) @ %04x", rSTACK, GET_PPC_OFFS());
+		elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME: stack underflow! (%i) @ %04x", rSTACK, GET_PPC_OFFS());
 	}
 	return ssp->stack[rSTACK];
 }
@@ -323,8 +376,7 @@ static u32 read_STACK(void)
 static void write_STACK(u32 d)
 {
 	if (rSTACK >= 6) {
-		running = 0;
-		elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME: stack overflow! (%i) @ %04x", rSTACK, GET_PPC_OFFS());
+		elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME: stack overflow! (%i) @ %04x", rSTACK, GET_PPC_OFFS());
 		rSTACK = 0;
 	}
 	ssp->stack[rSTACK++] = d;
@@ -345,25 +397,25 @@ static void write_PC(u32 d)
 // 7
 static u32 read_P(void)
 {
-	rP.v = (u32)rX * rY * 2;
+	int m1 = (signed short)rX;
+	int m2 = (signed short)rY;
+	rP.v = (m1 * m2 * 2);
 	return rP.h;
 }
 
 // -----------------------------------------------------
 
-static void iram_write(int addr, u32 d, int reg, int inc)
+static int get_inc(int mode)
 {
-	if ((addr&0xfc00) != 0x8000)
-		elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: invalid IRAM addr: %04x", addr<<1);
-	elprintf(EL_SVP, "ssp IRAM w [%06x] %04x (inc %i)", (addr<<1)&0x7ff, d, inc);
-	((unsigned short *)svp->iram_rom)[addr&0x3ff] = d;
-	ssp->pmac_write[reg] += inc<<16;
+	int inc = (mode >> 11) & 7;
+	if (inc != 0) {
+		if (inc != 7) inc--;
+		inc = (1<<16) << inc; // 0 1 2 4 8 16 32 128
+		if (mode & 0x8000) inc = -inc; // decrement mode
+	}
+	return inc;
 }
 
-int lil[32] = { 0, }, lilp = 0;
-
-static void debug_dump2file(const char *fname, void *mem, int len);
-
 #define overwite_write(dst, d) \
 { \
 	if (d & 0xf000) { dst &= ~0xf000; dst |= d & 0xf000; } \
@@ -374,110 +426,106 @@ static void debug_dump2file(const char *fname, void *mem, int len);
 
 static u32 pm_io(int reg, int write, u32 d)
 {
-	if (ssp->emu_status & SSP_PMC_SET) {
+	if (ssp->emu_status & SSP_PMC_SET)
+	{
+		// this MUST be blind r or w
+		if ((*(PC-1) & 0xff0f) && (*(PC-1) & 0xfff0)) {
+			elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: tried to set PM%i (%c) with non-blind i/o %08x @ %04x",
+				reg, write ? 'w' : 'r', rPMC.v, GET_PPC_OFFS());
+			ssp->emu_status &= ~SSP_PMC_SET;
+			return 0;
+		}
 		elprintf(EL_SVP, "PM%i (%c) set to %08x @ %04x", reg, write ? 'w' : 'r', rPMC.v, GET_PPC_OFFS());
 		ssp->pmac_read[write ? reg + 6 : reg] = rPMC.v;
 		ssp->emu_status &= ~SSP_PMC_SET;
 		if ((rPMC.v & 0x7f) == 0x1c && (rPMC.v & 0x7fff0000) == 0) {
-			elprintf(EL_SVP, "IRAM copy from %06x", (ssp->RAM1[0]-1)<<1);
-/*
-			{
-				int i;
-				char buff[64];
-				for (i = 0; i < 32; i++) {
-					if (lil[i] == last_iram) break;
-					if (lil[i] == 0) {
-						lil[i] = last_iram;
-						sprintf(buff, "iramrom_%04x.bin", last_iram);
-						debug_dump2file(buff, svp->iram_rom, sizeof(svp->iram_rom));
-						break;
-					}
-				}
-			}
-*/
+			elprintf(EL_SVP, "ssp IRAM copy from %06x", (ssp->RAM1[0]-1)<<1);
+#ifdef USE_DEBUGGER
 			last_iram = (ssp->RAM1[0]-1)<<1;
+#endif
 		}
 		return 0;
 	}
 
 	// just in case
-	ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
+	if (ssp->emu_status & SSP_PMC_HAVE_ADDR) {
+		elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: PM%i (%c) with only addr set @ %04x",
+			reg, write ? 'w' : 'r', GET_PPC_OFFS());
+		ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
+	}
 
-//	if (ssp->pmac_read[reg] != 0)
 	if (reg == 4 || (rST & 0x60))
 	{
 		#define CADDR ((((mode<<16)&0x7f0000)|addr)<<1)
 		unsigned short *dram = (unsigned short *)svp->dram;
 		if (write)
 		{
-			/* TODO: 0c18 mode? */
 			int mode = ssp->pmac_write[reg]&0xffff;
 			int addr = ssp->pmac_write[reg]>>16;
-			switch (mode) {
-				case 0x0018: elprintf(EL_SVP, "ssp DRAM w [%06x] %04x", CADDR, d);
-				             dram[addr] = d;
-					     break;
-				case 0x0418: elprintf(EL_SVP, "ssp DRAM w [%06x] %04x (overwr)", CADDR, d);
-				             overwite_write(dram[addr], d);
-					     break;
-				case 0x0818: elprintf(EL_SVP, "ssp DRAM w [%06x] %04x (inc 1)", CADDR, d);
-				             dram[addr] = d;
-					     ssp->pmac_write[reg] += 1<<16;
-					     break;
-				case 0x081c: iram_write(addr, d, reg, 1); break; // checked: used by code @ 0902
-				case 0x101c: iram_write(addr, d, reg, 2); break; // checked: used by code @ 3b7c
-				case 0x4018: elprintf(EL_SVP, "ssp DRAM w [%06x] %04x (cell inc)", CADDR, d);
-				             dram[addr] = d;
-					     ssp->pmac_write[reg] += (addr&1) ? (31<<16) : (1<<16);
-					     break;
-				case 0x4418: elprintf(EL_SVP, "ssp DRAM w [%06x] %04x (overwr, cell inc)", CADDR, d);
-				             overwite_write(dram[addr], d);
-					     ssp->pmac_write[reg] += (addr&1) ? (31<<16) : (1<<16);
-					     break;
-				default:     elprintf(EL_SVP|EL_ANOMALY, "ssp PM%i unhandled write mode %04x, [%06x] %04x @ %04x",
-							reg, mode, CADDR, d, GET_PPC_OFFS()); break;
+			if      ((mode & 0xb800) == 0xb800)
+					elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: mode %04x", mode);
+			if      ((mode & 0x43ff) == 0x0018) // DRAM
+			{
+				int inc = get_inc(mode);
+				elprintf(EL_SVP, "ssp PM%i DRAM w [%06x] %04x (inc %i, ovrw %i)",
+					reg, CADDR, d, inc >> 16, (mode>>10)&1);
+				if (mode & 0x0400) {
+				       overwite_write(dram[addr], d);
+				} else dram[addr] = d;
+				ssp->pmac_write[reg] += inc;
+			}
+			else if ((mode & 0xfbff) == 0x4018) // DRAM, cell inc
+			{
+				elprintf(EL_SVP, "ssp PM%i DRAM w [%06x] %04x (cell inc, ovrw %i) @ %04x",
+					reg, CADDR, d, (mode>>10)&1, GET_PPC_OFFS());
+				if (mode & 0x0400) {
+				       overwite_write(dram[addr], d);
+				} else dram[addr] = d;
+				ssp->pmac_write[reg] += (addr&1) ? (31<<16) : (1<<16);
+			}
+			else if ((mode & 0x47ff) == 0x001c) // IRAM
+			{
+				int inc = get_inc(mode);
+				if ((addr&0xfc00) != 0x8000)
+					elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: invalid IRAM addr: %04x", addr<<1);
+				elprintf(EL_SVP, "ssp IRAM w [%06x] %04x (inc %i)", (addr<<1)&0x7ff, d, inc >> 16);
+				((unsigned short *)svp->iram_rom)[addr&0x3ff] = d;
+				ssp->pmac_write[reg] += inc;
+			}
+			else
+			{
+				elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: PM%i unhandled write mode %04x, [%06x] %04x @ %04x",
+						reg, mode, CADDR, d, GET_PPC_OFFS());
 			}
 		}
 		else
 		{
 			int mode = ssp->pmac_read[reg]&0xffff;
 			int addr = ssp->pmac_read[reg]>>16;
-			if ((mode & 0xfff0) == 0x0800) { // ROM, inc 1, verified to be correct
+			if      ((mode & 0xfff0) == 0x0800) // ROM, inc 1, verified to be correct
+			{
 				elprintf(EL_SVP, "ssp ROM  r [%06x] %04x", CADDR,
 					((unsigned short *)Pico.rom)[addr|((mode&0xf)<<16)]);
+				if ((signed int)ssp->pmac_read[reg] >> 16 == -1)
+					ssp->pmac_read[reg]++;
 				ssp->pmac_read[reg] += 1<<16;
 				d = ((unsigned short *)Pico.rom)[addr|((mode&0xf)<<16)];
-				goto ext_io_end;
 			}
-
-			switch (mode) {
-				case 0x0018: elprintf(EL_SVP, "ssp DRAM r [%06x] %04x", CADDR, dram[addr]);
-				             d = dram[addr]; // checked
-				             break;
-				case 0x0818: elprintf(EL_SVP, "ssp DRAM r [%06x] %04x (inc 1)", CADDR, dram[addr]);
-				             ssp->pmac_read[reg] += 1<<16;
-				             d = dram[addr];
-				             break;
-				case 0x3018: elprintf(EL_SVP, "ssp DRAM r [%06x] %04x (inc 32)", CADDR, dram[addr]);
-				             ssp->pmac_read[reg] += 32<<16;
-				             d = dram[addr];
-				             break;
-				case 0xa818: elprintf(EL_SVP, "ssp DRAM r [%06x] %04x (dec 16)", CADDR, dram[addr]);
-				             ssp->pmac_read[reg] -= 16<<16;
-				             d = dram[addr];
-				             break;
-				case 0xb818: elprintf(EL_SVP, "ssp DRAM r [%06x] %04x (dec 128?)", CADDR, dram[addr]);
-				             ssp->pmac_read[reg] -= 128<<16;
-				             d = dram[addr];
-				             break;
-				default:     elprintf(EL_SVP|EL_ANOMALY, "ssp PM%i unhandled read  mode %04x, [%06x] @ %04x",
-							reg, mode, CADDR, GET_PPC_OFFS());
-				             d = 0;
-				             break;
+			else if ((mode & 0x47ff) == 0x0018) // DRAM
+			{
+				int inc = get_inc(mode);
+				elprintf(EL_SVP, "ssp PM%i DRAM r [%06x] %04x (inc %i)", reg, CADDR, dram[addr], inc >> 16);
+				d = dram[addr];
+				ssp->pmac_read[reg] += inc;
+			}
+			else
+			{
+				elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: PM%i unhandled read  mode %04x, [%06x] @ %04x",
+						reg, mode, CADDR, GET_PPC_OFFS());
+				d = 0;
 			}
 		}
 
-ext_io_end:
 		// PMC value corresponds to last PMR accessed (not sure).
 		rPMC.v = ssp->pmac_read[write ? reg + 6 : reg];
 
@@ -492,8 +540,7 @@ static u32 read_PM0(void)
 {
 	u32 d = pm_io(0, 0, 0);
 	if (d != (u32)-1) return d;
-	if (GET_PPC_OFFS() != 0x800 || rPM0 != 0) // debug
-		elprintf(EL_SVP, "PM0 raw r %04x @ %04x", rPM0, GET_PPC_OFFS());
+	elprintf(EL_SVP, "PM0 raw r %04x @ %04x", rPM0, GET_PPC_OFFS());
 	d = rPM0;
 	if (!(d & 2) && (GET_PPC_OFFS() == 0x800 || GET_PPC_OFFS() == 0x1851E)) {
 		ssp->emu_status |= SSP_WAIT_PM0; elprintf(EL_SVP, "det TIGHT loop: PM0");
@@ -598,39 +645,42 @@ static void write_PM4(u32 d)
 // 14
 static u32 read_PMC(void)
 {
-	elprintf(EL_SVP, "PMC r %08x @ %04x", rPMC.v, GET_PPC_OFFS());
+	elprintf(EL_SVP, "PMC r a %04x (st %c) @ %04x", rPMC.h,
+		(ssp->emu_status & SSP_PMC_HAVE_ADDR) ? 'm' : 'a', GET_PPC_OFFS());
 	if (ssp->emu_status & SSP_PMC_HAVE_ADDR) {
-		if (ssp->emu_status & SSP_PMC_SET)
-			elprintf(EL_ANOMALY|EL_SVP, "prev PMC not used @ %04x", GET_PPC_OFFS());
+		//if (ssp->emu_status & SSP_PMC_SET)
+		//	elprintf(EL_ANOMALY|EL_SVP, "prev PMC not used @ %04x", GET_PPC_OFFS());
 		ssp->emu_status |= SSP_PMC_SET;
 		ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
-		return rPMC.l;
 	} else {
 		ssp->emu_status |= SSP_PMC_HAVE_ADDR;
-		return rPMC.h;
 	}
+	return rPMC.h;
 }
 
 static void write_PMC(u32 d)
 {
 	if (ssp->emu_status & SSP_PMC_HAVE_ADDR) {
-		if (ssp->emu_status & SSP_PMC_SET)
-			elprintf(EL_ANOMALY|EL_SVP, "prev PMC not used @ %04x", GET_PPC_OFFS());
+		//if (ssp->emu_status & SSP_PMC_SET)
+		//	elprintf(EL_ANOMALY|EL_SVP, "prev PMC not used @ %04x", GET_PPC_OFFS());
 		ssp->emu_status |= SSP_PMC_SET;
 		ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
 		rPMC.l = d;
+		elprintf(EL_SVP, "PMC w m %04x @ %04x", rPMC.l, GET_PPC_OFFS());
 	} else {
 		ssp->emu_status |= SSP_PMC_HAVE_ADDR;
 		rPMC.h = d;
+		elprintf(EL_SVP, "PMC w a %04x @ %04x", rPMC.h, GET_PPC_OFFS());
 	}
 }
 
 // 15
 static u32 read_AL(void)
 {
-	// TODO: figure out what's up with those blind reads..
-	if (*(PC-1) == 0x000f)
-		elprintf(EL_SVP|EL_ANOMALY, "ssp unhandled AL blind read..");
+	if (*(PC-1) == 0x000f) {
+		elprintf(EL_SVP, "ssp dummy PM assign %08x @ %04x", rPMC.v, GET_PPC_OFFS());
+		ssp->emu_status &= ~(SSP_PMC_SET|SSP_PMC_HAVE_ADDR); // ?
+	}
 	return rAL;
 }
 
@@ -834,6 +884,7 @@ void ssp1601_reset(ssp1601_t *l_ssp)
 }
 
 
+#ifdef USE_DEBUGGER
 static void debug_dump(void)
 {
 	printf("GR0:   %04x    X: %04x    Y: %04x  A: %08x\n", ssp->gr[SSP_GR0].h, rX, rY, ssp->gr[SSP_A].v);
@@ -931,21 +982,23 @@ static void debug(unsigned int pc, unsigned int op)
 		}
 	}
 }
+#endif // USE_DEBUGGER
+
 
 void ssp1601_run(int cycles)
 {
 	SET_PC(rPC);
 	g_cycles = cycles;
 
-//if (Pico.m.frame_count == 480) running = 0;
-
 	while (g_cycles > 0 && !(ssp->emu_status & SSP_WAIT_MASK))
 	{
 		int op;
 		u32 tmpv;
 
 		op = *PC++;
+#ifdef USE_DEBUGGER
 		debug(GET_PC()-1, op);
+#endif
 		switch (op >> 9)
 		{
 			// ld d, s
@@ -954,7 +1007,7 @@ void ssp1601_run(int cycles)
 				if (op == ((SSP_A<<4)|SSP_P)) { // A <- P
 					// not sure. MAME claims that only hi word is transfered.
 					read_P(); // update P
-					ssp->gr[SSP_A].v = ssp->gr[SSP_P].v;
+					rA32 = ssp->gr[SSP_P].v;
 				}
 				else
 				{
@@ -1024,31 +1077,29 @@ void ssp1601_run(int cycles)
 						case 3: rA32 <<= 1; break; // shl
 						case 6: rA32 = -(signed int)rA32; break; // neg
 						case 7: if ((int)rA32 < 0) rA32 = -(signed int)rA32; break; // abs
-						default: elprintf(EL_SVP, "ssp16: FIXME unhandled mod %i @ %04x", op&7, GET_PPC_OFFS());
+						default: elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: unhandled mod %i @ %04x",
+								op&7, GET_PPC_OFFS());
 					}
 					UPD_ACC_ZN // ?
 				}
 				break;
 			}
 
-#if 1
 			// mpys?
 			case 0x1b:
-				// very uncertain about this one. What about b?
-				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp16: FIXME: no b bit @ %04x", GET_PPC_OFFS());
+				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: no b bit @ %04x", GET_PPC_OFFS());
 				read_P(); // update P
-				ssp->gr[SSP_A].v -= ssp->gr[SSP_P].v; // maybe only upper word?
-//				UPD_ACC_ZN // I've seen code checking flags after this
+				rA32 -= ssp->gr[SSP_P].v;	// maybe only upper word?
+				UPD_ACC_ZN			// there checking flags after this
 				rX = ptr1_read_(op&3, 0, (op<<1)&0x18); // ri (maybe rj?)
 				rY = ptr1_read_((op>>4)&3, 4, (op>>3)&0x18); // rj
 				break;
-#endif
+
 			// mpya (rj), (ri), b
 			case 0x4b:
-				// dunno if this is correct. What about b?
-				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp16: FIXME: no b bit @ %04x", GET_PPC_OFFS());
+				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: no b bit @ %04x", GET_PPC_OFFS());
 				read_P(); // update P
-				ssp->gr[SSP_A].v += ssp->gr[SSP_P].v; // maybe only upper word?
+				rA32 += ssp->gr[SSP_P].v; // confirmed to be 32bit
 				UPD_ACC_ZN // ?
 				rX = ptr1_read_(op&3, 0, (op<<1)&0x18); // ri (maybe rj?)
 				rY = ptr1_read_((op>>4)&3, 4, (op>>3)&0x18); // rj
@@ -1056,21 +1107,20 @@ void ssp1601_run(int cycles)
 
 			// mld (rj), (ri), b
 			case 0x5b:
-				// dunno if this is correct. What about b?
-				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp16: FIXME: no b bit @ %04x", GET_PPC_OFFS());
-				ssp->gr[SSP_A].v = 0; // maybe only upper word?
-				// UPD_t_LZVN // ?
+				if (!(op&0x100)) elprintf(EL_SVP|EL_ANOMALY, "ssp FIXME: no b bit @ %04x", GET_PPC_OFFS());
+				rA32 = 0;
+				rST &= 0x0fff; // ?
 				rX = ptr1_read_(op&3, 0, (op<<1)&0x18); // ri (maybe rj?)
 				rY = ptr1_read_((op>>4)&3, 4, (op>>3)&0x18); // rj
 				break;
 
 			// OP a, s
-			case 0x10: tmpv = REG_READ(op & 0x0f); OP_SUBA(tmpv); break;
-			case 0x30: tmpv = REG_READ(op & 0x0f); OP_CMPA(tmpv); break;
-			case 0x40: tmpv = REG_READ(op & 0x0f); OP_ADDA(tmpv); break;
-			case 0x50: tmpv = REG_READ(op & 0x0f); OP_ANDA(tmpv); break;
-			case 0x60: tmpv = REG_READ(op & 0x0f); OP_ORA (tmpv); break;
-			case 0x70: tmpv = REG_READ(op & 0x0f); OP_EORA(tmpv); break;
+			case 0x10: OP_CHECK32(OP_SUBA32); tmpv = REG_READ(op & 0x0f); OP_SUBA(tmpv); break;
+			case 0x30: OP_CHECK32(OP_CMPA32); tmpv = REG_READ(op & 0x0f); OP_CMPA(tmpv); break;
+			case 0x40: OP_CHECK32(OP_ADDA32); tmpv = REG_READ(op & 0x0f); OP_ADDA(tmpv); break;
+			case 0x50: OP_CHECK32(OP_ANDA32); tmpv = REG_READ(op & 0x0f); OP_ANDA(tmpv); break;
+			case 0x60: OP_CHECK32(OP_ORA32 ); tmpv = REG_READ(op & 0x0f); OP_ORA (tmpv); break;
+			case 0x70: OP_CHECK32(OP_EORA32); tmpv = REG_READ(op & 0x0f); OP_EORA(tmpv); break;
 
 			// OP a, (ri)
 			case 0x11: tmpv = ptr1_read(op); OP_SUBA(tmpv); break;
@@ -1114,16 +1164,16 @@ void ssp1601_run(int cycles)
 			case 0x79: tmpv = rIJ[IJind]; OP_EORA(tmpv); break;
 
 			// OP simm
-			case 0x1c: OP_SUBA(op & 0xff); break;
-			case 0x3c: OP_CMPA(op & 0xff); break;
-			case 0x4c: OP_ADDA(op & 0xff); break;
+			case 0x1c: OP_SUBA(op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
+			case 0x3c: OP_CMPA(op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
+			case 0x4c: OP_ADDA(op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
 			// MAME code only does LSB of top word, but this looks wrong to me.
-			case 0x5c: OP_ANDA(op & 0xff); break;
-			case 0x6c: OP_ORA (op & 0xff); break;
-			case 0x7c: OP_EORA(op & 0xff); break;
+			case 0x5c: OP_ANDA(op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
+			case 0x6c: OP_ORA (op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
+			case 0x7c: OP_EORA(op & 0xff); if (op&0x100) elprintf(EL_SVP|EL_ANOMALY, "FIXME: simm with upper bit set"); break;
 
 			default:
-				elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME unhandled op %04x @ %04x", op, GET_PPC_OFFS());
+				elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME unhandled op %04x @ %04x", op, GET_PPC_OFFS());
 				break;
 		}
 		g_cycles--;
@@ -1133,6 +1183,6 @@ void ssp1601_run(int cycles)
 	rPC = GET_PC();
 
 	if (ssp->gr[SSP_GR0].v != 0xffff0000)
-		elprintf(EL_ANOMALY|EL_SVP, "ssp16: FIXME: REG 0 corruption! %08x", ssp->gr[SSP_GR0].v);
+		elprintf(EL_ANOMALY|EL_SVP, "ssp FIXME: REG 0 corruption! %08x", ssp->gr[SSP_GR0].v);
 }