proper ym2612 save hopefully done

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@491 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Memory.c b/Pico/Memory.c
index fe87ab9..06806cb 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -937,11 +937,23 @@ void ym2612_unpack_state(void)
   YM2612PicoStateLoad();\r
 \r
   // feed all the registers and update internal state\r
-  for (i = 0x20; i < 0xB8; i++) {\r
+  for (i = 0x20; i < 0xA0; i++) {\r
     ym2612_write_local(0, i, 0);\r
     ym2612_write_local(1, ym2612.REGS[i], 0);\r
   }\r
-  for (i = 0x30; i < 0xB8; i++) {\r
+  for (i = 0x30; i < 0xA0; i++) {\r
+    ym2612_write_local(2, i, 0);\r
+    ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
+  }\r
+  for (i = 0xAF; i >= 0xA0; i--) { // must apply backwards\r
+    ym2612_write_local(2, i, 0);\r
+    ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
+    ym2612_write_local(0, i, 0);\r
+    ym2612_write_local(1, ym2612.REGS[i], 0);\r
+  }\r
+  for (i = 0xB0; i < 0xB8; i++) {\r
+    ym2612_write_local(0, i, 0);\r
+    ym2612_write_local(1, ym2612.REGS[i], 0);\r
     ym2612_write_local(2, i, 0);\r
     ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
   }\r
@@ -952,7 +964,10 @@ void ym2612_unpack_state(void)
   else\r
 #endif\r
     ret = YM2612PicoStateLoad2(&tat, &tbt);\r
-  if (ret != 0) return; // no saved timers\r
+  if (ret != 0) {\r
+    elprintf(EL_STATUS, "old ym2612 state");\r
+    return; // no saved timers\r
+  }\r
 \r
   tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
   tbc = (256  - ym2612.OPN.ST.TB) << 16;\r

diff --git a/Pico/sound/ym2612.c b/Pico/sound/ym2612.c
index 625864c..294d621 100644 (file)
--- a/Pico/sound/ym2612.c
+++ b/Pico/sound/ym2612.c
@@ -889,7 +889,7 @@ static void chan_render_loop(chan_rend_context *ct, int *buffer, int length)
                {\r
                        int out = 0;\r
 \r
-                       if (ct->pack&0xf000) out = ((ct->op1_out>>16) + (ct->op1_out<<16>>16)) << ((ct->pack&0xf000)>>12); /* op1_out0 + op1_out1 */\r
+                       if (ct->pack&0xf000) out = ((ct->op1_out>>16) + ((ct->op1_out<<16)>>16)) << ((ct->pack&0xf000)>>12); /* op1_out0 + op1_out1 */\r
                        ct->op1_out <<= 16;\r
                        ct->op1_out |= (unsigned short)op_calc1(ct->phase1, eg_out, out);\r
                } else {\r
@@ -1293,6 +1293,7 @@ static void reset_channels(FM_CH *CH)
                        CH[c].SLOT[s].state= EG_OFF;\r
                        CH[c].SLOT[s].volume = MAX_ATT_INDEX;\r
                }\r
+               CH[c].mem_value = CH[c].op1_out = 0;\r
        }\r
        ym2612.slot_mask = 0;\r
 }\r
@@ -1481,17 +1482,17 @@ static int OPNWriteReg(int r, int v)
                set_ar_ksr(CH,SLOT,v);\r
                break;\r
 \r
-       case 0x60:      /* bit7 = AM ENABLE, DR */\r
+       case 0x60:      /* bit7 = AM ENABLE, DR | depends on ksr */\r
                set_dr(SLOT,v);\r
                if(v&0x80) CH->AMmasks |=   1<<OPN_SLOT(r);\r
                else       CH->AMmasks &= ~(1<<OPN_SLOT(r));\r
                break;\r
 \r
-       case 0x70:      /*     SR */\r
+       case 0x70:      /*     SR | depends on ksr */\r
                set_sr(SLOT,v);\r
                break;\r
 \r
