Finish migrating to new mem handling. Make carthw db external.

Still need to fix asm and protection emulation.


git-svn-id: file:///home/notaz/opt/svn/PicoDrive@769 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-05 21:13:30 +00:00
parent af37bca858
commit 45f2f245f5
30 changed files with 948 additions and 1027 deletions

View file

@ -1,86 +1,79 @@
/*
* Support for a few cart mappers.
*
* (c) Copyright 2008, Grazvydas "notaz" Ignotas
* (c) Copyright 2008-2009, Grazvydas "notaz" Ignotas
* Free for non-commercial use.
*
*
* I should better do some pointer stuff here. But as none of these bankswitch
* while the game runs, memcpy will suffice.
*/
#include "../pico_int.h"
#include "../memory.h"
/* 12-in-1 and 4-in-1. Assuming >= 2MB ROMs here. */
static unsigned int carthw_12in1_baddr = 0;
/* Common *-in-1 pirate mapper.
* Switches banks based on addr lines when /TIME is set.
* TODO: verify
*/
static unsigned int carthw_Xin1_baddr = 0;
static carthw_state_chunk carthw_12in1_state[] =
{
{ CHUNK_CARTHW, sizeof(carthw_12in1_baddr), &carthw_12in1_baddr },
{ 0, 0, NULL }
};
static unsigned int carthw_12in1_read16(unsigned int a, int realsize)
{
// ??
elprintf(EL_UIO, "12-in-1: read [%06x] @ %06x", a, SekPc);
return 0;
}
static void carthw_12in1_write8(unsigned int a, unsigned int d, int realsize)
static void carthw_Xin1_do(u32 a, int mask, int shift)
{
int len;
if (a < 0xA13000 || a >= 0xA13040) {
/* 4-in-1 has Real Deal Boxing, which uses serial eeprom,
* but I really doubt that pirate cart had it */
if (a != 0x200001)
elprintf(EL_ANOMALY, "12-in-1: unexpected write [%06x] %02x @ %06x", a, d, SekPc);
return;
}
carthw_12in1_baddr = a;
a &= 0x3f; a <<= 16;
carthw_Xin1_baddr = a;
a &= mask;
a <<= shift;
len = Pico.romsize - a;
if (len <= 0) {
elprintf(EL_ANOMALY|EL_STATUS, "12-in-1: missing bank @ %06x", a);
elprintf(EL_ANOMALY|EL_STATUS, "X-in-1: missing bank @ %06x", a);
return;
}
memcpy(Pico.rom, Pico.rom + Pico.romsize + a, len);
len = (len + M68K_BANK_MASK) & ~M68K_BANK_MASK;
cpu68k_map_set(m68k_read8_map, 0x000000, len - 1, Pico.rom + a, 0);
cpu68k_map_set(m68k_read16_map, 0x000000, len - 1, Pico.rom + a, 0);
}
static void carthw_12in1_reset(void)
static carthw_state_chunk carthw_Xin1_state[] =
{
carthw_12in1_write8(0xA13000, 0, 0);
}
{ CHUNK_CARTHW, sizeof(carthw_Xin1_baddr), &carthw_Xin1_baddr },
{ 0, 0, NULL }
};
static void carthw_12in1_statef(void)
// TODO: test a0, reads, w16
static void carthw_Xin1_write8(u32 a, u32 d)
{
carthw_12in1_write8(carthw_12in1_baddr, 0, 0);
}
void carthw_12in1_startup(void)
{
void *tmp;
elprintf(EL_STATUS, "12-in-1 mapper detected");
tmp = realloc(Pico.rom, Pico.romsize * 2);
if (tmp == NULL)
{
elprintf(EL_STATUS, "OOM");
if ((a & 0xffff00) != 0xa13000) {
PicoWrite8_io(a, d);
return;
}
Pico.rom = tmp;
memcpy(Pico.rom + Pico.romsize, Pico.rom, Pico.romsize);
PicoRead16Hook = carthw_12in1_read16;
PicoWrite8Hook = carthw_12in1_write8;
PicoResetHook = carthw_12in1_reset;
PicoLoadStateHook = carthw_12in1_statef;
carthw_chunks = carthw_12in1_state;
carthw_Xin1_do(a, 0x3f, 16);
}
static void carthw_Xin1_mem_setup(void)
{
cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, carthw_Xin1_write8, 1);
}
static void carthw_Xin1_reset(void)
{
carthw_Xin1_write8(0xa13000, 0);
}
static void carthw_Xin1_statef(void)
{
carthw_Xin1_write8(carthw_Xin1_baddr, 0);
}
void carthw_Xin1_startup(void)
{
elprintf(EL_STATUS, "X-in-1 mapper startup");
PicoCartMemSetup = carthw_Xin1_mem_setup;
PicoResetHook = carthw_Xin1_reset;
PicoLoadStateHook = carthw_Xin1_statef;
carthw_chunks = carthw_Xin1_state;
}
@ -88,9 +81,8 @@ void carthw_12in1_startup(void)
* http://www.sharemation.com/TascoDLX/REALTEC%20Cart%20Mapper%20-%20description%20v1.txt
*/
static int realtec_bank = 0x80000000, realtec_size = 0x80000000;
static int realtec_romsize = 0;
static void carthw_realtec_write8(unsigned int a, unsigned int d, int realsize)
static void carthw_realtec_write8(u32 a, u32 d)
{
int i, bank_old = realtec_bank, size_old = realtec_size;
@ -121,105 +113,92 @@ static void carthw_realtec_write8(unsigned int a, unsigned int d, int realsize)
(realtec_bank != bank_old || realtec_size != size_old))
{
elprintf(EL_ANOMALY, "realtec: new bank %06x, size %06x", realtec_bank, realtec_size, SekPc);
if (realtec_size > realtec_romsize - realtec_bank || realtec_bank >= realtec_romsize)
if (realtec_size > Pico.romsize - realtec_bank)
{
elprintf(EL_ANOMALY, "realtec: bank too large / out of range?");
return;
}
for (i = 0; i < 0x400000; i += realtec_size)
memcpy(Pico.rom + i, Pico.rom + 0x400000 + realtec_bank, realtec_size);
for (i = 0; i < 0x400000; i += realtec_size) {
cpu68k_map_set(m68k_read8_map, i, realtec_size - 1, Pico.rom + realtec_bank, 0);
cpu68k_map_set(m68k_read16_map, i, realtec_size - 1, Pico.rom + realtec_bank, 0);
}
}
}
static void carthw_realtec_reset(void)
{
int i;
/* map boot code */
for (i = 0; i < 0x400000; i += 0x2000)
memcpy(Pico.rom + i, Pico.rom + 0x400000 + realtec_romsize - 0x2000, 0x2000);
for (i = 0; i < 0x400000; i += M68K_BANK_SIZE) {
cpu68k_map_set(m68k_read8_map, i, i + M68K_BANK_SIZE - 1, Pico.rom + Pico.romsize, 0);
cpu68k_map_set(m68k_read16_map, i, i + M68K_BANK_SIZE - 1, Pico.rom + Pico.romsize, 0);
}
cpu68k_map_set(m68k_write8_map, 0x400000, 0x400000 + M68K_BANK_SIZE - 1, carthw_realtec_write8, 1);
realtec_bank = realtec_size = 0x80000000;
}
void carthw_realtec_startup(void)
{
void *tmp;
int i;
elprintf(EL_STATUS, "Realtec mapper detected");
elprintf(EL_STATUS, "Realtec mapper startup");
realtec_romsize = Pico.romsize;
Pico.romsize = 0x400000;
tmp = realloc(Pico.rom, 0x400000 + realtec_romsize);
// allocate additional bank for boot code
// (we know those ROMs have aligned size)
tmp = realloc(Pico.rom, Pico.romsize + M68K_BANK_SIZE);
if (tmp == NULL)
{
elprintf(EL_STATUS, "OOM");
return;
}
Pico.rom = tmp;
memcpy(Pico.rom + 0x400000, Pico.rom, realtec_romsize);
PicoWrite8Hook = carthw_realtec_write8;
// create bank for boot code
for (i = 0; i < M68K_BANK_SIZE; i += 0x2000)
memcpy(Pico.rom + Pico.romsize + i, Pico.rom + Pico.romsize - 0x2000, 0x2000);
PicoResetHook = carthw_realtec_reset;
}
/* Radica mapper, based on DevSter's info
* http://devster.monkeeh.com/sega/radica/
* XXX: mostly the same as X-in-1, merge?
*/
static unsigned int carthw_radica_baddr = 0;
static carthw_state_chunk carthw_radica_state[] =
static u32 carthw_radica_read16(u32 a)
{
{ CHUNK_CARTHW, sizeof(carthw_radica_baddr), &carthw_radica_baddr },
{ 0, 0, NULL }
};
if ((a & 0xffff00) != 0xa13000)
return PicoRead16_io(a);
static unsigned int carthw_radica_read16(unsigned int a, int realsize)
{
if ((a & 0xffff80) != 0xa13000) {
elprintf(EL_UIO, "radica: r16 %06x", a);
return 0;
}
carthw_radica_baddr = a;
a = (a & 0x7e) << 15;
if (a >= Pico.romsize) {
elprintf(EL_ANOMALY|EL_STATUS, "radica: missing bank @ %06x", a);
return 0;
}
memcpy(Pico.rom, Pico.rom + Pico.romsize + a, Pico.romsize - a);
carthw_Xin1_do(a, 0x7e, 15);
return 0;
}
static void carthw_radica_mem_setup(void)
{
cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, carthw_radica_read16, 1);
}
static void carthw_radica_statef(void)
{
carthw_radica_read16(carthw_radica_baddr, 0);
carthw_radica_read16(carthw_Xin1_baddr);
}
static void carthw_radica_reset(void)
{
memcpy(Pico.rom, Pico.rom + Pico.romsize, Pico.romsize);
carthw_radica_read16(0xa13000);
}
void carthw_radica_startup(void)
{
void *tmp;
elprintf(EL_STATUS, "Radica mapper startup");
elprintf(EL_STATUS, "Radica mapper detected");
tmp = realloc(Pico.rom, Pico.romsize * 2);
if (tmp == NULL)
{
elprintf(EL_STATUS, "OOM");
return;
}
Pico.rom = tmp;
memcpy(Pico.rom + Pico.romsize, Pico.rom, Pico.romsize);
PicoRead16Hook = carthw_radica_read16;
PicoResetHook = carthw_radica_reset;
PicoCartMemSetup = carthw_radica_mem_setup;
PicoResetHook = carthw_radica_reset;
PicoLoadStateHook = carthw_radica_statef;
carthw_chunks = carthw_radica_state;
carthw_chunks = carthw_Xin1_state;
}

