Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

AM_BASE_LEGACY breathes its last.

Browse Source
This commit is contained in:
Aaron Giles 2012-09-12 17:03:17 +00:00
parent 0343824418
commit c9e2a03013
37 changed files with 138 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/addrmap.h
View File

@ -736,9 +736,6 @@ void _class :: _name(address_map &map, const device_t &device) \
#define AM_SHARE(_tag) \ #define AM_SHARE(_tag) \
curentry->set_share(_tag); \ curentry->set_share(_tag); \
#define AM_BASE_LEGACY(_base) \
curentry->set_baseptr(_base); \
// common shortcuts // common shortcuts
#define AM_ROMBANK(_bank) AM_READ_BANK(_bank) #define AM_ROMBANK(_bank) AM_READ_BANK(_bank)

7
src/mame/audio/t5182.c
View File

@ -162,6 +162,11 @@ enum
static UINT8 *t5182_sharedram; static UINT8 *t5182_sharedram;
static int irqstate; static int irqstate;
void t5182_init(running_machine &machine)
{
t5182_sharedram = reinterpret_cast<UINT8 *>(machine.root_device().memshare("t5182_sharedram")->ptr());
}
READ8_HANDLER(t5182_sharedram_r) READ8_HANDLER(t5182_sharedram_r)
{ {
return t5182_sharedram[offset]; return t5182_sharedram[offset];
@ -298,7 +303,7 @@ const ym2151_interface t5182_ym2151_interface =
ADDRESS_MAP_START( t5182_map, AS_PROGRAM, 8, driver_device ) ADDRESS_MAP_START( t5182_map, AS_PROGRAM, 8, driver_device )
AM_RANGE(0x0000, 0x1fff) AM_ROM // internal ROM AM_RANGE(0x0000, 0x1fff) AM_ROM // internal ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_MIRROR(0x1800) // internal RAM AM_RANGE(0x2000, 0x27ff) AM_RAM AM_MIRROR(0x1800) // internal RAM
AM_RANGE(0x4000, 0x40ff) AM_RAM AM_MIRROR(0x3F00) AM_BASE_LEGACY(&t5182_sharedram) // 2016 with four 74ls245s, one each for main and t5182 address and data. pins 23, 22, 20, 19, 18 are all tied low so only 256 bytes are usable AM_RANGE(0x4000, 0x40ff) AM_RAM AM_MIRROR(0x3F00) AM_SHARE("t5182_sharedram") // 2016 with four 74ls245s, one each for main and t5182 address and data. pins 23, 22, 20, 19, 18 are all tied low so only 256 bytes are usable
AM_RANGE(0x8000, 0xffff) AM_ROM // external ROM AM_RANGE(0x8000, 0xffff) AM_ROM // external ROM
ADDRESS_MAP_END ADDRESS_MAP_END

2
src/mame/audio/t5182.h
View File

@ -5,6 +5,8 @@
#define CPUTAG_T5182 "t5182" #define CPUTAG_T5182 "t5182"
#define T5182COINPORT "T5182_COIN" #define T5182COINPORT "T5182_COIN"
void t5182_init(running_machine &machine);
ADDRESS_MAP_EXTERN( t5182_map, 8 ); ADDRESS_MAP_EXTERN( t5182_map, 8 );
ADDRESS_MAP_EXTERN( t5182_io, 8 ); ADDRESS_MAP_EXTERN( t5182_io, 8 );

14
src/mame/drivers/aleck64.c
View File

@ -276,11 +276,11 @@ static READ32_HANDLER( aleck_dips_r )
*/ */
static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state ) static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM /*AM_MIRROR(0xc0000000)*/ AM_BASE_LEGACY(&rdram) // RDRAM AM_RANGE(0x00000000, 0x007fffff) AM_RAM /*AM_MIRROR(0xc0000000)*/ AM_SHARE("rdram") // RDRAM
AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w) AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w)
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("rsp_dmem") // RSP DMEM
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("rsp_imem") // RSP IMEM
AM_RANGE(0x04040000, 0x040fffff) AM_DEVREADWRITE_LEGACY("rsp", n64_sp_reg_r, n64_sp_reg_w) // RSP AM_RANGE(0x04040000, 0x040fffff) AM_DEVREADWRITE_LEGACY("rsp", n64_sp_reg_r, n64_sp_reg_w) // RSP
AM_RANGE(0x04100000, 0x041fffff) AM_DEVREADWRITE_LEGACY("rsp", n64_dp_reg_r, n64_dp_reg_w) // RDP AM_RANGE(0x04100000, 0x041fffff) AM_DEVREADWRITE_LEGACY("rsp", n64_dp_reg_r, n64_dp_reg_w) // RDP
AM_RANGE(0x04300000, 0x043fffff) AM_DEVREADWRITE("rcp", n64_periphs, mi_reg_r, mi_reg_w) // MIPS Interface AM_RANGE(0x04300000, 0x043fffff) AM_DEVREADWRITE("rcp", n64_periphs, mi_reg_r, mi_reg_w) // MIPS Interface
@ -305,10 +305,10 @@ static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state )
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32, n64_state ) static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("dmem") AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("rsp_dmem")
AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("imem") AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("rsp_imem")
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_BASE_LEGACY(&rsp_dmem) AM_SHARE("dmem") AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("rsp_dmem")
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_BASE_LEGACY(&rsp_imem) AM_SHARE("imem") AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("rsp_imem")
ADDRESS_MAP_END ADDRESS_MAP_END
static INPUT_PORTS_START( aleck64 ) static INPUT_PORTS_START( aleck64 )

2
src/mame/drivers/darkmist.c
View File

@ -408,6 +408,8 @@ DRIVER_INIT_MEMBER(darkmist_state,darkmist)
UINT8 *buffer = auto_alloc_array(machine(), UINT8, 0x10000); UINT8 *buffer = auto_alloc_array(machine(), UINT8, 0x10000);
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000); UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000);
t5182_init(machine());
decrypt_gfx(machine()); decrypt_gfx(machine());
decrypt_snd(machine()); decrypt_snd(machine());

2
src/mame/drivers/konamigx.c
View File

@ -1213,7 +1213,7 @@ static ADDRESS_MAP_START( gx_type3_map, AS_PROGRAM, 32, konamigx_state )
//AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) //AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w)
AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_SHARE("k053936_0_ctrl") AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_SHARE("k053936_0_ctrl")
//AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP //AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP
AM_RANGE(0xe40000, 0xe40003) AM_WRITE(konamigx_type3_psac2_bank_w) AM_BASE_LEGACY(&konamigx_type3_psac2_bank) AM_RANGE(0xe40000, 0xe40003) AM_WRITE(konamigx_type3_psac2_bank_w) AM_SHARE("psac2_bank")
AM_RANGE(0xe60000, 0xe60fff) AM_RAM AM_SHARE("k053936_0_line") AM_RANGE(0xe60000, 0xe60fff) AM_RAM AM_SHARE("k053936_0_line")
AM_RANGE(0xe80000, 0xe83fff) AM_RAM AM_SHARE("paletteram") // main monitor palette AM_RANGE(0xe80000, 0xe83fff) AM_RAM AM_SHARE("paletteram") // main monitor palette
AM_RANGE(0xea0000, 0xea3fff) AM_RAM AM_SHARE("subpaletteram") AM_RANGE(0xea0000, 0xea3fff) AM_RAM AM_SHARE("subpaletteram")

2
src/mame/drivers/ms32.c
View File

@ -363,7 +363,7 @@ static ADDRESS_MAP_START( ms32_map, AS_PROGRAM, 32, ms32_state )
AM_RANGE(0xfce00034, 0xfce00037) AM_WRITENOP // irq ack? AM_RANGE(0xfce00034, 0xfce00037) AM_WRITENOP // irq ack?
AM_RANGE(0xfce00038, 0xfce0003b) AM_WRITE(reset_sub_w) AM_RANGE(0xfce00038, 0xfce0003b) AM_WRITE(reset_sub_w)
AM_RANGE(0xfce00050, 0xfce0005f) AM_WRITENOP // watchdog? I haven't investigated AM_RANGE(0xfce00050, 0xfce0005f) AM_WRITENOP // watchdog? I haven't investigated
// AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITEONLY AM_BASE_LEGACY(&ms32_fce00000) /* registers not ram? */ // AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITEONLY AM_SHARE("ms32_fce00000") /* registers not ram? */
AM_RANGE(0xfce00000, 0xfce00003) AM_WRITE(ms32_gfxctrl_w) /* flip screen + other unknown bits */ AM_RANGE(0xfce00000, 0xfce00003) AM_WRITE(ms32_gfxctrl_w) /* flip screen + other unknown bits */
AM_RANGE(0xfce00280, 0xfce0028f) AM_WRITE(ms32_brightness_w) // global brightness control AM_RANGE(0xfce00280, 0xfce0028f) AM_WRITE(ms32_brightness_w) // global brightness control
/**/AM_RANGE(0xfce00600, 0xfce0065f) AM_RAM AM_SHARE("roz_ctrl") /* roz control registers */ /**/AM_RANGE(0xfce00600, 0xfce0065f) AM_RAM AM_SHARE("roz_ctrl") /* roz control registers */

