mirror of
https://github.com/holub/mame
synced 2025-05-22 13:48:55 +03:00
Removed per-game hacks from CPS3 (moved to DMA callback in SH2 core)
(also added a to-check note, 16-bit wide DMA is currently using 32-bit functions, is this correct?) Removed Speedups from CPS3 / PsikyoSH, while they do still give a decent speed boost they're not really needed with the DRC and just clutter the code.
This commit is contained in:
davidhay
parent
298dd21606
commit
090ab6fe44
@ -2156,7 +2156,11 @@ static void sh2_reset(void)
|
||||
f = sh2->ftcsr_read_callback;
|
||||
save_irqcallback = sh2->irq_callback;
|
||||
save_is_slave = sh2->is_slave;
|
||||
dma_callback_kludge = sh2->dma_callback_kludge;
|
||||
|
||||
memset(sh2, 0, sizeof(SH2));
|
||||
|
||||
sh2->dma_callback_kludge = dma_callback_kludge;
|
||||
sh2->is_slave = save_is_slave;
|
||||
sh2->ftcsr_read_callback = f;
|
||||
sh2->irq_callback = save_irqcallback;
|
||||
|
||||
@ -89,6 +89,7 @@ typedef struct _sh2_cpu_core sh2_cpu_core;
|
||||
struct _sh2_cpu_core
|
||||
{
|
||||
int is_slave;
|
||||
int (*dma_callback_kludge)(UINT32 src, UINT32 dst, UINT32 data, int size);
|
||||
};
|
||||
|
||||
extern void sh2_get_info(UINT32 state, cpuinfo *info);
|
||||
|
||||
@ -155,6 +155,7 @@ static void sh2_dmac_check(int dma)
|
||||
{
|
||||
int incs, incd, size;
|
||||
UINT32 src, dst, count;
|
||||
UINT32 dmadata;
|
||||
incd = (sh2->m[0x63+4*dma] >> 14) & 3;
|
||||
incs = (sh2->m[0x63+4*dma] >> 12) & 3;
|
||||
size = (sh2->m[0x63+4*dma] >> 10) & 3;
|
||||
@ -186,7 +187,11 @@ static void sh2_dmac_check(int dma)
|
||||
src --;
|
||||
if(incd == 2)
|
||||
dst --;
|
||||
program_write_byte_32be(dst, program_read_byte_32be(src));
|
||||
|
||||
dmadata = program_read_byte_32be(src);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_byte_32be(dst, dmadata);
|
||||
|
||||
if(incs == 1)
|
||||
src ++;
|
||||
if(incd == 1)
|
||||
@ -198,11 +203,17 @@ static void sh2_dmac_check(int dma)
|
||||
dst &= ~1;
|
||||
for(;count > 0; count --)
|
||||
{
|
||||
|
||||
if(incs == 2)
|
||||
src -= 2;
|
||||
if(incd == 2)
|
||||
dst -= 2;
|
||||
program_write_word_32be(dst, program_read_word_32be(src));
|
||||
|
||||
// check: should this really be using read_word_32 / write_word_32?
|
||||
dmadata = program_read_word_32be(src);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_word_32be(dst, dmadata);
|
||||
|
||||
if(incs == 1)
|
||||
src += 2;
|
||||
if(incd == 1)
|
||||
@ -218,7 +229,11 @@ static void sh2_dmac_check(int dma)
|
||||
src -= 4;
|
||||
if(incd == 2)
|
||||
dst -= 4;
|
||||
program_write_dword_32be(dst, program_read_dword_32be(src));
|
||||
|
||||
dmadata = program_read_dword_32be(src);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_dword_32be(dst, dmadata);
|
||||
|
||||
if(incs == 1)
|
||||
src += 4;
|
||||
if(incd == 1)
|
||||
@ -234,10 +249,23 @@ static void sh2_dmac_check(int dma)
|
||||
{
|
||||
if(incd == 2)
|
||||
dst -= 16;
|
||||
program_write_dword_32be(dst, program_read_dword_32be(src));
|
||||
program_write_dword_32be(dst+4, program_read_dword_32be(src+4));
|
||||
program_write_dword_32be(dst+8, program_read_dword_32be(src+8));
|
||||
program_write_dword_32be(dst+12, program_read_dword_32be(src+12));
|
||||
|
||||
dmadata = program_read_dword_32be(src);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_dword_32be(dst, dmadata);
|
||||
|
||||
dmadata = program_read_dword_32be(src+4);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_dword_32be(dst+4, dmadata);
|
||||
|
||||
dmadata = program_read_dword_32be(src+8);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_dword_32be(dst+8, dmadata);
|
||||
|
||||
dmadata = program_read_dword_32be(src+12);
|
||||
if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(src, dst, dmadata, size);
|
||||
program_write_dword_32be(dst+12, dmadata);
|
||||
|
||||
src += 16;
|
||||
if(incd == 1)
|
||||
dst += 16;
|
||||
@ -692,10 +720,16 @@ void sh2_common_init(int alloc, int index, int clock, const void *config, int (*
|
||||
sh2->m = auto_malloc(0x200);
|
||||
|
||||
if(conf)
|
||||
{
|
||||
sh2->is_slave = conf->is_slave;
|
||||
sh2->dma_callback_kludge = conf->dma_callback_kludge;
|
||||
}
|
||||
else
|
||||
{
|
||||
sh2->is_slave = 0;
|
||||
sh2->dma_callback_kludge = NULL;
|
||||
|
||||
}
|
||||
sh2->cpu_number = index;
|
||||
sh2->irq_callback = irqcallback;
|
||||
|
||||
|
||||
@ -128,6 +128,7 @@ typedef struct
|
||||
int dma_timer_active[2];
|
||||
|
||||
int is_slave, cpu_number, cpu_type;
|
||||
int (*dma_callback_kludge)(UINT32 src, UINT32 dst, UINT32 data, int size);
|
||||
|
||||
void (*ftcsr_read_callback)(UINT32 data);
|
||||
|
||||
|
||||
@ -13,15 +13,6 @@ SCSI code by ElSemi
|
||||
|
||||
ToDo: (in order or priority?)
|
||||
|
||||
There are currently a bunch of hacks in here to workaround the way the encryption works on the actual
|
||||
PCB. It seems that the SH2 DMA should bypass the encryption, returning values directly stored in the
|
||||
BIOS and/or flashROMs. Without modification to the CPU core this isn't possible. The hacks currently
|
||||
in the driver allow the Flash commands to be sent correctly from the BIOS rom (they're stored
|
||||
unencrypted) and allow the Flash type and Rom checksums to pass, needed for the flash routines.
|
||||
|
||||
The SCSI / CD Rom controller code here is limited, it's designed for the needs of CPS3 only, we should
|
||||
fix MAME's generic implementation and use that.
|
||||
|
||||
Street Fighter 3 2nd Impact uses flipped tilemaps during flashing, emulate this.
|
||||
|
||||
Figure out proper IRQ10 generation:
|
||||
@ -32,7 +23,7 @@ Figure out proper IRQ10 generation:
|
||||
|
||||
Alpha Blending Effects
|
||||
These are actually palette manipulation effects, not true blending. How the values are used is
|
||||
not currently 100% understood, however it seems good enough for Warzard etc. at the moment.
|
||||
not currently 100% understood. They are incorrect if you use player 2 in Warzard
|
||||
|
||||
Linezoom
|
||||
Is it used anywhere??
|
||||
@ -53,7 +44,7 @@ Sprite positioning glitches
|
||||
|
||||
Gaps in Sprite Zooming
|
||||
probably cause by use of drawgfx instead of processing as a single large sprite, but could also be due to the
|
||||
positioning of each part of the sprite.
|
||||
positioning of each part of the sprite. Warzard is confirmed to have gaps during some cutscenes on real hardware.
|
||||
|
||||
---
|
||||
|
||||
@ -345,9 +336,9 @@ Notes:
|
||||
#define DMA_XOR(a) ((a) ^ 2)
|
||||
#endif
|
||||
|
||||
static int cps3_use_fastboot;
|
||||
|
||||
static UINT32* decrypted_bios;
|
||||
|
||||
static UINT32* decrypted_gamerom;
|
||||
static UINT32 cram_gfxflash_bank;
|
||||
static UINT32* cps3_nops;
|
||||
@ -616,7 +607,8 @@ static OPBASE_HANDLER( cps3_opbase_handler );
|
||||
|
||||
/* Encryption */
|
||||
|
||||
static UINT32 cps3_key1, cps3_key2, cps3_isSpecial;
|
||||
static UINT32 cps3_key1, cps3_key2;
|
||||
static int cps3_altEncryption; // sfiii2 has different encryption, data isn't encrypted outside of the bios
|
||||
|
||||
static UINT16 rotate_left(UINT16 value, int n)
|
||||
{
|
||||
@ -699,14 +691,14 @@ static void cps3_decrypt_bios(running_machine *machine)
|
||||
UINT32 xormask = cps3_mask(i, cps3_key1, cps3_key2);
|
||||
|
||||
/* a bit of a hack, don't decrypt the FLASH commands which are transfered by SH2 DMA */
|
||||
if (((i<0x1ff00) || (i>0x1ff6b)) && (i<0x20000) )
|
||||
{
|
||||
// if (((i<0x1ff00) || (i>0x1ff6b)) && (i<0x20000) )
|
||||
// {
|
||||
decrypted_bios[i/4] = dword ^ xormask;
|
||||
}
|
||||
else
|
||||
{
|
||||
decrypted_bios[i/4] = dword;
|
||||
}
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// decrypted_bios[i/4] = dword;
|
||||
// }
|
||||
}
|
||||
#if 0
|
||||
/* Dump to file */
|
||||
@ -726,7 +718,7 @@ static void cps3_decrypt_bios(running_machine *machine)
|
||||
#endif
|
||||
}
|
||||
|
||||
static DRIVER_INIT( cps3crpt )
|
||||
static DRIVER_INIT( cps3 )
|
||||
{
|
||||
const char *gamename = machine->gamedrv->name;
|
||||
const struct game_keys2 *k = &keys_table2[0];
|
||||
@ -737,7 +729,7 @@ static DRIVER_INIT( cps3crpt )
|
||||
|
||||
cps3_key1 = -1;
|
||||
cps3_key2 = -1;
|
||||
cps3_isSpecial = -1;
|
||||
cps3_altEncryption = -1;
|
||||
|
||||
while (k->name)
|
||||
{
|
||||
@ -746,7 +738,7 @@ static DRIVER_INIT( cps3crpt )
|
||||
// we have a proper key set the global variables to it (so that we can decrypt code in ram etc.)
|
||||
cps3_key1 = k->keys[0];
|
||||
cps3_key2 = k->keys[1];
|
||||
cps3_isSpecial = k->isSpecial;
|
||||
cps3_altEncryption = k->isSpecial;
|
||||
break;
|
||||
}
|
||||
++k;
|
||||
@ -1364,7 +1356,7 @@ static OPBASE_HANDLER( cps3_opbase_handler )
|
||||
opbase->rom = (UINT8*)decrypted_gamerom-0x06000000;
|
||||
opbase->ram = (UINT8*)decrypted_gamerom-0x06000000;
|
||||
|
||||
if (cps3_isSpecial) opbase->ram = (UINT8*) memory_region(machine, "user4")-0x06000000;
|
||||
if (cps3_altEncryption) opbase->ram = (UINT8*) memory_region(machine, "user4")-0x06000000;
|
||||
|
||||
|
||||
return ~0;
|
||||
@ -1562,79 +1554,13 @@ static UINT32 cps3_flashmain_r(int base, UINT32 offset, UINT32 mem_mask)
|
||||
return result;
|
||||
}
|
||||
|
||||
/* In certain situations (SH2 DMA?) the reads must bypass the encryption device,
|
||||
this is used when checking the flash roms, and performing rom tests. Without
|
||||
modification to the SH2 core this requires PC based hacks to work correctly */
|
||||
static UINT32 cps3_bios_test_hack;
|
||||
static UINT32 cps3_game_test_hack;
|
||||
|
||||
struct cps3_test_hacks
|
||||
{
|
||||
const char *name; /* game driver name */
|
||||
const UINT32 bios_test_hack;
|
||||
const UINT32 game_test_hack;
|
||||
};
|
||||
|
||||
static const struct cps3_test_hacks testhack_table[] =
|
||||
{
|
||||
// name mainram address code address
|
||||
{ "jojo", 0x0011c2a, 0x6172566 },
|
||||
{ "jojon", 0x0011c2a, 0x6172566 },
|
||||
{ "jojoalt", 0x0011c2a, 0x6172796 },
|
||||
{ "jojoaltn", 0x0011c2a, 0x6172796 },
|
||||
{ "jojoba", 0x0011c8e, 0x61c45ba },
|
||||
{ "jojoban", 0x0011c8e, 0x61c45ba },
|
||||
{ "jojobane", 0x0011c8e, 0x61c45ba },
|
||||
{ "sfiii", 0x00166b2, 0x63cdff2 },
|
||||
{ "sfiiiu", 0x00166b2, 0x63cdff2 },
|
||||
{ "sfiiin", 0x00166b2, 0x63cdff2 },
|
||||
{ "sfiii2", 0, 0 },
|
||||
{ "sfiii2u", 0, 0 },
|
||||
{ "sfiii2n", 0, 0 },
|
||||
{ "sfiii3", 0x0011c42, 0x613a9fa },
|
||||
{ "sfiii3n", 0x0011c42, 0x613a9fa },
|
||||
{ "sfiii3a", 0x0011c42, 0x613ab46 },
|
||||
{ "sfiii3an", 0x0011c42, 0x613ab46 },
|
||||
{ "warzard", 0x001652e, 0x60105ee },
|
||||
{ "redearth", 0x001652e, 0x60105ee },
|
||||
{ 0 } // end of table
|
||||
};
|
||||
|
||||
static DRIVER_INIT( cps3_testhacks )
|
||||
{
|
||||
const char *gamename = machine->gamedrv->name;
|
||||
const struct cps3_test_hacks *k = &testhack_table[0];
|
||||
|
||||
cps3_bios_test_hack = 0;
|
||||
cps3_game_test_hack = 0;
|
||||
|
||||
while (k->name)
|
||||
{
|
||||
if (strcmp(k->name, gamename) == 0)
|
||||
{
|
||||
cps3_bios_test_hack = k->bios_test_hack;
|
||||
cps3_game_test_hack = k->game_test_hack;
|
||||
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, cps3_bios_test_hack);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, cps3_game_test_hack);
|
||||
|
||||
break;
|
||||
}
|
||||
++k;
|
||||
}
|
||||
printf("testhacks %08x %08x\n",cps3_bios_test_hack,cps3_game_test_hack);
|
||||
}
|
||||
|
||||
|
||||
static READ32_HANDLER( cps3_flash1_r )
|
||||
{
|
||||
UINT32 retvalue = cps3_flashmain_r(0, offset,mem_mask);
|
||||
|
||||
if (activecpu_get_pc()==cps3_bios_test_hack) return retvalue; // initial flash tests / bios tests
|
||||
if (activecpu_get_pc()==cps3_game_test_hack) return retvalue; // test menu rom tests
|
||||
if (cps3_isSpecial) return retvalue; // sfiii2.. (no encrypted data)
|
||||
if (cps3_altEncryption) return retvalue;
|
||||
|
||||
retvalue = retvalue ^ cps3_mask(0x6000000+offset*4, cps3_key1, cps3_key2);
|
||||
return retvalue;
|
||||
@ -1644,9 +1570,7 @@ static READ32_HANDLER( cps3_flash2_r )
|
||||
{
|
||||
UINT32 retvalue = cps3_flashmain_r(4, offset,mem_mask);
|
||||
|
||||
if (activecpu_get_pc()==cps3_bios_test_hack) return retvalue; // initial flash tests / bios tests
|
||||
if (activecpu_get_pc()==cps3_game_test_hack) return retvalue; // test menu rom tests
|
||||
if (cps3_isSpecial) return retvalue; // sfiii2.. (no encrypted data)
|
||||
if (cps3_altEncryption) return retvalue;
|
||||
|
||||
retvalue = retvalue ^ cps3_mask(0x6800000+offset*4, cps3_key1, cps3_key2);
|
||||
return retvalue;
|
||||
@ -2421,18 +2345,7 @@ static const custom_sound_interface custom_interface =
|
||||
};
|
||||
|
||||
|
||||
static emu_timer* fastboot_timer;
|
||||
|
||||
static TIMER_CALLBACK( fastboot_timer_callback )
|
||||
{
|
||||
UINT32 *rom = (UINT32*)decrypted_gamerom;//memory_region ( machine, "user4" );
|
||||
if (cps3_isSpecial) rom = (UINT32*)memory_region(machine, "user4");
|
||||
|
||||
// printf("fastboot callback %08x %08x", rom[0], rom[1]);
|
||||
cpunum_set_reg(0,SH2_PC, rom[0]);
|
||||
cpunum_set_reg(0,SH2_R15, rom[1]);
|
||||
cpunum_set_reg(0,SH2_VBR, 0x6000000);
|
||||
}
|
||||
|
||||
static const SCSIConfigTable dev_table =
|
||||
{
|
||||
@ -2460,13 +2373,6 @@ static MACHINE_START( cps3 )
|
||||
static MACHINE_RESET( cps3 )
|
||||
{
|
||||
current_table_address = -1;
|
||||
|
||||
if (cps3_use_fastboot)
|
||||
{
|
||||
fastboot_timer = timer_alloc(fastboot_timer_callback, NULL);
|
||||
// printf("reset\n");
|
||||
timer_adjust_oneshot(fastboot_timer, attotime_zero, 0);
|
||||
}
|
||||
}
|
||||
|
||||
#define MASTER_CLOCK 42954500
|
||||
@ -2660,6 +2566,67 @@ static NVRAM_HANDLER( cps3 )
|
||||
|
||||
|
||||
|
||||
static UINT32 cps3_dma_callback(UINT32 src, UINT32 dst, UINT32 data, int size)
|
||||
{
|
||||
/*
|
||||
on the actual CPS3 hardware the SH2 DMA bypasses the encryption.
|
||||
|
||||
to handle this in MAME we use this callback, and reverse the effect of the
|
||||
encryption that would otherwise be applied. this allows us to avoid per-game,
|
||||
per-PC hacks. this approach is however still a little messy.
|
||||
|
||||
*/
|
||||
|
||||
/* I doubt this is endian safe.. needs checking / fixing */
|
||||
if (size==0)
|
||||
{
|
||||
if ((src&3)==0) data <<=24;
|
||||
if ((src&3)==1) data <<=16;
|
||||
if ((src&3)==2) data <<=8;
|
||||
if ((src&3)==3) data <<=0;
|
||||
}
|
||||
|
||||
|
||||
if (src<0x80000)
|
||||
{
|
||||
int offs = (src&0x07ffff)>>2;
|
||||
data = data ^ cps3_mask(offs*4, cps3_key1, cps3_key2);
|
||||
}
|
||||
else if (src>=0x6000000 && src<0x6800000)
|
||||
{
|
||||
int offs = (src&0x07fffff)>>2;
|
||||
if (!cps3_altEncryption) data = data ^ cps3_mask(0x6000000+offs*4, cps3_key1, cps3_key2);
|
||||
}
|
||||
else if (src>=0x6800000 && src<0x7000000)
|
||||
{
|
||||
int offs = (src&0x07fffff)>>2;
|
||||
if (!cps3_altEncryption) data = data ^ cps3_mask(0x6800000+offs*4, cps3_key1, cps3_key2);
|
||||
}
|
||||
else
|
||||
{
|
||||
//printf("PC %08x :src %08x, dst %08x, returning %08x\n", activecpu_get_pc(), src, dst, data);
|
||||
}
|
||||
|
||||
/* I doubt this is endian safe.. needs checking / fixing */
|
||||
if (size==0)
|
||||
{
|
||||
if ((src&3)==0) data >>=24;
|
||||
if ((src&3)==1) data >>=16;
|
||||
if ((src&3)==2) data >>=8;
|
||||
if ((src&3)==3) data >>=0;
|
||||
|
||||
data &=0x000000ff;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static const sh2_cpu_core sh2_conf_cps3 = {
|
||||
0, // master
|
||||
(void*)cps3_dma_callback
|
||||
};
|
||||
|
||||
static MACHINE_DRIVER_START( cps3 )
|
||||
/* basic machine hardware */
|
||||
@ -2667,6 +2634,7 @@ static MACHINE_DRIVER_START( cps3 )
|
||||
MDRV_CPU_PROGRAM_MAP(cps3_map,0)
|
||||
MDRV_CPU_VBLANK_INT("main", cps3_vbl_interrupt)
|
||||
MDRV_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */
|
||||
MDRV_CPU_CONFIG(sh2_conf_cps3)
|
||||
|
||||
/* video hardware */
|
||||
MDRV_SCREEN_ADD("main", RASTER)
|
||||
@ -2971,272 +2939,183 @@ ROM_START( redeartn )
|
||||
ROM_LOAD( "50", 0x2000000, 0x400000, CRC(2f5b44bd) SHA1(7ffdbed5b6899b7e31414a0828e04543d07435e4) )
|
||||
ROM_END
|
||||
|
||||
/* Idle loop skipping speedups */
|
||||
static UINT32 cps3_speedup_ram_address;
|
||||
static UINT32 cps3_speedup_code_address;
|
||||
|
||||
struct cps3_speedups
|
||||
{
|
||||
const char *name; /* game driver name */
|
||||
const UINT32 ram_address;
|
||||
const UINT32 code_address;
|
||||
};
|
||||
/*****************************************************************************************
|
||||
CPS3 game region / special flag information
|
||||
*****************************************************************************************/
|
||||
|
||||
static const struct cps3_speedups speedup_table[] =
|
||||
{
|
||||
// name mainram address code address
|
||||
{ "jojo", 0x223c0, 0x600065a },
|
||||
{ "jojon", 0x223c0, 0x600065a },
|
||||
{ "jojoalt", 0x223d8, 0x600065a },
|
||||
{ "jojoaltn", 0x223d8, 0x600065a },
|
||||
{ "jojoba", 0x267dc, 0x600065a },
|
||||
{ "jojoban", 0x267dc, 0x600065a },
|
||||
{ "jojobane", 0x267dc, 0x600065a },
|
||||
{ "sfiii", 0x0cc6c, 0x6000882 },
|
||||
{ "sfiiiu", 0x0cc6c, 0x6000882 },
|
||||
{ "sfiiin", 0x0cc6c, 0x6000882 },
|
||||
{ "sfiii2", 0x0dfe4, 0x6000882 },
|
||||
{ "sfiii2u", 0x0dfe4, 0x6000882 },
|
||||
{ "sfiii2n", 0x0dfe4, 0x6000882 },
|
||||
{ "sfiii3", 0x0d794, 0x6000882 },
|
||||
{ "sfiii3n", 0x0d794, 0x6000882 },
|
||||
{ "sfiii3a", 0x0d794, 0x6000882 },
|
||||
{ "sfiii3an", 0x0d794, 0x6000882 },
|
||||
{ "warzard", 0x2136c, 0x600194c },
|
||||
{ "redearth", 0x2136c, 0x600194c },
|
||||
{ 0 } // end of table
|
||||
};
|
||||
/*****************************************************************************************
|
||||
|
||||
static READ32_HANDLER(cps3_speedup_r)
|
||||
{
|
||||
// printf("speedup read %08x %d\n",activecpu_get_pc(), cpu_getexecutingcpu());
|
||||
if (cpu_getexecutingcpu()>=0) // prevent cheat search crash..
|
||||
if (activecpu_get_pc()==cps3_speedup_code_address) {cpu_spinuntil_int();return cps3_mainram[cps3_speedup_ram_address/4];}
|
||||
JoJo's Venture
|
||||
|
||||
return cps3_mainram[cps3_speedup_ram_address/4];
|
||||
}
|
||||
XXXXXX 0
|
||||
JAPAN 1
|
||||
ASIA 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
|
||||
static DRIVER_INIT( cps3_speedups )
|
||||
{
|
||||
const char *gamename = machine->gamedrv->name;
|
||||
const struct cps3_speedups *k = &speedup_table[0];
|
||||
DEVELOPMENT VERSION add 0x70 mask!
|
||||
|
||||
cps3_speedup_ram_address = 0;
|
||||
cps3_speedup_code_address = 0;
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fec8/4]^=0x00000001; // region hack (clear jpn)
|
||||
|
||||
while (k->name)
|
||||
{
|
||||
if (strcmp(k->name, gamename) == 0)
|
||||
{
|
||||
cps3_speedup_ram_address = k->ram_address;
|
||||
cps3_speedup_code_address = k->code_address;
|
||||
break;
|
||||
}
|
||||
++k;
|
||||
}
|
||||
rom[0x1fec8/4]^=0x00000004; // region
|
||||
rom[0x1fec8/4]^=0x00000070; // DEV mode
|
||||
rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
|
||||
//printf("speedup %08x %08x\n",cps3_speedup_ram_address,cps3_speedup_code_address);
|
||||
|
||||
if (cps3_speedup_code_address!=0)
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, cps3_speedup_code_address);
|
||||
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, cps3_speedup_ram_address+0x02000000, cps3_speedup_ram_address+0x02000003, 0, 0, cps3_speedup_r );
|
||||
}
|
||||
}
|
||||
*****************************************************************************************/
|
||||
|
||||
|
||||
/* PLEASE leave the region / NOCD information here even once CD emulation is done, its useful for debugging */
|
||||
/*****************************************************************************************
|
||||
|
||||
JoJo's Bizarre Adventure: Heritage for the Future
|
||||
|
||||
static DRIVER_INIT( jojo )
|
||||
{
|
||||
// XXXXXX 0
|
||||
// JAPAN 1
|
||||
// ASIA 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
XXXXXX 0
|
||||
JAPAN 1
|
||||
ASIA 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
|
||||
// DEVELOPMENT VERSION add 0x70 mask!
|
||||
DEVELOPMENT VERSION add 0x70 mask!
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
// rom[0x1fec8/4]^=0x00000001; // region hack (clear jpn)
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fec8/4]^=0x00000001; // region (clear jpn)
|
||||
rom[0x1fec8/4]^=0x00000002; // region
|
||||
rom[0x1fec8/4]^=0x00000070; // DEV mode
|
||||
rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
|
||||
// rom[0x1fec8/4]^=0x00000004; // region
|
||||
// rom[0x1fec8/4]^=0x00000070; // DEV mode
|
||||
// rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
*****************************************************************************************/
|
||||
|
||||
cps3_use_fastboot = 0;
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
/*****************************************************************************************
|
||||
|
||||
Red Earth / Warzard
|
||||
|
||||
}
|
||||
JAPAN 1
|
||||
ASIA 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
ASIA NCD 8
|
||||
|
||||
static DRIVER_INIT (jojoba)
|
||||
{
|
||||
// XXXXXX 0
|
||||
// JAPAN 1
|
||||
// ASIA 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
|
||||
// DEVELOPMENT VERSION add 0x70 mask!
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
// rom[0x1fec8/4]^=0x00000001; // region (clear jpn)
|
||||
// rom[0x1fec8/4]^=0x00000002; // region
|
||||
// rom[0x1fec8/4]^=0x00000070; // DEV mode
|
||||
// rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
|
||||
cps3_use_fastboot = 0;
|
||||
}
|
||||
|
||||
|
||||
static DRIVER_INIT( warzard )
|
||||
{
|
||||
// JAPAN 1
|
||||
// ASIA 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
// ASIA NCD 8
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
// rom[0x1fed8/4]^=0x00000001; // clear region to 0 (invalid)
|
||||
// rom[0x1fed8/4]^=0x00000008; // region 8 - ASIA NO CD - doesn't actually skip the CD test on startup,
|
||||
// only during game, must be another flag somewhere too, and we don't have
|
||||
// any actual NCD dumps to compare (or it expects SCSI to report there being
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fed8/4]^=0x00000001; // clear region to 0 (invalid)
|
||||
rom[0x1fed8/4]^=0x00000008; // region 8 - ASIA NO CD - doesn't actually skip the CD
|
||||
// test on startup, only during game, must be another flag
|
||||
// somewhere too, and we don't have any actual NCD dumps
|
||||
// to compare (or it expects SCSI to report there being
|
||||
// no cd drive?)
|
||||
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
*****************************************************************************************/
|
||||
|
||||
cps3_use_fastboot = 0; // required due to cd check, even with ASIA NO CD selected, not req. with CD emulation
|
||||
}
|
||||
/*****************************************************************************************
|
||||
|
||||
Street Fighter III: New Generation
|
||||
|
||||
static DRIVER_INIT( sfiii )
|
||||
{
|
||||
// JAPAN 1
|
||||
// ASIA NCD 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
// ASIA 8
|
||||
JAPAN 1
|
||||
ASIA NCD 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
ASIA 8
|
||||
|
||||
// bios rom also lists korea, but game rom does not.
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
// rom[0x1fec8/4]^=0x00000001; // region (clear region)
|
||||
// rom[0x1fec8/4]^=0x00000008; // region
|
||||
// rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test menu is region is ASIA NCD, otherwise it will report NG, Asia was probably the only NCD region for this
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fec8/4]^=0x00000001; // region (clear region)
|
||||
rom[0x1fec8/4]^=0x00000008; // region
|
||||
rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test
|
||||
// menu is region is ASIA NCD, otherwise it will report
|
||||
// NG, Asia was probably the only NCD region for this
|
||||
|
||||
cps3_use_fastboot = 0;
|
||||
*****************************************************************************************/
|
||||
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
/*****************************************************************************************
|
||||
|
||||
}
|
||||
Street Fighter III 2nd Impact
|
||||
|
||||
static DRIVER_INIT( sfiii2 )
|
||||
{
|
||||
// JAPAN 1
|
||||
// ASIA NCD 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
// ASIA 8
|
||||
JAPAN 1
|
||||
ASIA NCD 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
ASIA 8
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
// rom[0x1fec8/4]^=0x00000001; // region (clear region)
|
||||
// rom[0x1fec8/4]^=0x00000008; // region
|
||||
// rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test menu is region is ASIA NCD, otherwise it will report NG, Asia was probably the only NCD region for this
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fec8/4]^=0x00000001; // region (clear region)
|
||||
rom[0x1fec8/4]^=0x00000008; // region
|
||||
rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test
|
||||
// menu is region is ASIA NCD, otherwise it will report
|
||||
// NG, Asia was probably the only NCD region for this
|
||||
|
||||
cps3_use_fastboot = 0; // not required
|
||||
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
}
|
||||
*****************************************************************************************/
|
||||
|
||||
|
||||
static DRIVER_INIT( sfiii3 )
|
||||
{
|
||||
// JAPAN 1
|
||||
// ASIA 2
|
||||
// EURO 3
|
||||
// USA 4
|
||||
// HISPANIC 5
|
||||
// BRAZIL 6
|
||||
// OCEANIA 7
|
||||
/*****************************************************************************************
|
||||
|
||||
// UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
Street Fighter III 3rd Strike
|
||||
|
||||
// rom[0x1fec8/4]^=0x00000004; // region (clear region)
|
||||
// rom[0x1fec8/4]^=0x00000001; // region
|
||||
// rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
JAPAN 1
|
||||
ASIA 2
|
||||
EURO 3
|
||||
USA 4
|
||||
HISPANIC 5
|
||||
BRAZIL 6
|
||||
OCEANIA 7
|
||||
|
||||
UINT32 *rom = (UINT32*)memory_region ( machine, "user1" );
|
||||
rom[0x1fec8/4]^=0x00000004; // region (clear region)
|
||||
rom[0x1fec8/4]^=0x00000001; // region
|
||||
rom[0x1fecc/4]^=0x01000000; // nocd
|
||||
|
||||
*****************************************************************************************/
|
||||
|
||||
DRIVER_INIT_CALL(cps3crpt);
|
||||
DRIVER_INIT_CALL(cps3_speedups);
|
||||
DRIVER_INIT_CALL(cps3_testhacks);
|
||||
|
||||
cps3_use_fastboot = 0;
|
||||
}
|
||||
|
||||
/* todo: use BIOS for the bios roms, having clones only for CD / No CD */
|
||||
|
||||
GAME( 1997, sfiii, 0, cps3, cps3, sfiii, ROT0, "Capcom", "Street Fighter III: New Generation (Japan, 970204)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiiiu, sfiii, cps3, cps3, sfiii, ROT0, "Capcom", "Street Fighter III: New Generation (USA, 970204)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiii, 0, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III: New Generation (Japan, 970204)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiiiu, sfiii, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III: New Generation (USA, 970204)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1997, sfiii2, 0, cps3, cps3, sfiii2, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (Japan, 970930)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiii2u, sfiii2, cps3, cps3, sfiii2, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (USA, 970930)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiii2, 0, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (Japan, 970930)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiii2u, sfiii2, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (USA, 970930)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1999, sfiii3, 0, cps3, cps3, sfiii3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (USA, 990512)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3a, sfiii3, cps3, cps3, sfiii3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (USA, 990608)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3, 0, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (USA, 990512)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3a, sfiii3, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (USA, 990608)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1998, jojo, 0, cps3, cps3, jojo, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Japan, 981202)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojoalt, jojo, cps3, cps3, jojo, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Japan, 990108)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojo, 0, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Japan, 981202)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojoalt, jojo, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Japan, 990108)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1999, jojoba, 0, cps3, cps3, jojoba, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Japan, 990913)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, jojoba, 0, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Japan, 990913)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1996, redearth,0, cps3, cps3, warzard, ROT0, "Capcom", "Red Earth (Euro, 961121)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1996, warzard, redearth, cps3, cps3, warzard, ROT0, "Capcom", "Warzard (Japan, 961121)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1996, redearth,0, cps3, cps3, cps3, ROT0, "Capcom", "Red Earth (Euro, 961121)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1996, warzard, redearth, cps3, cps3, cps3, ROT0, "Capcom", "Warzard (Japan, 961121)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
/* NO-CD sets */
|
||||
|
||||
GAME( 1997, sfiiin, sfiii, cps3, cps3, sfiii, ROT0, "Capcom", "Street Fighter III: New Generation (Asia, 970204, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiiin, sfiii, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III: New Generation (Asia, 970204, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1997, sfiii2n, sfiii2, cps3, cps3, sfiii2, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (Asia, 970930, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1997, sfiii2n, sfiii2, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 2nd Impact: Giant Attack (Asia, 970930, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1999, sfiii3n, sfiii3, cps3, cps3, sfiii3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (Japan, 990512, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3an,sfiii3, cps3, cps3, sfiii3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (Japan, 990608, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3n, sfiii3, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (Japan, 990512, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, sfiii3an,sfiii3, cps3, cps3, cps3, ROT0, "Capcom", "Street Fighter III 3rd Strike: Fight for the Future (Japan, 990608, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1998, jojon, jojo, cps3, cps3, jojo, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Asia, 981202, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojoaltn,jojo, cps3, cps3, jojo, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Asia, 990108, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojon, jojo, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Asia, 981202, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1998, jojoaltn,jojo, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Venture / JoJo no Kimyouna Bouken (Asia, 990108, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
GAME( 1999, jojoban, jojoba, cps3, cps3, jojoba, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Japan, 990913, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, jojobane,jojoba, cps3, cps3, jojoba, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Euro, 990913, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, jojoban, jojoba, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Japan, 990913, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 1999, jojobane,jojoba, cps3, cps3, cps3, ROT0, "Capcom", "JoJo's Bizarre Adventure: Heritage for the Future / JoJo no Kimyouna Bouken: Miraie no Isan (Euro, 990913, NO CD)", GAME_IMPERFECT_GRAPHICS )
|
||||
|
||||
// We don't have any actual warzard / red earth no cd bios sets, but keep this here anyway
|
||||
GAME( 1996, redeartn,redearth, cps3, cps3, warzard,ROT0, "Capcom", "Red Earth (961121, NO CD)", GAME_NOT_WORKING )
|
||||
GAME( 1996, redeartn,redearth, cps3, cps3, cps3, ROT0, "Capcom", "Red Earth (961121, NO CD)", GAME_NOT_WORKING )
|
||||
|
||||
@ -379,8 +379,18 @@ static NVRAM_HANDLER(93C56)
|
||||
memcpy(eeprom_data+0xf0, mjgtaste_eeprom, 0x10);
|
||||
}
|
||||
|
||||
|
||||
|
||||
eeprom_set_data(eeprom_data,0x100);
|
||||
}
|
||||
else if (memory_region(machine,"user1")) /* if there is an eeprom in the romdef, use that */
|
||||
{
|
||||
UINT8 eeprom_data[0x100];
|
||||
printf("user1\n");
|
||||
memcpy(eeprom_data, memory_region(machine,"user1"), 0x100);
|
||||
eeprom_set_data(eeprom_data,0x100);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -639,7 +649,6 @@ static MACHINE_DRIVER_START( psikyo5 )
|
||||
MDRV_CPU_PROGRAM_MAP(ps5_readmem,ps5_writemem)
|
||||
MACHINE_DRIVER_END
|
||||
|
||||
#if 0
|
||||
static MACHINE_DRIVER_START( psikyo5_240 )
|
||||
/* basic machine hardware */
|
||||
MDRV_IMPORT_FROM(psikyo3v1)
|
||||
@ -651,7 +660,6 @@ static MACHINE_DRIVER_START( psikyo5_240 )
|
||||
MDRV_SCREEN_MODIFY("main")
|
||||
MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
|
||||
MACHINE_DRIVER_END
|
||||
#endif
|
||||
|
||||
static INPUT_PORTS_START( common )
|
||||
PORT_START("INPUTS")
|
||||
@ -1125,274 +1133,67 @@ ROM_START( tgm2p )
|
||||
// might need byteswapping to reprogram actual chip/
|
||||
ROM_LOAD( "tgm2p.default.nv", 0x000, 0x100, CRC(b2328b40) SHA1(e6cda4d6f4e91b9f78d2ca84a5eee6c3bd03fe02) )
|
||||
ROM_END
|
||||
|
||||
*/
|
||||
|
||||
/* are these right? should i fake the counter return?
|
||||
'speedups / idle skipping isn't needed for 'hotgmck, hgkairak'
|
||||
as the core catches and skips the idle loops automatically'
|
||||
*/
|
||||
|
||||
static READ32_HANDLER( soldivid_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC : 0001AE74: MOV.L @R14,R1
|
||||
PC : 0001AE76: ADD #$01,R1
|
||||
PC : 0001AE78: MOV.L R1,@R14
|
||||
PC : 0001AE7A: MOV.L @($7C,PC),R3
|
||||
PC : 0001AE7C: MOV.L @R3,R0
|
||||
PC : 0001AE7E: TST R0,R0
|
||||
PC : 0001AE80: BT $0001AE74
|
||||
*/
|
||||
if (activecpu_get_pc()==0x0001AFAA) cpu_spinuntil_int(); // Character Select + InGame
|
||||
if (activecpu_get_pc()==0x0001AE74) cpu_spinuntil_int(); // Everything Else?
|
||||
|
||||
return psh_ram[0x00000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( s1945ii_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC : 0609FC68: MOV.L @R13,R1 // R13 is 600000C R1 is counter (read from r13)
|
||||
PC : 0609FC6A: ADD #$01,R1 // add 1 to counter
|
||||
PC : 0609FC6C: MOV.L R1,@R13 // write it back
|
||||
PC : 0609FC6E: MOV.L @($3C,PC),R3 // 609fdac into r3
|
||||
PC : 0609FC70: MOV.L @R3,R0 // whats there into r0
|
||||
PC : 0609FC72: TST R0,R0 // test
|
||||
PC : 0609FC74: BT $0609FC68
|
||||
*/
|
||||
if (activecpu_get_pc()==0x609FC68) cpu_spinuntil_int(); // Title Screens
|
||||
if (activecpu_get_pc()==0x609FED2) cpu_spinuntil_int(); // In Game
|
||||
if (activecpu_get_pc()==0x60A0170) cpu_spinuntil_int(); // Attract Demo
|
||||
|
||||
return psh_ram[0x00000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( daraku_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC : 00047618: MOV.L @($BC,PC),R0
|
||||
PC : 0004761A: MOV.L @R0,R1
|
||||
PC : 0004761C: ADD #$01,R1
|
||||
PC : 0004761E: MOV.L R1,@R0
|
||||
PC : 00047620: MOV.L @($BC,PC),R3
|
||||
PC : 00047622: MOV.L @R3,R0
|
||||
PC : 00047624: TST R0,R0
|
||||
PC : 00047626: BT $00047618
|
||||
*/
|
||||
if (activecpu_get_pc()==0x0004761a) cpu_spinuntil_int(); // title
|
||||
if (activecpu_get_pc()==0x00047976) cpu_spinuntil_int(); // ingame
|
||||
|
||||
return psh_ram[0x00000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( sbomberb_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC : 060A10EC: MOV.L @R13,R3
|
||||
PC : 060A10EE: ADD #$01,R3
|
||||
PC : 060A10F0: MOV.L R3,@R13
|
||||
PC : 060A10F2: MOV.L @($34,PC),R1
|
||||
PC : 060A10F4: MOV.L @R1,R2
|
||||
PC : 060A10F6: TST R2,R2
|
||||
PC : 060A10F8: BT $060A10EC
|
||||
*/
|
||||
if (activecpu_get_pc()==0x060A10EC) cpu_spinuntil_int(); // title
|
||||
if (activecpu_get_pc()==0x060A1658) cpu_spinuntil_int(); // attract
|
||||
if (activecpu_get_pc()==0x060A1380) cpu_spinuntil_int(); // game
|
||||
|
||||
return psh_ram[0x00000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( gunbird2_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC : 06028972: MOV.L @R14,R3 // r14 is 604000c on this one
|
||||
PC : 06028974: MOV.L @($D4,PC),R1
|
||||
PC : 06028976: ADD #$01,R3
|
||||
PC : 06028978: MOV.L R3,@R14
|
||||
PC : 0602897A: MOV.L @R1,R2
|
||||
PC : 0602897C: TST R2,R2
|
||||
PC : 0602897E: BT $06028972
|
||||
*/
|
||||
if (activecpu_get_pc()==0x06028972) cpu_spinuntil_int();
|
||||
if (activecpu_get_pc()==0x06028E62) cpu_spinuntil_int();
|
||||
if (activecpu_get_pc()==0x06028BE4) cpu_spinuntil_int();
|
||||
|
||||
return psh_ram[0x04000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( s1945iii_speedup_r )
|
||||
{
|
||||
if (activecpu_get_pc()==0x0602B462) cpu_spinuntil_int(); // start up text
|
||||
if (activecpu_get_pc()==0x0602B6E0) cpu_spinuntil_int(); // intro attract
|
||||
if (activecpu_get_pc()==0x0602BC1C) cpu_spinuntil_int(); // game attract
|
||||
if (activecpu_get_pc()==0x0602B97A) cpu_spinuntil_int(); // game
|
||||
|
||||
return psh_ram[0x06000C/4];
|
||||
}
|
||||
|
||||
|
||||
static READ32_HANDLER( dragnblz_speedup_r )
|
||||
{
|
||||
if (activecpu_get_pc()==0x0602743e) cpu_spinuntil_int(); // startup texts
|
||||
if (activecpu_get_pc()==0x060276e4) cpu_spinuntil_int(); // attract intro
|
||||
if (activecpu_get_pc()==0x06027C72) cpu_spinuntil_int(); // attract game
|
||||
if (activecpu_get_pc()==0x060279A6) cpu_spinuntil_int(); // game
|
||||
|
||||
return psh_ram[0x006000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( gnbarich_speedup_r )
|
||||
{
|
||||
/*
|
||||
PC :0602CAE6: MOV.L @R14,R3 // R14 = 0x606000C
|
||||
PC :0602CAE8: MOV.L @($F4,PC),R1
|
||||
PC :0602CAEA: ADD #$01,R3
|
||||
PC :0602CAEC: MOV.L R3,@R14 // R14 = 0x606000C
|
||||
PC :0602CAEE: MOV.L @R1,R2
|
||||
PC :0602CAF0: TST R2,R2
|
||||
PC :0602CAF2: BT $0602CAE6
|
||||
*/
|
||||
|
||||
if (activecpu_get_pc()==0x0602CAE6) cpu_spinuntil_int(); // title logos
|
||||
if (activecpu_get_pc()==0x0602CD86) cpu_spinuntil_int(); // attract intro
|
||||
if (activecpu_get_pc()==0x0602D2ee) cpu_spinuntil_int(); // game attract
|
||||
if (activecpu_get_pc()==0x0602D040) cpu_spinuntil_int(); // game play
|
||||
|
||||
return psh_ram[0x006000C/4];
|
||||
}
|
||||
|
||||
static READ32_HANDLER( mjgtaste_speedup_r )
|
||||
{
|
||||
|
||||
if (activecpu_get_pc()==0x6031f02) {cpu_spinuntil_int();return psh_ram[0x006000C/4];} // title logos
|
||||
if (activecpu_get_pc()==0x603214a) {cpu_spinuntil_int();return psh_ram[0x006000C/4];} // attract game
|
||||
|
||||
// mame_printf_debug("at %08x\n",activecpu_get_pc());
|
||||
|
||||
return psh_ram[0x006000C/4];
|
||||
}
|
||||
|
||||
static DRIVER_INIT( soldivid )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x1afaa);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x1ae74);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, soldivid_speedup_r );
|
||||
use_factory_eeprom=eeprom_0;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( s1945ii )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x609fc68);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x609fed2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60a0170);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, s1945ii_speedup_r );
|
||||
use_factory_eeprom=eeprom_DEFAULT;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( daraku )
|
||||
{
|
||||
UINT8 *RAM = memory_region(machine, "main");
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x4761a);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x47976);
|
||||
memory_set_bankptr(1,&RAM[0x100000]);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, daraku_speedup_r );
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
use_factory_eeprom=eeprom_DARAKU;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( sbomberb )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60a10ec);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60a1658);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60a1380);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, sbomberb_speedup_r );
|
||||
use_factory_eeprom=eeprom_DEFAULT;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( gunbird2 )
|
||||
{
|
||||
UINT8 *RAM = memory_region(machine, "main");
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x6028972);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x6028e62);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x6028be4);
|
||||
memory_set_bankptr(1,&RAM[0x100000]);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x604000c, 0x604000f, 0, 0, gunbird2_speedup_r );
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
use_factory_eeprom=eeprom_DEFAULT;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( s1945iii )
|
||||
{
|
||||
UINT8 *RAM = memory_region(machine, "main");
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602b462);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602b6e0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602bc1c);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 3);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602b97a);
|
||||
memory_set_bankptr(1,&RAM[0x100000]);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, s1945iii_speedup_r );
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
use_factory_eeprom=eeprom_S1945III;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( dragnblz )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602743e);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60276e4);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x6027c72);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 3);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x60279a6);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, dragnblz_speedup_r );
|
||||
use_factory_eeprom=eeprom_DRAGNBLZ;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( gnbarich )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602cae6);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602cd86);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 2);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602d2ee);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 3);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x602d040);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, gnbarich_speedup_r );
|
||||
use_factory_eeprom=eeprom_GNBARICH;
|
||||
}
|
||||
|
||||
static DRIVER_INIT( mjgtaste )
|
||||
{
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_FASTEST_OPTIONS);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 0);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x6031f02);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_SELECT, 1);
|
||||
cpunum_set_info_int(0, CPUINFO_INT_SH2_PCFLUSH_ADDR, 0x603214a);
|
||||
memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, mjgtaste_speedup_r );
|
||||
use_factory_eeprom=eeprom_MJGTASTE;
|
||||
/* needs to install mahjong controls too (can select joystick in test mode tho) */
|
||||
}
|
||||
|
||||
@ -2499,8 +2499,8 @@ static GFXDECODE_START( stv )
|
||||
|
||||
GFXDECODE_END
|
||||
|
||||
static const sh2_cpu_core sh2_conf_master = { 0 };
|
||||
static const sh2_cpu_core sh2_conf_slave = { 1 };
|
||||
static const sh2_cpu_core sh2_conf_master = { 0, NULL };
|
||||
static const sh2_cpu_core sh2_conf_slave = { 1, NULL };
|
||||
|
||||
static int scsp_last_line = 0;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user