-       case 0x80:      /* SL, RR */\r
+       case 0x80:      /* SL, RR | depends on ksr */\r
                set_sl_rr(SLOT,v);\r
                break;\r
 \r
@@ -1502,7 +1503,7 @@ static int OPNWriteReg(int r, int v)
 \r
        case 0xa0:\r
                switch( OPN_SLOT(r) ){\r
-               case 0:         /* 0xa0-0xa2 : FNUM1 */\r
+               case 0:         /* 0xa0-0xa2 : FNUM1 | depends on fn_h (below) */\r
                        {\r
                                UINT32 fn = (((UINT32)( (ym2612.OPN.ST.fn_h)&7))<<8) + v;\r
                                UINT8 blk = ym2612.OPN.ST.fn_h>>3;\r
@@ -1530,7 +1531,7 @@ static int OPNWriteReg(int r, int v)
                                ym2612.OPN.SL3.kcode[c]= (blk<<2) | opn_fktable[fn >> 7];\r
                                /* phase increment counter */\r
                                ym2612.OPN.SL3.fc[c] = fn_table[fn*2]>>(7-blk);\r
-                               ym2612.OPN.SL3.block_fnum[c] = fn;\r
+                               ym2612.OPN.SL3.block_fnum[c] = (blk<<11) | fn;\r
                                ym2612.CH[2].SLOT[SLOT1].Incr=-1;\r
                        }\r
                        break;\r
@@ -1872,6 +1873,7 @@ void YM2612PicoStateLoad_(void)
        ym2612.slot_mask = 0xffffff;\r
 }\r
 \r
+/* rather stupid design because I wanted to fit in unused register "space" */\r
 typedef struct\r
 {\r
        UINT32  state_phase;\r
@@ -1887,20 +1889,54 @@ typedef struct
        UINT8   unused;\r
        int     TAT;\r
        int     TBT;\r
-       UINT32  eg_cnt;\r
+       UINT32  eg_cnt;         // 10\r
        UINT32  eg_timer;\r
        UINT32  lfo_cnt;\r
        UINT16  lfo_ampm;\r
-       UINT16  unused2;\r
+       UINT8   fn_h;\r
+       UINT8   fn_h_sl3;\r
+       UINT32  keyon_field;    // 20\r
+       UINT32  kcode_fc_sl3_3;\r
 } ym_save_addon;\r
 \r
+typedef struct\r
+{\r
+       UINT16  block_fnum[6];\r
+       UINT16  block_fnum_sl3[3];\r
+       UINT16  unused;\r
+} ym_save_addon2;\r
+\r
+\r
+//static YM2612 check_ym;\r
+\r
 void YM2612PicoStateSave2(int tat, int tbt)\r
 {\r
        ym_save_addon_slot ss;\r
+       ym_save_addon2 sa2;\r
        ym_save_addon sa;\r
        unsigned char *ptr;\r
        int c, s;\r
 \r
+       refresh_fc_eg_chan( &ym2612.CH[0] );\r
+       refresh_fc_eg_chan( &ym2612.CH[1] );\r
+       if( (ym2612.OPN.ST.mode & 0xc0) )\r
+       {\r
+               /* 3SLOT MODE */\r
+               if( ym2612.CH[2].SLOT[SLOT1].Incr==-1)\r
+               {\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT1], ym2612.OPN.SL3.fc[1], ym2612.OPN.SL3.kcode[1] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT2], ym2612.OPN.SL3.fc[2], ym2612.OPN.SL3.kcode[2] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT3], ym2612.OPN.SL3.fc[0], ym2612.OPN.SL3.kcode[0] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT4], ym2612.CH[2].fc , ym2612.CH[2].kcode );\r
+               }\r
+       } else refresh_fc_eg_chan( &ym2612.CH[2] );\r
+       refresh_fc_eg_chan( &ym2612.CH[3] );\r
+       refresh_fc_eg_chan( &ym2612.CH[4] );\r
+       refresh_fc_eg_chan( &ym2612.CH[5] );\r
+\r
+       memset(&sa, 0, sizeof(sa));\r
+//memcpy(&check_ym, &ym2612, sizeof(ym2612));\r
+\r
        // chans 1,2,3\r
        ptr = &ym2612.REGS[0x0b8];\r
        for (c = 0; c < 3; c++)\r
