mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
1.20 release
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@57 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
860c6322c3
commit
68cba51e20
8 changed files with 93 additions and 53 deletions
|
|
@ -31,6 +31,7 @@ void mp3_update(int *buffer, int length, int stereo);
|
|||
// enable_ym2612&dac, enable_sn76496, enable_z80, stereo_sound,
|
||||
// alt_renderer, 6button_gamepad, accurate_timing, accurate_sprites,
|
||||
// draw_no_32col_border, external_ym2612, enable_pcm, enable cdda
|
||||
// enable_cdgfx, cd_perfect_sync
|
||||
extern int PicoOpt;
|
||||
extern int PicoVer;
|
||||
extern int PicoSkipFrame; // skip rendering frame, but still do sound (if enabled) and emulation stuff
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ typedef unsigned int u32;
|
|||
//#define __debug_io2
|
||||
//#define rdprintf dprintf
|
||||
#define rdprintf(...)
|
||||
//#define wrdprintf dprintf
|
||||
#define wrdprintf(...)
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
|
@ -698,11 +699,11 @@ u8 PicoReadS68k8(u32 a)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
int bank;
|
||||
wrdprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff];
|
||||
wrdprintf("ret = %02x", (u8)d);
|
||||
|
|
@ -781,11 +782,11 @@ u16 PicoReadS68k16(u32 a)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
int bank;
|
||||
wrdprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
|
||||
wrdprintf("ret = %04x", d);
|
||||
|
|
@ -871,11 +872,11 @@ u32 PicoReadS68k32(u32 a)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
int bank;
|
||||
wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];
|
||||
wrdprintf("ret = %08x", d);
|
||||
|
|
@ -972,12 +973,13 @@ void PicoWriteS68k8(u32 a,u8 d)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
// Wing Commander tries to write here in wrong mode
|
||||
int bank;
|
||||
if (d)
|
||||
wrdprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
*(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d;
|
||||
return;
|
||||
|
|
@ -1051,12 +1053,12 @@ void PicoWriteS68k16(u32 a,u16 d)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
int bank;
|
||||
if (d)
|
||||
wrdprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
*(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d;
|
||||
return;
|
||||
|
|
@ -1136,13 +1138,13 @@ void PicoWriteS68k32(u32 a,u32 d)
|
|||
}
|
||||
|
||||
// word RAM (1M area)
|
||||
if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff
|
||||
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff
|
||||
int bank;
|
||||
u16 *pm;
|
||||
if (d)
|
||||
wrdprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);
|
||||
if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
// if (!(Pico_mcd->s68k_regs[3]&4))
|
||||
// dprintf("s68k_wram1M FIXME: wrong mode");
|
||||
bank = !(Pico_mcd->s68k_regs[3]&1);
|
||||
pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));
|
||||
pm[0]=(u16)(d>>16); pm[1]=(u16)d;
|
||||
|
|
|
|||
|
|
@ -83,6 +83,46 @@ static __inline void SekRunS68k(int cyc)
|
|||
#endif
|
||||
}
|
||||
|
||||
#define PS_STEP_M68K 8
|
||||
#define PS_STEP_S68K 13
|
||||
|
||||
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
|
||||
{
|
||||
int cyc_do_m68k, cyc_do_s68k, it=0;
|
||||
int cyc_done_m68k=0, cyc_done_s68k=0;
|
||||
SekCycleAim+=cyc_m68k;
|
||||
SekCycleAimS68k+=cyc_s68k;
|
||||
cyc_do_m68k=SekCycleAim-SekCycleCnt;
|
||||
cyc_do_s68k=SekCycleAimS68k-SekCycleCntS68k;
|
||||
while (cyc_done_m68k < cyc_do_m68k || cyc_done_s68k < cyc_do_s68k) {
|
||||
it++;
|
||||
if (cyc_done_m68k < cyc_do_m68k && it*PS_STEP_M68K > cyc_done_m68k) {
|
||||
#if defined(EMU_C68K)
|
||||
PicoCpu.cycles = PS_STEP_M68K;
|
||||
CycloneRun(&PicoCpu);
|
||||
cyc_done_m68k += PS_STEP_M68K - PicoCpu.cycles;
|
||||
#elif defined(EMU_M68K)
|
||||
m68k_set_context(&PicoM68kCPU);
|
||||
cyc_done_m68k += m68k_execute(PS_STEP_M68K);
|
||||
#endif
|
||||
} //else dprintf("m68k skipping it #%i", it);
|
||||
if (cyc_done_s68k < cyc_do_s68k && it*PS_STEP_S68K > cyc_done_s68k) {
|
||||
#if defined(EMU_C68K)
|
||||
PicoCpuS68k.cycles = PS_STEP_S68K;
|
||||
CycloneRun(&PicoCpuS68k);
|
||||
cyc_done_s68k += PS_STEP_S68K - PicoCpuS68k.cycles;
|
||||
#elif defined(EMU_M68K)
|
||||
m68k_set_context(&PicoS68kCPU);
|
||||
cyc_done_s68k += m68k_execute(PS_STEP_S68K);
|
||||
#endif
|
||||
} //else dprintf("s68k skipping it #%i", it);
|
||||
}
|
||||
SekCycleCnt += cyc_done_m68k;
|
||||
SekCycleCntS68k += cyc_done_s68k;
|
||||
//dprintf("== end SekRunPS, it=%i ==", it);
|
||||
}
|
||||
|
||||
|
||||
static __inline void check_cd_dma(void)
|
||||
{
|
||||
int ddx;
|
||||
|
|
@ -230,23 +270,12 @@ static int PicoFrameHintsMCD(void)
|
|||
// Run scanline:
|
||||
//dprintf("m68k starting exec @ %06x", SekPc);
|
||||
if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
|
||||
SekRun(cycles_68k);
|
||||
if ((Pico_mcd->m.busreq&3) == 1) { // no busreq/no reset
|
||||
#if 0
|
||||
int i;
|
||||
FILE *f = fopen("prg_ram.bin", "wb");
|
||||
for (i = 0; i < 0x80000; i+=2)
|
||||
{
|
||||
int tmp = Pico_mcd->prg_ram[i];
|
||||
Pico_mcd->prg_ram[i] = Pico_mcd->prg_ram[i+1];
|
||||
Pico_mcd->prg_ram[i+1] = tmp;
|
||||
}
|
||||
fwrite(Pico_mcd->prg_ram, 1, 0x80000, f);
|
||||
fclose(f);
|
||||
exit(1);
|
||||
#endif
|
||||
//dprintf("s68k starting exec @ %06x", SekPcS68k);
|
||||
SekRunS68k(cycles_s68k);
|
||||
if((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) {
|
||||
SekRunPS(cycles_68k, cycles_s68k); // "perfect sync"
|
||||
} else {
|
||||
SekRun(cycles_68k);
|
||||
if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset
|
||||
SekRunS68k(cycles_s68k);
|
||||
}
|
||||
|
||||
if((PicoOpt&4) && Pico.m.z80Run) {
|
||||
|
|
|
|||
|
|
@ -48,10 +48,11 @@ void pcm_write(unsigned int a, unsigned int d)
|
|||
|
||||
void pcm_set_rate(int rate)
|
||||
{
|
||||
double step = 31.8 * 1024.0 / (double) rate; // max <4 @ 8000Hz
|
||||
float step = 31.8 * 1024.0 / (float) rate; // max <4 @ 8000Hz
|
||||
step *= 256*256/4;
|
||||
g_rate = (unsigned int) step;
|
||||
printf("g_rate: %08x\n", g_rate);
|
||||
if (step - (float) g_rate >= 0.5) g_rate++;
|
||||
printf("g_rate: %f %08x\n", (double)step, g_rate);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -82,7 +83,7 @@ void pcm_update(int *buffer, int length, int stereo)
|
|||
mul_l = ((int)ch->regs[0] * (ch->regs[1] & 0xf)) >> (5+1); // (env * pan) >> 5
|
||||
mul_r = ((int)ch->regs[0] * (ch->regs[1] >> 4)) >> (5+1);
|
||||
step = ((unsigned int)(*(unsigned short *)&ch->regs[2]) * g_rate) >> 14; // freq step
|
||||
// printf("step=%i, cstep=%i, mul_l=%i, mul_r=%i, ch=%i, addr=%x, en=%02x\n",
|
||||
// fprintf(stderr, "step=%i, cstep=%i, mul_l=%i, mul_r=%i, ch=%i, addr=%x, en=%02x\n",
|
||||
// *(unsigned short *)&ch->regs[2], step, mul_l, mul_r, i, addr, Pico_mcd->pcm.enabled);
|
||||
|
||||
if (!stereo && mul_l < mul_r) mul_l = mul_r;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue