RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

memory refactoring (mostly for cd) + ARM mem asm update

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@780 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-16 21:34:35 +00:00
parent 5e89f0f5ae
commit 0ace9b9aac
10 changed files with 677 additions and 2770 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pico/cd/area.c
View file

@ -272,18 +272,10 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
readend: readend:
if (PicoAHW & PAHW_MCD) if (PicoAHW & PAHW_MCD)
{ {
/* after load events */ PicoMemStateLoaded();
if (Pico_mcd->s68k_regs[3] & 4) // 1M mode?
wram_2M_to_1M(Pico_mcd->word_ram2M);
PicoMemRemapCD(Pico_mcd->s68k_regs[3]);
#ifdef _ASM_CD_MEMORY_C
if (Pico_mcd->s68k_regs[3] & 4)
PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
#endif
if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
cdda_start_play(); cdda_start_play();
// restore hint vector
*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
// must unpack after other CD stuff is loaded // must unpack after other CD stuff is loaded
PicoAreaUnpackCpu(buff_s68k, 1); PicoAreaUnpackCpu(buff_s68k, 1);

340
pico/cd/memory.c
View file

@ -21,6 +21,48 @@ MAKE_68K_WRITE32(s68k_write32, s68k_write16_map)
// ----------------------------------------------------------------- // -----------------------------------------------------------------
// provided by ASM code:
#ifdef _ASM_CD_MEMORY_C
u32 PicoReadM68k8_io(u32 a);
u32 PicoReadM68k16_io(u32 a);
void PicoWriteM68k8_io(u32 a, u32 d);
void PicoWriteM68k16_io(u32 a, u32 d);
u32 PicoReadS68k8_pr(u32 a);
u32 PicoReadS68k16_pr(u32 a);
void PicoWriteS68k8_pr(u32 a, u32 d);
void PicoWriteS68k16_pr(u32 a, u32 d);
u32 PicoReadM68k8_cell0(u32 a);
u32 PicoReadM68k8_cell1(u32 a);
u32 PicoReadM68k16_cell0(u32 a);
u32 PicoReadM68k16_cell1(u32 a);
void PicoWriteM68k8_cell0(u32 a, u32 d);
void PicoWriteM68k8_cell1(u32 a, u32 d);
void PicoWriteM68k16_cell0(u32 a, u32 d);
void PicoWriteM68k16_cell1(u32 a, u32 d);
u32 PicoReadS68k8_dec0(u32 a);
u32 PicoReadS68k8_dec1(u32 a);
u32 PicoReadS68k16_dec0(u32 a);
u32 PicoReadS68k16_dec1(u32 a);
void PicoWriteS68k8_dec_m0b0(u32 a, u32 d);
void PicoWriteS68k8_dec_m1b0(u32 a, u32 d);
void PicoWriteS68k8_dec_m2b0(u32 a, u32 d);
void PicoWriteS68k8_dec_m0b1(u32 a, u32 d);
void PicoWriteS68k8_dec_m1b1(u32 a, u32 d);
void PicoWriteS68k8_dec_m2b1(u32 a, u32 d);
void PicoWriteS68k16_dec_m0b0(u32 a, u32 d);
void PicoWriteS68k16_dec_m1b0(u32 a, u32 d);
void PicoWriteS68k16_dec_m2b0(u32 a, u32 d);
void PicoWriteS68k16_dec_m0b1(u32 a, u32 d);
void PicoWriteS68k16_dec_m1b1(u32 a, u32 d);
void PicoWriteS68k16_dec_m2b1(u32 a, u32 d);
#endif
static void remap_prg_window(void);
static void remap_word_ram(int r3);
// poller detection // poller detection
#define POLL_LIMIT 16 #define POLL_LIMIT 16
#define POLL_CYCLES 124 #define POLL_CYCLES 124
@ -98,7 +140,7 @@ void m68k_reg_write8(u32 a, u32 d)
if (!(d & 1)) if (!(d & 1))
d |= 2; // verified: reset also gives bus d |= 2; // verified: reset also gives bus
if ((d ^ Pico_mcd->m.busreq) & 2) if ((d ^ Pico_mcd->m.busreq) & 2)
PicoMemRemapCD(Pico_mcd->s68k_regs[3]); remap_prg_window();
Pico_mcd->m.busreq = d; Pico_mcd->m.busreq = d;
return; return;
case 2: case 2:
@ -123,7 +165,7 @@ void m68k_reg_write8(u32 a, u32 d)
Pico_mcd->s68k_regs[3] = (d & 0xc2) | (dold & 0x1f); Pico_mcd->s68k_regs[3] = (d & 0xc2) | (dold & 0x1f);
if ((d ^ dold) & 0xc0) { if ((d ^ dold) & 0xc0) {
elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));
PicoMemRemapCD(Pico_mcd->s68k_regs[3]); remap_prg_window();
} }
#ifdef USE_POLL_DETECT #ifdef USE_POLL_DETECT
if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) { if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {
@ -272,14 +314,10 @@ void s68k_reg_write8(u32 a, u32 d)
d |= dold & 0xc2; d |= dold & 0xc2;
if (d & 4) if (d & 4)
{ {
if ((d ^ dold) & 5) { if ((d ^ dold) & 0x1d) {
d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit
PicoMemRemapCD(d); remap_word_ram(d);
} }
#ifdef _ASM_CD_MEMORY_C
if ((d ^ dold) & 0x1d)
PicoMemResetCDdecode(d);
#endif
if (!(dold & 4)) { if (!(dold & 4)) {
elprintf(EL_CDREG3, "wram mode 2M->1M"); elprintf(EL_CDREG3, "wram mode 2M->1M");
wram_2M_to_1M(Pico_mcd->word_ram2M); wram_2M_to_1M(Pico_mcd->word_ram2M);
@ -294,7 +332,7 @@ void s68k_reg_write8(u32 a, u32 d)
d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode
} }
wram_1M_to_2M(Pico_mcd->word_ram2M); wram_1M_to_2M(Pico_mcd->word_ram2M);
PicoMemRemapCD(d); remap_word_ram(d);
} }
// s68k can only set RET, writing 0 has no effect // s68k can only set RET, writing 0 has no effect
else if ((dold ^ d) & d & 1) { // RET being set else if ((dold ^ d) & d & 1) { // RET being set
@ -371,37 +409,57 @@ void s68k_reg_write8(u32 a, u32 d)
#ifndef _ASM_CD_MEMORY_C #ifndef _ASM_CD_MEMORY_C
#include "cell_map.c" #include "cell_map.c"
#endif
// WORD RAM, cell aranged area (220000 - 23ffff) // WORD RAM, cell aranged area (220000 - 23ffff)
static u32 PicoReadM68k8_cell(u32 a) static u32 PicoReadM68k8_cell0(u32 a)
{ {
int bank = Pico_mcd->s68k_regs[3] & 1;
a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged
return Pico_mcd->word_ram1M[bank][a ^ 1]; return Pico_mcd->word_ram1M[0][a ^ 1];
} }
static u32 PicoReadM68k16_cell(u32 a) static u32 PicoReadM68k8_cell1(u32 a)
{
a = (a&3) | (cell_map(a >> 2) << 2);
return Pico_mcd->word_ram1M[1][a ^ 1];
}
static u32 PicoReadM68k16_cell0(u32 a)
{ {
int bank = Pico_mcd->s68k_regs[3] & 1;
a = (a&2) | (cell_map(a >> 2) << 2); a = (a&2) | (cell_map(a >> 2) << 2);
return *(u16 *)(Pico_mcd->word_ram1M[bank] + a); return *(u16 *)(Pico_mcd->word_ram1M[0] + a);
} }
static void PicoWriteM68k8_cell(u32 a, u32 d) static u32 PicoReadM68k16_cell1(u32 a)
{ {
int bank = Pico_mcd->s68k_regs[3] & 1; a = (a&2) | (cell_map(a >> 2) << 2);
a = (a&3) | (cell_map(a >> 2) << 2); return *(u16 *)(Pico_mcd->word_ram1M[1] + a);
Pico_mcd->word_ram1M[bank][a ^ 1] = d;
} }
static void PicoWriteM68k16_cell(u32 a, u32 d) static void PicoWriteM68k8_cell0(u32 a, u32 d)
{ {
int bank = Pico_mcd->s68k_regs[3] & 1;
a = (a&3) | (cell_map(a >> 2) << 2); a = (a&3) | (cell_map(a >> 2) << 2);
*(u16 *)(Pico_mcd->word_ram1M[bank] + a) = d; Pico_mcd->word_ram1M[0][a ^ 1] = d;
} }
static void PicoWriteM68k8_cell1(u32 a, u32 d)
{
a = (a&3) | (cell_map(a >> 2) << 2);
Pico_mcd->word_ram1M[1][a ^ 1] = d;
}
static void PicoWriteM68k16_cell0(u32 a, u32 d)
{
a = (a&3) | (cell_map(a >> 2) << 2);
*(u16 *)(Pico_mcd->word_ram1M[0] + a) = d;
}
static void PicoWriteM68k16_cell1(u32 a, u32 d)
{
a = (a&3) | (cell_map(a >> 2) << 2);
*(u16 *)(Pico_mcd->word_ram1M[1] + a) = d;
}
#endif
// RAM cart (40000 - 7fffff, optional) // RAM cart (40000 - 7fffff, optional)
static u32 PicoReadM68k8_ramc(u32 a) static u32 PicoReadM68k8_ramc(u32 a)
{ {
@ -456,6 +514,7 @@ static void PicoWriteM68k16_ramc(u32 a, u32 d)
} }
// IO/control/cd registers (a10000 - ...) // IO/control/cd registers (a10000 - ...)
#ifndef _ASM_CD_MEMORY_C
static u32 PicoReadM68k8_io(u32 a) static u32 PicoReadM68k8_io(u32 a)
{ {
u32 d; u32 d;
@ -518,6 +577,7 @@ static void PicoWriteM68k16_io(u32 a, u32 d)
PicoWrite16_io(a, d); PicoWrite16_io(a, d);
} }
#endif
// ----------------------------------------------------------------- // -----------------------------------------------------------------
// Sub 68k // Sub 68k
@ -545,12 +605,26 @@ static void s68k_unmapped_write16(u32 a, u32 d)
elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc); elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);
} }
// decode (080000 - 0bffff, in 1M mode) // PRG RAM protected range (000000 - 00ff00)?
static u32 PicoReadS68k8_dec(u32 a) // XXX verify: ff00 or 1fe00 max?
static void PicoWriteS68k8_prgwp(u32 a, u32 d)
{ {
u32 d, bank; if (a >= (Pico_mcd->s68k_regs[2] << 8))
bank = (Pico_mcd->s68k_regs[3] & 1) ^ 1; Pico_mcd->prg_ram[a ^ 1] = d;
d = Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; }
static void PicoWriteS68k16_prgwp(u32 a, u32 d)
{
if (a >= (Pico_mcd->s68k_regs[2] << 8))
*(u16 *)(Pico_mcd->prg_ram + a) = d;
}
#ifndef _ASM_CD_MEMORY_C
// decode (080000 - 0bffff, in 1M mode)
static u32 PicoReadS68k8_dec0(u32 a)
{
u32 d = Pico_mcd->word_ram1M[0][((a >> 1) ^ 1) & 0x1ffff];
if (a & 1) if (a & 1)
d &= 0x0f; d &= 0x0f;
else else
@ -558,69 +632,97 @@ static u32 PicoReadS68k8_dec(u32 a)
return d; return d;
} }
static u32 PicoReadS68k16_dec(u32 a) static u32 PicoReadS68k8_dec1(u32 a)
{ {
u32 d, bank; u32 d = Pico_mcd->word_ram1M[1][((a >> 1) ^ 1) & 0x1ffff];
bank = (Pico_mcd->s68k_regs[3] & 1) ^ 1; if (a & 1)
d = Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; d &= 0x0f;
else
d >>= 4;
return d;
}
static u32 PicoReadS68k16_dec0(u32 a)
{
u32 d = Pico_mcd->word_ram1M[0][((a >> 1) ^ 1) & 0x1ffff];
d |= d << 4;
d &= ~0xf0;
return d;
}
static u32 PicoReadS68k16_dec1(u32 a)
{
u32 d = Pico_mcd->word_ram1M[1][((a >> 1) ^ 1) & 0x1ffff];
d |= d << 4; d |= d << 4;
d &= ~0xf0; d &= ~0xf0;
return d; return d;
} }
/* check: jaguar xj 220 (draws entire world using decode) */ /* check: jaguar xj 220 (draws entire world using decode) */
static void PicoWriteS68k8_dec(u32 a, u32 d) #define mk_decode_w8(bank) \
{ static void PicoWriteS68k8_dec_m0b##bank(u32 a, u32 d) \
u8 r3 = Pico_mcd->s68k_regs[3]; { \
u8 *pd = &Pico_mcd->word_ram1M[(r3 & 1) ^ 1][((a >> 1) ^ 1) & 0x1ffff]; u8 *pd = &Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; \
u8 oldmask = (a & 1) ? 0xf0 : 0x0f; \
if (!(a & 1)) \
r3 &= 0x18; *pd = (*pd & 0x0f) | (d << 4); \
d &= 0x0f; else \
if (!(a & 1)) *pd = (*pd & 0xf0) | (d & 0x0f); \
d <<= 4; } \
\
if (r3 == 8) { static void PicoWriteS68k8_dec_m1b##bank(u32 a, u32 d) \
if ((!(*pd & (~oldmask))) && d) { \
goto do_it; u8 *pd = &Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; \
} else if (r3 > 8) { u8 mask = (a & 1) ? 0x0f : 0xf0; \
if (d) \
goto do_it; if (!(*pd & mask) && (d & 0x0f)) /* underwrite */ \
} else PicoWriteS68k8_dec_m0b##bank(a, d); \
goto do_it; } \
\
return; static void PicoWriteS68k8_dec_m2b##bank(u32 a, u32 d) /* ...and m3? */ \
{ \
do_it: if (d & 0x0f) /* overwrite */ \
*pd = d | (*pd & oldmask); PicoWriteS68k8_dec_m0b##bank(a, d); \
} }
static void PicoWriteS68k16_dec(u32 a, u32 d) mk_decode_w8(0)
{ mk_decode_w8(1)
u8 r3 = Pico_mcd->s68k_regs[3];
u8 *pd = &Pico_mcd->word_ram1M[(r3 & 1) ^ 1][((a >> 1) ^ 1) & 0x1ffff];
//if ((a & 0x3ffff) < 0x28000) return; #define mk_decode_w16(bank) \
static void PicoWriteS68k16_dec_m0b##bank(u32 a, u32 d) \
r3 &= 0x18; { \
d &= 0x0f0f; u8 *pd = &Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; \
d |= d >> 4; \
d &= 0x0f0f; \
if (r3 == 8) { *pd = d | (d >> 4); \
u8 dold = *pd; } \
if (!(dold & 0xf0)) dold |= d & 0xf0; \
if (!(dold & 0x0f)) dold |= d & 0x0f; static void PicoWriteS68k16_dec_m1b##bank(u32 a, u32 d) \
*pd = dold; { \
} else if (r3 > 8) { u8 *pd = &Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; \
u8 dold = *pd; \
if (!(d & 0xf0)) d |= dold & 0xf0; d &= 0x0f0f; /* underwrite */ \
if (!(d & 0x0f)) d |= dold & 0x0f; if (!(*pd & 0xf0)) *pd |= d >> 4; \
*pd = d; if (!(*pd & 0x0f)) *pd |= d; \
} else { } \
*pd = d; \
} static void PicoWriteS68k16_dec_m2b##bank(u32 a, u32 d) \
{ \
u8 *pd = &Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; \
\
d &= 0x0f0f; /* overwrite */ \
d |= d >> 4; \
\
if (!(d & 0xf0)) d |= *pd & 0xf0; \
if (!(d & 0x0f)) d |= *pd & 0x0f; \
*pd = d; \
} }
mk_decode_w16(0)
mk_decode_w16(1)
#endif
// backup RAM (fe0000 - feffff) // backup RAM (fe0000 - feffff)
static u32 PicoReadS68k8_bram(u32 a) static u32 PicoReadS68k8_bram(u32 a)
{ {
@ -652,6 +754,8 @@ static void PicoWriteS68k16_bram(u32 a, u32 d)
SRam.changed = 1; SRam.changed = 1;
} }
#ifndef _ASM_CD_MEMORY_C
// PCM and registers (ff0000 - ffffff) // PCM and registers (ff0000 - ffffff)
static u32 PicoReadS68k8_pr(u32 a) static u32 PicoReadS68k8_pr(u32 a)
{ {
@ -677,6 +781,7 @@ static u32 PicoReadS68k8_pr(u32 a)
} }
// PCM // PCM
// XXX: verify: probably odd addrs only?
if ((a & 0x8000) == 0x0000) { if ((a & 0x8000) == 0x0000) {
a &= 0x7fff; a &= 0x7fff;
if (a >= 0x2000) if (a >= 0x2000)
@ -785,21 +890,43 @@ static void PicoWriteS68k16_pr(u32 a, u32 d)
s68k_unmapped_write16(a, d); s68k_unmapped_write16(a, d);
} }
#endif
static const void *m68k_cell_read8[] = { PicoReadM68k8_cell0, PicoReadM68k8_cell1 };
static const void *m68k_cell_read16[] = { PicoReadM68k16_cell0, PicoReadM68k16_cell1 };
static const void *m68k_cell_write8[] = { PicoWriteM68k8_cell0, PicoWriteM68k8_cell1 };
static const void *m68k_cell_write16[] = { PicoWriteM68k16_cell0, PicoWriteM68k16_cell1 };
static const void *s68k_dec_read8[] = { PicoReadS68k8_dec0, PicoReadS68k8_dec1 };
static const void *s68k_dec_read16[] = { PicoReadS68k16_dec0, PicoReadS68k16_dec1 };
static const void *s68k_dec_write8[2][4] = {
{ PicoWriteS68k8_dec_m0b0, PicoWriteS68k8_dec_m1b0, PicoWriteS68k8_dec_m2b0, PicoWriteS68k8_dec_m2b0 },
{ PicoWriteS68k8_dec_m0b1, PicoWriteS68k8_dec_m1b1, PicoWriteS68k8_dec_m2b1, PicoWriteS68k8_dec_m2b1 },
};
static const void *s68k_dec_write16[2][4] = {
{ PicoWriteS68k16_dec_m0b0, PicoWriteS68k16_dec_m1b0, PicoWriteS68k16_dec_m2b0, PicoWriteS68k16_dec_m2b0 },
{ PicoWriteS68k16_dec_m0b1, PicoWriteS68k16_dec_m1b1, PicoWriteS68k16_dec_m2b1, PicoWriteS68k16_dec_m2b1 },
};
// ----------------------------------------------------------------- // -----------------------------------------------------------------
// TODO: probably split static void remap_prg_window(void)
void PicoMemRemapCD(int r3)
{ {
void *bank;
// PRG RAM // PRG RAM
if (Pico_mcd->m.busreq & 2) { if (Pico_mcd->m.busreq & 2) {
bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3] >> 6]; void *bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3] >> 6];
cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0); cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0);
} }
else { else {
m68k_map_unmap(0x020000, 0x03ffff); m68k_map_unmap(0x020000, 0x03ffff);
} }
}
static void remap_word_ram(int r3)
{
void *bank;
// WORD RAM // WORD RAM
if (!(r3 & 4)) { if (!(r3 & 4)) {
@ -810,20 +937,22 @@ void PicoMemRemapCD(int r3)
// TODO: handle 0x0c0000 // TODO: handle 0x0c0000
} }
else { else {
bank = Pico_mcd->word_ram1M[r3 & 1]; int b0 = r3 & 1;
int m = (r3 & 0x18) >> 3;
bank = Pico_mcd->word_ram1M[b0];
cpu68k_map_all_ram(0x200000, 0x21ffff, bank, 0); cpu68k_map_all_ram(0x200000, 0x21ffff, bank, 0);
bank = Pico_mcd->word_ram1M[(r3 & 1) ^ 1]; bank = Pico_mcd->word_ram1M[b0 ^ 1];
cpu68k_map_all_ram(0x0c0000, 0x0effff, bank, 1); cpu68k_map_all_ram(0x0c0000, 0x0effff, bank, 1);
// "cell arrange" on m68k // "cell arrange" on m68k
cpu68k_map_set(m68k_read8_map, 0x220000, 0x23ffff, PicoReadM68k8_cell, 1); cpu68k_map_set(m68k_read8_map, 0x220000, 0x23ffff, m68k_cell_read8[b0], 1);
cpu68k_map_set(m68k_read16_map, 0x220000, 0x23ffff, PicoReadM68k16_cell, 1); cpu68k_map_set(m68k_read16_map, 0x220000, 0x23ffff, m68k_cell_read16[b0], 1);
cpu68k_map_set(m68k_write8_map, 0x220000, 0x23ffff, PicoWriteM68k8_cell, 1); cpu68k_map_set(m68k_write8_map, 0x220000, 0x23ffff, m68k_cell_write8[b0], 1);
cpu68k_map_set(m68k_write16_map, 0x220000, 0x23ffff, PicoWriteM68k16_cell, 1); cpu68k_map_set(m68k_write16_map, 0x220000, 0x23ffff, m68k_cell_write16[b0], 1);
// "decode format" on s68k // "decode format" on s68k
cpu68k_map_set(s68k_read8_map, 0x080000, 0x0bffff, PicoReadS68k8_dec, 1); cpu68k_map_set(s68k_read8_map, 0x080000, 0x0bffff, s68k_dec_read8[b0 ^ 1], 1);
cpu68k_map_set(s68k_read16_map, 0x080000, 0x0bffff, PicoReadS68k16_dec, 1); cpu68k_map_set(s68k_read16_map, 0x080000, 0x0bffff, s68k_dec_read16[b0 ^ 1], 1);
cpu68k_map_set(s68k_write8_map, 0x080000, 0x0bffff, PicoWriteS68k8_dec, 1); cpu68k_map_set(s68k_write8_map, 0x080000, 0x0bffff, s68k_dec_write8[b0 ^ 1][m], 1);
cpu68k_map_set(s68k_write16_map, 0x080000, 0x0bffff, PicoWriteS68k16_dec, 1); cpu68k_map_set(s68k_write16_map, 0x080000, 0x0bffff, s68k_dec_write16[b0 ^ 1][m], 1);
} }
#ifdef EMU_F68K #ifdef EMU_F68K
@ -844,6 +973,20 @@ void PicoMemRemapCD(int r3)
#endif #endif
} }
void PicoMemStateLoaded(void)
{
int r3 = Pico_mcd->s68k_regs[3];
/* after load events */
if (r3 & 4) // 1M mode?
wram_2M_to_1M(Pico_mcd->word_ram2M);
remap_word_ram(r3);
remap_prg_window();
// restore hint vector
*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
}
#ifdef EMU_M68K #ifdef EMU_M68K
static void m68k_mem_setup_cd(void); static void m68k_mem_setup_cd(void);
#endif #endif
@ -853,8 +996,6 @@ PICO_INTERNAL void PicoMemSetupCD(void)
// setup default main68k map // setup default main68k map
PicoMemSetup(); PicoMemSetup();
// PicoMemRemapCD() will set up RAMs, so not done here
// main68k map (BIOS mapped by PicoMemSetup()): // main68k map (BIOS mapped by PicoMemSetup()):
// RAM cart // RAM cart
if (PicoOpt & POPT_EN_MCD_RAMCART) { if (PicoOpt & POPT_EN_MCD_RAMCART) {
@ -881,6 +1022,8 @@ PICO_INTERNAL void PicoMemSetupCD(void)
cpu68k_map_set(s68k_read16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); cpu68k_map_set(s68k_read16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);
cpu68k_map_set(s68k_write8_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); cpu68k_map_set(s68k_write8_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);
cpu68k_map_set(s68k_write16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); cpu68k_map_set(s68k_write16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);
cpu68k_map_set(s68k_write8_map, 0x000000, 0x00ffff, PicoWriteS68k8_prgwp, 1);
cpu68k_map_set(s68k_write16_map, 0x000000, 0x00ffff, PicoWriteS68k16_prgwp, 1);
// BRAM // BRAM
cpu68k_map_set(s68k_read8_map, 0xfe0000, 0xfeffff, PicoReadS68k8_bram, 1); cpu68k_map_set(s68k_read8_map, 0xfe0000, 0xfeffff, PicoReadS68k8_bram, 1);
@ -894,6 +1037,9 @@ PICO_INTERNAL void PicoMemSetupCD(void)
cpu68k_map_set(s68k_write8_map, 0xff0000, 0xffffff, PicoWriteS68k8_pr, 1); cpu68k_map_set(s68k_write8_map, 0xff0000, 0xffffff, PicoWriteS68k8_pr, 1);
cpu68k_map_set(s68k_write16_map, 0xff0000, 0xffffff, PicoWriteS68k16_pr, 1); cpu68k_map_set(s68k_write16_map, 0xff0000, 0xffffff, PicoWriteS68k16_pr, 1);
// RAMs
remap_word_ram(1);
#ifdef EMU_C68K #ifdef EMU_C68K
// s68k // s68k
PicoCpuCS68k.read8 = (void *)s68k_read8_map; PicoCpuCS68k.read8 = (void *)s68k_read8_map;
@ -939,7 +1085,7 @@ PICO_INTERNAL void PicoMemSetupCD(void)
// WORD RAM 2M area // WORD RAM 2M area
for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++) for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)
PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000; PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000;
// PicoMemRemapCD() will setup word ram for both // remap_word_ram() will setup word ram for both
} }
#endif #endif
#ifdef EMU_M68K #ifdef EMU_M68K

