X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=4bc92922a955837c1e5ea5072fdafe74288eaa36;hb=43e6eaad0b73b37907be3342e0fd4cf65919e9f6;hp=6ea966bb49b1a90e71f302f948a57a9f9cb712d5;hpb=4f265db77684ec33f9533e7c76734498df03bba4;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 6ea966b..4bc9292 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -1,65 +1,60 @@
 // This is part of Pico Library
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006,2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
 
 
 #include <string.h>
-#include "sound.h"
 #include "ym2612.h"
 #include "sn76496.h"
 
-#ifndef __GNUC__
-#pragma warning (disable:4244)
-#endif
-
-#if defined(_USE_MZ80)
-#include "../../cpu/mz80/mz80.h"
-#elif defined(_USE_DRZ80)
-#include "../../cpu/DrZ80/drz80.h"
-#endif
-
 #include "../PicoInt.h"
 #include "../cd/pcm.h"
 #include "mix.h"
 
+void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;
+
 // master int buffer to mix to
 static int PsndBuffer[2*44100/50];
 
-//int z80CycleAim = 0;
-
 // dac
-short *dac_out;
-unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
+static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
+
+// cdda output buffer
+short cdda_out_buffer[2*1152];
 
 // for Pico
 int PsndRate=0;
 int PsndLen=0; // number of mono samples, multiply by 2 for stereo
+int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60
+int PsndLen_exc_cnt=0;
+int PsndDacLine=0;
 short *PsndOut=NULL; // PCM data buffer
 
-// from ym2612.c
-extern int   *ym2612_dacen;
-extern INT32 *ym2612_dacout;
-void YM2612TimerHandler(int c,int cnt);
+// timers
+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;
 
 
-static void dac_recalculate()
+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 = 0;//lines - PsndLen;
+    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) {
@@ -70,11 +65,14 @@ static void dac_recalculate()
       dac_cnt -= PsndLen;
       dac_info[i] = (pos<<4)|len;
     }
-  } else {
+  }
+  else
+  {
     // stretching
-    dac_cnt = PsndLen/2;
+    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) {
@@ -92,113 +90,111 @@ static void dac_recalculate()
     }
     // last sample
     for(len = 0, i = pos; i < PsndLen; i++) len++;
+    if (PsndLen_exc_add) len++;
     dac_info[224] = (pos<<4)|len;
   }
-//  dprintf("rate is %i, len %i", PsndRate, PsndLen);
-//  for(i=0; i < lines; i++)
-//    dprintf("%03i : %03i : %i", i, dac_info[i]>>4, dac_info[i]&0xf);
-//exit(8);
+  for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)
+    dac_info[i] = 0;
+  //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;
+  //}
+  //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0));
+  //printf("len total: %i, last pos: %i\n", len, pos);
+  //exit(8);
 }
 
 
-void sound_reset()
+PICO_INTERNAL void PsndReset(void)
 {
-  extern int z80stopCycle;
   void *ym2612_regs;
 
-  // init even if we are not going to use them, just in case we ever enable it
-  YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
   // also clear the internal registers+addr line
   ym2612_regs = YM2612GetRegs();
   memset(ym2612_regs, 0, 0x200+4);
+  timers_reset();
 
-  SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);
-
-  // calculate PsndLen
-  PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);
-
-  // recalculate dac info
-  dac_recalculate();
-  z80stopCycle = 0;
+  PsndRerate(0);
 }
 
 
 // to be called after changing sound rate or chips
