static int PsndBuffer[2*44100/50];\r
\r
// dac\r
-static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
+static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
\r
// cdda output buffer\r
short cdda_out_buffer[2*1152];\r
int PsndLen=0; // number of mono samples, multiply by 2 for stereo\r
int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60\r
int PsndLen_exc_cnt=0;\r
+int PsndDacLine=0;\r
short *PsndOut=NULL; // PCM data buffer\r
\r
+// timers\r
+int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
+int timer_b_next_oflow, timer_b_step;\r
+\r
// sn76496\r
extern int *sn76496_regs;\r
\r
{\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
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
if (PsndLen_exc_add) len++;\r
dac_info[224] = (pos<<4)|len;\r
}\r
+ mid = (dac_info[lines-1] & 0xfff0) + ((dac_info[lines-1] & 0xf) << 4);\r
+ for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)\r
+ dac_info[i] = mid;\r
//for(i=len=0; i < lines; i++) {\r
// printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);\r
// len+=dac_info[i]&0xf;\r
// also clear the internal registers+addr line\r
ym2612_regs = YM2612GetRegs();\r
memset(ym2612_regs, 0, 0x200+4);\r
- z80startCycle = z80stopCycle = 0;\r
+ timers_reset();\r
\r
PsndRerate(0);\r
}\r
if (preserve_state) {\r
// feed it back it's own registers, just like after loading state\r
memcpy(YM2612GetRegs(), state, 0x200);\r
- YM2612PicoStateLoad();\r
+ ym2612_unpack_state();\r
if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
cdda_start_play();\r
}\r
\r
// set mixer\r
PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
+\r
+ if (PicoAHW & PAHW_PICO)\r
+ PicoReratePico();\r
}\r
\r
\r
-// This is called once per raster (aka line), but not necessarily for every line\r
-PICO_INTERNAL void Psnd_timers_and_dac(int raster)\r
+PICO_INTERNAL void PsndDoDAC(int line_to)\r
{\r
- int pos, len;\r
- int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;\r
-// int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);\r
+ int pos, pos1, len;\r
+ int dout = ym2612.dacout;\r
+ int line_from = PsndDacLine;\r
\r
- // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)\r
- YM2612PicoTick(1);\r
+ PsndDacLine = line_to + 1;\r
\r
- if (!do_dac /*&& !do_pcm*/) return;\r
-\r
- pos=dac_info[raster], len=pos&0xf;\r
+ pos =dac_info[line_from]>>4;\r
+ pos1=dac_info[line_to];\r
+ len = ((pos1>>4)-pos) + (pos1&0xf);\r
if (!len) return;\r
\r
- pos>>=4;\r
-\r
- if (do_dac)\r
- {\r
+ if (PicoOpt & POPT_EN_STEREO) {\r
short *d = PsndOut + pos*2;\r
- int dout = *ym2612_dacout;\r
- if(PicoOpt&POPT_EN_STEREO) {\r
- // some manual loop unrolling here :)\r
- d[0] = dout;\r
- if (len > 1) {\r
- d[2] = dout;\r
- if (len > 2)\r
- d[4] = dout;\r
- }\r
- } else {\r
- short *d = PsndOut + pos;\r
- d[0] = dout;\r
- if (len > 1) {\r
- d[1] = dout;\r
- if (len > 2)\r
- d[2] = dout;\r
- }\r
- }\r
+ for (; len > 0; len--, d+=2) *d = dout;\r
+ } else {\r
+ short *d = PsndOut + pos;\r
+ for (; len > 0; len--, d++) *d = dout;\r
}\r
\r
#if 0\r
cdda_stream = Pico_mcd->TOC.Tracks[i].F;\r
PicoCDBufferFlush(); // buffering relies on fp not being touched\r
pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET);\r
+ if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_WAV)\r
+ {\r
+ // skip headers, assume it's 44kHz stereo uncompressed\r
+ pm_seek(cdda_stream, 44, SEEK_CUR);\r
+ }\r
}\r
\r
\r
if (PicoOpt & POPT_EN_PSG)\r
SN76496Update(PsndOut+offset, length, stereo);\r
\r
+ if (PicoAHW & PAHW_PICO) {\r
+ PicoPicoPCMUpdate(PsndOut+offset, length, stereo);\r
+ return length;\r
+ }\r
+\r
// Add in the stereo FM buffer\r
if (PicoOpt & POPT_EN_FM) {\r
buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);\r
// -----------------------------------------------------------------\r
// z80 stuff\r
\r
-\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
\r
// memhandlers for mz80 core\r
unsigned char mz80_read(UINT32 a, struct MemoryReadByte *w) { return z80_read(a); }\r
return mz80GetElapsedTicks(0) - ticks_pre;\r
}\r
\r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+\r
+#ifdef _USE_DRZ80\r
\r
struct DrZ80 drZ80;\r
\r
drZ80.Z80SP_BASE = (unsigned int) Pico.zram;\r
return drZ80.Z80SP_BASE + a;\r
}\r
-\r
-static void DrZ80_irq_callback()\r
-{\r
- drZ80.Z80_IRQ = 0; // lower irq when accepted\r
-}\r
#endif\r
\r
#if defined(_USE_DRZ80) || defined(_USE_CZ80)\r
// z80 functionality wrappers\r
PICO_INTERNAL void z80_init(void)\r
{\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
struct mz80context z80;\r
\r
// z80\r
z80.z80IoWrite=mz80_io_write;\r
\r
mz80SetContext(&z80);\r
-\r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+#ifdef _USE_DRZ80\r
memset(&drZ80, 0, sizeof(struct DrZ80));\r
drZ80.z80_rebasePC=DrZ80_rebasePC;\r
drZ80.z80_rebaseSP=DrZ80_rebaseSP;\r
drZ80.z80_read8 =z80_read;\r
- drZ80.z80_read16 =z80_read16;\r
+ drZ80.z80_read16 =NULL;\r
drZ80.z80_write8 =z80_write;\r
- drZ80.z80_write16 =z80_write16;\r
+ drZ80.z80_write16 =NULL;\r
drZ80.z80_in =z80_in;\r
drZ80.z80_out =z80_out;\r
- drZ80.z80_irq_callback=DrZ80_irq_callback;\r
-\r
-#elif defined(_USE_CZ80)\r
+ drZ80.z80_irq_callback=NULL;\r
+#endif\r
+#ifdef _USE_CZ80\r
memset(&CZ80, 0, sizeof(CZ80));\r
Cz80_Init(&CZ80);\r
Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM\r
\r
PICO_INTERNAL void z80_reset(void)\r
{\r
-#if defined(_USE_MZ80)\r
+#ifdef _USE_MZ80\r
mz80reset();\r
-#elif defined(_USE_DRZ80)\r
+#endif\r
+#ifdef _USE_DRZ80\r
memset(&drZ80, 0, 0x54);\r
drZ80.Z80F = (1<<2); // set ZFlag\r
drZ80.Z80F2 = (1<<2); // set ZFlag\r
drZ80.Z80IX = 0xFFFF << 16;\r
drZ80.Z80IY = 0xFFFF << 16;\r
drZ80.Z80IM = 0; // 1?\r
+ drZ80.z80irqvector = 0xff0000; // RST 38h\r
drZ80.Z80PC = drZ80.z80_rebasePC(0);\r
drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?\r
-#elif defined(_USE_CZ80)\r
+#endif\r
+#ifdef _USE_CZ80\r
Cz80_Reset(&CZ80);\r
Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);\r
Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);\r
Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled\r
}\r
\r
+#if 0\r
+static int had_irq = 0, z80_ppc, z80_ops_done = 0;\r
+int z80_cycles_left = 0;\r
+\r
+void z80_int(void)\r
+{\r
+ had_irq = 1;\r
+}\r
+\r
+static void xfail(void)\r
+{\r
+ printf("PC: %04x, %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC), z80_ppc);\r
+ printf("z80_ops_done done: %i\n", z80_ops_done);\r
+ exit(1);\r
+}\r
+\r
+int z80_run(int cycles)\r
+{\r
+ int fail = 0;\r
+ int cdrz, ccz;\r
+\r
+ z80_cycles_left = cycles;\r
+ z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+\r
+ if (had_irq) {\r
+ printf("irq @ %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC));\r
+ Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);\r
+ drZ80.Z80_IRQ = 1;\r
+ had_irq = 0;\r
+ }\r
+\r
+ while (z80_cycles_left > 0)\r
+ {\r
+ ccz = Cz80_Exec(&CZ80, 1);\r
+ cdrz = 1 - DrZ80Run(&drZ80, 1);\r
+\r
+ if (drZ80.Z80_IRQ && (drZ80.Z80IF&1))\r
+ cdrz += 1 - DrZ80Run(&drZ80, 1); // cz80 processes IRQ after EI, DrZ80 does not\r
+\r
+ if (cdrz != ccz) {\r
+ printf("cycles: %i vs %i\n", cdrz, ccz);\r
+ fail = 1;\r
+ }\r
+\r
+ if (drZ80.Z80PC - drZ80.Z80PC_BASE != Cz80_Get_Reg(&CZ80, CZ80_PC)) {\r
+ printf("PC: %04x vs %04x\n", drZ80.Z80PC - drZ80.Z80PC_BASE, Cz80_Get_Reg(&CZ80, CZ80_PC));\r
+ fail = 1;\r
+ }\r
+\r
+ if (fail) xfail();\r
+\r
+ z80_ops_done++;\r
+ z80_cycles_left -= ccz;\r
+ z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+ }\r
+\r
+ return co - z80_cycles_left;\r
+}\r
+#endif\r
+\r
\r
PICO_INTERNAL void z80_pack(unsigned char *data)\r
{\r
notaz.gp2x.de / picodrive.git / blobdiff