2060
pico/cd/memory_arm.s
View file

File diff suppressed because it is too large Load diff

1
pico/cd/pico.c
View file

@ -30,7 +30,6 @@ PICO_INTERNAL void PicoPowerMCD(void)
memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram)); memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram));
memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram)); memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size); memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
PicoMemRemapCD(1);
} }
PICO_INTERNAL int PicoResetMCD(void) PICO_INTERNAL int PicoResetMCD(void)

33
pico/memory.c
View file

@ -21,7 +21,7 @@ unsigned long m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
unsigned long m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT]; unsigned long m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
static void xmap_set(unsigned long *map, int shift, int start_addr, int end_addr, static void xmap_set(unsigned long *map, int shift, int start_addr, int end_addr,
void *func_or_mh, int is_func) const void *func_or_mh, int is_func)
{ {
unsigned long addr = (unsigned long)func_or_mh; unsigned long addr = (unsigned long)func_or_mh;
int mask = (1 << shift) - 1; int mask = (1 << shift) - 1;
@ -49,13 +49,13 @@ static void xmap_set(unsigned long *map, int shift, int start_addr, int end_addr
} }
void z80_map_set(unsigned long *map, int start_addr, int end_addr, void z80_map_set(unsigned long *map, int start_addr, int end_addr,
void *func_or_mh, int is_func) const void *func_or_mh, int is_func)
{ {
xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func); xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
} }
void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr, void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr,
void *func_or_mh, int is_func) const void *func_or_mh, int is_func)
{ {
xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func); xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
} }
@ -144,6 +144,10 @@ static u32 ym2612_read_local_68k(void);
static int ym2612_write_local(u32 a, u32 d, int is_from_z80); static int ym2612_write_local(u32 a, u32 d, int is_from_z80);
static void z80_mem_setup(void); static void z80_mem_setup(void);
#ifdef _ASM_MEMORY_C
u32 PicoRead8_sram(u32 a);
u32 PicoRead16_sram(u32 a);
#endif
#ifdef EMU_CORE_DEBUG #ifdef EMU_CORE_DEBUG
u32 lastread_a, lastread_d[16]={0,}, lastwrite_cyc_d[16]={0,}, lastwrite_mus_d[16]={0,}; u32 lastread_a, lastread_d[16]={0,}, lastwrite_cyc_d[16]={0,}, lastwrite_mus_d[16]={0,};
@ -172,7 +176,10 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
// ----------------------------------------------------------------- // -----------------------------------------------------------------
// memmap helpers // memmap helpers
static int PadRead(int i) #ifndef _ASM_MEMORY_C
static
#endif
int PadRead(int i)
{ {
int pad,value,data_reg; int pad,value,data_reg;
pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
@ -204,6 +211,8 @@ static int PadRead(int i)
return value; // will mirror later return value; // will mirror later
} }
#ifndef _ASM_MEMORY_C
static u32 io_ports_read(u32 a) static u32 io_ports_read(u32 a)
{ {
u32 d; u32 d;
@ -233,7 +242,9 @@ static void NOINLINE io_ports_write(u32 a, u32 d)
Pico.ioports[a] = d; Pico.ioports[a] = d;
} }
static void NOINLINE ctl_write_z80busreq(u32 d) #endif // _ASM_MEMORY_C
void NOINLINE ctl_write_z80busreq(u32 d)
{ {
d&=1; d^=1; d&=1; d^=1;
elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc); elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
@ -253,7 +264,7 @@ static void NOINLINE ctl_write_z80busreq(u32 d)
} }
} }
static void NOINLINE ctl_write_z80reset(u32 d) void NOINLINE ctl_write_z80reset(u32 d)
{ {
d&=1; d^=1; d&=1; d^=1;
elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc); elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
@ -277,6 +288,8 @@ static void NOINLINE ctl_write_z80reset(u32 d)
// ----------------------------------------------------------------- // -----------------------------------------------------------------
#ifndef _ASM_MEMORY_C
// cart (save) RAM area (usually 0x200000 - ...) // cart (save) RAM area (usually 0x200000 - ...)
static u32 PicoRead8_sram(u32 a) static u32 PicoRead8_sram(u32 a)
{ {
@ -322,6 +335,8 @@ static u32 PicoRead16_sram(u32 a)
return m68k_unmapped_read16(a); return m68k_unmapped_read16(a);
} }
#endif // _ASM_MEMORY_C
static void PicoWrite8_sram(u32 a, u32 d) static void PicoWrite8_sram(u32 a, u32 d)
{ {
if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) { if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
@ -415,7 +430,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
SN76496Write(d); SN76496Write(d);
return; return;
} }
#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
if ((a & 0x7f00) == 0x6000) // Z80 BANK register if ((a & 0x7f00) == 0x6000) // Z80 BANK register
{ {
Pico.m.z80_bank68k >>= 1; Pico.m.z80_bank68k >>= 1;
@ -424,7 +438,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k << 15); elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k << 15);
return; return;
} }
#endif
elprintf(EL_UIO|EL_ANOMALY, "68k bad write [%06x] %02x @ %06x", a, d&0xff, SekPc); elprintf(EL_UIO|EL_ANOMALY, "68k bad write [%06x] %02x @ %06x", a, d&0xff, SekPc);
} }
@ -435,6 +448,8 @@ static void PicoWrite16_z80(u32 a, u32 d)
PicoWrite8_z80(a, d >> 8); PicoWrite8_z80(a, d >> 8);
} }
#ifndef _ASM_MEMORY_C
// IO/control area (0xa10000 - 0xa1ffff) // IO/control area (0xa10000 - 0xa1ffff)
u32 PicoRead8_io(u32 a) u32 PicoRead8_io(u32 a)
{ {
@ -561,6 +576,8 @@ void PicoWrite16_io(u32 a, u32 d)
m68k_unmapped_write16(a, d); m68k_unmapped_write16(a, d);
} }
#endif // _ASM_MEMORY_C
// VDP area (0xc00000 - 0xdfffff) // VDP area (0xc00000 - 0xdfffff)
// TODO: verify if lower byte goes to PSG on word writes // TODO: verify if lower byte goes to PSG on word writes
static u32 PicoRead8_vdp(u32 a) static u32 PicoRead8_vdp(u32 a)