-void sound_rerate()
+void PsndRerate(int preserve_state)
 {
-  unsigned int state[28];
+  void *state = NULL;
+  int target_fps = Pico.m.pal ? 50 : 60;
 
-  // not all rates are supported in MCD mode due to mp3 decoder
-  if (PicoMCD & 1) {
+  // not all rates are supported in MCD mode due to mp3 decoder limitations
+  if (PicoAHW & PAHW_MCD) {
     if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;
-    if (!(PicoOpt & 8)) PicoOpt |= 8;
+    PicoOpt |= POPT_EN_STEREO; // force stereo
   }
 
-  if ((PicoMCD & 1) && Pico_mcd->m.audio_track) Pico_mcd->m.audio_offset = mp3_get_offset();
+  if (preserve_state) {
+    state = malloc(0x200);
+    if (state == NULL) return;
+    memcpy(state, YM2612GetRegs(), 0x200);
+  }
   YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
-  // feed it back it's own registers, just like after loading state
-  YM2612PicoStateLoad();
-  if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
-    mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+  if (preserve_state) {
+    // feed it back it's own registers, just like after loading state
+    memcpy(YM2612GetRegs(), state, 0x200);
+    YM2612PicoStateLoad();
+    if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+      cdda_start_play();
+  }
 
-  memcpy(state, sn76496_regs, 28*4); // remember old state
+  if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state
   SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);
-  memcpy(sn76496_regs, state, 28*4); // restore old state
+  if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state
+
+  if (state)
+    free(state);
 
   // calculate PsndLen
-  PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);
+  PsndLen=PsndRate / target_fps;
+  PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;
+  PsndLen_exc_cnt=0;
 
   // recalculate dac info
   dac_recalculate();
 
-  if (PicoMCD & 1)
+  if (PicoAHW & PAHW_MCD)
     pcm_set_rate(PsndRate);
+
+  // clear all buffers
+  memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);
+  memset(cdda_out_buffer, 0, sizeof(cdda_out_buffer));
+  if (PsndOut)
+    PsndClear();
+
+  // set mixer
+  PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;
+
+  if (PicoAHW & PAHW_PICO)
+    PicoReratePico();
 }
 
 
-// This is called once per raster (aka line), but not necessarily for every line
-void sound_timers_and_dac(int raster)
+PICO_INTERNAL void PsndDoDAC(int line_to)
 {
-  int pos, len;
-  int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;
-//  int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400);
+  int pos, pos1, len;
+  int dout = ym2612.dacout;
+  int line_from = PsndDacLine;
 
-  // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)
-  YM2612PicoTick(1);
+  PsndDacLine = line_to + 1;
 
-  if (!do_dac /*&& !do_pcm*/) return;
-
-  pos=dac_info[raster], len=pos&0xf;
+  pos =dac_info[line_from]>>4;
+  pos1=dac_info[line_to];
+  len = ((pos1>>4)-pos) + (pos1&0xf);
   if (!len) return;
 
-  pos>>=4;
-
-  if (do_dac) {
+  if (PicoOpt & POPT_EN_STEREO) {
     short *d = PsndOut + pos*2;
-    int dout = *ym2612_dacout;
-    if(PicoOpt&8) {
-      // some manual loop unrolling here :)
-      d[0] = dout;
-      if (len > 1) {
-        d[2] = dout;
-        if (len > 2) {
-          d[4] = dout;
-          if (len > 3)
-            d[6] = dout;
-        }
-      }
-    } else {
-      short *d = PsndOut + pos;
-      d[0] = dout;
-      if (len > 1) {
-        d[1] = dout;
-        if (len > 2) {
-          d[2] = dout;
-          if (len > 3)
-            d[3] = dout;
-        }
-      }
-    }
+    for (; len > 0; len--, d+=2) *d = dout;
+  } else {
+    short *d = PsndOut + pos;
+    for (; len > 0; len--, d++)  *d = dout;
   }
 
 #if 0
@@ -210,47 +206,165 @@ void sound_timers_and_dac(int raster)
 #endif
 }
 
+// cdda
+static pm_file *cdda_stream = NULL;
+
+static void cdda_raw_update(int *buffer, int length)
+{
+  int ret, cdda_bytes;
+  if (cdda_stream == NULL) return;
+
+  cdda_bytes = length*4;
+  if (PsndRate <= 22050) cdda_bytes *= 2;
+  if (PsndRate <  22050) cdda_bytes *= 2;
+
+  ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream);
+  if (ret < cdda_bytes) {
+    memset((char *)cdda_out_buffer + ret, 0, cdda_bytes - ret);
+    cdda_stream = NULL;
+    return;
+  }
+
+  // now mix
+  switch (PsndRate) {
+    case 44100: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break;
+    case 22050: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break;
+    case 11025: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break;
+  }
+}
+
+PICO_INTERNAL void cdda_start_play(void)
+{
+  int lba_offset, index, lba_length, i;
+
+  elprintf(EL_STATUS, "cdda play track #%i", Pico_mcd->scd.Cur_Track);
+
+  index = Pico_mcd->scd.Cur_Track - 1;
+
+  lba_offset = Pico_mcd->scd.Cur_LBA - Track_to_LBA(index + 1);
+  if (lba_offset < 0) lba_offset = 0;
+  lba_offset += Pico_mcd->TOC.Tracks[index].Offset;
+
+  // find the actual file for this track
+  for (i = index; i >= 0; i--)
+    if (Pico_mcd->TOC.Tracks[i].F != NULL) break;
+
+  if (Pico_mcd->TOC.Tracks[i].F == NULL) {
+    elprintf(EL_STATUS|EL_ANOMALY, "no track?!");
+    return;
+  }
+
+  if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_MP3)
+  {
+    int pos1024 = 0;
+
+    lba_length = Pico_mcd->TOC.Tracks[i].Length;
+    for (i++; i < Pico_mcd->TOC.Last_Track; i++) {
+      if (Pico_mcd->TOC.Tracks[i].F != NULL) break;
+      lba_length += Pico_mcd->TOC.Tracks[i].Length;
+    }
+
+    if (lba_offset)
+      pos1024 = lba_offset * 1024 / lba_length;
+
+    mp3_start_play(Pico_mcd->TOC.Tracks[index].F, pos1024);
+    return;
+  }
+
+  cdda_stream = Pico_mcd->TOC.Tracks[i].F;
+  PicoCDBufferFlush(); // buffering relies on fp not being touched
+  pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET);
+  if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_WAV)
+  {
+    // skip headers, assume it's 44kHz stereo uncompressed
+    pm_seek(cdda_stream, 44, SEEK_CUR);
+  }
+}
+
 
