#include "gfx_cd.h"\r
#include "pcm.h"\r
\r
-#include "cell_map.c"\r
-\r
typedef unsigned char u8;\r
typedef unsigned short u16;\r
typedef unsigned int u32;\r
\r
//#define __debug_io\r
//#define __debug_io2\r
+\r
//#define rdprintf dprintf\r
#define rdprintf(...)\r
//#define wrdprintf dprintf\r
// -----------------------------------------------------------------\r
\r
\r
+#ifndef _ASM_CD_MEMORY_C\r
static u32 m68k_reg_read16(u32 a)\r
{\r
u32 d=0;\r
dprintf("m68k FIXME: reserved read");\r
goto end;\r
case 0xC:\r
- dprintf("m68k stopwatch timer read");\r
d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ dprintf("m68k stopwatch timer read (%04x)", d);\r
goto end;\r
}\r
\r
// dprintf("ret = %04x", d);\r
return d;\r
}\r
+#endif\r
\r
-static void m68k_reg_write8(u32 a, u32 d)\r
+#ifndef _ASM_CD_MEMORY_C\r
+static\r
+#endif\r
+void m68k_reg_write8(u32 a, u32 d)\r
{\r
a &= 0x3f;\r
// dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc);\r
if ( (Pico_mcd->m.busreq&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1);\r
if ((Pico_mcd->m.state_flags&1) && (d&3)==1) {\r
SekResetS68k(); // S68k comes out of RESET or BRQ state\r
- Pico_mcd->m.state_flags&=~1;\r
- dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);\r
+ Pico_mcd->m.state_flags&=~1;\r
+ dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);\r
}\r
Pico_mcd->m.busreq = d;\r
return;\r
case 2:\r
Pico_mcd->s68k_regs[2] = d; // really use s68k side register\r
return;\r
- case 3:\r
+ case 3: {\r
+ u32 dold = Pico_mcd->s68k_regs[3]&0x1f;\r
dprintf("m68k_regs w3: %02x @%06x", (u8)d, SekPc);\r
d &= 0xc2;\r
- if ((Pico_mcd->s68k_regs[3]>>6) != ((d>>6)&3))\r
+ if ((dold>>6) != ((d>>6)&3))\r
dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));\r
//if ((Pico_mcd->s68k_regs[3]&4) != (d&4)) dprintf("m68k: ram mode %i mbit", (d&4) ? 1 : 2);\r
//if ((Pico_mcd->s68k_regs[3]&2) != (d&2)) dprintf("m68k: %s", (d&4) ? ((d&2) ? "word swap req" : "noop?") :\r
// ((d&2) ? "word ram to s68k" : "word ram to m68k"));\r
- d |= Pico_mcd->s68k_regs[3]&0x1d;\r
- if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode\r
- Pico_mcd->s68k_regs[3] = d; // really use s68k side register\r
+ if (dold & 4) {\r
+ d ^= 2; // writing 0 to DMNA actually sets it, 1 does nothing\r
+ } else {\r
+ //dold &= ~2; // ??\r
+ if (d & 2) dold &= ~1; // return word RAM to s68k in 2M mode\r
+ }\r
+ Pico_mcd->s68k_regs[3] = d | dold; // really use s68k side register\r
+\r
+/*\r
+ d |= Pico_mcd->s68k_regs[3]&0x1d;\r
+ if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode\r
+ Pico_mcd->s68k_regs[3] = d; // really use s68k side register\r
+*/\r
return;\r
+ }\r
case 6:\r
Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer\r
return;\r
}\r
\r
\r
-static u32 s68k_reg_read16(u32 a)\r
+#ifndef _ASM_CD_MEMORY_C\r
+static\r
+#endif\r
+u32 s68k_reg_read16(u32 a)\r
{\r
u32 d=0;\r
\r
goto end;\r
case 2:\r
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f);\r
- dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
+ dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);\r
goto end;\r
case 6:\r
d = CDC_Read_Reg();\r
d = Read_CDC_Host(1); // Gens returns 0 here on byte reads\r
goto end;\r
case 0xC:\r
- dprintf("s68k stopwatch timer read");\r
d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ dprintf("s68k stopwatch timer read (%04x)", d);\r
goto end;\r
case 0x30:\r
- dprintf("s68k int3 timer read");\r
+ dprintf("s68k int3 timer read (%02x%02x)", Pico_mcd->s68k_regs[30], Pico_mcd->s68k_regs[31]);\r
break;\r
case 0x34: // fader\r
d = 0; // no busy bit\r
return d;\r
}\r
\r
-static void s68k_reg_write8(u32 a, u32 d)\r
+#ifndef _ASM_CD_MEMORY_C\r
+static\r
+#endif\r
+void s68k_reg_write8(u32 a, u32 d)\r
{\r
//dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);\r
\r
// TODO: review against Gens\r
+ // Warning: d might have upper bits set\r
switch (a) {\r
case 2:\r
return; // only m68k can change WP\r
int dold = Pico_mcd->s68k_regs[3];\r
dprintf("s68k_regs w3: %02x @%06x", (u8)d, SekPc);\r
d &= 0x1d;\r
+ d |= dold&0xc2;\r
if (d&4) {\r
- d |= dold&0xc2;\r
- if ((d ^ dold) & 5) d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit\r
+ if ((d ^ dold) & 5) {\r
+ d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit\r
+#ifdef _ASM_CD_MEMORY_C\r
+ PicoMemResetCD(d);\r
+#endif\r
+ }\r
+#ifdef _ASM_CD_MEMORY_C\r
+ if ((d ^ dold) & 0x1d)\r
+ PicoMemResetCDdecode(d);\r
+#endif\r
if (!(dold & 4)) {\r
dprintf("wram mode 2M->1M");\r
wram_2M_to_1M(Pico_mcd->word_ram2M);\r
- }\r
+ }\r
} else {\r
- d |= Pico_mcd->s68k_regs[3]&0xc3;\r
- if (d&1) d &= ~2; // return word RAM to m68k in 2M mode\r
if (dold & 4) {\r
dprintf("wram mode 1M->2M");\r
+ if (!(d&1)) { // it didn't set the ret bit, which means it doesn't want to give WRAM to m68k\r
+ d &= ~3;\r
+ d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode\r
+ }\r
wram_1M_to_2M(Pico_mcd->word_ram2M);\r
- }\r
+#ifdef _ASM_CD_MEMORY_C\r
+ PicoMemResetCD(d);\r
+#endif\r
+ }\r
+ else\r
+ d |= dold&1;\r
+ if (d&1) d &= ~2; // return word RAM to m68k in 2M mode\r
}\r
break;\r
}\r
return;\r
case 0x31:\r
dprintf("s68k set int3 timer: %02x", d);\r
- Pico_mcd->m.timer_int3 = d << 16;\r
+ Pico_mcd->m.timer_int3 = (d & 0xff) << 16;\r
break;\r
case 0x33: // IRQ mask\r
dprintf("s68k irq mask: %02x", d);\r
}\r
\r
\r
-\r
+#ifndef _ASM_CD_MEMORY_C\r
static u32 OtherRead16End(u32 a, int realsize)\r
{\r
u32 d=0;\r
\r
#undef _ASM_MEMORY_C\r
#include "../MemoryCmn.c"\r
-\r
+#include "cell_map.c"\r
+#endif // !def _ASM_CD_MEMORY_C\r
\r
// -----------------------------------------------------------------\r
// Read Rom and read Ram\r
\r
-u8 PicoReadM68k8(u32 a)\r
+//u8 PicoReadM68k8_(u32 a);\r
+#ifdef _ASM_CD_MEMORY_C\r
+u8 PicoReadM68k8(u32 a);\r
+#else\r
+static u8 PicoReadM68k8(u32 a)\r
{\r
u32 d=0;\r
\r
if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
d = *(prg_bank+((a^1)&0x1ffff));\r
goto end;\r
}\r
\r
-#if 0\r
- if (a == 0x200000 && SekPc == 0xff0b66 && Pico.m.frame_count > 1000)\r
- {\r
- int i;\r
- FILE *ff;\r
- unsigned short *ram = (unsigned short *) Pico.ram;\r
- // unswap and dump RAM\r
- for (i = 0; i < 0x10000/2; i++)\r
- ram[i] = (ram[i]>>8) | (ram[i]<<8);\r
- ff = fopen("ram.bin", "wb");\r
- fwrite(ram, 1, 0x10000, ff);\r
- fclose(ff);\r
- exit(0);\r
- }\r
-#endif\r
-\r
// word RAM\r
if ((a&0xfc0000)==0x200000) {\r
wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);\r
#endif\r
return (u8)d;\r
}\r
+#endif\r
\r
\r
-u16 PicoReadM68k16(u32 a)\r
+#ifdef _ASM_CD_MEMORY_C\r
+u16 PicoReadM68k16(u32 a);\r
+#else\r
+static u16 PicoReadM68k16(u32 a)\r
{\r
u16 d=0;\r
\r
if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
d = *(u16 *)(prg_bank+(a&0x1fffe));\r
goto end;\r
#endif\r
return d;\r
}\r
+#endif\r
\r
\r
-u32 PicoReadM68k32(u32 a)\r
+#ifdef _ASM_CD_MEMORY_C\r
+u32 PicoReadM68k32(u32 a);\r
+#else\r
+static u32 PicoReadM68k32(u32 a)\r
{\r
u32 d=0;\r
\r
if (a < 0x20000) { u16 *pm=(u16 *)(Pico_mcd->bios+a); d = (pm[0]<<16)|pm[1]; goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));\r
d = (pm[0]<<16)|pm[1];\r
if (a >= 0x220000) { // cell arranged\r
u32 a1, a2;\r
a1 = (a&2) | (cell_map(a >> 2) << 2);\r
- if (a&2) a2 = cell_map((a+2) >> 2) << 2;\r
- else a2 = a1 + 2;\r
- d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16;\r
- d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2);\r
+ if (a&2) a2 = cell_map((a+2) >> 2) << 2;\r
+ else a2 = a1 + 2;\r
+ d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16;\r
+ d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2);\r
} else {\r
u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
}\r
#endif\r
return d;\r
}\r
+#endif\r
\r
\r
// -----------------------------------------------------------------\r
// Write Ram\r
\r
-void PicoWriteM68k8(u32 a,u8 d)\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteM68k8(u32 a,u8 d);\r
+#else\r
+static void PicoWriteM68k8(u32 a,u8 d)\r
{\r
#ifdef __debug_io\r
dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc);\r
a&=0xffffff;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
*(u8 *)(prg_bank+((a^1)&0x1ffff))=d;\r
return;\r
\r
OtherWrite8(a,d,8);\r
}\r
+#endif\r
\r
\r
-void PicoWriteM68k16(u32 a,u16 d)\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteM68k16(u32 a,u16 d);\r
+#else\r
+static void PicoWriteM68k16(u32 a,u16 d)\r
{\r
#ifdef __debug_io\r
dprintf("w16: %06x, %04x", a&0xffffff, d);\r
a&=0xfffffe;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
*(u16 *)(prg_bank+(a&0x1fffe))=d;\r
return;\r
\r
OtherWrite16(a,d);\r
}\r
+#endif\r
\r
\r
-void PicoWriteM68k32(u32 a,u32 d)\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteM68k32(u32 a,u32 d);\r
+#else\r
+static void PicoWriteM68k32(u32 a,u32 d)\r
{\r
#ifdef __debug_io\r
dprintf("w32: %06x, %08x", a&0xffffff, d);\r
a&=0xfffffe;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));\r
pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
if (a >= 0x220000) { // cell arranged\r
u32 a1, a2;\r
a1 = (a&2) | (cell_map(a >> 2) << 2);\r
- if (a&2) a2 = cell_map((a+2) >> 2) << 2;\r
- else a2 = a1 + 2;\r
- *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16;\r
- *(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d;\r
+ if (a&2) a2 = cell_map((a+2) >> 2) << 2;\r
+ else a2 = a1 + 2;\r
+ *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16;\r
+ *(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d;\r
} else {\r
u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
OtherWrite16(a, (u16)(d>>16));\r
OtherWrite16(a+2,(u16)d);\r
}\r
+#endif\r
\r
\r
// -----------------------------------------------------------------\r
\r
-\r
-u8 PicoReadS68k8(u32 a)\r
+#ifdef _ASM_CD_MEMORY_C\r
+u8 PicoReadS68k8(u32 a);\r
+#else\r
+static u8 PicoReadS68k8(u32 a)\r
{\r
u32 d=0;\r
\r
#endif\r
return (u8)d;\r
}\r
+#endif\r
\r
\r
-u16 PicoReadS68k16(u32 a)\r
+//u16 PicoReadS68k16_(u32 a);\r
+#ifdef _ASM_CD_MEMORY_C\r
+u16 PicoReadS68k16(u32 a);\r
+#else\r
+static u16 PicoReadS68k16(u32 a)\r
{\r
u32 d=0;\r
\r
\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram r16: [%06x] @%06x", a, SekPcS68k);\r
+ dprintf("FIXME: s68k_bram r16: [%06x] @%06x", a, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
d = Pico_mcd->bram[a++]; // Gens does little endian here, and so do we..\r
- d|= Pico_mcd->bram[a++] << 8;\r
+ d|= Pico_mcd->bram[a++] << 8; // This is most likely wrong\r
dprintf("ret = %04x", d);\r
goto end;\r
}\r
\r
// PCM\r
if ((a&0xff8000)==0xff0000) {\r
- dprintf("s68k_pcm r16: [%06x] @%06x", a, SekPcS68k);\r
+ dprintf("FIXME: s68k_pcm r16: [%06x] @%06x", a, SekPcS68k);\r
a &= 0x7fff;\r
if (a >= 0x2000)\r
d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff];\r
#endif\r
return d;\r
}\r
+#endif\r
\r
\r
-u32 PicoReadS68k32(u32 a)\r
+#ifdef _ASM_CD_MEMORY_C\r
+u32 PicoReadS68k32(u32 a);\r
+#else\r
+static u32 PicoReadS68k32(u32 a)\r
{\r
u32 d=0;\r
\r
\r
// PCM\r
if ((a&0xff8000)==0xff0000) {\r
- dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);\r
+ dprintf("FIXME: s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);\r
a &= 0x7fff;\r
if (a >= 0x2000) {\r
a >>= 1;\r
\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram r32: [%06x] @%06x", a, SekPcS68k);\r
+ dprintf("FIXME: s68k_bram r32: [%06x] @%06x", a, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
d = Pico_mcd->bram[a++] << 16; // middle endian? TODO: verify against Fusion..\r
d|= Pico_mcd->bram[a++] << 24;\r
#endif\r
return d;\r
}\r
+#endif\r
\r
\r
/* check: jaguar xj 220 (draws entire world using decode) */\r
\r
// -----------------------------------------------------------------\r
\r
-void PicoWriteS68k8(u32 a,u8 d)\r
+//void PicoWriteS68k8_(u32 a,u8 d);\r
+//void PicoWriteS68k8__(u32 a,u8 d);\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteS68k8(u32 a,u8 d);\r
+#else\r
+static void PicoWriteS68k8(u32 a,u8 d)\r
{\r
#ifdef __debug_io2\r
dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k);\r
#endif\r
\r
a&=0xffffff;\r
+#if 0\r
+ PicoWriteS68k8_(a, d);\r
+/* if ((a&0xfc0000)!=0x080000) {\r
+ PicoWriteS68k8_(a, d);\r
+ return;\r
+ }\r
+ printf("r3: %02x\n", Pico_mcd->s68k_regs[3]);\r
+ PicoWriteS68k8__(a,d);*/\r
+ return;\r
+#endif\r
\r
// prg RAM\r
if (a < 0x80000) {\r
a &= 0x1ff;\r
rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);\r
if (a >= 0x58 && a < 0x68)\r
- gfx_cd_write(a&~1, (d<<8)|d);\r
+ gfx_cd_write16(a&~1, (d<<8)|d);\r
else s68k_reg_write8(a,d);\r
return;\r
}\r
\r
dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k);\r
}\r
+#endif\r
\r
\r
-void PicoWriteS68k16(u32 a,u16 d)\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteS68k16(u32 a,u16 d);\r
+#else\r
+static void PicoWriteS68k16(u32 a,u16 d)\r
{\r
#ifdef __debug_io2\r
dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
a &= 0x1fe;\r
rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);\r
if (a >= 0x58 && a < 0x68)\r
- gfx_cd_write(a, d);\r
+ gfx_cd_write16(a, d);\r
else {\r
if (a == 0xe) { // special case, 2 byte writes would be handled differently\r
Pico_mcd->s68k_regs[0xf] = d;\r
- return;\r
+ return;\r
}\r
s68k_reg_write8(a, d>>8);\r
s68k_reg_write8(a+1,d&0xff);\r
\r
dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
}\r
+#endif\r
\r
\r
-void PicoWriteS68k32(u32 a,u32 d)\r
+#ifdef _ASM_CD_MEMORY_C\r
+void PicoWriteS68k32(u32 a,u32 d);\r
+#else\r
+static void PicoWriteS68k32(u32 a,u32 d)\r
{\r
#ifdef __debug_io2\r
dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
a &= 0x1fe;\r
rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k);\r
if (a >= 0x58 && a < 0x68) {\r
- gfx_cd_write(a, d>>16);\r
- gfx_cd_write(a+2, d&0xffff);\r
+ gfx_cd_write16(a, d>>16);\r
+ gfx_cd_write16(a+2, d&0xffff);\r
} else {\r
s68k_reg_write8(a, d>>24);\r
s68k_reg_write8(a+1,(d>>16)&0xff);\r
\r
dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
}\r
-\r
+#endif\r
\r
\r
// -----------------------------------------------------------------\r
notaz.gp2x.de / picodrive.git / blobdiff