@@ -1908,9 +1944,12 @@ void YM2612PicoStateSave2(int tat, int tbt)
                for (s = 0; s < 4; s++) {\r
                        ss.state_phase = (ym2612.CH[c].SLOT[s].state << 29) | (ym2612.CH[c].SLOT[s].phase >> 3);\r
                        ss.volume = ym2612.CH[c].SLOT[s].volume;\r
+                       if (ym2612.CH[c].SLOT[s].key)\r
+                               sa.keyon_field |= 1 << (c*4 + s);\r
                        memcpy(ptr, &ss, 6);\r
                        ptr += 6;\r
                }\r
+               sa2.block_fnum[c] = ym2612.CH[c].block_fnum;\r
        }\r
        // chans 4,5,6\r
        ptr = &ym2612.REGS[0x1b8];\r
@@ -1919,10 +1958,20 @@ void YM2612PicoStateSave2(int tat, int tbt)
                for (s = 0; s < 4; s++) {\r
                        ss.state_phase = (ym2612.CH[c].SLOT[s].state << 29) | (ym2612.CH[c].SLOT[s].phase >> 3);\r
                        ss.volume = ym2612.CH[c].SLOT[s].volume;\r
+                       if (ym2612.CH[c].SLOT[s].key)\r
+                               sa.keyon_field |= 1 << (c*4 + s);\r
                        memcpy(ptr, &ss, 6);\r
                        ptr += 6;\r
                }\r
+               sa2.block_fnum[c] = ym2612.CH[c].block_fnum;\r
        }\r
+       for (c = 0; c < 3; c++)\r
+       {\r
+               sa2.block_fnum_sl3[c] = ym2612.OPN.SL3.block_fnum[c];\r
+       }\r
+\r
+       memcpy(&ym2612.REGS[0], &sa2, sizeof(sa2)); // 0x20 max\r
+\r
        // other things\r
        ptr = &ym2612.REGS[0x100];\r
        sa.magic = 0x41534d59; // 'YMSA'\r
@@ -1936,21 +1985,28 @@ void YM2612PicoStateSave2(int tat, int tbt)
        sa.eg_timer = ym2612.OPN.eg_timer;\r
        sa.lfo_cnt  = ym2612.OPN.lfo_cnt;\r
        sa.lfo_ampm = g_lfo_ampm;\r
-       sa.unused2  = 0;\r
+       sa.fn_h     = ym2612.REGS[0xa4] = ym2612.OPN.ST.fn_h;\r
+       sa.fn_h_sl3 = ym2612.REGS[0xac] = ym2612.OPN.SL3.fn_h;\r
        memcpy(ptr, &sa, sizeof(sa)); // 0x30 max\r
 }\r
 \r
 int YM2612PicoStateLoad2(int *tat, int *tbt)\r
 {\r
        ym_save_addon_slot ss;\r
+       ym_save_addon2 sa2;\r
        ym_save_addon sa;\r
        unsigned char *ptr;\r
+       UINT32 fn;\r
+       UINT8 blk;\r
        int c, s;\r
 \r
        ptr = &ym2612.REGS[0x100];\r
        memcpy(&sa, ptr, sizeof(sa)); // 0x30 max\r
        if (sa.magic != 0x41534d59) return -1;\r
 \r
+       ptr = &ym2612.REGS[0];\r
+       memcpy(&sa2, ptr, sizeof(sa2));\r
+\r
        ym2612.OPN.ST.address = sa.address;\r
        ym2612.OPN.ST.status = sa.status;\r
        ym2612.addr_A1 = sa.addr_A1;\r
@@ -1970,8 +2026,17 @@ int YM2612PicoStateLoad2(int *tat, int *tbt)
                        ym2612.CH[c].SLOT[s].state = ss.state_phase >> 29;\r
                        ym2612.CH[c].SLOT[s].phase = ss.state_phase << 3;\r
                        ym2612.CH[c].SLOT[s].volume = ss.volume;\r
+                       ym2612.CH[c].SLOT[s].key = (sa.keyon_field & (1 << (c*4 + s))) ? 1 : 0;\r
+                       ym2612.CH[c].SLOT[s].ksr = (UINT8)-1;\r
+//ym2612.CH[c].SLOT[s].Incr = check_ym.CH[c].SLOT[s].Incr;\r
                        ptr += 6;\r
                }\r