-void sound_clear(void)
+PICO_INTERNAL void PsndClear(void)
 {
-  if (PicoOpt & 8) memset32((int *) PsndOut, 0, PsndLen);
-  else memset(PsndOut, 0, PsndLen<<1);
-//  memset(PsndBuffer, 0, (PicoOpt & 8) ? (PsndLen<<3) : (PsndLen<<2));
+  int len = PsndLen;
+  if (PsndLen_exc_add) len++;
+  if (PicoOpt & POPT_EN_STEREO)
+    memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned
+  else {
+    short *out = PsndOut;
+    if ((int)out & 2) { *out++ = 0; len--; }
+    memset32((int *) out, 0, len/2);
+    if (len & 1) out[len-1] = 0;
+  }
 }
 
 
-int sound_render(int offset, int length)
+PICO_INTERNAL int PsndRender(int offset, int length)
 {
+  int  buf32_updated = 0;
   int *buf32 = PsndBuffer+offset;
   int stereo = (PicoOpt & 8) >> 3;
   // emulating CD && PCM option enabled && PCM chip on && have enabled channels
-  int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
+  int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) &&
+		(Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
   offset <<= stereo;
 
+#if !SIMPLE_WRITE_SOUND
+  if (offset == 0) { // should happen once per frame
+    // compensate for float part of PsndLen
+    PsndLen_exc_cnt += PsndLen_exc_add;
+    if (PsndLen_exc_cnt >= 0x10000) {
+      PsndLen_exc_cnt -= 0x10000;
+      length++;
+    }
+  }
+#endif
+
   // PSG
-  if (PicoOpt & 2)
+  if (PicoOpt & POPT_EN_PSG)
     SN76496Update(PsndOut+offset, length, stereo);
 
+  if (PicoAHW & PAHW_PICO) {
+    PicoPicoPCMUpdate(PsndOut+offset, length, stereo);
+    return length;
+  }
+
   // Add in the stereo FM buffer
-  if (PicoOpt & 1)
-    YM2612UpdateOne(buf32, length, stereo, 1);
+  if (PicoOpt & POPT_EN_FM) {
+    buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);
+  } else
+    memset32(buf32, 0, length<<stereo);
 
