X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=e2967421a9804fc88b0b2be92be1f285f6af476b;hb=07abbab17a9baab5eeabe30767b0336326049994;hp=6c7c6d8757c1a070f1af4bc3cc65b7b4c449e0ed;hpb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 6c7c6d8..e296742 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -35,8 +35,8 @@ int PsndDacLine=0;
 short *PsndOut=NULL; // PCM data buffer
 
 // timers
-int timer_a_next_oflow, timer_a_step; // in z80 cycles
-//int
+int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles
+int timer_b_next_oflow, timer_b_step, timer_b_offset;
 
 // sn76496
 extern int *sn76496_regs;
@@ -46,13 +46,15 @@ static void dac_recalculate(void)
 {
   int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;
 
-  if(PsndLen <= lines) {
+  if (PsndLen <= lines)
+  {
     // shrinking algo
     dac_cnt = -PsndLen;
     len=1; pos=0;
     dac_info[225] = 1;
 
-    for(i=226; i != 225; i++) {
+    for(i=226; i != 225; i++)
+    {
       if (i >= lines) i = 0;
       len = 0;
       if(dac_cnt < 0) {
@@ -63,11 +65,14 @@ static void dac_recalculate(void)
       dac_cnt -= PsndLen;
       dac_info[i] = (pos<<4)|len;
     }
-  } else {
+  }
+  else
+  {
     // stretching
     dac_cnt = PsndLen;
     pos=0;
-    for(i = 225; i != 224; i++) {
+    for(i = 225; i != 224; i++)
+    {
       if (i >= lines) i = 0;
       len=0;
       while(dac_cnt >= 0) {
@@ -88,8 +93,9 @@ static void dac_recalculate(void)
     if (PsndLen_exc_add) len++;
     dac_info[224] = (pos<<4)|len;
   }
+  mid = (dac_info[lines-1] & 0xfff0) + ((dac_info[lines-1] & 0xf) << 4);
   for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)
-    dac_info[i] = 0;
+    dac_info[i] = mid;
   //for(i=len=0; i < lines; i++) {
   //  printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);
   //  len+=dac_info[i]&0xf;
@@ -134,7 +140,7 @@ void PsndRerate(int preserve_state)
   if (preserve_state) {
     // feed it back it's own registers, just like after loading state
     memcpy(YM2612GetRegs(), state, 0x200);
-    YM2612PicoStateLoad();
+    ym2612_unpack_state();
     if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
       cdda_start_play();
   }
@@ -360,8 +366,7 @@ PICO_INTERNAL int PsndRender(int offset, int length)
 // -----------------------------------------------------------------
 //                            z80 stuff
 
-
-#if defined(_USE_MZ80)
+#ifdef _USE_MZ80
 
 // memhandlers for mz80 core
 unsigned char mz80_read(UINT32 a,  struct MemoryReadByte *w)  { return z80_read(a); }
@@ -392,7 +397,9 @@ int mz80_run(int cycles)
   return mz80GetElapsedTicks(0) - ticks_pre;
 }
 
-#elif defined(_USE_DRZ80)
+#endif
+
+#ifdef _USE_DRZ80
 
 struct DrZ80 drZ80;
 
@@ -407,11 +414,6 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
   drZ80.Z80SP_BASE = (unsigned int) Pico.zram;
   return drZ80.Z80SP_BASE + a;
 }
-
-static void DrZ80_irq_callback()
-{
-  drZ80.Z80_IRQ = 0; // lower irq when accepted
-}
 #endif
 
 #if defined(_USE_DRZ80) || defined(_USE_CZ80)
@@ -431,7 +433,7 @@ static void z80_out(unsigned short p,unsigned char d)
 // z80 functionality wrappers
 PICO_INTERNAL void z80_init(void)
 {
-#if defined(_USE_MZ80)
+#ifdef _USE_MZ80
   struct mz80context z80;
 
   // z80
@@ -447,20 +449,20 @@ PICO_INTERNAL void z80_init(void)
   z80.z80IoWrite=mz80_io_write;
 
   mz80SetContext(&z80);
-
-#elif defined(_USE_DRZ80)
+#endif
+#ifdef _USE_DRZ80
   memset(&drZ80, 0, sizeof(struct DrZ80));
   drZ80.z80_rebasePC=DrZ80_rebasePC;
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;
   drZ80.z80_read8   =z80_read;
-  drZ80.z80_read16  =z80_read16;
+  drZ80.z80_read16  =NULL;
   drZ80.z80_write8  =z80_write;
-  drZ80.z80_write16 =z80_write16;
+  drZ80.z80_write16 =NULL;
   drZ80.z80_in      =z80_in;
   drZ80.z80_out     =z80_out;
-  drZ80.z80_irq_callback=DrZ80_irq_callback;
-
-#elif defined(_USE_CZ80)
+  drZ80.z80_irq_callback=NULL;
+#endif
+#ifdef _USE_CZ80
   memset(&CZ80, 0, sizeof(CZ80));
   Cz80_Init(&CZ80);
   Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
@@ -474,18 +476,21 @@ PICO_INTERNAL void z80_init(void)
 
 PICO_INTERNAL void z80_reset(void)
 {
-#if defined(_USE_MZ80)
+#ifdef _USE_MZ80
   mz80reset();
-#elif defined(_USE_DRZ80)
+#endif
+#ifdef _USE_DRZ80
   memset(&drZ80, 0, 0x54);
   drZ80.Z80F  = (1<<2);  // set ZFlag
   drZ80.Z80F2 = (1<<2);  // set ZFlag
   drZ80.Z80IX = 0xFFFF << 16;
   drZ80.Z80IY = 0xFFFF << 16;
   drZ80.Z80IM = 0; // 1?
+  drZ80.z80irqvector = 0xff0000; // RST 38h
   drZ80.Z80PC = drZ80.z80_rebasePC(0);
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
-#elif defined(_USE_CZ80)
+#endif
+#ifdef _USE_CZ80
   Cz80_Reset(&CZ80);
   Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);
   Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
@@ -494,6 +499,66 @@ PICO_INTERNAL void z80_reset(void)
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
+#if 0
+static int had_irq = 0, z80_ppc, z80_ops_done = 0;
+int z80_cycles_left = 0;
+
+void z80_int(void)
+{
+  had_irq = 1;
+}
+
+static void xfail(void)
+{
+  printf("PC: %04x, %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC), z80_ppc);
+  printf("z80_ops_done done: %i\n", z80_ops_done);
+  exit(1);
+}
+
+int  z80_run(int cycles)
+{
+  int fail = 0;
+  int cdrz, ccz;
+
+  z80_cycles_left = cycles;
+  z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);
+
+  if (had_irq) {
+    printf("irq @ %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC));
+    Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);
+    drZ80.Z80_IRQ = 1;
+    had_irq = 0;
+  }
+
+  while (z80_cycles_left > 0)
+  {
+    ccz = Cz80_Exec(&CZ80, 1);
+    cdrz = 1 - DrZ80Run(&drZ80, 1);
+
+    if (drZ80.Z80_IRQ && (drZ80.Z80IF&1))
+      cdrz += 1 - DrZ80Run(&drZ80, 1); // cz80 processes IRQ after EI, DrZ80 does not
+
+    if (cdrz != ccz) {
+      printf("cycles: %i vs %i\n", cdrz, ccz);
+      fail = 1;
+    }
+
+    if (drZ80.Z80PC - drZ80.Z80PC_BASE != Cz80_Get_Reg(&CZ80, CZ80_PC)) {
+      printf("PC: %04x vs %04x\n", drZ80.Z80PC - drZ80.Z80PC_BASE, Cz80_Get_Reg(&CZ80, CZ80_PC));
+      fail = 1;
+    }
+
+    if (fail) xfail();
+
+    z80_ops_done++;
+    z80_cycles_left -= ccz;
+    z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);
+  }
+
+  return co - z80_cycles_left;
+}
+#endif
+
 
 PICO_INTERNAL void z80_pack(unsigned char *data)
 {