2
src/mame/drivers/mustache.c
View File

@ -250,6 +250,8 @@ ROM_END
DRIVER_INIT_MEMBER(mustache_state,mustache) DRIVER_INIT_MEMBER(mustache_state,mustache)
{ {
t5182_init(machine());
int i; int i;
int G1 = machine().root_device().memregion("gfx1")->bytes()/3; int G1 = machine().root_device().memregion("gfx1")->bytes()/3;

4
src/mame/drivers/namcos2.c
View File

@ -594,8 +594,8 @@ static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, AS_PROGRAM, 16, namc
AM_RANGE(0x440000, 0x44ffff) AM_READWRITE(paletteram_word_r,paletteram_word_w) AM_SHARE("paletteram") AM_RANGE(0x440000, 0x44ffff) AM_READWRITE(paletteram_word_r,paletteram_word_w) AM_SHARE("paletteram")
AM_RANGE(0x460000, 0x460fff) AM_READWRITE(dpram_word_r,dpram_word_w) AM_RANGE(0x460000, 0x460fff) AM_READWRITE(dpram_word_r,dpram_word_w)
AM_RANGE(0x468000, 0x468fff) AM_READWRITE(dpram_word_r,dpram_word_w) /* mirror */ AM_RANGE(0x468000, 0x468fff) AM_READWRITE(dpram_word_r,dpram_word_w) /* mirror */
AM_RANGE(0x480000, 0x483fff) AM_READWRITE_LEGACY(namcos2_68k_serial_comms_ram_r,namcos2_68k_serial_comms_ram_w) AM_BASE_LEGACY(&namcos2_68k_serial_comms_ram) AM_RANGE(0x480000, 0x483fff) AM_READWRITE(serial_comms_ram_r,serial_comms_ram_w) AM_SHARE("serialram")
AM_RANGE(0x4a0000, 0x4a000f) AM_READWRITE_LEGACY(namcos2_68k_serial_comms_ctrl_r,namcos2_68k_serial_comms_ctrl_w) AM_RANGE(0x4a0000, 0x4a000f) AM_READWRITE(serial_comms_ctrl_r,serial_comms_ctrl_w)
ADDRESS_MAP_END ADDRESS_MAP_END
/*************************************************************/ /*************************************************************/

16
src/mame/drivers/naomi.c
View File

@ -1582,7 +1582,7 @@ static ADDRESS_MAP_START( naomi_map, AS_PROGRAM, 64, dc_state )
AM_RANGE(0x08000000, 0x09ffffff) AM_MIRROR(0x02000000) AM_NOP // 'Unassigned' AM_RANGE(0x08000000, 0x09ffffff) AM_MIRROR(0x02000000) AM_NOP // 'Unassigned'
/* Area 3 */ /* Area 3 */
AM_RANGE(0x0c000000, 0x0dffffff) AM_MIRROR(0xa2000000) AM_RAM AM_BASE_LEGACY(&naomi_ram64) AM_RANGE(0x0c000000, 0x0dffffff) AM_MIRROR(0xa2000000) AM_RAM AM_SHARE("dc_ram")
/* Area 4 */ /* Area 4 */
AM_RANGE(0x10000000, 0x107fffff) AM_MIRROR(0x02000000) AM_WRITE_LEGACY(ta_fifo_poly_w ) AM_RANGE(0x10000000, 0x107fffff) AM_MIRROR(0x02000000) AM_WRITE_LEGACY(ta_fifo_poly_w )
@ -1644,7 +1644,7 @@ static ADDRESS_MAP_START( naomi2_map, AS_PROGRAM, 64, dc_state )
AM_RANGE(0x0a000000, 0x0bffffff) AM_RAM AM_SHARE("elan_ram") // T&L chip RAM AM_RANGE(0x0a000000, 0x0bffffff) AM_RAM AM_SHARE("elan_ram") // T&L chip RAM
/* Area 3 */ /* Area 3 */
AM_RANGE(0x0c000000, 0x0dffffff) AM_MIRROR(0xa2000000) AM_RAM AM_BASE_LEGACY(&naomi_ram64) AM_RANGE(0x0c000000, 0x0dffffff) AM_MIRROR(0xa2000000) AM_RAM AM_SHARE("dc_ram")
/* Area 4 */ /* Area 4 */
AM_RANGE(0x10000000, 0x107fffff) AM_WRITE_LEGACY(ta_fifo_poly_w ) AM_RANGE(0x10000000, 0x107fffff) AM_WRITE_LEGACY(ta_fifo_poly_w )
@ -1786,13 +1786,13 @@ static ADDRESS_MAP_START( aw_map, AS_PROGRAM, 64, dc_state )
AM_RANGE(0x08000000, 0x0bffffff) AM_NOP // 'Unassigned' AM_RANGE(0x08000000, 0x0bffffff) AM_NOP // 'Unassigned'
/* Area 3 */ /* Area 3 */
AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_BASE_LEGACY(&naomi_ram64) AM_SHARE("share4") AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_SHARE("dc_ram")
AM_RANGE(0x0d000000, 0x0dffffff) AM_RAM AM_SHARE("share4")// extra ram on Naomi (mirror on DC) AM_RANGE(0x0d000000, 0x0dffffff) AM_RAM AM_SHARE("dc_ram")// extra ram on Naomi (mirror on DC)
AM_RANGE(0x0e000000, 0x0effffff) AM_RAM AM_SHARE("share4")// mirror AM_RANGE(0x0e000000, 0x0effffff) AM_RAM AM_SHARE("dc_ram")// mirror
AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE("share4")// mirror AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE("dc_ram")// mirror
AM_RANGE(0x8c000000, 0x8cffffff) AM_RAM AM_SHARE("share4") // RAM access through cache AM_RANGE(0x8c000000, 0x8cffffff) AM_RAM AM_SHARE("dc_ram") // RAM access through cache
AM_RANGE(0x8d000000, 0x8dffffff) AM_RAM AM_SHARE("share4") // RAM access through cache AM_RANGE(0x8d000000, 0x8dffffff) AM_RAM AM_SHARE("dc_ram") // RAM access through cache
/* Area 4 - half the texture memory, like dreamcast, not naomi */ /* Area 4 - half the texture memory, like dreamcast, not naomi */
AM_RANGE(0x10000000, 0x107fffff) AM_MIRROR(0x02000000) AM_WRITE_LEGACY(ta_fifo_poly_w ) AM_RANGE(0x10000000, 0x107fffff) AM_MIRROR(0x02000000) AM_WRITE_LEGACY(ta_fifo_poly_w )

7
src/mame/drivers/neogeo.c
View File

@ -167,7 +167,6 @@
*************************************/ *************************************/
static UINT8 *memcard_data; static UINT8 *memcard_data;
static UINT16 *save_ram;
static const char *audio_banks[4] = static const char *audio_banks[4] =
{ {
@ -499,7 +498,7 @@ WRITE16_MEMBER(neogeo_state::save_ram_w)
{ {
if (m_save_ram_unlocked) if (m_save_ram_unlocked)
COMBINE_DATA(&save_ram[offset]); COMBINE_DATA(&m_save_ram[offset]);
} }
@ -992,7 +991,7 @@ static MACHINE_START( neogeo )
neogeo_state *state = machine.driver_data<neogeo_state>(); neogeo_state *state = machine.driver_data<neogeo_state>();
/* configure NVRAM */ /* configure NVRAM */
machine.device<nvram_device>("saveram")->set_base(save_ram, 0x10000); machine.device<nvram_device>("saveram")->set_base(state->m_save_ram, 0x10000);
/* set the BIOS bank */ /* set the BIOS bank */
state->membank(NEOGEO_BANK_BIOS)->set_base(state->memregion("mainbios")->base()); state->membank(NEOGEO_BANK_BIOS)->set_base(state->memregion("mainbios")->base());
@ -1105,7 +1104,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, neogeo_state )
AM_RANGE(0x400000, 0x401fff) AM_MIRROR(0x3fe000) AM_READWRITE(neogeo_paletteram_r, neogeo_paletteram_w) AM_RANGE(0x400000, 0x401fff) AM_MIRROR(0x3fe000) AM_READWRITE(neogeo_paletteram_r, neogeo_paletteram_w)
AM_RANGE(0x800000, 0x800fff) AM_READWRITE(memcard_r, memcard_w) AM_RANGE(0x800000, 0x800fff) AM_READWRITE(memcard_r, memcard_w)
AM_RANGE(0xc00000, 0xc1ffff) AM_MIRROR(0x0e0000) AM_ROMBANK(NEOGEO_BANK_BIOS) AM_RANGE(0xc00000, 0xc1ffff) AM_MIRROR(0x0e0000) AM_ROMBANK(NEOGEO_BANK_BIOS)
AM_RANGE(0xd00000, 0xd0ffff) AM_MIRROR(0x0f0000) AM_RAM_WRITE(save_ram_w) AM_BASE_LEGACY(&save_ram) AM_RANGE(0xd00000, 0xd0ffff) AM_MIRROR(0x0f0000) AM_RAM_WRITE(save_ram_w) AM_SHARE("save_ram")
AM_RANGE(0xe00000, 0xffffff) AM_READ(neogeo_unmapped_r) AM_RANGE(0xe00000, 0xffffff) AM_READ(neogeo_unmapped_r)
ADDRESS_MAP_END ADDRESS_MAP_END

4
src/mame/drivers/nmk16.c
View File

@ -882,8 +882,8 @@ static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x044022, 0x044023) AM_READNOP /* No Idea */ AM_RANGE(0x044022, 0x044023) AM_READNOP /* No Idea */
// AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM /* Work RAM */ // AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM /* Work RAM */
// AM_RANGE(0x0b8000, 0x0b8fff) AM_RAM AM_SHARE("spriteram") /* Sprite RAM */ // AM_RANGE(0x0b8000, 0x0b8fff) AM_RAM AM_SHARE("spriteram") /* Sprite RAM */
// AM_RANGE(0x0b9000, 0x0bdfff) AM_RAM AM_BASE_LEGACY(&nmk16_mcu_work_ram) /* Work RAM */ // AM_RANGE(0x0b9000, 0x0bdfff) AM_RAM AM_SHARE("mcu_work_ram") /* Work RAM */
// AM_RANGE(0x0be000, 0x0befff) AM_READWRITE(mcu_shared_r,tdragon_mcu_shared_w) AM_BASE_LEGACY(&nmk16_mcu_shared_ram) /* Work RAM */ // AM_RANGE(0x0be000, 0x0befff) AM_READWRITE(mcu_shared_r,tdragon_mcu_shared_w) AM_SHARE("mcu_shared_ram") /* Work RAM */
// AM_RANGE(0x0bf000, 0x0bffff) AM_RAM /* Work RAM */ // AM_RANGE(0x0bf000, 0x0bffff) AM_RAM /* Work RAM */
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM_WRITE(tdragon_mainram_w ) AM_SHARE("mainram") AM_RANGE(0x0b0000, 0x0bffff) AM_RAM_WRITE(tdragon_mainram_w ) AM_SHARE("mainram")
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN0") AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN0")

2
src/mame/drivers/panicr.c
View File

@ -619,6 +619,8 @@ DRIVER_INIT_MEMBER(panicr_state,panicr)
int size; int size;
int i,j; int i,j;
t5182_init(machine());
rom = machine().root_device().memregion("gfx1")->base(); rom = machine().root_device().memregion("gfx1")->base();
size = machine().root_device().memregion("gfx1")->bytes(); size = machine().root_device().memregion("gfx1")->bytes();

5
src/mame/drivers/pgm.c
View File

@ -191,9 +191,6 @@ Notes:
#include "includes/pgm.h" #include "includes/pgm.h"
UINT16 *pgm_mainram;
READ16_MEMBER(pgm_state::pgm_videoram_r) READ16_MEMBER(pgm_state::pgm_videoram_r)
{ {
@ -320,7 +317,7 @@ ADDRESS_MAP_END
ADDRESS_MAP_START( pgm_base_mem, AS_PROGRAM, 16, pgm_state ) ADDRESS_MAP_START( pgm_base_mem, AS_PROGRAM, 16, pgm_state )
AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog?
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE_LEGACY(&pgm_mainram) AM_SHARE("sram") /* Main Ram */ AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_SHARE("sram") /* Main Ram */
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_READWRITE(pgm_videoram_r, pgm_videoram_w) AM_SHARE("videoram") /* IGS023 VIDEO CHIP */ AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_READWRITE(pgm_videoram_r, pgm_videoram_w) AM_SHARE("videoram") /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")

2
src/mame/drivers/spool99.c
View File

@ -276,7 +276,7 @@ static ADDRESS_MAP_START( vcarn_map, AS_PROGRAM, 8, spool99_state )
AM_RANGE(0xa800, 0xabff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram") AM_RANGE(0xa800, 0xabff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xb000, 0xdfff) AM_RAM AM_RANGE(0xb000, 0xdfff) AM_RAM
// AM_RANGE(0xdf00, 0xdfff) AM_READWRITE(vcarn_io_r,vcarn_io_w) AM_BASE_LEGACY(&vcarn_io) // AM_RANGE(0xdf00, 0xdfff) AM_READWRITE(vcarn_io_r,vcarn_io_w) AM_SHARE("vcarn_io")
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(spool99_vram_w) AM_SHARE("vram") AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(spool99_vram_w) AM_SHARE("vram")
AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(spool99_cram_w) AM_SHARE("cram") AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(spool99_cram_w) AM_SHARE("cram")
ADDRESS_MAP_END ADDRESS_MAP_END

10
src/mame/drivers/tmmjprd.c
View File

@ -672,7 +672,7 @@ static ADDRESS_MAP_START( tmmjprd_map, AS_PROGRAM, 32, tmmjprd_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200010, 0x200013) AM_READ(randomtmmjprds) // gfx chip status? AM_RANGE(0x200010, 0x200013) AM_READ(randomtmmjprds) // gfx chip status?
/* check these are used .. */ /* check these are used .. */
// AM_RANGE(0x200010, 0x200013) AM_WRITEONLY AM_BASE_LEGACY(&tmmjprd_viewregs0 ) // AM_RANGE(0x200010, 0x200013) AM_WRITEONLY AM_SHARE("tmmjprd_viewregs0")
AM_RANGE(0x200100, 0x200117) AM_WRITEONLY AM_SHARE("tilemap_regs.0" ) // tilemap regs1 AM_RANGE(0x200100, 0x200117) AM_WRITEONLY AM_SHARE("tilemap_regs.0" ) // tilemap regs1
AM_RANGE(0x200120, 0x200137) AM_WRITEONLY AM_SHARE("tilemap_regs.1" ) // tilemap regs2 AM_RANGE(0x200120, 0x200137) AM_WRITEONLY AM_SHARE("tilemap_regs.1" ) // tilemap regs2
AM_RANGE(0x200140, 0x200157) AM_WRITEONLY AM_SHARE("tilemap_regs.2" ) // tilemap regs3 AM_RANGE(0x200140, 0x200157) AM_WRITEONLY AM_SHARE("tilemap_regs.2" ) // tilemap regs3
@ -681,12 +681,12 @@ static ADDRESS_MAP_START( tmmjprd_map, AS_PROGRAM, 32, tmmjprd_state )
// AM_RANGE(0x200300, 0x200303) AM_WRITE_LEGACY(tmmjprd_rombank_w) // used during rom testing, rombank/area select + something else? // AM_RANGE(0x200300, 0x200303) AM_WRITE_LEGACY(tmmjprd_rombank_w) // used during rom testing, rombank/area select + something else?
AM_RANGE(0x20040c, 0x20040f) AM_WRITE(tmmjprd_brt_1_w) AM_RANGE(0x20040c, 0x20040f) AM_WRITE(tmmjprd_brt_1_w)
AM_RANGE(0x200410, 0x200413) AM_WRITE(tmmjprd_brt_2_w) AM_RANGE(0x200410, 0x200413) AM_WRITE(tmmjprd_brt_2_w)
// AM_RANGE(0x200500, 0x200503) AM_WRITEONLY AM_BASE_LEGACY(&tmmjprd_viewregs7 ) // AM_RANGE(0x200500, 0x200503) AM_WRITEONLY AM_SHARE("tmmjprd_viewregs7")
// AM_RANGE(0x200700, 0x20070f) AM_WRITE(tmmjprd_blitter_w) AM_BASE_LEGACY(&tmmjprd_blitterregs ) // AM_RANGE(0x200700, 0x20070f) AM_WRITE(tmmjprd_blitter_w) AM_SHARE("tmmjprd_blitterregs")
// AM_RANGE(0x200800, 0x20080f) AM_WRITEONLY AM_BASE_LEGACY(&tmmjprd_viewregs9 ) // never changes? // AM_RANGE(0x200800, 0x20080f) AM_WRITEONLY AM_SHARE("tmmjprd_viewregs9") // never changes?
AM_RANGE(0x200900, 0x2009ff) AM_DEVREADWRITE16("i5000snd", i5000snd_device, read, write, 0xffffffff) AM_RANGE(0x200900, 0x2009ff) AM_DEVREADWRITE16("i5000snd", i5000snd_device, read, write, 0xffffffff)
/* hmm */ /* hmm */
// AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_BASE_LEGACY(&tmmjprd_viewregs10 ) // AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_SHARE("tmmjprd_viewregs10")
/* tilemaps */ /* tilemaps */
AM_RANGE(0x280000, 0x283fff) AM_READWRITE(tmmjprd_tilemap0_r,tmmjprd_tilemap0_w) AM_RANGE(0x280000, 0x283fff) AM_READWRITE(tmmjprd_tilemap0_r,tmmjprd_tilemap0_w)
AM_RANGE(0x284000, 0x287fff) AM_READWRITE(tmmjprd_tilemap1_r,tmmjprd_tilemap1_w) AM_RANGE(0x284000, 0x287fff) AM_READWRITE(tmmjprd_tilemap1_r,tmmjprd_tilemap1_w)

2
src/mame/includes/dc.h
View File

@ -15,6 +15,7 @@ class dc_state : public driver_device
dc_framebuffer_ram(*this, "frameram"), dc_framebuffer_ram(*this, "frameram"),
dc_texture_ram(*this, "dc_texture_ram"), dc_texture_ram(*this, "dc_texture_ram"),
dc_sound_ram(*this, "dc_sound_ram"), dc_sound_ram(*this, "dc_sound_ram"),
dc_ram(*this, "dc_ram"),
pvr2_texture_ram(*this, "textureram2"), pvr2_texture_ram(*this, "textureram2"),
pvr2_framebuffer_ram(*this, "frameram2"), pvr2_framebuffer_ram(*this, "frameram2"),
elan_ram(*this, "elan_ram") { } elan_ram(*this, "elan_ram") { }
@ -23,6 +24,7 @@ class dc_state : public driver_device
required_shared_ptr<UINT64> dc_texture_ram; // '64-bit access area' required_shared_ptr<UINT64> dc_texture_ram; // '64-bit access area'
required_shared_ptr<UINT32> dc_sound_ram; required_shared_ptr<UINT32> dc_sound_ram;
required_shared_ptr<UINT64> dc_ram;
/* machine related */ /* machine related */
UINT32 dc_rtcregister[4]; UINT32 dc_rtcregister[4];

8
src/mame/includes/konamigx.h
View File

@ -8,7 +8,8 @@ public:
m_psacram(*this,"psacram"), m_psacram(*this,"psacram"),
m_subpaletteram32(*this,"subpaletteram"), m_subpaletteram32(*this,"subpaletteram"),
m_k053936_0_ctrl(*this,"k053936_0_ctrl",32), m_k053936_0_ctrl(*this,"k053936_0_ctrl",32),
m_k053936_0_linectrl(*this,"k053936_0_line",32) m_k053936_0_linectrl(*this,"k053936_0_line",32),
m_konamigx_type3_psac2_bank(*this,"psac2_bank")
{ } { }
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
@ -17,6 +18,7 @@ public:
optional_shared_ptr<UINT32> m_subpaletteram32; optional_shared_ptr<UINT32> m_subpaletteram32;
optional_shared_ptr<UINT16> m_k053936_0_ctrl; optional_shared_ptr<UINT16> m_k053936_0_ctrl;
optional_shared_ptr<UINT16> m_k053936_0_linectrl; optional_shared_ptr<UINT16> m_k053936_0_linectrl;
optional_shared_ptr<UINT32> m_konamigx_type3_psac2_bank;
DECLARE_WRITE32_MEMBER(esc_w); DECLARE_WRITE32_MEMBER(esc_w);
DECLARE_WRITE32_MEMBER(eeprom_w); DECLARE_WRITE32_MEMBER(eeprom_w);
DECLARE_WRITE32_MEMBER(control_w); DECLARE_WRITE32_MEMBER(control_w);
@ -148,11 +150,7 @@ SCREEN_UPDATE_RGB32(konamigx);
SCREEN_UPDATE_RGB32(konamigx_left); SCREEN_UPDATE_RGB32(konamigx_left);
SCREEN_UPDATE_RGB32(konamigx_right); SCREEN_UPDATE_RGB32(konamigx_right);
#ifdef UNUSED_FUNCTION
#endif
extern int konamigx_current_frame; extern int konamigx_current_frame;
extern UINT32* konamigx_type3_psac2_bank;
/*----------- defined in machine/konamigx.c -----------*/ /*----------- defined in machine/konamigx.c -----------*/

9
src/mame/includes/megadriv.h
View File

@ -105,9 +105,11 @@ class md_base_state : public driver_device
public: public:
md_base_state(const machine_config &mconfig, device_type type, const char *tag) md_base_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_vdp(*this,"gen_vdp") m_vdp(*this,"gen_vdp"),
m_megadrive_ram(*this,"megadrive_ram")
{ } { }
required_device<sega_genesis_vdp_device> m_vdp; required_device<sega_genesis_vdp_device> m_vdp;
optional_shared_ptr<UINT16> m_megadrive_ram;
DECLARE_DRIVER_INIT(megadriv_c2); DECLARE_DRIVER_INIT(megadriv_c2);
DECLARE_DRIVER_INIT(megadrie); DECLARE_DRIVER_INIT(megadrie);
@ -445,7 +447,10 @@ class segacd_state : public _32x_state // use _32x_state as base to make easier
{ {
public: public:
segacd_state(const machine_config &mconfig, device_type type, const char *tag) segacd_state(const machine_config &mconfig, device_type type, const char *tag)
: _32x_state(mconfig, type, tag) { } : _32x_state(mconfig, type, tag),
m_font_bits(*this,"segacd_font") { }
required_shared_ptr<UINT16> m_font_bits;
}; };
extern int sega_cd_connected; extern int sega_cd_connected;

17
src/mame/includes/namcos2.h
View File

@ -188,6 +188,7 @@ public:
m_dpram(*this, "dpram"), m_dpram(*this, "dpram"),
m_paletteram(*this, "paletteram"), m_paletteram(*this, "paletteram"),
m_spriteram(*this, "spriteram"), m_spriteram(*this, "spriteram"),
m_serial_comms_ram(*this, "serialram"),
m_rozram(*this, "rozram"), m_rozram(*this, "rozram"),
m_roz_ctrl(*this, "rozctrl"), m_roz_ctrl(*this, "rozctrl"),
m_c45_road(*this, "c45_road") m_c45_road(*this, "c45_road")
@ -250,6 +251,10 @@ public:
DECLARE_WRITE16_MEMBER( rozram_word_w ); DECLARE_WRITE16_MEMBER( rozram_word_w );
DECLARE_READ16_MEMBER( gfx_ctrl_r ); DECLARE_READ16_MEMBER( gfx_ctrl_r );
DECLARE_WRITE16_MEMBER( gfx_ctrl_w ); DECLARE_WRITE16_MEMBER( gfx_ctrl_w );
DECLARE_READ16_MEMBER( serial_comms_ram_r );
DECLARE_WRITE16_MEMBER( serial_comms_ram_w );
DECLARE_READ16_MEMBER( serial_comms_ctrl_r );
DECLARE_WRITE16_MEMBER( serial_comms_ctrl_w );
void draw_sprite_init(); void draw_sprite_init();
void update_palette(); void update_palette();
@ -264,10 +269,12 @@ public:
required_shared_ptr<UINT8> m_dpram; /* 2Kx8 */ required_shared_ptr<UINT8> m_dpram; /* 2Kx8 */
required_shared_ptr<UINT16> m_paletteram; required_shared_ptr<UINT16> m_paletteram;
optional_shared_ptr<UINT16> m_spriteram; optional_shared_ptr<UINT16> m_spriteram;
optional_shared_ptr<UINT16> m_serial_comms_ram;
optional_shared_ptr<UINT16> m_rozram; optional_shared_ptr<UINT16> m_rozram;
optional_shared_ptr<UINT16> m_roz_ctrl; optional_shared_ptr<UINT16> m_roz_ctrl;
tilemap_t *m_tilemap_roz; tilemap_t *m_tilemap_roz;
UINT16 m_gfx_ctrl; UINT16 m_gfx_ctrl;
UINT16 m_serial_comms_ctrl[0x8];
optional_device<namco_c45_road_device> m_c45_road; optional_device<namco_c45_road_device> m_c45_road;
}; };
@ -308,16 +315,6 @@ READ16_HANDLER( namcos2_68k_eeprom_r );
/**************************************************************/ /**************************************************************/
READ16_HANDLER( namcos2_68k_data_rom_r ); READ16_HANDLER( namcos2_68k_data_rom_r );
/**************************************************************/
/* Shared serial communications processory (CPU5 ????) */
/**************************************************************/
READ16_HANDLER( namcos2_68k_serial_comms_ram_r );
WRITE16_HANDLER( namcos2_68k_serial_comms_ram_w );
READ16_HANDLER( namcos2_68k_serial_comms_ctrl_r );
WRITE16_HANDLER( namcos2_68k_serial_comms_ctrl_w );
extern UINT16 *namcos2_68k_serial_comms_ram;
/**************************************************************/ /**************************************************************/
/* Shared protection/random number generator */ /* Shared protection/random number generator */
/**************************************************************/ /**************************************************************/

2
src/mame/includes/naomi.h
View File

@ -25,8 +25,6 @@ extern void naomi_game_decrypt(running_machine& machine, UINT64 key, UINT8* regi
extern UINT64 *naomi_ram64;
extern int jvsboard_type; extern int jvsboard_type;
extern UINT16 actel_id; extern UINT16 actel_id;

5
src/mame/includes/neogeo.h
View File

@ -36,11 +36,12 @@ class neogeo_state : public driver_device
{ {
public: public:
neogeo_state(const machine_config &mconfig, device_type type, const char *tag) neogeo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { } : driver_device(mconfig, type, tag),
m_save_ram(*this, "save_ram") { }
/* memory pointers */ /* memory pointers */
// UINT8 *memcard_data; // this currently uses generic handlers // UINT8 *memcard_data; // this currently uses generic handlers
// UINT16 *save_ram; // this currently uses generic handlers required_shared_ptr<UINT16> m_save_ram; // this currently uses generic handlers
/* video-related */ /* video-related */
UINT8 *m_sprite_gfx; UINT8 *m_sprite_gfx;

7
src/mame/includes/pgm.h
View File

@ -16,7 +16,8 @@ public:
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_videoregs(*this, "videoregs"), m_videoregs(*this, "videoregs"),
m_videoram(*this, "videoram"), m_videoram(*this, "videoram"),
m_z80_mainram(*this, "z80_mainram") m_z80_mainram(*this, "z80_mainram"),
m_mainram(*this, "sram")
{ {
m_irq4_disabled = 0; m_irq4_disabled = 0;
} }
@ -25,7 +26,7 @@ public:
required_shared_ptr<UINT16> m_videoregs; required_shared_ptr<UINT16> m_videoregs;
required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_videoram;
required_shared_ptr<UINT8> m_z80_mainram; required_shared_ptr<UINT8> m_z80_mainram;
// UINT16 * m_mainram; // currently this is also used by nvram handler required_shared_ptr<UINT16> m_mainram;
UINT16 * m_bg_videoram; UINT16 * m_bg_videoram;
UINT16 * m_tx_videoram; UINT16 * m_tx_videoram;
UINT16 * m_rowscrollram; UINT16 * m_rowscrollram;
@ -299,8 +300,6 @@ public:
extern UINT16 *pgm_mainram; // used by nvram handler, we cannot move it to driver data struct
/*----------- defined in drivers/pgm.c -----------*/ /*----------- defined in drivers/pgm.c -----------*/
void pgm_basic_init( running_machine &machine, bool set_bank = true ); void pgm_basic_init( running_machine &machine, bool set_bank = true );

18
src/mame/machine/megacd.c
View File

@ -2235,7 +2235,13 @@ READ16_HANDLER( segacd_stopwatch_timer_r )
void segacd_init_main_cpu( running_machine& machine ) void segacd_init_main_cpu( running_machine& machine )
{ {
address_space* space = machine.device("maincpu")->memory().space(AS_PROGRAM); address_space* space = machine.device("maincpu")->memory().space(AS_PROGRAM);
segacd_font_bits = reinterpret_cast<UINT16 *>(machine.root_device().memshare("segacd_font")->ptr());
segacd_backupram = reinterpret_cast<UINT16 *>(machine.root_device().memshare("backupram")->ptr());
segacd_dataram = reinterpret_cast<UINT16 *>(machine.root_device().memshare("dataram")->ptr());
segacd_dataram2 = reinterpret_cast<UINT16 *>(machine.root_device().memshare("dataram2")->ptr());
segacd_4meg_prgram = reinterpret_cast<UINT16 *>(machine.root_device().memshare("segacd_program")->ptr());
segacd_4meg_prgbank = 0; segacd_4meg_prgbank = 0;
@ -3008,12 +3014,12 @@ READ16_HANDLER( segacd_font_converted_r )
} }
ADDRESS_MAP_START( segacd_map, AS_PROGRAM, 16, driver_device ) ADDRESS_MAP_START( segacd_map, AS_PROGRAM, 16, driver_device )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_BASE_LEGACY(&segacd_4meg_prgram) AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_SHARE("segacd_program")
AM_RANGE(0x080000, 0x0bffff) AM_READWRITE_LEGACY(segacd_sub_dataram_part1_r, segacd_sub_dataram_part1_w) AM_BASE_LEGACY(&segacd_dataram) AM_RANGE(0x080000, 0x0bffff) AM_READWRITE_LEGACY(segacd_sub_dataram_part1_r, segacd_sub_dataram_part1_w) AM_SHARE("dataram")
AM_RANGE(0x0c0000, 0x0dffff) AM_READWRITE_LEGACY(segacd_sub_dataram_part2_r, segacd_sub_dataram_part2_w) AM_BASE_LEGACY(&segacd_dataram2) AM_RANGE(0x0c0000, 0x0dffff) AM_READWRITE_LEGACY(segacd_sub_dataram_part2_r, segacd_sub_dataram_part2_w) AM_SHARE("dataram2")
AM_RANGE(0xfe0000, 0xfe3fff) AM_READWRITE_LEGACY(segacd_backupram_r,segacd_backupram_w) AM_SHARE("backupram") AM_BASE_LEGACY(&segacd_backupram)// backup RAM, odd bytes only! AM_RANGE(0xfe0000, 0xfe3fff) AM_READWRITE_LEGACY(segacd_backupram_r,segacd_backupram_w) AM_SHARE("backupram") // backup RAM, odd bytes only!
AM_RANGE(0xff0000, 0xff001f) AM_DEVWRITE8_LEGACY("rfsnd", rf5c68_w, 0x00ff) // PCM, RF5C164 AM_RANGE(0xff0000, 0xff001f) AM_DEVWRITE8_LEGACY("rfsnd", rf5c68_w, 0x00ff) // PCM, RF5C164
AM_RANGE(0xff0020, 0xff003f) AM_DEVREAD8_LEGACY("rfsnd", rf5c68_r, 0x00ff) AM_RANGE(0xff0020, 0xff003f) AM_DEVREAD8_LEGACY("rfsnd", rf5c68_r, 0x00ff)
@ -3038,7 +3044,7 @@ ADDRESS_MAP_START( segacd_map, AS_PROGRAM, 16, driver_device )
AM_RANGE(0xff8038, 0xff8041) AM_READ8_LEGACY(segacd_cdd_rx_r,0xffff) AM_RANGE(0xff8038, 0xff8041) AM_READ8_LEGACY(segacd_cdd_rx_r,0xffff)
AM_RANGE(0xff8042, 0xff804b) AM_WRITE8_LEGACY(segacd_cdd_tx_w,0xffff) AM_RANGE(0xff8042, 0xff804b) AM_WRITE8_LEGACY(segacd_cdd_tx_w,0xffff)
AM_RANGE(0xff804c, 0xff804d) AM_READWRITE_LEGACY(segacd_font_color_r, segacd_font_color_w) AM_RANGE(0xff804c, 0xff804d) AM_READWRITE_LEGACY(segacd_font_color_r, segacd_font_color_w)
AM_RANGE(0xff804e, 0xff804f) AM_RAM AM_BASE_LEGACY(&segacd_font_bits) AM_RANGE(0xff804e, 0xff804f) AM_RAM AM_SHARE("segacd_font")
AM_RANGE(0xff8050, 0xff8057) AM_READ_LEGACY(segacd_font_converted_r) AM_RANGE(0xff8050, 0xff8057) AM_READ_LEGACY(segacd_font_converted_r)
AM_RANGE(0xff8058, 0xff8059) AM_READWRITE_LEGACY(segacd_stampsize_r, segacd_stampsize_w) // Stamp size AM_RANGE(0xff8058, 0xff8059) AM_READWRITE_LEGACY(segacd_stampsize_r, segacd_stampsize_w) // Stamp size
AM_RANGE(0xff805a, 0xff805b) AM_READWRITE_LEGACY(segacd_stampmap_base_address_r, segacd_stampmap_base_address_w) // Stamp map base address AM_RANGE(0xff805a, 0xff805b) AM_READWRITE_LEGACY(segacd_stampmap_base_address_r, segacd_stampmap_base_address_w) // Stamp map base address

15
src/mame/machine/megadriv.c
View File

@ -56,7 +56,6 @@ static cpu_device *_genesis_snd_z80_cpu;
int genesis_other_hacks = 0; // misc hacks int genesis_other_hacks = 0; // misc hacks
timer_device* megadriv_scanline_timer; timer_device* megadriv_scanline_timer;
UINT16* megadrive_ram = NULL;
struct genesis_z80_vars struct genesis_z80_vars
{ {
@ -577,14 +576,14 @@ static ADDRESS_MAP_START( megadriv_map, AS_PROGRAM, 16, driver_device )
AM_RANGE(0xa11200, 0xa11201) AM_WRITE_LEGACY(megadriv_68k_req_z80_reset) AM_RANGE(0xa11200, 0xa11201) AM_WRITE_LEGACY(megadriv_68k_req_z80_reset)
/* these are fake - remove allocs in VIDEO_START to use these to view ram instead */ /* these are fake - remove allocs in VIDEO_START to use these to view ram instead */
// AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE_LEGACY(&megadrive_vdp_vram) // AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_SHARE("megadrive_vdp_vram")
// AM_RANGE(0xb10000, 0xb1007f) AM_RAM AM_BASE_LEGACY(&megadrive_vdp_vsram) // AM_RANGE(0xb10000, 0xb1007f) AM_RAM AM_SHARE("megadrive_vdp_vsram")
// AM_RANGE(0xb10100, 0xb1017f) AM_RAM AM_BASE_LEGACY(&megadrive_vdp_cram) // AM_RANGE(0xb10100, 0xb1017f) AM_RAM AM_SHARE("megadrive_vdp_cram")
AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w)
AM_RANGE(0xd00000, 0xd0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) // the earth defend AM_RANGE(0xd00000, 0xd0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) // the earth defend
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_BASE_LEGACY(&megadrive_ram) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_SHARE("megadrive_ram")
// AM_RANGE(0xff0000, 0xffffff) AM_READONLY // AM_RANGE(0xff0000, 0xffffff) AM_READONLY
/* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */ /* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */
ADDRESS_MAP_END ADDRESS_MAP_END
@ -883,7 +882,7 @@ static ADDRESS_MAP_START( md_bootleg_map, AS_PROGRAM, 16, driver_device )
AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) AM_RANGE(0xc00000, 0xc0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w)
AM_RANGE(0xd00000, 0xd0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w) AM_RANGE(0xd00000, 0xd0001f) AM_DEVREADWRITE("gen_vdp", sega_genesis_vdp_device, megadriv_vdp_r,megadriv_vdp_w)
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_BASE_LEGACY(&megadrive_ram) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_SHARE("megadrive_ram")
ADDRESS_MAP_END ADDRESS_MAP_END
MACHINE_CONFIG_DERIVED( md_bootleg, megadriv ) MACHINE_CONFIG_DERIVED( md_bootleg, megadriv )
@ -1008,8 +1007,8 @@ MACHINE_RESET( megadriv )
{ {
// set_refresh_rate(megadriv_framerate); // set_refresh_rate(megadriv_framerate);
// machine.device("maincpu")->set_clock_scale(0.9950f); /* Fatal Rewind is very fussy... (and doesn't work now anyway, so don't bother with this) */ // machine.device("maincpu")->set_clock_scale(0.9950f); /* Fatal Rewind is very fussy... (and doesn't work now anyway, so don't bother with this) */
if (megadrive_ram) if (state->m_megadrive_ram)
memset(megadrive_ram,0x00,0x10000); memset(state->m_megadrive_ram,0x00,0x10000);
} }
megadriv_reset_vdp(machine); megadriv_reset_vdp(machine);

6
src/mame/machine/n64.c
View File

@ -2404,6 +2404,12 @@ static void n64_machine_stop(running_machine &machine)
MACHINE_START( n64 ) MACHINE_START( n64 )
{ {
n64_state *state = machine.driver_data<n64_state>();
rdram = reinterpret_cast<UINT32 *>(state->memshare("rdram")->ptr());
n64_sram = reinterpret_cast<UINT32 *>(state->memshare("sram")->ptr());
rsp_imem = reinterpret_cast<UINT32 *>(state->memshare("rsp_imem")->ptr());
rsp_dmem = reinterpret_cast<UINT32 *>(state->memshare("rsp_dmem")->ptr());
mips3drc_set_options(machine.device("maincpu"), MIPS3DRC_COMPATIBLE_OPTIONS); mips3drc_set_options(machine.device("maincpu"), MIPS3DRC_COMPATIBLE_OPTIONS);
/* configure fast RAM regions for DRC */ /* configure fast RAM regions for DRC */

19
src/mame/machine/namcos2.c
View File

@ -164,20 +164,17 @@ READ16_HANDLER( namcos2_68k_data_rom_r ){
/* 68000 Shared serial communications processor (CPU5?) */ /* 68000 Shared serial communications processor (CPU5?) */
/**************************************************************/ /**************************************************************/
static UINT16 namcos2_68k_serial_comms_ctrl[0x8]; READ16_MEMBER( namcos2_state::serial_comms_ram_r ){
UINT16 *namcos2_68k_serial_comms_ram; return m_serial_comms_ram[offset];
READ16_HANDLER( namcos2_68k_serial_comms_ram_r ){
return namcos2_68k_serial_comms_ram[offset];
} }
WRITE16_HANDLER( namcos2_68k_serial_comms_ram_w ){ WRITE16_MEMBER( namcos2_state::serial_comms_ram_w ){
COMBINE_DATA( &namcos2_68k_serial_comms_ram[offset] ); COMBINE_DATA( &m_serial_comms_ram[offset] );
} }
READ16_HANDLER( namcos2_68k_serial_comms_ctrl_r ) READ16_MEMBER( namcos2_state::serial_comms_ctrl_r )
{ {
UINT16 retval = namcos2_68k_serial_comms_ctrl[offset]; UINT16 retval = m_serial_comms_ctrl[offset];
switch(offset){ switch(offset){
case 0x00: case 0x00:
@ -190,9 +187,9 @@ READ16_HANDLER( namcos2_68k_serial_comms_ctrl_r )
return retval; return retval;
} }
WRITE16_HANDLER( namcos2_68k_serial_comms_ctrl_w ) WRITE16_MEMBER( namcos2_state::serial_comms_ctrl_w )
{ {
COMBINE_DATA( &namcos2_68k_serial_comms_ctrl[offset] ); COMBINE_DATA( &m_serial_comms_ctrl[offset] );
} }
/*************************************************************/ /*************************************************************/

17
src/mame/machine/naomi.c
View File

@ -22,7 +22,6 @@ hotd2o: bp 0xc0ba1f6, modify work RAM 0xc9c35a8 to be zero, bpclear
#include "includes/naomi.h" #include "includes/naomi.h"
#include "includes/dc.h" #include "includes/dc.h"
UINT64 *naomi_ram64;
int jvsboard_type; int jvsboard_type;
UINT16 actel_id; UINT16 actel_id;
@ -34,7 +33,7 @@ static READ64_HANDLER( naomi_biose_idle_skip_r )
// else // else
// printf("%08x\n", space->device().safe_pc()); // printf("%08x\n", space->device().safe_pc());
return naomi_ram64[0x2ad238/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x2ad238/8];
} }
static READ64_HANDLER( naomi_biosh_idle_skip_r ) static READ64_HANDLER( naomi_biosh_idle_skip_r )
@ -44,7 +43,7 @@ static READ64_HANDLER( naomi_biosh_idle_skip_r )
// printf("%08x\n", space->device().safe_pc()); // printf("%08x\n", space->device().safe_pc());
return naomi_ram64[0x2b0600/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x2b0600/8];
} }
static READ64_HANDLER( naomi2_biose_idle_skip_r ) static READ64_HANDLER( naomi2_biose_idle_skip_r )
@ -55,7 +54,7 @@ static READ64_HANDLER( naomi2_biose_idle_skip_r )
// else // else
// printf("%08x\n", space->device().safe_pc()); // printf("%08x\n", space->device().safe_pc());
return naomi_ram64[0x2b0600/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x2b0600/8];
} }
static UINT8 asciihex_to_dec(UINT8 in) static UINT8 asciihex_to_dec(UINT8 in)
@ -246,7 +245,7 @@ static READ64_HANDLER( naomigd_ggxxsla_idle_skip_r )
if (space->device().safe_pc()==0x0c0c9adc) if (space->device().safe_pc()==0x0c0c9adc)
space->device().execute().spin_until_time(attotime::from_usec(500)); space->device().execute().spin_until_time(attotime::from_usec(500));
return naomi_ram64[0x1aae18/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x1aae18/8];
} }
DRIVER_INIT_MEMBER(dc_state,ggxxsla) DRIVER_INIT_MEMBER(dc_state,ggxxsla)
@ -260,7 +259,7 @@ static READ64_HANDLER( naomigd_ggxx_idle_skip_r )
if (space->device().safe_pc()==0xc0b5c3c) // or 0xc0bab0c if (space->device().safe_pc()==0xc0b5c3c) // or 0xc0bab0c
space->device().execute().spin_until_time(attotime::from_usec(500)); space->device().execute().spin_until_time(attotime::from_usec(500));
return naomi_ram64[0x1837b8/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x1837b8/8];
} }
@ -277,7 +276,7 @@ static READ64_HANDLER( naomigd_ggxxrl_idle_skip_r )
//printf("%08x\n", space->device().safe_pc()); //printf("%08x\n", space->device().safe_pc());
return naomi_ram64[0x18d6c8/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x18d6c8/8];
} }
DRIVER_INIT_MEMBER(dc_state,ggxxrl) DRIVER_INIT_MEMBER(dc_state,ggxxrl)
@ -292,7 +291,7 @@ static READ64_HANDLER( naomigd_sfz3ugd_idle_skip_r )
if (space->device().safe_pc()==0xc36a2dc) if (space->device().safe_pc()==0xc36a2dc)
space->device().execute().spin_until_time(attotime::from_usec(500)); space->device().execute().spin_until_time(attotime::from_usec(500));
return naomi_ram64[0x5dc900/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x5dc900/8];
} }
DRIVER_INIT_MEMBER(dc_state,sfz3ugd) DRIVER_INIT_MEMBER(dc_state,sfz3ugd)
@ -340,7 +339,7 @@ static READ64_HANDLER( hotd2_idle_skip_r )
// else // else
// printf("%08x\n", space->device().safe_pc()); // printf("%08x\n", space->device().safe_pc());
return naomi_ram64[0xa25fb8/8]; return space->machine().driver_data<dc_state>()->dc_ram[0xa25fb8/8];
} }
DRIVER_INIT_MEMBER(dc_state,hotd2) DRIVER_INIT_MEMBER(dc_state,hotd2)

