timers implemented for new z80 mode

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

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 45d9fdf..fb6b99c 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -706,6 +706,53 @@ static int get_scanline(int is_from_z80)
   return vcounts[SekCyclesDone()>>8];\r
 }\r
 \r
+/* probably not should be in this file, but it's near related code here */\r
+void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)\r
+{\r
+  int xcycles = z80_cycles << 8;\r
+\r
+  /* check for overflows */\r
+  if ((mode_old & 4) && xcycles > timer_a_next_oflow)\r
+    ym2612.OPN.ST.status |= 1;\r
+\r
+  if ((mode_old & 8) && xcycles > timer_b_next_oflow)\r
+    ym2612.OPN.ST.status |= 2;\r
+\r
+  /* update timer a */\r
+  if (mode_old & 1)\r
+    while (xcycles >= timer_a_next_oflow)\r
+      timer_a_next_oflow += timer_a_step;\r
+\r
+  if ((mode_old ^ mode_new) & 1) // turning on/off\r
+  {\r
+    if (mode_old & 1) {\r
+      timer_a_offset = timer_a_next_oflow - xcycles;\r
+      timer_a_next_oflow = 0x70000000;\r
+    }\r
+    else\r
+      timer_a_next_oflow = xcycles + timer_a_offset;\r
+  }\r
+  if (mode_new & 1)\r
+    elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles);\r
+\r
+  /* update timer b */\r
+  if (mode_old & 2)\r
+    while (xcycles >= timer_b_next_oflow)\r
+      timer_b_next_oflow += timer_b_step;\r
+\r
+  if ((mode_old ^ mode_new) & 2)\r
+  {\r
+    if (mode_old & 2) {\r
+      timer_b_offset = timer_b_next_oflow - xcycles;\r
+      timer_b_next_oflow = 0x70000000;\r
+    }\r
+    else\r
+      timer_b_next_oflow = xcycles + timer_b_offset;\r
+  }\r
+  if (mode_new & 2)\r
+    elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);\r
+}\r
+\r
 // ym2612 DAC and timer I/O handlers for z80\r
 int ym2612_write_local(u32 a, u32 d, int is_from_z80)\r
 {\r
@@ -752,12 +799,12 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             //ym2612.OPN.ST.TAC = (1024-TAnew)*18;\r
             //ym2612.OPN.ST.TAT = 0;\r
             //\r
-            timer_a_step = 16495 * (1024 - TAnew);\r
-            if ((ym2612.OPN.ST.mode & 5) == 5) {\r
+            timer_a_step = timer_a_offset = 16495 * (1024 - TAnew);\r
+            if (ym2612.OPN.ST.mode & 1) {\r
               int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
               timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
-              //elprintf(EL_STATUS, "set to %i @ %i", timer_a_next_oflow>>8, cycles);\r
             }\r
+            elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, timer_a_next_oflow>>8);\r
           }\r
           return 0;\r
         }\r
@@ -768,36 +815,36 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             //ym2612.OPN.ST.TBC  = (256-d)<<4;\r
             //ym2612.OPN.ST.TBC *= 18;\r
             //ym2612.OPN.ST.TBT  = 0;\r
+            timer_b_step = timer_b_offset = 263912 * (256 - d);\r
+            if (ym2612.OPN.ST.mode & 2) {\r
+              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
+              timer_b_next_oflow = (cycles << 8) + timer_b_step;\r
+            }\r
+            elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, timer_b_next_oflow>>8);\r
           }\r
           return 0;\r
         case 0x27: { /* mode, timer control */\r
           int old_mode = ym2612.OPN.ST.mode;\r
-          int xcycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
-          xcycles <<= 8;\r
+          int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
+          ym2612.OPN.ST.mode = d;\r
 \r
-          //elprintf(EL_STATUS, "st mode %02x", d);\r
+          elprintf(EL_YMTIMER, "st mode %02x", d);\r
+          ym2612_sync_timers(cycles, old_mode, d);\r
 \r
-          if ((ym2612.OPN.ST.mode & 5) != 5 && (d & 5) == 5) {\r
-            timer_a_next_oflow = xcycles + timer_a_step;\r
-            //elprintf(EL_STATUS, "set to %i @ %i st", timer_a_next_oflow>>8, xcycles >> 8);\r
-          }\r
+          /* reset Timer a flag */\r
+          if (d & 0x10)\r
+            ym2612.OPN.ST.status &= ~1;\r
 \r
           /* reset Timer b flag */\r
           if (d & 0x20)\r
             ym2612.OPN.ST.status &= ~2;\r
 \r
-          /* reset Timer a flag */\r
-          if (d & 0x10) {\r
-            if (ym2612.OPN.ST.status & 1)\r
-              while (xcycles > timer_a_next_oflow)\r
-                timer_a_next_oflow += timer_a_step;\r
-            ym2612.OPN.ST.status &= ~1;\r
-          }\r
-          if (!(d & 5)) timer_a_next_oflow = 0x80000000;\r
-          ym2612.OPN.ST.mode = d;\r
+          if ((d ^ old_mode) & 0xc0) {\r
 #ifdef __GP2X__\r
-          if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+            if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));\r
 #endif\r