-  if (do_pcm)
+//printf("active_chs: %02x\n", buf32_updated);
+
+  // CD: PCM sound
+  if (do_pcm) {
     pcm_update(buf32, length, stereo);
+    //buf32_updated = 1;
+  }
 
-  // CDDA audio
-//  if ((PicoMCD & 1) && (PicoOpt & 0x800))
-//    mp3_update(PsndBuffer+offset, length, stereo);
+  // CD: CDDA audio
+  // CD mode, cdda enabled, not data track, CDC is reading
+  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&
+		!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+  {
+    // note: only 44, 22 and 11 kHz supported, with forced stereo
+    int index = Pico_mcd->scd.Cur_Track - 1;
+
+    if (Pico_mcd->TOC.Tracks[index].ftype == TYPE_MP3)
+      mp3_update(buf32, length, stereo);
+    else
+      cdda_raw_update(buf32, length);
+  }
 
   // convert + limit to normal 16bit output
-  if (stereo)
-       mix_32_to_16l_stereo(PsndOut+offset, buf32, length);
-  else mix_32_to_16_mono   (PsndOut+offset, buf32, length);
+  PsndMix_32_to_16l(PsndOut+offset, buf32, length);
 
-  return 0;
+  return length;
 }
 
 
+// -----------------------------------------------------------------
+//                            z80 stuff
+
 
 #if defined(_USE_MZ80)
 
@@ -276,9 +390,16 @@ static struct z80PortWrite mz80_io_write[]={
   {(UINT16) -1,(UINT16) -1,NULL}
 };
 
+int mz80_run(int cycles)
+{
+  int ticks_pre = mz80GetElapsedTicks(0);
+  mz80exec(cycles);
+  return mz80GetElapsedTicks(0) - ticks_pre;
+}
+
 #elif defined(_USE_DRZ80)
 
-static struct DrZ80 drZ80;
+struct DrZ80 drZ80;
 
 static unsigned int DrZ80_rebasePC(unsigned short a)
 {
@@ -292,24 +413,28 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
   return drZ80.Z80SP_BASE + a;
 }
 
-static unsigned char DrZ80_in(unsigned short p)
+static void DrZ80_irq_callback()
 {
-  return 0xff;
+  drZ80.Z80_IRQ = 0; // lower irq when accepted
 }
+#endif
 
-static void DrZ80_out(unsigned short p,unsigned char d)
+#if defined(_USE_DRZ80) || defined(_USE_CZ80)
+static unsigned char z80_in(unsigned short p)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x read", p);
+  return 0xff;
 }
 
-static void DrZ80_irq_callback()
+static void z80_out(unsigned short p,unsigned char d)
 {
-  drZ80.Z80_IRQ = 0; // lower irq when accepted
+  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);
 }
-
 #endif
 
+
 // z80 functionality wrappers
-void z80_init()
+PICO_INTERNAL void z80_init(void)
 {
 #if defined(_USE_MZ80)
   struct mz80context z80;
@@ -329,7 +454,6 @@ void z80_init()
   mz80SetContext(&z80);
 
 #elif defined(_USE_DRZ80)
-
   memset(&drZ80, 0, sizeof(struct DrZ80));
   drZ80.z80_rebasePC=DrZ80_rebasePC;
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;
@@ -337,13 +461,23 @@ void z80_init()
   drZ80.z80_read16  =z80_read16;
   drZ80.z80_write8  =z80_write;
   drZ80.z80_write16 =z80_write16;
-  drZ80.z80_in      =DrZ80_in;
-  drZ80.z80_out     =DrZ80_out;
+  drZ80.z80_in      =z80_in;
+  drZ80.z80_out     =z80_out;
   drZ80.z80_irq_callback=DrZ80_irq_callback;
+
+#elif defined(_USE_CZ80)
+  memset(&CZ80, 0, sizeof(CZ80));
+  Cz80_Init(&CZ80);
+  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // mirror
+  Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read); // unused (hacked in)
+  Cz80_Set_WriteB(&CZ80, z80_write);
+  Cz80_Set_INPort(&CZ80, z80_in);
+  Cz80_Set_OUTPort(&CZ80, z80_out);
 #endif
 }
 