+               ym2612.CH[c].SLOT[SLOT1].Incr=-1;\r
+               ym2612.CH[c].block_fnum = sa2.block_fnum[c];\r
+               fn = ym2612.CH[c].block_fnum & 0x7ff;\r
+               blk = ym2612.CH[c].block_fnum >> 11;\r
+               ym2612.CH[c].kcode= (blk<<2) | opn_fktable[fn >> 7];\r
+               ym2612.CH[c].fc = fn_table[fn*2]>>(7-blk);\r
        }\r
        // chans 4,5,6\r
        ptr = &ym2612.REGS[0x1b8];\r
@@ -1982,10 +2047,85 @@ int YM2612PicoStateLoad2(int *tat, int *tbt)
                        ym2612.CH[c].SLOT[s].state = ss.state_phase >> 29;\r
                        ym2612.CH[c].SLOT[s].phase = ss.state_phase << 3;\r
                        ym2612.CH[c].SLOT[s].volume = ss.volume;\r
+                       ym2612.CH[c].SLOT[s].key = (sa.keyon_field & (1 << (c*4 + s))) ? 1 : 0;\r
+                       ym2612.CH[c].SLOT[s].ksr = (UINT8)-1;\r
+//ym2612.CH[c].SLOT[s].Incr = check_ym.CH[c].SLOT[s].Incr;\r
                        ptr += 6;\r
                }\r
+               ym2612.CH[c].SLOT[SLOT1].Incr=-1;\r
+               ym2612.CH[c].block_fnum = sa2.block_fnum[c];\r
+               fn = ym2612.CH[c].block_fnum & 0x7ff;\r
+               blk = ym2612.CH[c].block_fnum >> 11;\r
+               ym2612.CH[c].kcode= (blk<<2) | opn_fktable[fn >> 7];\r
+               ym2612.CH[c].fc = fn_table[fn*2]>>(7-blk);\r
+       }\r
+       for (c = 0; c < 3; c++)\r
+       {\r
+               ym2612.OPN.SL3.block_fnum[c] = sa2.block_fnum_sl3[c];\r
+               fn = ym2612.OPN.SL3.block_fnum[c] & 0x7ff;\r
+               blk = ym2612.OPN.SL3.block_fnum[c] >> 11;\r
+               ym2612.OPN.SL3.kcode[c]= (blk<<2) | opn_fktable[fn >> 7];\r
+               ym2612.OPN.SL3.fc[c] = fn_table[fn*2]>>(7-blk);\r
        }\r
 \r
