X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=aa2acb2e4c75e761d3a32a1bbc26a408ed0edb6d;hb=88b3d7c16ae976d332b8462de839b86f856a7180;hp=ac37c614c769b8adec3dac8639067a86d0dee8de;hpb=5f8c85be2aa0b7ea93e8b041c80996eaedaf715b;p=picodrive.git diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c index ac37c61..aa2acb2 100644 --- a/Pico/sound/sound.c +++ b/Pico/sound/sound.c @@ -15,6 +15,8 @@ #include "../../cpu/mz80/mz80.h" #elif defined(_USE_DRZ80) #include "../../cpu/DrZ80/drz80.h" +#elif defined(_USE_CZ80) +#include "../../cpu/cz80/cz80.h" #endif #include "../PicoInt.h" @@ -99,23 +101,21 @@ static void dac_recalculate(void) } -PICO_INTERNAL void sound_reset(void) +PICO_INTERNAL void PsndReset(void) { void *ym2612_regs; // also clear the internal registers+addr line ym2612_regs = YM2612GetRegs(); memset(ym2612_regs, 0, 0x200+4); - // setting these to 0 might confuse timing code, - // so better set to something like this instead - z80startCycle = z80stopCycle = 0x01000000; + z80startCycle = z80stopCycle = 0; - sound_rerate(0); + PsndRerate(0); } // to be called after changing sound rate or chips -void sound_rerate(int preserve_state) +void PsndRerate(int preserve_state) { void *state = NULL; int target_fps = Pico.m.pal ? 50 : 60; @@ -163,12 +163,12 @@ void sound_rerate(int preserve_state) // clear all buffers memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4); if (PsndOut) - sound_clear(); + PsndClear(); } // This is called once per raster (aka line), but not necessarily for every line -PICO_INTERNAL void sound_timers_and_dac(int raster) +PICO_INTERNAL void Psnd_timers_and_dac(int raster) { int pos, len; int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen; @@ -216,16 +216,22 @@ PICO_INTERNAL void sound_timers_and_dac(int raster) } -PICO_INTERNAL void sound_clear(void) +PICO_INTERNAL void PsndClear(void) { int len = PsndLen; if (PsndLen_exc_add) len++; - if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once - else memset(PsndOut, 0, len<<1); + if (PicoOpt & 8) + 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; + } } -PICO_INTERNAL int sound_render(int offset, int length) +PICO_INTERNAL int PsndRender(int offset, int length) { int buf32_updated = 0; int *buf32 = PsndBuffer+offset; @@ -248,9 +254,9 @@ PICO_INTERNAL int sound_render(int offset, int length) SN76496Update(PsndOut+offset, length, stereo); // Add in the stereo FM buffer - if (PicoOpt & 1) { + if (PicoOpt & 1) buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1); - } else + else memset32(buf32, 0, length<s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) mp3_update(buf32, length, stereo); // convert + limit to normal 16bit output @@ -315,24 +322,26 @@ 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() { - elprintf(EL_ANOMALY, "Z80 port %04x read", p); - 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 write %02x", p, d); + 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 PICO_INTERNAL void z80_init(void) { @@ -354,7 +363,6 @@ PICO_INTERNAL void z80_init(void) mz80SetContext(&z80); #elif defined(_USE_DRZ80) - memset(&drZ80, 0, sizeof(struct DrZ80)); drZ80.z80_rebasePC=DrZ80_rebasePC; drZ80.z80_rebaseSP=DrZ80_rebaseSP; @@ -362,9 +370,19 @@ PICO_INTERNAL void z80_init(void) 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 - 0x2000); // mirror + Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read); + Cz80_Set_WriteB(&CZ80, z80_write); + Cz80_Set_INPort(&CZ80, z80_in); + Cz80_Set_OUTPort(&CZ80, z80_out); #endif } @@ -381,6 +399,8 @@ PICO_INTERNAL void z80_reset(void) drZ80.Z80IM = 0; // 1? drZ80.Z80PC = drZ80.z80_rebasePC(0); drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ? +#elif defined(_USE_CZ80) + Cz80_Reset(&CZ80); #endif Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled } @@ -399,6 +419,8 @@ PICO_INTERNAL void z80_int(void) #elif defined(_USE_DRZ80) drZ80.z80irqvector = 0xFF; // default IRQ vector RST opcode drZ80.Z80_IRQ = 1; +#elif defined(_USE_CZ80) + Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE); #endif } @@ -411,6 +433,8 @@ PICO_INTERNAL int z80_run(int cycles) return mz80GetElapsedTicks(0) - ticks_pre; #elif defined(_USE_DRZ80) return cycles - DrZ80Run(&drZ80, cycles); +#elif defined(_USE_CZ80) + return Cz80_Exec(&CZ80, cycles); #else return cycles; #endif @@ -428,13 +452,17 @@ PICO_INTERNAL 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 } 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); @@ -444,7 +472,7 @@ PICO_INTERNAL 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); @@ -454,6 +482,14 @@ PICO_INTERNAL 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 } @@ -464,11 +500,13 @@ PICO_INTERNAL void z80_exit(void) #endif } -#if defined(__DEBUG_PRINT) || defined(__GP2X__) +#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__) PICO_INTERNAL void z80_debug(char *dstr) { #if defined(_USE_DRZ80) 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