+            return 1;\r
+          }\r
           return 0;\r
         }\r
         case 0x2b: { /* DAC Sel  (YM2612) */\r
@@ -836,16 +883,33 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   return YM2612Write_(a, d);\r
 }\r
 \r
-// TODO: timer b, 68k side + asm, savestates\r
+// TODO: savestates\r
+#define ym2612_read_local() \\r
+  if (xcycles >= timer_a_next_oflow) \\r
+    ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \\r
+  if (xcycles >= timer_b_next_oflow) \\r
+    ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2\r
+\r
+\r
 u32 ym2612_read_local_z80(void)\r
 {\r
   int xcycles = z80_cyclesDone() << 8;\r
-  if (timer_a_next_oflow != 0x80000000 && xcycles >= timer_a_next_oflow) {\r
-    ym2612.OPN.ST.status |= 1;\r
-  }\r
 \r
-  //elprintf(EL_STATUS, "timer %i, sched %i, @ %i|%i", ym2612.OPN.ST.status, timer_a_next_oflow>>8,\r
-  //     xcycles >> 8, (xcycles >> 8) / 228);\r
+  ym2612_read_local();\r
+\r
+  elprintf(EL_YMTIMER, "timer z80 read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,\r
+      timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);\r
+  return ym2612.OPN.ST.status;\r
+}\r
+\r
+u32 ym2612_read_local_68k(void)\r
+{\r
+  int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 8;\r
+\r
+  ym2612_read_local();\r
+\r
+  elprintf(EL_YMTIMER, "timer 68k read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,\r
+      timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);\r
   return ym2612.OPN.ST.status;\r
 }\r
 \r
@@ -869,13 +933,13 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
     addr68k=Pico.m.z80_bank68k<<15;\r
     addr68k+=a&0x7fff;\r
 \r
+    if (addr68k < Pico.romsize) { ret = Pico.rom[addr68k^1]; goto bnkend; }\r
+    elprintf(EL_ANOMALY, "z80->68k upper read [%06x] %02x", addr68k, ret);\r
     if (PicoAHW & PAHW_MCD)\r
          ret = PicoReadM68k8(addr68k);\r
     else ret = PicoRead8(addr68k);\r
-    if (addr68k >= 0x400000) // not many games do this\r
-      { elprintf(EL_ANOMALY, "z80->68k upper read [%06x] %02x", addr68k, ret); }\r
-    else\r
-      { elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret); }\r
+bnkend:\r
+    elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);\r
     return ret;\r
   }\r
 \r

diff --git a/Pico/Memory.s b/Pico/Memory.s
index dbe76ac..04d062f 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -389,11 +389,7 @@ m_read8_misc2:
     ldr     r1, =PicoOpt\r
     ldr     r1, [r1]\r
     tst     r1, #1\r
-\r
-    ldrne   r1, =ym2612_st\r
-    ldrne   r1, [r1]\r
-    ldrneb  r0, [r1, #0x11]   @ ym2612_st->status\r
-    bxne    lr\r
+    bne     ym2612_read_local_68k\r
 \r
 m_read8_fake_ym2612:\r
     ldr     r3, =(Pico+0x22200)\r

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index 2cf8e8d..4b5620d 100644 (file)
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -114,9 +114,8 @@ u32 OtherRead16(u32 a, int realsize)
       elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc);
     if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
     if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
-      if(PicoOpt&POPT_EN_FM) d=YM2612Read();
+      if (PicoOpt&POPT_EN_FM) d=ym2612_read_local_68k();
       else d=Pico.m.rotate++&3;
-      elprintf(EL_YM2612R, "read ym2612: %02x", d);
       goto end;
     }
     elprintf(EL_ANOMALY, "68k bad read [%06x]", a);