4
pico/memory.h
View file

@ -20,9 +20,9 @@ extern unsigned long s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
extern unsigned long s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT]; extern unsigned long s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
void z80_map_set(unsigned long *map, int start_addr, int end_addr, void z80_map_set(unsigned long *map, int start_addr, int end_addr,
void *func_or_mh, int is_func); const void *func_or_mh, int is_func);
void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr, void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr,
void *func_or_mh, int is_func); const void *func_or_mh, int is_func);
void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub); void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub);
void m68k_map_unmap(int start_addr, int end_addr); void m68k_map_unmap(int start_addr, int end_addr);

1
pico/memory_amips.s
View file

@ -2,6 +2,7 @@
# memory handlers with banking support for SSF II - The New Challengers # memory handlers with banking support for SSF II - The New Challengers
# mostly based on Gens code # mostly based on Gens code
# OUT OF DATE
# (c) Copyright 2007, Grazvydas "notaz" Ignotas # (c) Copyright 2007, Grazvydas "notaz" Ignotas
# All Rights Reserved # All Rights Reserved

1005
pico/memory_arm.s
View file

File diff suppressed because it is too large Load diff

5
pico/pico_int.h
View file

@ -259,7 +259,7 @@ struct PicoMisc
unsigned short z80_bank68k; // 0a unsigned short z80_bank68k; // 0a
unsigned short pad0; unsigned short pad0;
unsigned char pad1; unsigned char pad1;
unsigned char z80_reset; // z80 reset held unsigned char z80_reset; // 0f z80 reset held
unsigned char padDelay[2]; // 10 gamepad phase time outs, so we count a delay unsigned char padDelay[2]; // 10 gamepad phase time outs, so we count a delay
unsigned short eeprom_addr; // EEPROM address register unsigned short eeprom_addr; // EEPROM address register
unsigned char eeprom_cycle; // EEPROM cycle number unsigned char eeprom_cycle; // EEPROM cycle number
@ -482,8 +482,7 @@ PICO_INTERNAL void PicoMemSetupPico(void);
// cd/memory.c // cd/memory.c
PICO_INTERNAL void PicoMemSetupCD(void); PICO_INTERNAL void PicoMemSetupCD(void);
PICO_INTERNAL_ASM void PicoMemRemapCD(int r3); void PicoMemStateLoaded(void);
PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
// pico.c // pico.c
extern struct Pico Pico; extern struct Pico Pico;

4
platform/gp2x/Makefile
View file

@ -3,12 +3,12 @@ export CROSS = arm-linux-
# settings # settings
#mz80 = 1 #mz80 = 1
#debug_cyclone = 1 #debug_cyclone = 1
#asm_memory = 1 # TODO asm_memory = 1
asm_render = 1 asm_render = 1
asm_ym2612 = 1 asm_ym2612 = 1
asm_misc = 1 asm_misc = 1
asm_cdpico = 1 asm_cdpico = 1
#asm_cdmemory = 1 # TODO asm_cdmemory = 1
amalgamate = 0 amalgamate = 0
#profile = 1 #profile = 1
#use_musashi = 1 #use_musashi = 1