-void z80_reset()
+PICO_INTERNAL void z80_reset(void)
 {
 #if defined(_USE_MZ80)
   mz80reset();
@@ -356,42 +490,17 @@ void z80_reset()
   drZ80.Z80IM = 0; // 1?
   drZ80.Z80PC = drZ80.z80_rebasePC(0);
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
+#elif defined(_USE_CZ80)
+  Cz80_Reset(&CZ80);
+  Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);
+  Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
+  Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
 #endif
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
-void z80_resetCycles()
-{
-#if defined(_USE_MZ80)
-  mz80GetElapsedTicks(1);
-#endif
-}
-
-void z80_int()
-{
-#if defined(_USE_MZ80)
-  mz80int(0);
-#elif defined(_USE_DRZ80)
-  drZ80.z80irqvector = 0xFF; // default IRQ vector RST opcode
-  drZ80.Z80_IRQ = 1;
-#endif
-}
 
-// returns number of cycles actually executed
-int z80_run(int cycles)
-{
-#if defined(_USE_MZ80)
-  int ticks_pre = mz80GetElapsedTicks(0);
-  mz80exec(cycles);
-  return mz80GetElapsedTicks(0) - ticks_pre;
-#elif defined(_USE_DRZ80)
-  return cycles - DrZ80Run(&drZ80, cycles);
-#else
-  return cycles;
-#endif
-}
-
-void z80_pack(unsigned char *data)
+PICO_INTERNAL void z80_pack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
   struct mz80context mz80;
@@ -403,13 +512,17 @@ void z80_pack(unsigned char *data)
   drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
   drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);
   memcpy(data+4, &drZ80, 0x54);
+#elif defined(_USE_CZ80)
+  *(int *)data = 0x00007a43; // "Cz"
+  *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC);
+  memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
 #endif
 }
 
-void z80_unpack(unsigned char *data)
+PICO_INTERNAL void z80_unpack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
-  if(*(int *)data == 0x00005A6D) { // "mZ" save?
+  if (*(int *)data == 0x00005A6D) { // "mZ" save?
     struct mz80context mz80;
     mz80GetContext(&mz80);
     memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4);
@@ -419,7 +532,7 @@ void z80_unpack(unsigned char *data)
     z80_int();
   }
 #elif defined(_USE_DRZ80)
-  if(*(int *)data == 0x015A7244) { // "DrZ" v1 save?
+  if (*(int *)data == 0x015A7244) { // "DrZ" v1 save?
     memcpy(&drZ80, data+4, 0x54);
     // update bases
     drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
@@ -429,21 +542,31 @@ void z80_unpack(unsigned char *data)
     drZ80.Z80IM = 1;
     z80_int(); // try to goto int handler, maybe we won't execute trash there?
   }
+#elif defined(_USE_CZ80)
+  if (*(int *)data == 0x00007a43) { // "Cz" save?
+    memcpy(&CZ80, data+8, (INT32)&CZ80.BasePC - (INT32)&CZ80);
+    Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4));
+  } else {
+    z80_reset();
+    z80_int();
+  }
 #endif
 }
 
-void z80_exit()
+PICO_INTERNAL void z80_exit(void)
 {
 #if defined(_USE_MZ80)
   mz80shutdown();
 #endif
 }
 
-#if defined(__DEBUG_PRINT) || defined(WIN32)
-void z80_debug(char *dstr)
+#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)
+PICO_INTERNAL void z80_debug(char *dstr)
 {
 #if defined(_USE_DRZ80)
-  sprintf(dstr, "%sZ80 state: PC: %04x SP: %04x\n", dstr, drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
+#elif defined(_USE_CZ80)
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W);
 #endif
 }
 #endif