4
src/mame/machine/pgmprot2.c
View File

@ -280,8 +280,8 @@ static READ32_HANDLER( ddp2_speedup_r )
static READ16_HANDLER( ddp2_main_speedup_r ) static READ16_HANDLER( ddp2_main_speedup_r )
{ {
pgm_state *state = space->machine().driver_data<pgm_state>();
UINT16 data = pgm_mainram[0x0ee54/2]; UINT16 data = state->m_mainram[0x0ee54/2];
int pc = space->device().safe_pc(); int pc = space->device().safe_pc();
if (pc == 0x149dce) space->device().execute().spin_until_interrupt(); if (pc == 0x149dce) space->device().execute().spin_until_interrupt();

3
src/mame/machine/pgmprot3.c
View File

@ -277,7 +277,8 @@ static READ32_HANDLER( dmnfrnt_speedup_r )
static READ16_HANDLER( dmnfrnt_main_speedup_r ) static READ16_HANDLER( dmnfrnt_main_speedup_r )
{ {
UINT16 data = pgm_mainram[0xa03c/2]; pgm_state *state = space->machine().driver_data<pgm_state>();
UINT16 data = state->m_mainram[0xa03c/2];
int pc = space->device().safe_pc(); int pc = space->device().safe_pc();
if (pc == 0x10193a) space->device().execute().spin_until_interrupt(); if (pc == 0x10193a) space->device().execute().spin_until_interrupt();
else if (pc == 0x1019a4) space->device().execute().spin_until_interrupt(); else if (pc == 0x1019a4) space->device().execute().spin_until_interrupt();

3
src/mame/machine/pgmprot5.c
View File

@ -32,7 +32,8 @@ READ16_HANDLER( dw2_d80000_r )
// if(dw2reg<0x20) //NOT SURE!! // if(dw2reg<0x20) //NOT SURE!!
{ {
//The value at 0x80EECE is computed in the routine at 0x107c18 //The value at 0x80EECE is computed in the routine at 0x107c18
UINT16 d = pgm_mainram[0xEECE/2]; pgm_state *state = space->machine().driver_data<pgm_state>();
UINT16 d = state->m_mainram[0xEECE/2];
UINT16 d2 = 0; UINT16 d2 = 0;
d = (d >> 8) | (d << 8); d = (d >> 8) | (d << 8);
DW2BITSWAP(d, d2, 7, 0); DW2BITSWAP(d, d2, 7, 0);

5
src/mame/machine/pgmprot6.c
View File

@ -185,10 +185,11 @@ static WRITE16_HANDLER( olds_w )
static READ16_HANDLER( olds_prot_swap_r ) static READ16_HANDLER( olds_prot_swap_r )
{ {
pgm_state *state = space->machine().driver_data<pgm_state>();
if (space->device().safe_pc() < 0x100000) //bios if (space->device().safe_pc() < 0x100000) //bios
return pgm_mainram[0x178f4 / 2]; return state->m_mainram[0x178f4 / 2];
else //game else //game
return pgm_mainram[0x178d8 / 2]; return state->m_mainram[0x178d8 / 2];
} }

5
src/mame/video/konamigx.c
View File

@ -1839,7 +1839,6 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac_tile_info)
SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flip)); SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flip));
} }
UINT32* konamigx_type3_psac2_bank;
static int konamigx_type3_psac2_actual_bank; static int konamigx_type3_psac2_actual_bank;
//int konamigx_type3_psac2_actual_last_bank = 0; //int konamigx_type3_psac2_actual_last_bank = 0;
@ -1847,8 +1846,8 @@ WRITE32_MEMBER(konamigx_state::konamigx_type3_psac2_bank_w)
{ {
// other bits are used for something... // other bits are used for something...
COMBINE_DATA(&konamigx_type3_psac2_bank[offset]); COMBINE_DATA(&m_konamigx_type3_psac2_bank[offset]);
konamigx_type3_psac2_actual_bank = (konamigx_type3_psac2_bank[0] & 0x10000000) >> 28; konamigx_type3_psac2_actual_bank = (m_konamigx_type3_psac2_bank[0] & 0x10000000) >> 28;
/* handle this by creating 2 roz tilemaps instead, otherwise performance dies completely on dual screen mode /* handle this by creating 2 roz tilemaps instead, otherwise performance dies completely on dual screen mode
if (konamigx_type3_psac2_actual_bank!=konamigx_type3_psac2_actual_last_bank) if (konamigx_type3_psac2_actual_bank!=konamigx_type3_psac2_actual_last_bank)

2
src/mame/video/pgm.c
View File

@ -676,6 +676,6 @@ SCREEN_VBLANK( pgm )
pgm_state *state = screen.machine().driver_data<pgm_state>(); pgm_state *state = screen.machine().driver_data<pgm_state>();
/* first 0xa00 of main ram = sprites, seems to be buffered, DMA? */ /* first 0xa00 of main ram = sprites, seems to be buffered, DMA? */
memcpy(state->m_spritebufferram, pgm_mainram, 0xa00); memcpy(state->m_spritebufferram, state->m_mainram, 0xa00);
} }
} }