+#if 0\r
+       refresh_fc_eg_chan( &ym2612.CH[0] );\r
+       refresh_fc_eg_chan( &ym2612.CH[1] );\r
+       if( (ym2612.OPN.ST.mode & 0xc0) )\r
+       {\r
+               /* 3SLOT MODE */\r
+               if( ym2612.CH[2].SLOT[SLOT1].Incr==-1)\r
+               {\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT1], ym2612.OPN.SL3.fc[1], ym2612.OPN.SL3.kcode[1] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT2], ym2612.OPN.SL3.fc[2], ym2612.OPN.SL3.kcode[2] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT3], ym2612.OPN.SL3.fc[0], ym2612.OPN.SL3.kcode[0] );\r
+                       refresh_fc_eg_slot(&ym2612.CH[2].SLOT[SLOT4], ym2612.CH[2].fc , ym2612.CH[2].kcode );\r
+               }\r
+       } else refresh_fc_eg_chan( &ym2612.CH[2] );\r
+       refresh_fc_eg_chan( &ym2612.CH[3] );\r
+       refresh_fc_eg_chan( &ym2612.CH[4] );\r
+       refresh_fc_eg_chan( &ym2612.CH[5] );\r
+\r
+       for (c = 0; c < 6; c++)\r
+       {\r
+               for (s = 0; s < 4; s++)\r
+               {\r
+                       int i;\r
+                       unsigned char *chk = ((unsigned char *) &check_ym.CH[c].SLOT[s]);\r
+                       unsigned char *res = ((unsigned char *) &ym2612.CH[c].SLOT[s]);\r
+\r
+                       for (i = 0; i < sizeof(check_ym.CH[0].SLOT[0]); i++)\r
+                       {\r
+                               if (i != 0x0c && chk[i] != res[i])\r
+                                       printf("ch[%i].slot[%i].%03x: %02x vs %02x\n", c, s, i, chk[i], res[i]);\r
+                       }\r
+               }\r
+\r
+               {\r
+                       int i;\r
+                       unsigned char *chk = ((unsigned char *) &check_ym.CH[c].ALGO);\r
+                       unsigned char *res = ((unsigned char *) &ym2612.CH[c].ALGO);\r
+\r
+                       for (i = 0; i < 8*4; i++)\r
+                       {\r
+                               if ((i < 4 || i > 0x0b) && chk[i] != res[i])\r
+                                       printf("ch[%i].%03x: %02x vs %02x\n", c, i, chk[i], res[i]);\r
+                       }\r
+               }\r
+       }\r
+\r
+       for (c = 0; c < sizeof(ym2612.OPN); c++)\r
+       {\r
+               unsigned char *chk = ((unsigned char *) &check_ym.OPN);\r
+               unsigned char *res = ((unsigned char *) &ym2612.OPN);\r
+\r
+               if (chk[c] != res[c])\r
+               {\r
+                       printf("OPN: %03x: %02x vs %02x\n", c, chk[c], res[c]);\r
+               }\r
+       }\r
+#endif\r
+\r
        return 0;\r
 }\r
 \r

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index 07f4198..ed4910c 100644 (file)
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -30,7 +30,7 @@ typedef struct
 \r
        /* Phase Generator */\r
        UINT32  phase;          /* #0x0c phase counter | need_save */\r
-       UINT32  Incr;           /* #0x10 phase step | need_save */\r
+       UINT32  Incr;           /* #0x10 phase step */\r
 \r
        UINT8   KSR;            /* #0x14 key scale rate  :3-KSR */\r
        UINT8   ksr;            /* #0x15 key scale rate  :kcode>>(3-KSR) */\r
@@ -54,16 +54,16 @@ typedef struct
 {\r
        FM_SLOT SLOT[4];        /* four SLOTs (operators) */\r
 \r
-       UINT8   ALGO;           /* algorithm */\r
+       UINT8   ALGO;           /* +00 algorithm */\r
        UINT8   FB;             /* feedback shift */\r
        INT32   op1_out;        /* op1 output for feedback */\r
 \r
-       INT32   mem_value;      /* delayed sample (MEM) value */\r
+       INT32   mem_value;      /* +08 delayed sample (MEM) value */\r
 \r
        INT32   pms;            /* channel PMS */\r
        UINT8   ams;            /* channel AMS */\r
 \r
-       UINT8   kcode;          /* key code:                        */\r
+       UINT8   kcode;          /* +11 key code:                        */\r
        UINT32  fc;             /* fnum,blk:adjusted to sample rate */\r
        UINT32  block_fnum;     /* current blk/fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */\r
 \r