hint-less mode updated for SVP, state load callback, etc
[picodrive.git] / Pico / carthw / svp / compiler.c
index e6da06b..f89ad95 100644 (file)
-// 187 blocks, 12072 bytes
-// 14 IRAM blocks
 
 #include "../../PicoInt.h"
 #include "compiler.h"
 
-static unsigned int *block_table[0x5090/2];
-static unsigned int *block_table_iram[15][0x800/2];
-static unsigned int *tcache_ptr = NULL;
+#define u32 unsigned int
+
+static u32 *block_table[0x5090/2];
+static u32 *block_table_iram[15][0x800/2];
+static u32 *tcache_ptr = NULL;
 
 static int nblocks = 0;
-static int iram_context = 0;
+static int n_in_ops = 0;
+
+extern ssp1601_t *ssp;
+
+#define rPC    ssp->gr[SSP_PC].h
+#define rPMC   ssp->gr[SSP_PMC]
+
+#define SSP_FLAG_Z (1<<0xd)
+#define SSP_FLAG_N (1<<0xf)
 
 #ifndef ARM
-#define DUMP_BLOCK 0x084a
+#define DUMP_BLOCK 0x0c9a
 unsigned int tcache[512*1024];
 void regfile_load(void){}
 void regfile_store(void){}
 #endif
 
-#define EMBED_INTERPRETER
-#define ssp1601_reset ssp1601_reset_local
-#define ssp1601_run ssp1601_run_local
-
-#define GET_PC() rPC
-#define GET_PPC_OFFS() (GET_PC()*2 - 2)
-#define SET_PC(d) { rPC = d; }         /* must return to dispatcher after this */
-//#define GET_PC() (PC - (unsigned short *)svp->iram_rom)
-//#define GET_PPC_OFFS() ((unsigned int)PC - (unsigned int)svp->iram_rom - 2)
-//#define SET_PC(d) PC = (unsigned short *)svp->iram_rom + d
-
-#include "ssp16.c"
 #include "gen_arm.c"
 
 // -----------------------------------------------------
 
-// ld d, s
-static void op00(unsigned int op, unsigned int imm)
+static int get_inc(int mode)
 {
-       unsigned int tmpv;
-       PC = ((unsigned short *)(void *)&op) + 1; /* FIXME: needed for interpreter */
-       if (op == 0) return; // nop
-       if (op == ((SSP_A<<4)|SSP_P)) { // A <- P
-               // not sure. MAME claims that only hi word is transfered.
-               read_P(); // update P
-               rA32 = rP.v;
+       int inc = (mode >> 11) & 7;
+       if (inc != 0) {
+               if (inc != 7) inc--;
+               inc = 1 << inc; // 0 1 2 4 8 16 32 128
+               if (mode & 0x8000) inc = -inc; // decrement mode
        }
-       else
-       {
-               tmpv = REG_READ(op & 0x0f);
-               REG_WRITE((op & 0xf0) >> 4, tmpv);
-       }
-}
-
-// ld d, (ri)
-static void op01(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); REG_WRITE((op & 0xf0) >> 4, tmpv);
-}
-
-// ld (ri), s
-static void op02(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = REG_READ((op & 0xf0) >> 4); ptr1_write(op, tmpv);
+       return inc;
 }
 
-// ldi d, imm
-static void op04(unsigned int op, unsigned int imm)
+static u32 ssp_pm_read(int reg)
 {
-       REG_WRITE((op & 0xf0) >> 4, imm);
-}
+       u32 d = 0, mode;
 
-// ld d, ((ri))
-static void op05(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); REG_WRITE((op & 0xf0) >> 4, tmpv);
-}
-
-// ldi (ri), imm
-static void op06(unsigned int op, unsigned int imm)
-{
-       ptr1_write(op, imm);
-}
-
-// ld adr, a
-static void op07(unsigned int op, unsigned int imm)
-{
-       ssp->RAM[op & 0x1ff] = rA;
-}
-
-// ld d, ri
-static void op09(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[(op&3)|((op>>6)&4)]; REG_WRITE((op & 0xf0) >> 4, tmpv);
-}
-
-// ld ri, s
-static void op0a(unsigned int op, unsigned int imm)
-{
-       rIJ[(op&3)|((op>>6)&4)] = REG_READ((op & 0xf0) >> 4);
-}
-
-// ldi ri, simm (also op0d op0e op0f)
-static void op0c(unsigned int op, unsigned int imm)
-{
-       rIJ[(op>>8)&7] = op;
-}
-
-// call cond, addr
-static void op24(unsigned int op, unsigned int imm)
-{
-       int cond = 0;
-       do {
-               COND_CHECK
-               if (cond) { int new_PC = imm; write_STACK(GET_PC()); SET_PC(new_PC); }
+       if (ssp->emu_status & SSP_PMC_SET)
+       {
+               ssp->pmac_read[reg] = rPMC.v;
+               ssp->emu_status &= ~SSP_PMC_SET;
+               return 0;
        }
-       while (0);
-}
 
-// ld d, (a)
-static void op25(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ((unsigned short *)svp->iram_rom)[rA]; REG_WRITE((op & 0xf0) >> 4, tmpv);
-}
+       // just in case
+       ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
 
-// bra cond, addr
-static void op26(unsigned int op, unsigned int imm)
-{
-       do
+       mode = ssp->pmac_read[reg]>>16;
+       if      ((mode & 0xfff0) == 0x0800) // ROM
        {
-               int cond = 0;
-               COND_CHECK
-               if (cond) SET_PC(imm);
+               d = ((unsigned short *)Pico.rom)[ssp->pmac_read[reg]&0xfffff];
+               ssp->pmac_read[reg] += 1;
        }
-       while (0);
-}
-
-// mod cond, op
-static void op48(unsigned int op, unsigned int imm)
-{
-       do
+       else if ((mode & 0x47ff) == 0x0018) // DRAM
        {
-               int cond = 0;
-               COND_CHECK
-               if (cond) {
-                       switch (op & 7) {
-                               case 2: rA32 = (signed int)rA32 >> 1; break; // shr (arithmetic)
-                               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|EL_ANOMALY, "ssp FIXME: unhandled mod %i @ %04x",
-                                                        op&7, GET_PPC_OFFS());
-                       }
-                       UPD_ACC_ZN // ?
-               }
+               unsigned short *dram = (unsigned short *)svp->dram;
+               int inc = get_inc(mode);
+               d = dram[ssp->pmac_read[reg]&0xffff];
+               ssp->pmac_read[reg] += inc;
        }
-       while(0);
-}
 
-// mpys?
-static void op1b(unsigned int op, unsigned int imm)
-{
-       read_P(); // update P
-       rA32 -= rP.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
-}
+       // PMC value corresponds to last PMR accessed
+       rPMC.v = ssp->pmac_read[reg];
 
-// mpya (rj), (ri), b
-static void op4b(unsigned int op, unsigned int imm)
-{
-       read_P(); // update P
-       rA32 += rP.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
+       return d;
 }
 