16
src/mess/drivers/dc.c
View File

@ -40,15 +40,13 @@ extern WRITE64_HANDLER( dc_mess_gdrom_w );
extern READ64_HANDLER( dc_mess_g1_ctrl_r ); extern READ64_HANDLER( dc_mess_g1_ctrl_r );
extern WRITE64_HANDLER( dc_mess_g1_ctrl_w ); extern WRITE64_HANDLER( dc_mess_g1_ctrl_w );
static UINT64 *dc_ram;
static READ64_HANDLER( dcus_idle_skip_r ) static READ64_HANDLER( dcus_idle_skip_r )
{ {
if (space->device().safe_pc()==0xc0ba52a) if (space->device().safe_pc()==0xc0ba52a)
space->device().execute().spin_until_time(attotime::from_usec(2500)); space->device().execute().spin_until_time(attotime::from_usec(2500));
// device_spinuntil_int(&space->device()); // device_spinuntil_int(&space->device());
return dc_ram[0x2303b0/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x2303b0/8];
} }
static READ64_HANDLER( dcjp_idle_skip_r ) static READ64_HANDLER( dcjp_idle_skip_r )
@ -57,7 +55,7 @@ static READ64_HANDLER( dcjp_idle_skip_r )
space->device().execute().spin_until_time(attotime::from_usec(2500)); space->device().execute().spin_until_time(attotime::from_usec(2500));
// device_spinuntil_int(&space->device()); // device_spinuntil_int(&space->device());
return dc_ram[0x2302f8/8]; return space->machine().driver_data<dc_state>()->dc_ram[0x2302f8/8];
} }
DRIVER_INIT_MEMBER(dc_state,dc) DRIVER_INIT_MEMBER(dc_state,dc)
@ -179,10 +177,10 @@ static ADDRESS_MAP_START( dc_map, AS_PROGRAM, 64, dc_state )
AM_RANGE(0x05000000, 0x05ffffff) AM_RAM AM_SHARE("frameram") // apparently this actually accesses the same memory as the 64-bit texture memory access, but in a different format, keep it apart for now AM_RANGE(0x05000000, 0x05ffffff) AM_RAM AM_SHARE("frameram") // apparently this actually accesses the same memory as the 64-bit texture memory access, but in a different format, keep it apart for now
/* Area 3 */ /* Area 3 */
AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_SHARE("share4") AM_BASE_LEGACY(&dc_ram) AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_SHARE("dc_ram")
AM_RANGE(0x0d000000, 0x0dffffff) AM_RAM AM_SHARE("share4")// extra ram on Naomi (mirror on DC) AM_RANGE(0x0d000000, 0x0dffffff) AM_RAM AM_SHARE("dc_ram")// extra ram on Naomi (mirror on DC)
AM_RANGE(0x0e000000, 0x0effffff) AM_RAM AM_SHARE("share4")// mirror AM_RANGE(0x0e000000, 0x0effffff) AM_RAM AM_SHARE("dc_ram")// mirror
AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE("share4")// mirror AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE("dc_ram")// mirror
/* Area 4 */ /* Area 4 */
AM_RANGE(0x10000000, 0x107fffff) AM_WRITE_LEGACY(ta_fifo_poly_w ) AM_RANGE(0x10000000, 0x107fffff) AM_WRITE_LEGACY(ta_fifo_poly_w )
@ -193,7 +191,7 @@ static ADDRESS_MAP_START( dc_map, AS_PROGRAM, 64, dc_state )
AM_RANGE(0x12800000, 0x12ffffff) AM_WRITE_LEGACY(ta_fifo_yuv_w ) AM_RANGE(0x12800000, 0x12ffffff) AM_WRITE_LEGACY(ta_fifo_yuv_w )
AM_RANGE(0x13000000, 0x137fffff) AM_WRITE_LEGACY(ta_texture_directpath1_w ) AM_MIRROR(0x00800000) // access to texture / fraembfufer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue AM_RANGE(0x13000000, 0x137fffff) AM_WRITE_LEGACY(ta_texture_directpath1_w ) AM_MIRROR(0x00800000) // access to texture / fraembfufer memory (either 32-bit or 64-bit area depending on SB_LMMODE1 register - cannot be written directly, only through dma / store queue
AM_RANGE(0x8c000000, 0x8cffffff) AM_RAM AM_SHARE("share4") // another RAM mirror AM_RANGE(0x8c000000, 0x8cffffff) AM_RAM AM_SHARE("dc_ram") // another RAM mirror
AM_RANGE(0xa0000000, 0xa01fffff) AM_ROM AM_REGION("maincpu", 0) AM_RANGE(0xa0000000, 0xa01fffff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END ADDRESS_MAP_END

12
src/mess/drivers/n64.c
View File

@ -20,7 +20,7 @@ static READ32_HANDLER( dd_null_r )
} }
static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state ) static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_LEGACY(&rdram) // RDRAM AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_SHARE("rdram") // RDRAM
AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w) AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w)
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM
@ -33,14 +33,14 @@ static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x04700000, 0x047fffff) AM_DEVREADWRITE("rcp", n64_periphs, ri_reg_r, ri_reg_w) // RDRAM Interface AM_RANGE(0x04700000, 0x047fffff) AM_DEVREADWRITE("rcp", n64_periphs, ri_reg_r, ri_reg_w) // RDRAM Interface
AM_RANGE(0x04800000, 0x048fffff) AM_DEVREADWRITE("rcp", n64_periphs, si_reg_r, si_reg_w) // Serial Interface AM_RANGE(0x04800000, 0x048fffff) AM_DEVREADWRITE("rcp", n64_periphs, si_reg_r, si_reg_w) // Serial Interface
AM_RANGE(0x05000508, 0x0500050b) AM_READ_LEGACY(dd_null_r); AM_RANGE(0x05000508, 0x0500050b) AM_READ_LEGACY(dd_null_r);
AM_RANGE(0x08000000, 0x0801ffff) AM_RAM AM_BASE_LEGACY(&n64_sram) // Cartridge SRAM AM_RANGE(0x08000000, 0x0801ffff) AM_RAM AM_SHARE("sram") // Cartridge SRAM
AM_RANGE(0x10000000, 0x13ffffff) AM_ROM AM_REGION("user2", 0) // Cartridge AM_RANGE(0x10000000, 0x13ffffff) AM_ROM AM_REGION("user2", 0) // Cartridge
AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION("user1", 0) // PIF ROM AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION("user1", 0) // PIF ROM
AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_DEVREADWRITE("rcp", n64_periphs, pif_ram_r, pif_ram_w) AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_DEVREADWRITE("rcp", n64_periphs, pif_ram_r, pif_ram_w)
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( n64dd_map, AS_PROGRAM, 32, n64_state ) static ADDRESS_MAP_START( n64dd_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_LEGACY(&rdram) // RDRAM AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_SHARE("rdram") // RDRAM
AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w) AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w)
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM
@ -54,7 +54,7 @@ static ADDRESS_MAP_START( n64dd_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x04800000, 0x048fffff) AM_DEVREADWRITE("rcp", n64_periphs, si_reg_r, si_reg_w) // Serial Interface AM_RANGE(0x04800000, 0x048fffff) AM_DEVREADWRITE("rcp", n64_periphs, si_reg_r, si_reg_w) // Serial Interface
AM_RANGE(0x05000000, 0x05ffffff) AM_DEVREADWRITE("rcp", n64_periphs, dd_reg_r, dd_reg_w) // 64DD Interface AM_RANGE(0x05000000, 0x05ffffff) AM_DEVREADWRITE("rcp", n64_periphs, dd_reg_r, dd_reg_w) // 64DD Interface
AM_RANGE(0x06000000, 0x063fffff) AM_ROM AM_REGION("ddipl", 0) // 64DD IPL ROM AM_RANGE(0x06000000, 0x063fffff) AM_ROM AM_REGION("ddipl", 0) // 64DD IPL ROM
AM_RANGE(0x08000000, 0x0801ffff) AM_RAM AM_BASE_LEGACY(&n64_sram) // Cartridge SRAM AM_RANGE(0x08000000, 0x0801ffff) AM_RAM AM_SHARE("sram") // Cartridge SRAM
AM_RANGE(0x10000000, 0x13ffffff) AM_ROM AM_REGION("user2", 0) // Cartridge AM_RANGE(0x10000000, 0x13ffffff) AM_ROM AM_REGION("user2", 0) // Cartridge
AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION("user1", 0) // PIF ROM AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION("user1", 0) // PIF ROM
AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_DEVREADWRITE("rcp", n64_periphs, pif_ram_r, pif_ram_w) AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_DEVREADWRITE("rcp", n64_periphs, pif_ram_r, pif_ram_w)
@ -63,8 +63,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32, n64_state ) static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32, n64_state )
AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("dmem") AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("dmem")
AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("imem") AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("imem")
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_BASE_LEGACY(&rsp_dmem) AM_SHARE("dmem") AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("rsp_dmem") AM_SHARE("dmem")
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_BASE_LEGACY(&rsp_imem) AM_SHARE("imem") AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("rsp_imem") AM_SHARE("imem")
ADDRESS_MAP_END ADDRESS_MAP_END
static INPUT_PORTS_START( n64 ) static INPUT_PORTS_START( n64 )