diff --git a/Pico/Memory_amips.s b/Pico/Memory_amips.s
index 4ad7cd3..5a6b768 100644 (file)
--- a/Pico/Memory_amips.s
+++ b/Pico/Memory_amips.s
@@ -421,12 +421,8 @@ m_read8_z80_misc:
     lui     $t0, %hi(PicoOpt)
     lw      $t0, %lo(PicoOpt)($t0)
     andi    $t0, 1
-    beqz    $t0, m_read8_fake_ym2612
-    lui     $t0, %hi(Pico+0x22208)
-    lui     $t0, %hi(ym2612_st)
-    lw      $t0, %lo(ym2612_st)($t0)
-    jr      $ra
-    lb      $v0, 0x11($t0)
+    bnez    $t0, ym2612_read_local_68k
+    nop
 
 m_read8_fake_ym2612:
     lb      $v0, %lo(Pico+0x22208)($t0) # Pico.m.rotate

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 8525198..bf5c46d 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -431,6 +431,7 @@ PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 \r
 // Pico/Memory.c\r
 PICO_INTERNAL void PicoMemSetupPico(void);\r
+PICO_INTERNAL unsigned int ym2612_read_local_68k(void);\r
 \r
 // Pico.c\r
 extern struct Pico Pico;\r
@@ -474,13 +475,23 @@ PICO_INTERNAL void cdda_start_play();
 extern short cdda_out_buffer[2*1152];\r
 extern int PsndLen_exc_cnt;\r
 extern int PsndLen_exc_add;\r
-extern int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
+extern int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles\r
+extern int timer_b_next_oflow, timer_b_step, timer_b_offset;\r
+\r
+void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);\r
 \r
 #define timers_cycle() \\r
-  if (timer_a_next_oflow > 0) timer_a_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256\r
+  if (timer_a_next_oflow > 0 && timer_a_next_oflow < 0x70000000) \\r
+    timer_a_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256; \\r
+  if (timer_b_next_oflow > 0 && timer_b_next_oflow < 0x70000000) \\r
+    timer_b_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256; \\r
+  ym2612_sync_timers(0, ym2612.OPN.ST.mode, ym2612.OPN.ST.mode);\r
 \r
 #define timers_reset() \\r
-  timer_a_next_oflow = 0x80000000\r
+  timer_a_next_oflow = timer_b_next_oflow = 0x70000000; \\r
+  timer_a_step = timer_a_offset = 16495 * 1024; \\r
+  timer_b_step = timer_b_offset = 263912 * 256;\r
+\r
 \r
 // VideoPort.c\r
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);\r
@@ -528,7 +539,7 @@ extern int PsndDacLine;
 #define EL_HVCNT   0x00000001 /* hv counter reads */\r
 #define EL_SR      0x00000002 /* SR reads */\r
 #define EL_INTS    0x00000004 /* ints and acks */\r
-#define EL_YM2612R 0x00000008 /* 68k ym2612 reads */\r
+#define EL_YMTIMER 0x00000008 /* ym2612 timer stuff */\r
 #define EL_INTSW   0x00000010 /* log irq switching on/off */\r
 #define EL_ASVDP   0x00000020 /* VDP accesses during active scan */\r
 #define EL_VDPDMA  0x00000040 /* VDP DMA transfers and their timing */\r

diff --git a/Pico/carthw/svp/compiler.c b/Pico/carthw/svp/compiler.c
index 551794e..2db22b1 100644 (file)
--- a/Pico/carthw/svp/compiler.c
+++ b/Pico/carthw/svp/compiler.c
@@ -1763,6 +1763,7 @@ void *ssp_translate_block(int pc)
                fwrite(tcache, 1, (tcache_ptr - tcache)*4, f);
                fclose(f);
        }
+       printf("dumped tcache.bin\n");
        exit(0);
 #endif
 

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index bd61c2b..0bb6116 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -2,7 +2,7 @@
 
 
 #include "../PicoInt.h"
-
+#include "../sound/ym2612.h"
 
 extern unsigned char formatted_bram[4*0x10];
 extern unsigned int s68k_poll_adclk;

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 6c7c6d8..4bc9292 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -35,8 +35,8 @@ int PsndDacLine=0;
 short *PsndOut=NULL; // PCM data buffer\r
 \r
 // timers\r
-int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
-//int\r
+int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles\r
+int timer_b_next_oflow, timer_b_step, timer_b_offset;\r
 \r
 // sn76496\r
 extern int *sn76496_regs;\r