View file

@ -12,12 +12,9 @@ extern svp_t *svp;
void PicoSVPInit(void);
void PicoSVPStartup(void);
unsigned int PicoSVPRead16(unsigned int a, int realsize);
void PicoSVPWrite8 (unsigned int a, unsigned int d, int realsize);
void PicoSVPWrite16(unsigned int a, unsigned int d, int realsize);
void PicoSVPMemSetup(void);
/* misc */
void carthw_12in1_startup(void);
void carthw_Xin1_startup(void);
void carthw_realtec_startup(void);
void carthw_radica_startup(void);

View file

@ -7,32 +7,9 @@
#include "../../pico_int.h"
#include "../../memory.h"
#ifndef UTYPES_DEFINED
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#define UTYPES_DEFINED
#endif
#define CLEAR_DETECT(pc_start,pc_end,text) \
if (d == 0 && SekPc >= pc_start && SekPc < pc_end) \
{ \
if (!clearing_ram) \
elprintf(EL_SVP, text); \
clearing_ram = 1; \
return; \
}
unsigned int PicoSVPRead16(unsigned int a, int realsize)
{
unsigned int d = 0;
static int a15004_looping = 0;
// dram: 300000-31ffff
if ((a & 0xfe0000) == 0x300000)
d = *(u16 *)(svp->dram + (a&0x1fffe));
/*
// "cell arrange" 1: 390000-39ffff
else if ((a & 0xff0000) == 0x390000) {
// this is rewritten 68k code
@ -48,9 +25,15 @@ unsigned int PicoSVPRead16(unsigned int a, int realsize)
a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4);
d = ((u16 *)svp->dram)[a1];
}
*/
// IO/control area (0xa10000 - 0xa1ffff)
static u32 PicoRead16_svpr(u32 a)
{
u32 d = 0;
// regs
else if ((a & 0xfffff0) == 0xa15000) {
if ((a & 0xfffff0) == 0xa15000) {
switch (a & 0xf) {
case 0:
case 2:
@ -60,44 +43,41 @@ unsigned int PicoSVPRead16(unsigned int a, int realsize)
case 4:
d = svp->ssp1601.gr[SSP_PM0].h;
svp->ssp1601.gr[SSP_PM0].h &= ~1;
if (d&1) a15004_looping = 0;
break;
}
}
else
elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "SVP FIXME: unhandled r%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc);
if (!a15004_looping)
elprintf(EL_SVP, "SVP r%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc);
#if EL_LOGMASK & EL_SVP
{
static int a15004_looping = 0;
if (a == 0xa15004 && (d & 1))
a15004_looping = 0;
if (a == 0xa15004 && !(d&1)) {
if (!a15004_looping)
elprintf(EL_SVP, "SVP det TIGHT loop: a15004");
a15004_looping = 1;
if (!a15004_looping)
elprintf(EL_SVP, "SVP r%i: [%06x] %04x @%06x", realsize, a, d, SekPc);
if (a == 0xa15004 && !(d&1)) {
if (!a15004_looping)
elprintf(EL_SVP, "SVP det TIGHT loop: a15004");
a15004_looping = 1;
}
else
a15004_looping = 0;
}
#endif
return d;
}
else a15004_looping = 0;
//if (a == 0x30fe02 && d == 0)
// elprintf(EL_ANOMALY, "SVP lag?");
return d;
return PicoRead16_io(a);
}
void PicoSVPWrite8(unsigned int a, unsigned int d, int realsize)
static void PicoWrite16_svpr(u32 a, u32 d)
{
elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "!!! SVP w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);
}
elprintf(EL_SVP, "SVP w16: [%06x] %04x @%06x", a, d, SekPc);
void PicoSVPWrite16(unsigned int a, unsigned int d, int realsize)
{
static int clearing_ram = 0;
// DRAM
if ((a & 0xfe0000) == 0x300000)
*(u16 *)(svp->dram + (a&0x1fffe)) = d;
// regs
else if ((a & 0xfffff0) == 0xa15000) {
if ((a & 0xfffff0) == 0xa15000) {
if (a == 0xa15000 || a == 0xa15002) {
// just guessing here
svp->ssp1601.gr[SSP_XST].h = d;
@ -106,24 +86,34 @@ void PicoSVPWrite16(unsigned int a, unsigned int d, int realsize)
}
//else if (a == 0xa15006) svp->ssp1601.gr[SSP_PM0].h = d | (d << 1);
// 0xa15006 probably has 'halt'
return;
}
else
elprintf(EL_UIO|EL_SVP|EL_ANOMALY, "SVP FIXME: unhandled w%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc);
PicoWrite16_io(a, d);
/*
if (a == 0x30fe06 && d != 0)
svp->ssp1601.emu_status &= ~SSP_WAIT_30FE06;
if (a == 0x30fe08 && d != 0)
svp->ssp1601.emu_status &= ~SSP_WAIT_30FE08;
// debug: detect RAM clears..
CLEAR_DETECT(0x0221dc, 0x0221f0, "SVP RAM CLEAR (full) @ 0221C2");
CLEAR_DETECT(0x02204c, 0x022068, "SVP RAM CLEAR 300000-31ffbf (1) @ 022032");
CLEAR_DETECT(0x021900, 0x021ff0, "SVP RAM CLEAR 300000-305fff");
CLEAR_DETECT(0x0220b0, 0x0220cc, "SVP RAM CLEAR 300000-31ffbf (2) @ 022096");
clearing_ram = 0;
elprintf(EL_SVP, "SVP w%i: [%06x] %04x @%06x", realsize, a&0xffffff, d, SekPc);
*/
}
void PicoSVPMemSetup(void)
{
// 68k memmap:
// DRAM
cpu68k_map_set(m68k_read8_map, 0x300000, 0x31ffff, svp->dram, 0);
cpu68k_map_set(m68k_read16_map, 0x300000, 0x31ffff, svp->dram, 0);
cpu68k_map_set(m68k_write8_map, 0x300000, 0x31ffff, svp->dram, 0);
cpu68k_map_set(m68k_write16_map, 0x300000, 0x31ffff, svp->dram, 0);
// DRAM (cell arrange) - TODO
// regs
cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoRead8_io, 1); // PicoRead8_svpr
cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoRead16_svpr, 1);
cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWrite8_io, 1); // PicoWrite8_svpr
cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWrite16_svpr, 1);
}

View file

@ -647,12 +647,14 @@ static void write_XST(u32 d)
static u32 read_PM4(void)
{
u32 d = pm_io(4, 0, 0);
/* TODO?
if (d == 0) {
switch (GET_PPC_OFFS()) {
case 0x0854: ssp->emu_status |= SSP_WAIT_30FE08; elprintf(EL_SVP, "det TIGHT loop: [30fe08]"); break;
case 0x4f12: ssp->emu_status |= SSP_WAIT_30FE06; elprintf(EL_SVP, "det TIGHT loop: [30fe06]"); break;
}
}
*/
if (d != (u32)-1) return d;
// can be removed?
elprintf(EL_SVP|EL_ANOMALY, "PM4 raw r %04x @ %04x", rPM4, GET_PPC_OFFS());

View file

@ -121,7 +121,7 @@ void PicoSVPStartup(void)
{
void *tmp;
elprintf(EL_SVP, "SVP init");
elprintf(EL_STATUS, "SVP startup");
tmp = realloc(Pico.rom, 0x200000 + sizeof(*svp));
if (tmp == NULL)
@ -150,9 +150,7 @@ void PicoSVPStartup(void)
#endif
// init ok, setup hooks..
PicoRead16Hook = PicoSVPRead16;
PicoWrite8Hook = PicoSVPWrite8;
PicoWrite16Hook = PicoSVPWrite16;
PicoCartMemSetup = PicoSVPMemSetup;
PicoDmaHook = PicoSVPDma;
PicoResetHook = PicoSVPReset;
PicoLineHook = PicoSVPLine;