4
src/mess/drivers/ng_aes.c
View File

@ -110,7 +110,7 @@ public:
//static UINT16 *save_ram; //static UINT16 *save_ram;
UINT16* neocd_work_ram; //UINT16* neocd_work_ram;
/************************************* /*************************************
* *
@ -1310,7 +1310,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( neocd_main_map, AS_PROGRAM, 16, ng_aes_state ) static ADDRESS_MAP_START( neocd_main_map, AS_PROGRAM, 16, ng_aes_state )
AM_RANGE(0x000000, 0x00007f) AM_RAMBANK(NEOGEO_BANK_VECTORS) AM_RANGE(0x000000, 0x00007f) AM_RAMBANK(NEOGEO_BANK_VECTORS)
AM_RANGE(0x000080, 0x0fffff) AM_RAM AM_RANGE(0x000080, 0x0fffff) AM_RAM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x0f0000) AM_RAM AM_BASE_LEGACY(&neocd_work_ram) AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x0f0000) AM_RAM AM_SHARE("neocd_work_ram")
/* some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too */ /* some games have protection devices in the 0x200000 region, it appears to map to cart space, not surprising, the ROM is read here too */
AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK(NEOGEO_BANK_CARTRIDGE) AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK(NEOGEO_BANK_CARTRIDGE)
AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w) AM_RANGE(0x2ffff0, 0x2fffff) AM_WRITE(main_cpu_bank_select_w)