@@ -46,13 +46,15 @@ static void dac_recalculate(void)
 {\r
   int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;\r
 \r
-  if(PsndLen <= lines) {\r
+  if (PsndLen <= lines)\r
+  {\r
     // shrinking algo\r
     dac_cnt = -PsndLen;\r
     len=1; pos=0;\r
     dac_info[225] = 1;\r
 \r
-    for(i=226; i != 225; i++) {\r
+    for(i=226; i != 225; i++)\r
+    {\r
       if (i >= lines) i = 0;\r
       len = 0;\r
       if(dac_cnt < 0) {\r
@@ -63,11 +65,14 @@ static void dac_recalculate(void)
       dac_cnt -= PsndLen;\r
       dac_info[i] = (pos<<4)|len;\r
     }\r
-  } else {\r
+  }\r
+  else\r
+  {\r
     // stretching\r
     dac_cnt = PsndLen;\r
     pos=0;\r
-    for(i = 225; i != 224; i++) {\r
+    for(i = 225; i != 224; i++)\r
+    {\r
       if (i >= lines) i = 0;\r
       len=0;\r
       while(dac_cnt >= 0) {\r

diff --git a/Pico/sound/ym2612.c b/Pico/sound/ym2612.c
index b9749f2..34dabec 100644 (file)
--- a/Pico/sound/ym2612.c
+++ b/Pico/sound/ym2612.c
@@ -1584,8 +1584,6 @@ static int OPNWriteReg(int r, int v)
 /*      YM2612 local section                                                   */\r
 /*******************************************************************************/\r
 \r
-FM_ST *ym2612_st;\r
-\r
 /* Generate samples for YM2612 */\r
 int YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty)\r
 {\r
@@ -1650,9 +1648,6 @@ int YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty)
 /* initialize YM2612 emulator */\r
 void YM2612Init_(int clock, int rate)\r
 {\r
-       // notaz\r
-       ym2612_st = &ym2612.OPN.ST;\r
-\r
        memset(&ym2612, 0, sizeof(ym2612));\r
        init_tables();\r
 \r

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index 39c3cf6..a1124de 100644 (file)
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -141,35 +141,16 @@ typedef struct
 } YM2612;\r
 #endif\r
 \r
-extern FM_ST *ym2612_st;\r
 #ifndef EXTERNAL_YM2612\r
 extern YM2612 ym2612;\r
 #endif\r
 \r
-#define YM2612Read() ym2612_st->status\r
-\r
-#define YM2612PicoTick(n) \\r
-{ \\r
-       /* timer A */ \\r
-       if(ym2612_st->mode & 0x01 && (ym2612_st->TAT+=64*n) >= ym2612_st->TAC) { \\r
-               ym2612_st->TAT -= ym2612_st->TAC; \\r
-               if(ym2612_st->mode & 0x04) ym2612_st->status |= 1; \\r
-       } \\r
- \\r
-       /* timer B */ \\r
-       if(ym2612_st->mode & 0x02 && (ym2612_st->TBT+=64*n) >= ym2612_st->TBC) { \\r
-               ym2612_st->TBT -= ym2612_st->TBC; \\r
-               if(ym2612_st->mode & 0x08) ym2612_st->status |= 2; \\r
-       } \\r
-}\r
-\r
-\r
 void YM2612Init_(int baseclock, int rate);\r
 void YM2612ResetChip_(void);\r
 int  YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty);\r
 \r
 int  YM2612Write_(unsigned int a, unsigned int v);\r
-unsigned char YM2612Read_(void);\r
+//unsigned char YM2612Read_(void);\r
 \r
 int  YM2612PicoTick_(int n);\r
 void YM2612PicoStateLoad_(void);\r

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index 9b07a13..283cd8d 100644 (file)
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -24,7 +24,7 @@
       .extern PicoRead8\r
       .extern Pico\r
       .extern z80_write\r
-      .extern ym2612_st\r
+      .extern ym2612_read_local_z80\r
 .endif\r
 \r
 DrZ80Ver: .long 0x0001\r

diff --git a/platform/gp2x/940ctl.h b/platform/gp2x/940ctl.h
index 0318c1c..3251282 100644 (file)
--- a/platform/gp2x/940ctl.h
+++ b/platform/gp2x/940ctl.h
@@ -6,7 +6,6 @@ void YM2612ResetChip_940(void);
 int  YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty);\r
 \r
 int  YM2612Write_940(unsigned int a, unsigned int v, int scanline);\r
-unsigned char YM2612Read_940(void);\r
 \r
 int  YM2612PicoTick_940(int n);\r
 void YM2612PicoStateLoad_940(void);\r