-// mld (rj), (ri), b
-static void op5b(unsigned int op, unsigned int imm)
-{
-       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
+#define overwrite_write(dst, d) \
+{ \
+       if (d & 0xf000) { dst &= ~0xf000; dst |= d & 0xf000; } \
+       if (d & 0x0f00) { dst &= ~0x0f00; dst |= d & 0x0f00; } \
+       if (d & 0x00f0) { dst &= ~0x00f0; dst |= d & 0x00f0; } \
+       if (d & 0x000f) { dst &= ~0x000f; dst |= d & 0x000f; } \
 }
 
-// OP a, s
-static void op10(unsigned int op, unsigned int imm)
+static void ssp_pm_write(u32 d, int reg)
 {
-       do
-       {
-               unsigned int tmpv;
-               OP_CHECK32(OP_SUBA32); tmpv = REG_READ(op & 0x0f); OP_SUBA(tmpv);
-       }
-       while(0);
-}
+       unsigned short *dram;
+       int mode, addr;
 
-static void op30(unsigned int op, unsigned int imm)
-{
-       do
+       if (ssp->emu_status & SSP_PMC_SET)
        {
-               unsigned int tmpv;
-               OP_CHECK32(OP_CMPA32); tmpv = REG_READ(op & 0x0f); OP_CMPA(tmpv);
+               ssp->pmac_write[reg] = rPMC.v;
+               ssp->emu_status &= ~SSP_PMC_SET;
+               return;
        }
-       while(0);
-}
 
-static void op40(unsigned int op, unsigned int imm)
-{
-       do
-       {
-               unsigned int tmpv;
-               OP_CHECK32(OP_ADDA32); tmpv = REG_READ(op & 0x0f); OP_ADDA(tmpv);
-       }
-       while(0);
-}
+       // just in case
+       ssp->emu_status &= ~SSP_PMC_HAVE_ADDR;
 
-static void op50(unsigned int op, unsigned int imm)
-{
-       do
+       dram = (unsigned short *)svp->dram;
+       mode = ssp->pmac_write[reg]>>16;
+       addr = ssp->pmac_write[reg]&0xffff;
+       if      ((mode & 0x43ff) == 0x0018) // DRAM
        {
-               unsigned int tmpv;
-               OP_CHECK32(OP_ANDA32); tmpv = REG_READ(op & 0x0f); OP_ANDA(tmpv);
+               int inc = get_inc(mode);
+               if (mode & 0x0400) {
+                      overwrite_write(dram[addr], d);
+               } else dram[addr] = d;
+               ssp->pmac_write[reg] += inc;
        }
-       while(0);
-}
-
-static void op60(unsigned int op, unsigned int imm)
-{
-       do
+       else if ((mode & 0xfbff) == 0x4018) // DRAM, cell inc
        {
-               unsigned int tmpv;
-               OP_CHECK32(OP_ORA32 ); tmpv = REG_READ(op & 0x0f); OP_ORA (tmpv);
+               if (mode & 0x0400) {
+                      overwrite_write(dram[addr], d);
+               } else dram[addr] = d;
+               ssp->pmac_write[reg] += (addr&1) ? 31 : 1;
        }
-       while(0);
-}
-
-static void op70(unsigned int op, unsigned int imm)
-{
-       do
+       else if ((mode & 0x47ff) == 0x001c) // IRAM
        {
-               unsigned int tmpv;
-               OP_CHECK32(OP_EORA32); tmpv = REG_READ(op & 0x0f); OP_EORA(tmpv);
+               int inc = get_inc(mode);
+               ((unsigned short *)svp->iram_rom)[addr&0x3ff] = d;
+               ssp->pmac_write[reg] += inc;
+               ssp->drc.iram_dirty = 1;
        }
-       while(0);
-}
 
-// OP a, (ri)
-static void op11(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_SUBA(tmpv);
+       rPMC.v = ssp->pmac_write[reg];
 }
 
-static void op31(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_CMPA(tmpv);
-}
-
-static void op41(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_ADDA(tmpv);
-}
-
-static void op51(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_ANDA(tmpv);
-}
-
-static void op61(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_ORA (tmpv);
-}
-
-static void op71(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr1_read(op); OP_EORA(tmpv);
-}
-
-// OP a, adr
-static void op03(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_LDA (tmpv);
-}
-
-static void op13(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_SUBA(tmpv);
-}
-
-static void op33(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_CMPA(tmpv);
-}
-
-static void op43(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_ADDA(tmpv);
-}
-
-static void op53(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_ANDA(tmpv);
-}
-
-static void op63(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_ORA (tmpv);
-}
-
-static void op73(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ssp->RAM[op & 0x1ff]; OP_EORA(tmpv);
-}
-
-// OP a, imm
-static void op14(unsigned int op, unsigned int imm)
-{
-       OP_SUBA(imm);
-}
-
-static void op34(unsigned int op, unsigned int imm)
-{
-       OP_CMPA(imm);
-}
-
-static void op44(unsigned int op, unsigned int imm)
-{
-       OP_ADDA(imm);
-}
-
-static void op54(unsigned int op, unsigned int imm)
-{
-       OP_ANDA(imm);
-}
-
-static void op64(unsigned int op, unsigned int imm)
-{
-       OP_ORA (imm);
-}
-
-static void op74(unsigned int op, unsigned int imm)
-{
-       OP_EORA(imm);
-}
-
-// OP a, ((ri))
-static void op15(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_SUBA(tmpv);
-}
-
-static void op35(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_CMPA(tmpv);
-}
-
-static void op45(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_ADDA(tmpv);
-}
-
-static void op55(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_ANDA(tmpv);
-}
-
-static void op65(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_ORA (tmpv);
-}
-
-static void op75(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = ptr2_read(op); OP_EORA(tmpv);
-}
-
-// OP a, ri
-static void op19(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_SUBA(tmpv);
-}
-
-static void op39(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_CMPA(tmpv);
-}
-
-static void op49(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_ADDA(tmpv);
-}
-
-static void op59(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_ANDA(tmpv);
-}
-
-static void op69(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_ORA (tmpv);
-}
-
-static void op79(unsigned int op, unsigned int imm)
-{
-       unsigned int tmpv;
-       tmpv = rIJ[IJind]; OP_EORA(tmpv);
-}
-
-// OP simm
-static void op1c(unsigned int op, unsigned int imm)
-{
-       OP_SUBA(op & 0xff);
-}
-
-static void op3c(unsigned int op, unsigned int imm)
-{
-       OP_CMPA(op & 0xff);
-}
-
-static void op4c(unsigned int op, unsigned int imm)
-{
-       OP_ADDA(op & 0xff);
-}
-
-static void op5c(unsigned int op, unsigned int imm)
-{
-       OP_ANDA(op & 0xff);
-}
-
-static void op6c(unsigned int op, unsigned int imm)
-{
-       OP_ORA (op & 0xff);
-}
-
-static void op7c(unsigned int op, unsigned int imm)
-{
-       OP_EORA(op & 0xff);
-}
-
-typedef void (in_func)(unsigned int op, unsigned int imm);
-
-static in_func *in_funcs[0x80] =
-{
-       op00, op01, op02, op03, op04, op05, op06, op07,
-       NULL, op09, op0a, NULL, op0c, op0c, op0c, op0c,
-       op10, op11, NULL, op13, op14, op15, NULL, NULL,
-       NULL, op19, NULL, op1b, op1c, NULL, NULL, NULL,
-       NULL, NULL, NULL, NULL, op24, op25, op26, NULL,
-       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-       op30, op31, NULL, op33, op34, op35, NULL, NULL,
-       NULL, op39, NULL, NULL, op3c, NULL, NULL, NULL,
-       op40, op41, NULL, op43, op44, op45, NULL, NULL,
-       op48, op49, NULL, op4b, op4c, NULL, NULL, NULL,
-       op50, op51, NULL, op53, op54, op55, NULL, NULL,
-       NULL, op59, NULL, op5b, op5c, NULL, NULL, NULL,
-       op60, op61, NULL, op63, op64, op65, NULL, NULL,
-       NULL, op69, NULL, NULL, op6c, NULL, NULL, NULL,
-       op70, op71, NULL, op73, op74, op75, NULL, NULL,
-       NULL, op79, NULL, NULL, op7c, NULL, NULL, NULL,
-};
 
 // -----------------------------------------------------
 
+// 14 IRAM blocks
 static unsigned char iram_context_map[] =
 {
         0, 0, 0, 0, 1, 0, 0, 0, // 04
@@ -504,7 +143,7 @@ static unsigned char iram_context_map[] =
        13,14, 0, 0, 0, 0, 0, 0  // 38 39
 };
 
-static int get_iram_context(void)
+int ssp_get_iram_context(void)
 {
        unsigned char *ir = (unsigned char *)svp->iram_rom;
        int val1, val = ir[0x083^1] + ir[0x4FA^1] + ir[0x5F7^1] + ir[0x47B^1];
@@ -520,14 +159,7 @@ static int get_iram_context(void)
 }
 
 // -----------------------------------------------------
-/*
-enum {
-       SSP_GR0, SSP_X,     SSP_Y,   SSP_A,
-       SSP_ST,  SSP_STACK, SSP_PC,  SSP_P,
-       SSP_PM0, SSP_PM1,   SSP_PM2, SSP_XST,
-       SSP_PM4, SSP_gr13,  SSP_PMC, SSP_AL
-};
-*/
+
 /* regs with known values */
 static struct
 {
@@ -535,7 +167,7 @@ static struct
        unsigned char r[8];
        unsigned int pmac_read[5];
        unsigned int pmac_write[5];
-       unsigned int pmc;
+       ssp_reg_t pmc;
        unsigned int emu_status;
 } known_regs;
 
@@ -549,7 +181,8 @@ static struct
 #define KRREG_PR0   (1 << 8)
 #define KRREG_PR4   (1 << 12)
 #define KRREG_AL    (1 << 16)
-#define KRREG_PMC   (1 << 19)          /* PMx are always dirty */
+#define KRREG_PMCM  (1 << 18)          /* only mode word of PMC */
+#define KRREG_PMC   (1 << 19)
 #define KRREG_PM0R  (1 << 20)
 #define KRREG_PM1R  (1 << 21)
 #define KRREG_PM2R  (1 << 22)
@@ -565,7 +198,7 @@ static struct
 static u32 known_regb = 0;
 
 /* known vals, which need to be flushed
- * (only ST, P, r0-r7, PMxR, PMxW)
+ * (only ST, P, r0-r7, PMCx, PMxR, PMxW)
  * ST means flags are being held in ARM PSR
  * P means that it needs to be recalculated
  */
@@ -714,34 +347,37 @@ static void tr_mov16_cond(int cond, int r, int val)
 static void tr_flush_dirty_pmcrs(void)
 {
        u32 i, val = (u32)-1;
-       if (!(known_regb & 0x3ff80000)) return;
+       if (!(dirty_regb & 0x3ff80000)) return;
 
-       if (known_regb & KRREG_PMC) {
-               val = known_regs.pmc;
-               emit_mov_const(A_COND_AL, 0, val);
-               EOP_STR_IMM(0,7,0x400+SSP_PMC*4);
+       if (dirty_regb & KRREG_PMC) {
+               val = known_regs.pmc.v;
+               emit_mov_const(A_COND_AL, 1, val);
+               EOP_STR_IMM(1,7,0x400+SSP_PMC*4);
 
-               if (known_regs.emu_status & SSP_PMC_SET)
-                       printf("!! SSP_PMC_SET set on flush\n");
+               if (known_regs.emu_status & (SSP_PMC_SET|SSP_PMC_HAVE_ADDR)) {
+                       printf("!! SSP_PMC_SET|SSP_PMC_HAVE_ADDR set on flush\n");
+                       tr_unhandled();
+               }
        }
        for (i = 0; i < 5; i++)
        {
-               if (known_regb & (1 << (20+i))) {
+               if (dirty_regb & (1 << (20+i))) {
                        if (val != known_regs.pmac_read[i]) {
                                val = known_regs.pmac_read[i];
-                               emit_mov_const(A_COND_AL, 0, val);
+                               emit_mov_const(A_COND_AL, 1, val);
                        }
-                       EOP_STR_IMM(0,7,0x454+i*4); // pmac_read
+                       EOP_STR_IMM(1,7,0x454+i*4); // pmac_read
                }
-               if (known_regb & (1 << (25+i))) {
+               if (dirty_regb & (1 << (25+i))) {
                        if (val != known_regs.pmac_write[i]) {
                                val = known_regs.pmac_write[i];
-                               emit_mov_const(A_COND_AL, 0, val);
+                               emit_mov_const(A_COND_AL, 1, val);
                        }
-                       EOP_STR_IMM(0,7,0x46c+i*4); // pmac_write
+                       EOP_STR_IMM(1,7,0x46c+i*4); // pmac_write
                }
        }
-       hostreg_r[0] = -1;
+       dirty_regb &= ~0x3ff80000;
+       hostreg_r[1] = -1;
 }
 
 /* read bank word to r0 (upper bits zero). Thrashes r1. */
@@ -972,8 +608,6 @@ static int tr_aop_ssp2arm(int op)
 
 // -----------------------------------------------------
 
-//     SSP_GR0, SSP_X,     SSP_Y,   SSP_A,
-//     SSP_ST,  SSP_STACK, SSP_PC,  SSP_P,
 //@ r4:  XXYY
 //@ r5:  A
 //@ r6:  STACK and emu flags
@@ -981,12 +615,12 @@ static int tr_aop_ssp2arm(int op)
 //@ r10: P
 
 // read general reg to r0. Trashes r1
-static void tr_GR0_to_r0(void)
+static void tr_GR0_to_r0(int op)
 {
        tr_mov16(0, 0xffff);
 }
 
-static void tr_X_to_r0(void)
+static void tr_X_to_r0(int op)
 {
        if (hostreg_r[0] != (SSP_X<<16)) {
                EOP_MOV_REG_LSR(0, 4, 16);      // mov  r0, r4, lsr #16
@@ -994,16 +628,15 @@ static void tr_X_to_r0(void)
        }
 }
 
-static void tr_Y_to_r0(void)
+static void tr_Y_to_r0(int op)
 {
-       // TODO..
        if (hostreg_r[0] != (SSP_Y<<16)) {
                EOP_MOV_REG_SIMPLE(0, 4);       // mov  r0, r4
                hostreg_r[0] = SSP_Y<<16;
        }
 }
 
-static void tr_A_to_r0(void)
+static void tr_A_to_r0(int op)
 {
        if (hostreg_r[0] != (SSP_A<<16)) {
                EOP_MOV_REG_LSR(0, 5, 16);      // mov  r0, r5, lsr #16  @ AH
@@ -1011,7 +644,7 @@ static void tr_A_to_r0(void)
        }
 }
 
-static void tr_ST_to_r0(void)
+static void tr_ST_to_r0(int op)
 {
        // VR doesn't need much accuracy here..
        EOP_MOV_REG_LSR(0, 6, 4);               // mov  r0, r6, lsr #4
@@ -1019,7 +652,7 @@ static void tr_ST_to_r0(void)
        hostreg_r[0] = -1;
 }
 
-static void tr_STACK_to_r0(void)
+static void tr_STACK_to_r0(int op)
 {
        // 448
        EOP_SUB_IMM(6, 6,  8/2, 0x20);          // sub  r6, r6, #1<<29
@@ -1030,81 +663,161 @@ static void tr_STACK_to_r0(void)
        hostreg_r[0] = hostreg_r[1] = -1;
 }
 
-static void tr_PC_to_r0(void)
+static void tr_PC_to_r0(int op)
 {
        tr_mov16(0, known_regs.gr[SSP_PC].h);
 }
 
-static void tr_P_to_r0(void)
+static void tr_P_to_r0(int op)
 {
        tr_flush_dirty_P();
        EOP_MOV_REG_LSR(0, 10, 16);             // mov  r0, r10, lsr #16
        hostreg_r[0] = -1;
 }
-/*
-static void tr_PM0_to_r0(void)
+
+static void tr_AL_to_r0(int op)
 {
+       if (op == 0x000f) {
+               if (known_regb & KRREG_PMC) {
+                       known_regs.emu_status &= ~(SSP_PMC_SET|SSP_PMC_HAVE_ADDR);
+               } else {
+                       EOP_LDR_IMM(0,7,0x484);                 // ldr r1, [r7, #0x484] // emu_status
+                       EOP_BIC_IMM(0,0,0,SSP_PMC_SET|SSP_PMC_HAVE_ADDR);
+                       EOP_STR_IMM(0,7,0x484);
+               }
+       }
+
+       if (hostreg_r[0] != (SSP_AL<<16)) {
+               EOP_MOV_REG_SIMPLE(0, 5);       // mov  r0, r5
+               hostreg_r[0] = SSP_AL<<16;
+       }
 }
-*/
 
-static int tr_PM4_to_r0(void)
+static void tr_PMX_to_r0(int reg)
 {
-       int reg = 4;
-       u32 pmcv = known_regs.pmac_read[reg];
-
        if ((known_regb & KRREG_PMC) && (known_regs.emu_status & SSP_PMC_SET))
        {
-               known_regs.pmac_read[reg] = known_regs.pmc;
+               known_regs.pmac_read[reg] = known_regs.pmc.v;
                known_regs.emu_status &= ~SSP_PMC_SET;
-               return 0;
+               known_regb |= 1 << (20+reg);
+               dirty_regb |= 1 << (20+reg);
+               return;
        }
 
-       if (known_regb & (1 << (20+4)))
+       if ((known_regb & KRREG_PMC) && (known_regb & (1 << (20+reg))))
        {
-               int mode = known_regs.pmac_read[reg]>>16;
+               u32 pmcv = known_regs.pmac_read[reg];
+               int mode = pmcv>>16;
+               known_regs.emu_status &= ~SSP_PMC_HAVE_ADDR;
+
                if      ((mode & 0xfff0) == 0x0800)
                {
-                       known_regs.pmac_read[reg] += 1;
                        EOP_LDR_IMM(1,7,0x488);         // rom_ptr
                        emit_mov_const(A_COND_AL, 0, (pmcv&0xfffff)<<1);
                        EOP_LDRH_REG(0,1,0);            // ldrh r0, [r1, r0]
-                       hostreg_r[0] = hostreg_r[1] = -1;
+                       known_regs.pmac_read[reg] += 1;
                }
                else if ((mode & 0x47ff) == 0x0018) // DRAM
                {
                        int inc = get_inc(mode);
-                       ssp->pmac_read[reg] += inc;
                        EOP_LDR_IMM(1,7,0x490);         // dram_ptr
                        emit_mov_const(A_COND_AL, 0, (pmcv&0xffff)<<1);
                        EOP_LDRH_REG(0,1,0);            // ldrh r0, [r1, r0]
-                       if (pmcv == 0x187f03 || pmcv == 0x187f04) // wait loop detection
+                       if (reg == 4 && (pmcv == 0x187f03 || pmcv == 0x187f04)) // wait loop detection
                        {
                                int flag = (pmcv == 0x187f03) ? SSP_WAIT_30FE06 : SSP_WAIT_30FE08;
                                tr_flush_dirty_ST();
                                EOP_LDR_IMM(1,7,0x484);                 // ldr r1, [r7, #0x484] // emu_status
                                EOP_TST_REG_SIMPLE(0,0);
-                               EOP_C_DOP_IMM(A_COND_EQ,A_OP_ADD,0,11,11,22/2,1);       // add r11, r11, #1024
-                               EOP_C_DOP_IMM(A_COND_EQ,A_OP_ORR,0, 1, 1,24/2,flag>>8); // orr r1, r1, #SSP_WAIT_30FE08
+                               EOP_C_DOP_IMM(A_COND_EQ,A_OP_SUB,0,11,11,22/2,1);       // subeq r11, r11, #1024
+                               EOP_C_DOP_IMM(A_COND_EQ,A_OP_ORR,0, 1, 1,24/2,flag>>8); // orreq r1, r1, #SSP_WAIT_30FE08
                                EOP_STR_IMM(1,7,0x484);                 // str r1, [r7, #0x484] // emu_status
                        }
-                       hostreg_r[0] = hostreg_r[1] = -1;
+                       known_regs.pmac_read[reg] += inc;
                }
                else
                {
                        tr_unhandled();
                }
-               known_regs.pmc = known_regs.pmac_read[reg];
-               known_regb |= KRREG_PMC;
+               known_regs.pmc.v = known_regs.pmac_read[reg];
+               //known_regb |= KRREG_PMC;
+               dirty_regb |= KRREG_PMC;
+               dirty_regb |= 1 << (20+reg);
+               hostreg_r[0] = hostreg_r[1] = -1;
+               return;
+       }
 
-               return 0;
+       known_regb &= ~KRREG_PMC;
+       dirty_regb &= ~KRREG_PMC;
+       known_regb &= ~(1 << (20+reg));
+       dirty_regb &= ~(1 << (20+reg));
+
+       // call the C code to handle this
+       tr_flush_dirty_ST();
+       //tr_flush_dirty_pmcrs();
+       tr_mov16(0, reg);
+       emit_call(ssp_pm_read);
+       hostreg_clear();
+}
+
+static void tr_PM0_to_r0(int op)
+{
+       tr_PMX_to_r0(0);
+}
+
+static void tr_PM1_to_r0(int op)
+{
+       tr_PMX_to_r0(1);
+}
+
+static void tr_PM2_to_r0(int op)
+{
+       tr_PMX_to_r0(2);
+}
+
+static void tr_XST_to_r0(int op)
+{
+       EOP_ADD_IMM(0, 7, 24/2, 4);     // add r0, r7, #0x400
+       EOP_LDRH_IMM(0, 0, SSP_XST*4+2);
+}
+
+static void tr_PM4_to_r0(int op)
+{
+       tr_PMX_to_r0(4);
+}
+
+static void tr_PMC_to_r0(int op)
+{
+       if (known_regb & KRREG_PMC)
+       {
+               if (known_regs.emu_status & SSP_PMC_HAVE_ADDR) {
+                       known_regs.emu_status |= SSP_PMC_SET;
+                       known_regs.emu_status &= ~SSP_PMC_HAVE_ADDR;
+                       // do nothing - this is handled elsewhere
+               } else {
+                       tr_mov16(0, known_regs.pmc.l);
+                       known_regs.emu_status |= SSP_PMC_HAVE_ADDR;
+               }
+       }
+       else
+       {
+               EOP_LDR_IMM(1,7,0x484);                 // ldr r1, [r7, #0x484] // emu_status
+               tr_flush_dirty_ST();
+               if (op != 0x000e)
+                       EOP_LDR_IMM(0, 7, 0x400+SSP_PMC*4);
+               EOP_TST_IMM(1, 0, SSP_PMC_HAVE_ADDR);
+               EOP_C_DOP_IMM(A_COND_EQ,A_OP_ORR,0, 1, 1, 0, SSP_PMC_HAVE_ADDR); // orreq r1, r1, #..
+               EOP_C_DOP_IMM(A_COND_NE,A_OP_BIC,0, 1, 1, 0, SSP_PMC_HAVE_ADDR); // bicne r1, r1, #..
+               EOP_C_DOP_IMM(A_COND_NE,A_OP_ORR,0, 1, 1, 0, SSP_PMC_SET);       // orrne r1, r1, #..
+               EOP_STR_IMM(1,7,0x484);
+               hostreg_r[0] = hostreg_r[1] = -1;
        }
-       return -1;
 }
 
 
-typedef void (tr_read_func)(void);
+typedef void (tr_read_func)(int op);
 
-static tr_read_func *tr_read_funcs[8] =
+static tr_read_func *tr_read_funcs[16] =
 {
        tr_GR0_to_r0,
        tr_X_to_r0,
@@ -1113,7 +826,15 @@ static tr_read_func *tr_read_funcs[8] =
        tr_ST_to_r0,
        tr_STACK_to_r0,
        tr_PC_to_r0,
-       tr_P_to_r0
+       tr_P_to_r0,
+       tr_PM0_to_r0,
+       tr_PM1_to_r0,
+       tr_PM2_to_r0,
+       tr_XST_to_r0,
+       tr_PM4_to_r0,
+       (tr_read_func *)tr_unhandled,
+       tr_PMC_to_r0,
+       tr_AL_to_r0
 };
 
 
@@ -1190,9 +911,147 @@ static void tr_r0_to_PC(int const_val)
        hostreg_r[1] = -1;
 }
 
+static void tr_r0_to_AL(int const_val)
+{
+       EOP_MOV_REG_LSR(5, 5, 16);              // mov  r5, r5, lsr #16
+       EOP_ORR_REG_LSL(5, 5, 0, 16);           // orr  r5, r5, r0, lsl #16
+       EOP_MOV_REG_ROR(5, 5, 16);              // mov  r5, r5, ror #16
+       hostreg_sspreg_changed(SSP_AL);
+       if (const_val != -1) {
+               known_regs.gr[SSP_A].l = const_val;
+               known_regb |= 1 << SSP_AL;
+       } else
+               known_regb &= ~(1 << SSP_AL);
+}
+
+static void tr_r0_to_PMX(int reg)
+{
+       if ((known_regb & KRREG_PMC) && (known_regs.emu_status & SSP_PMC_SET))
+       {
+               known_regs.pmac_write[reg] = known_regs.pmc.v;
+               known_regs.emu_status &= ~SSP_PMC_SET;
+               known_regb |= 1 << (25+reg);
+               dirty_regb |= 1 << (25+reg);
+               return;
+       }
+
+       if ((known_regb & KRREG_PMC) && (known_regb & (1 << (25+reg))))
+       {
+               int mode, addr;
+
+               known_regs.emu_status &= ~SSP_PMC_HAVE_ADDR;
+
+               mode = known_regs.pmac_write[reg]>>16;
+               addr = known_regs.pmac_write[reg]&0xffff;
+               if      ((mode & 0x43ff) == 0x0018) // DRAM
+               {
+                       int inc = get_inc(mode);
+                       if (mode & 0x0400) tr_unhandled();
+                       EOP_LDR_IMM(1,7,0x490);         // dram_ptr
+                       emit_mov_const(A_COND_AL, 2, addr<<1);
+                       EOP_STRH_REG(0,1,2);            // strh r0, [r1, r2]
+                       known_regs.pmac_write[reg] += inc;
+               }
+               else if ((mode & 0xfbff) == 0x4018) // DRAM, cell inc
+               {
+                       if (mode & 0x0400) tr_unhandled();
+                       EOP_LDR_IMM(1,7,0x490);         // dram_ptr
+                       emit_mov_const(A_COND_AL, 2, addr<<1);
+                       EOP_STRH_REG(0,1,2);            // strh r0, [r1, r2]
+                       known_regs.pmac_write[reg] += (addr&1) ? 31 : 1;
+               }
+               else if ((mode & 0x47ff) == 0x001c) // IRAM
+               {
+                       int inc = get_inc(mode);
+                       EOP_LDR_IMM(1,7,0x48c);         // iram_ptr
+                       emit_mov_const(A_COND_AL, 2, (addr&0x3ff)<<1);
+                       EOP_STRH_REG(0,1,2);            // strh r0, [r1, r2]
+                       EOP_MOV_IMM(1,0,1);
+                       EOP_STR_IMM(1,7,0x494);         // iram_dirty
+                       known_regs.pmac_write[reg] += inc;
+               }
+               else
+                       tr_unhandled();
+
+               known_regs.pmc.v = known_regs.pmac_write[reg];
+               //known_regb |= KRREG_PMC;
+               dirty_regb |= KRREG_PMC;
+               dirty_regb |= 1 << (25+reg);
+               hostreg_r[1] = hostreg_r[2] = -1;
+               return;
+       }
+
+       known_regb &= ~KRREG_PMC;
+       dirty_regb &= ~KRREG_PMC;
+       known_regb &= ~(1 << (25+reg));
+       dirty_regb &= ~(1 << (25+reg));
+
+       // call the C code to handle this
+       tr_flush_dirty_ST();
+       //tr_flush_dirty_pmcrs();
+       tr_mov16(1, reg);
+       emit_call(ssp_pm_write);
+       hostreg_clear();
+}
+
+static void tr_r0_to_PM0(int const_val)
+{
+       tr_r0_to_PMX(0);
+}
+
+static void tr_r0_to_PM1(int const_val)
+{
+       tr_r0_to_PMX(1);
+}
+
+static void tr_r0_to_PM2(int const_val)
+{
+       tr_r0_to_PMX(2);
+}
+
+static void tr_r0_to_PM4(int const_val)
+{
+       tr_r0_to_PMX(4);
+}
+
+static void tr_r0_to_PMC(int const_val)
+{
+       if ((known_regb & KRREG_PMC) && const_val != -1)
+       {
+               if (known_regs.emu_status & SSP_PMC_HAVE_ADDR) {
+                       known_regs.emu_status |= SSP_PMC_SET;
+                       known_regs.emu_status &= ~SSP_PMC_HAVE_ADDR;
+                       known_regs.pmc.h = const_val;
+               } else {
+                       known_regs.emu_status |= SSP_PMC_HAVE_ADDR;
+                       known_regs.pmc.l = const_val;
+               }
+       }
+       else
+       {
+               tr_flush_dirty_ST();
+               if (known_regb & KRREG_PMC) {
+                       emit_mov_const(A_COND_AL, 1, known_regs.pmc.v);
+                       EOP_STR_IMM(1,7,0x400+SSP_PMC*4);
+                       known_regb &= ~KRREG_PMC;
+                       dirty_regb &= ~KRREG_PMC;
+               }
+               EOP_LDR_IMM(1,7,0x484);                 // ldr r1, [r7, #0x484] // emu_status
+               EOP_ADD_IMM(2,7,24/2,4);                // add r2, r7, #0x400
+               EOP_TST_IMM(1, 0, SSP_PMC_HAVE_ADDR);
+               EOP_C_AM3_IMM(A_COND_EQ,1,0,2,0,0,1,SSP_PMC*4);         // strxx r0, [r2, #SSP_PMC]
+               EOP_C_AM3_IMM(A_COND_NE,1,0,2,0,0,1,SSP_PMC*4+2);
+               EOP_C_DOP_IMM(A_COND_EQ,A_OP_ORR,0, 1, 1, 0, SSP_PMC_HAVE_ADDR); // orreq r1, r1, #..
+               EOP_C_DOP_IMM(A_COND_NE,A_OP_BIC,0, 1, 1, 0, SSP_PMC_HAVE_ADDR); // bicne r1, r1, #..
+               EOP_C_DOP_IMM(A_COND_NE,A_OP_ORR,0, 1, 1, 0, SSP_PMC_SET);       // orrne r1, r1, #..
+               EOP_STR_IMM(1,7,0x484);
+               hostreg_r[1] = hostreg_r[2] = -1;
+       }
+}
+
 typedef void (tr_write_func)(int const_val);
 
-static tr_write_func *tr_write_funcs[8] =
+static tr_write_func *tr_write_funcs[16] =
 {
        tr_r0_to_GR0,
        tr_r0_to_X,
@@ -1201,7 +1060,15 @@ static tr_write_func *tr_write_funcs[8] =
        tr_r0_to_ST,
        tr_r0_to_STACK,
        tr_r0_to_PC,
-       (tr_write_func *)tr_unhandled
+       (tr_write_func *)tr_unhandled,
+       tr_r0_to_PM0,
+       tr_r0_to_PM1,
+       tr_r0_to_PM2,
+       (tr_write_func *)tr_unhandled,
+       tr_r0_to_PM4,
+       (tr_write_func *)tr_unhandled,
+       tr_r0_to_PMC,
+       tr_r0_to_AL
 };
 
 static void tr_mac_load_XY(int op)
@@ -1219,32 +1086,6 @@ static void tr_mac_load_XY(int op)
 
 // -----------------------------------------------------
 
-static const short startup_seq[] = { 0xb802, 0x4d50, 0x400 };
-
-static int tr_detect_startup(unsigned int op, int *pc, int imm)
-{
-       // ld      A, PM0
-       // andi    2
-       // bra     z=1, gloc_0800
-       unsigned short *pp;
-       if (op != 0x38) return 0;
-       pp = PROGRAM_P(*pc);
-       if (memcmp(pp, startup_seq, sizeof(startup_seq)) != 0) return 0;
-       // the only place when we GPO bits are set in ST is the startup code
-       // (excluding memtest, which we do not support).
-       EOP_LDR_IMM(0,7,0x400+SSP_PM0*4);
-       EOP_LDR_IMM(1,7,0x484);         // ldr r1, [r7, #0x484] // emu_status
-       EOP_TST_IMM(0,16/2,2);
-       EOP_C_DOP_IMM(A_COND_EQ,A_OP_ORR,0, 1, 1,24/2,SSP_WAIT_PM0>>8); // orreq r1, r1, #SSP_WAIT_PM0
-       EOP_C_DOP_IMM(A_COND_EQ,A_OP_ADD,0,11,11,22/2,1);               // addeq r11, r11, #1024
-       EOP_STR_IMM(1,7,0x484);         // str r1, [r7, #0x484] // emu_status
-       tr_mov16_cond(A_COND_NE, 0, 0x04040000);
-       EOP_C_AM2_IMM(A_COND_NE,1,0,0,7,0,0x400+SSP_PC*4);
-       hostreg_r[0] = hostreg_r[1] = -1;
-       (*pc) += 3;
-       return 4 | 0x10000;
-}
-
 static int tr_detect_set_pm(unsigned int op, int *pc, int imm)
 {
        u32 pmcv, tmpv;
@@ -1255,9 +1096,11 @@ static int tr_detect_set_pm(unsigned int op, int *pc, int imm)
        // ldi PMC, imm2
        (*pc)++;
        pmcv = imm | (PROGRAM((*pc)++) << 16);
-       known_regs.pmc = pmcv;
+       known_regs.pmc.v = pmcv;
        known_regb |= KRREG_PMC;
+       dirty_regb |= KRREG_PMC;
        known_regs.emu_status |= SSP_PMC_SET;
+       n_in_ops++;
 
        // check for possible reg programming
        tmpv = PROGRAM(*pc);
@@ -1266,13 +1109,17 @@ static int tr_detect_set_pm(unsigned int op, int *pc, int imm)
                int is_write = (tmpv & 0xff8f) == 0x80;
                int reg = is_write ? ((tmpv>>4)&0x7) : (tmpv&0x7);
                if (reg > 4) tr_unhandled();
+               if ((tmpv & 0x0f) != 0 && (tmpv & 0xf0) != 0) tr_unhandled();
                known_regs.pmac_read[is_write ? reg + 5 : reg] = pmcv;
                known_regb |= is_write ? (1 << (reg+25)) : (1 << (reg+20));
+               dirty_regb |= is_write ? (1 << (reg+25)) : (1 << (reg+20));
                known_regs.emu_status &= ~SSP_PMC_SET;
                (*pc)++;
+               n_in_ops++;
                return 5;
        }
 
+       tr_unhandled();
        return 4;
 }
 
@@ -1296,9 +1143,27 @@ static int tr_detect_pm0_block(unsigned int op, int *pc, int imm)
        known_regb |= 1 << SSP_ST;
        dirty_regb &= ~KRREG_ST;
        (*pc) += 3*2;
+       n_in_ops += 3;
        return 4*2;
 }
 
+static int tr_detect_rotate(unsigned int op, int *pc, int imm)
+{
+       // @ 3DA2 and 426A
+       // ld PMC, (r3|00)
+       // ld (r3|00), PMC
+       // ld -, AL
+       if (op != 0x02e3 || PROGRAM(*pc) != 0x04e3 || PROGRAM(*pc + 1) != 0x000f) return 0;
+
+       tr_bank_read(0);
+       EOP_MOV_REG_LSL(0, 0, 4);
+       EOP_ORR_REG_LSR(0, 0, 0, 16);
+       tr_bank_write(0);
+       (*pc) += 2;
+       n_in_ops += 2;
+       return 3;
+}
+
 // -----------------------------------------------------
 
 static int translate_op(unsigned int op, int *pc, int imm)
@@ -1306,7 +1171,6 @@ static int translate_op(unsigned int op, int *pc, int imm)
        u32 tmpv, tmpv2, tmpv3;
        int ret = 0;
        known_regs.gr[SSP_PC].h = *pc;
-       known_regs.emu_status = 0;
 
        switch (op >> 9)
        {
@@ -1315,32 +1179,25 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        if (op == 0) { ret++; break; } // nop
                        tmpv  = op & 0xf; // src
                        tmpv2 = (op >> 4) & 0xf; // dst
-                       ret = tr_detect_startup(op, pc, imm);
-                       if (ret > 0) break;
-                       if (tmpv != 0xc && (tmpv >= 8 || tmpv2 >= 8)) return -1; // TODO
                        if (tmpv2 == SSP_A && tmpv == SSP_P) { // ld A, P
                                tr_flush_dirty_P();
                                EOP_MOV_REG_SIMPLE(5, 10);
-                               hostreg_sspreg_changed(SSP_A); \
+                               hostreg_sspreg_changed(SSP_A);
                                known_regb &= ~(KRREG_A|KRREG_AL);
                                ret++; break;
                        }
-                       if (tmpv == 0xc) {
-                               ret = tr_PM4_to_r0();
-                               if (ret != 0) return -1;
-                       }
-                       else tr_read_funcs[tmpv](); // TODO
+                       tr_read_funcs[tmpv](op);
                        tr_write_funcs[tmpv2]((known_regb & (1 << tmpv)) ? known_regs.gr[tmpv].h : -1);
                        if (tmpv2 == SSP_PC) ret |= 0x10000;
                        ret++; break;
 
                // ld d, (ri)
                case 0x01: {
-                       // tmpv = ptr1_read(op); REG_WRITE((op & 0xf0) >> 4, tmpv); break;
                        int r = (op&3) | ((op>>6)&4);
                        int mod = (op>>2)&3;
                        tmpv = (op >> 4) & 0xf; // dst
-                       if (tmpv >= 8) return -1; // TODO
+                       ret = tr_detect_rotate(op, pc, imm);
+                       if (ret > 0) break;
                        if (tmpv != 0)
                             tr_rX_read(r, mod);
                        else tr_ptrr_mod(r, mod, 1, 1);
@@ -1352,8 +1209,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
                // ld (ri), s
                case 0x02:
                        tmpv = (op >> 4) & 0xf; // src
-                       if (tmpv >= 8) return -1; // TODO
-                       tr_read_funcs[tmpv]();
+                       tr_read_funcs[tmpv](op);
                        tr_rX_write(op);
                        ret++; break;
 
@@ -1368,21 +1224,16 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        tmpv = (op & 0xf0) >> 4; // dst
                        ret = tr_detect_pm0_block(op, pc, imm);
                        if (ret > 0) break;
-                       if (tmpv < 8)
-                       {
-                               tr_mov16(0, imm);
-                               tr_write_funcs[tmpv](imm);
-                               ret += 2; break;
-                       }
                        ret = tr_detect_set_pm(op, pc, imm);
                        if (ret > 0) break;
+                       tr_mov16(0, imm);
+                       tr_write_funcs[tmpv](imm);
                        if (tmpv == SSP_PC) ret |= 0x10000;
-                       return -1;      /* TODO.. */
+                       ret += 2; break;
 
                // ld d, ((ri))
                case 0x05:
                        tmpv2 = (op >> 4) & 0xf;  // dst
-                       if (tmpv2 >= 8) return -1; // TODO
                        tr_rX_read2(op);
                        tr_write_funcs[tmpv2](-1);
                        if (tmpv2 == SSP_PC) ret |= 0x10000;
@@ -1396,7 +1247,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
 
                // ld adr, a
                case 0x07:
-                       tr_A_to_r0();
+                       tr_A_to_r0(op);
                        tr_bank_write(op&0x1ff);
                        ret++; break;
 
@@ -1405,7 +1256,6 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        int r;
                        r = (op&3) | ((op>>6)&4); // src
                        tmpv2 = (op >> 4) & 0xf;  // dst
-                       if (tmpv2 >= 8) tr_unhandled();
                        if ((r&3) == 3) tr_unhandled();
 
                        if (known_regb & (1 << (r+8))) {
@@ -1426,7 +1276,6 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        int r;
                        r = (op&3) | ((op>>6)&4); // dst
                        tmpv = (op >> 4) & 0xf;   // src
-                       if (tmpv >= 8)  tr_unhandled();
                        if ((r&3) == 3) tr_unhandled();
 
                        if (known_regb & (1 << tmpv)) {
@@ -1436,7 +1285,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        } else {
                                int reg = (r < 4) ? 8 : 9;
                                int ror = ((4 - (r&3))*8) & 0x1f;
-                               tr_read_funcs[tmpv]();
+                               tr_read_funcs[tmpv](op);
                                EOP_BIC_IMM(reg, reg, ror/2, 0xff);             // bic r{7,8}, r{7,8}, <mask>
                                EOP_AND_IMM(0, 0, 0, 0xff);                     // and r0, r0, 0xff
                                EOP_ORR_REG_LSL(reg, reg, 0, (r&3)*8);          // orr r{7,8}, r{7,8}, r0, lsl #lsl
@@ -1483,9 +1332,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
                // ld d, (a)
                case 0x25:
                        tmpv2 = (op >> 4) & 0xf;  // dst
-                       if (tmpv2 >= 8) return -1; // TODO
-
-                       tr_A_to_r0();
+                       tr_A_to_r0(op);
                        EOP_LDR_IMM(1,7,0x48c);                                 // ptr_iram_rom
                        EOP_ADD_REG_LSL(0,1,0,1);                               // add  r0, r1, r0, lsl #1
                        EOP_LDRH_SIMPLE(0,0);                                   // ldrh r0, [r0]
@@ -1511,6 +1358,7 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        tmpv = 1; // count
                        while (PROGRAM(*pc) == op && (op & 7) != 6) {
                                (*pc)++; tmpv++;
+                               n_in_ops++;
                        }
                        if ((op&0xf0) != 0) // !always
                                tr_make_dirty_ST();
@@ -1575,14 +1423,13 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        tmpv = op & 0xf; // src
                        tmpv2 = tr_aop_ssp2arm(op>>13); // op
                        tmpv3 = (tmpv2 == A_OP_CMP) ? 0 : 5;
-                       if (tmpv >= 8) return -1; // TODO
                        if (tmpv == SSP_P) {
                                tr_flush_dirty_P();
                                EOP_C_DOP_REG_XIMM(A_COND_AL,tmpv2,1,5,tmpv3, 0,A_AM1_LSL,10); // OPs r5, r5, r10
                        } else if (tmpv == SSP_A) {
                                EOP_C_DOP_REG_XIMM(A_COND_AL,tmpv2,1,5,tmpv3, 0,A_AM1_LSL, 5); // OPs r5, r5, r5
                        } else {
-                               tr_read_funcs[tmpv]();
+                               tr_read_funcs[tmpv](op);
                                EOP_C_DOP_REG_XIMM(A_COND_AL,tmpv2,1,5,tmpv3,16,A_AM1_LSL, 0); // OPs r5, r5, r0, lsl #16
                        }
                        hostreg_sspreg_changed(SSP_A);
@@ -1699,29 +1546,28 @@ static int translate_op(unsigned int op, int *pc, int imm)
                        ret++; break;
        }
 
+       n_in_ops++;
+
        return ret;
 }
 
-static void *translate_block(int pc)
+void *ssp_translate_block(int pc)
 {
        unsigned int op, op1, imm, ccount = 0;
        unsigned int *block_start;
        int ret, ret_prev = -1, tpc;
 
-       // create .pool
-       //*tcache_ptr++ = (u32) in_funcs;                       // -1 func pool
-
        printf("translate %04x -> %04x\n", pc<<1, (tcache_ptr-tcache)<<2);
        block_start = tcache_ptr;
        known_regb = 0;
        dirty_regb = KRREG_P;
+       known_regs.emu_status = 0;
        hostreg_clear();
 
        emit_block_prologue();
 
        for (; ccount < 100;)
        {
-               //printf("  insn #%i\n", icount);
                op = PROGRAM(pc++);
                op1 = op >> 9;
                imm = (u32)-1;
@@ -1733,31 +1579,8 @@ static void *translate_block(int pc)
                ret = translate_op(op, &pc, imm);
                if (ret <= 0)
                {
-                       tr_flush_dirty_prs();
-                       tr_flush_dirty_ST();
-                       tr_flush_dirty_pmcrs();
-
-                       emit_mov_const(A_COND_AL, 0, op);
-
-                       // need immediate?
-                       if (imm != (u32)-1)
-                               emit_mov_const(A_COND_AL, 1, imm);
-
-                       // dump PC
-                       emit_pc_dump(pc);
-
-                       if (ret_prev > 0) emit_call(regfile_store);
-                       emit_call(in_funcs[op1]);
-                       emit_call(regfile_load);
-
-                       if (in_funcs[op1] == NULL) {
-                               printf("NULL func! op=%08x (%02x)\n", op, op1);
-                               exit(1);
-                       }
-                       ccount++;
-                       hostreg_clear();
-                       dirty_regb |= KRREG_P;
-                       known_regb = 0;
+                       printf("NULL func! op=%08x (%02x)\n", op, op1);
+                       exit(1);
                }
                else
                {
@@ -1768,12 +1591,14 @@ static void *translate_block(int pc)
                ret_prev = ret;
        }
 
+       if (ccount >= 100)
+               emit_pc_dump(pc);
+
        tr_flush_dirty_prs();
        tr_flush_dirty_ST();
        tr_flush_dirty_pmcrs();
        emit_block_epilogue(ccount + 1);
        *tcache_ptr++ = 0xffffffff; // end of block
-       //printf("  %i inst\n", icount);
 
        if (tcache_ptr - tcache > TCACHE_SIZE/4) {
                printf("tcache overflow!\n");
@@ -1783,9 +1608,8 @@ static void *translate_block(int pc)
 
        // stats
        nblocks++;
-       //if (pc >= 0x400)
-       printf("%i blocks, %i bytes\n", nblocks, (tcache_ptr - tcache)*4);
-       //printf("%p %p\n", tcache_ptr, emit_block_epilogue);
+       printf("%i blocks, %i bytes, k=%.3f\n", nblocks, (tcache_ptr - tcache)*4,
+               (double)(tcache_ptr - tcache) / (double)n_in_ops);
 
 #ifdef DUMP_BLOCK
        {
@@ -1805,6 +1629,12 @@ static void *translate_block(int pc)
 
 // -----------------------------------------------------
 
+static void ssp1601_state_load(void)
+{
+       ssp->drc.iram_dirty = 1;
+       ssp->drc.iram_context = 0;
+}
+
 int ssp1601_dyn_startup(void)
 {
        memset(tcache, 0, TCACHE_SIZE);
@@ -1813,57 +1643,40 @@ int ssp1601_dyn_startup(void)
        tcache_ptr = tcache;
        *tcache_ptr++ = 0xffffffff;
 
-// TODO: rm
-{
-static unsigned short dummy = 0;
-PC = &dummy;
-}
+       PicoLoadStateHook = ssp1601_state_load;
+
+#ifdef ARM
+       // hle'd blocks
+       block_table[0x400] = (void *) ssp_hle_800;
+       n_in_ops = 3; // # of hled ops
+#endif
+
        return 0;
 }
 
 
 void ssp1601_dyn_reset(ssp1601_t *ssp)
 {
-       ssp1601_reset_local(ssp);
-       ssp->ptr_rom = (unsigned int) Pico.rom;
-       ssp->ptr_iram_rom = (unsigned int) svp->iram_rom;
-       ssp->ptr_dram = (unsigned int) svp->dram;
+       ssp1601_reset(ssp);
+       ssp->drc.iram_dirty = 1;
+       ssp->drc.iram_context = 0;
+       // must do this here because ssp is not available @ startup()
+       ssp->drc.ptr_rom = (u32) Pico.rom;
+       ssp->drc.ptr_iram_rom = (u32) svp->iram_rom;
+       ssp->drc.ptr_dram = (u32) svp->dram;
+       ssp->drc.ptr_btable = (u32) block_table;
+       ssp->drc.ptr_btable_iram = (u32) block_table_iram;
 }
 
 void ssp1601_dyn_run(int cycles)
 {
        if (ssp->emu_status & SSP_WAIT_MASK) return;
-       //{ printf("%i wait\n", Pico.m.frame_count); return; }
-       //printf("%i  %04x\n", Pico.m.frame_count, rPC<<1);
 
 #ifdef DUMP_BLOCK
-       rPC = DUMP_BLOCK >> 1;
+       ssp_translate_block(DUMP_BLOCK >> 1);
+#endif
+#ifdef ARM
+       ssp_drc_entry(cycles);
 #endif
-       while (cycles > 0)
-       {
-               int (*trans_entry)(void);
-               if (rPC < 0x800/2)
-               {
-                       if (iram_dirty) {
-                               iram_context = get_iram_context();
-                               iram_dirty--;
-                       }
-                       if (block_table_iram[iram_context][rPC] == NULL)
-                               block_table_iram[iram_context][rPC] = translate_block(rPC);
-                       trans_entry = (void *) block_table_iram[iram_context][rPC];
-               }
-               else
-               {
-                       if (block_table[rPC] == NULL)
-                               block_table[rPC] = translate_block(rPC);
-                       trans_entry = (void *) block_table[rPC];
-               }
-
-               //printf("enter %04x\n", rPC<<1);
-               cycles -= trans_entry();
-               //printf("leave %04x\n", rPC<<1);
-       }
-//     debug_dump2file("tcache.bin", tcache, (tcache_ptr - tcache) << 1);
-//     exit(1);
 }