Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup in mess section (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-04-19 09:49:27 +02:00
parent 22c7189362
commit b49e9beeef
35 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,8 +316,8 @@ void beta_state::machine_start()
memset(&m_eprom_rom[0], 0xff, 0x800);
else
{
astring region_tag;
memcpy(&m_eprom_rom[0], memregion(region_tag.cpy(m_eprom->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base(), 0x800);
std::string region_tag;
memcpy(&m_eprom_rom[0], memregion(region_tag.assign(m_eprom->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base(), 0x800);
}
// state saving

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

@ -545,8 +545,8 @@ void cc40_state::postload()
void cc40_state::machine_start()
{
// init
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
membank("sysbank")->configure_entries(0, 4, memregion("system")->base(), 0x2000);
if (m_cart_rom)

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

@ -118,8 +118,8 @@ DEVICE_IMAGE_LOAD_MEMBER( gameking_state, gameking_cart )
void gameking_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (!m_cart_rom)
{

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

@ -2117,8 +2117,8 @@ void gba_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_bank(0x0a000000, 0x0bffffff, 0, 0, "rom2");
m_maincpu->space(AS_PROGRAM).install_read_bank(0x0c000000, 0x0cffffff, 0, 0, "rom3");
astring region_tag;
memory_region *cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GBASLOT_ROM_REGION_TAG).c_str());
std::string region_tag;
memory_region *cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GBASLOT_ROM_REGION_TAG).c_str());
// install ROM accesses
membank("rom1")->set_base(cart_rom->base());

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

@ -1168,8 +1168,8 @@ void kc85_state::machine_start()
{
address_space &program = m_maincpu->space(AS_PROGRAM);
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_opt_region = memregion(region_tag.assign(m_opt_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* initialize RTC */
m_rtc->cs_w(1);
@ -1211,8 +1211,8 @@ void pc8201_state::machine_start()
{
UINT8 *ram = m_ram->pointer();
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_opt_region = memregion(region_tag.assign(m_opt_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* initialize RTC */
m_rtc->cs_w(1);
@ -1245,8 +1245,8 @@ void trsm100_state::machine_start()
{
address_space &program = m_maincpu->space(AS_PROGRAM);
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_opt_region = memregion(region_tag.assign(m_opt_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* initialize RTC */
m_rtc->cs_w(1);
@ -1296,8 +1296,8 @@ void trsm100_state::machine_start()
void tandy200_state::machine_start()
{
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_opt_region = memregion(region_tag.assign(m_opt_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* configure ROM banking */
membank("bank1")->configure_entry(0, m_rom->base());

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

@ -269,8 +269,8 @@ DEVICE_IMAGE_LOAD_MEMBER( leapster_state, leapster_cart )
void leapster_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (m_cart_rom)
{

8
src/mess/drivers/nc.c
View File

@ -795,8 +795,8 @@ void nc_state::machine_start()
{
m_type = NC_TYPE_1xx;
astring region_tag;
m_card_ram = memregion(region_tag.cpy(m_card->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_card_ram = memregion(region_tag.assign(m_card->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (m_card_ram)
m_card_size = m_card_ram->bytes();
else
@ -1139,8 +1139,8 @@ MACHINE_START_MEMBER(nc_state, nc200)
{
m_type = NC_TYPE_200;
astring region_tag;
m_card_ram = memregion(region_tag.cpy(m_card->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_card_ram = memregion(region_tag.assign(m_card->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (m_card_ram)
m_card_size = m_card_ram->bytes();
else

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

@ -644,8 +644,8 @@ void ngp_state::machine_start()
{
if (m_cart->exists())
{
astring region_tag;
UINT8 *cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base();
std::string region_tag;
UINT8 *cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base();
m_maincpu->space(AS_PROGRAM).install_read_bank(0x200000, 0x3fffff, "flash0");
m_maincpu->space(AS_PROGRAM).install_read_bank(0x800000, 0x9fffff, "flash1");

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

@ -516,9 +516,9 @@ INTERRUPT_GEN_MEMBER(pasogo_state::pasogo_interrupt)
void pasogo_state::machine_reset()
{
astring region_tag;
std::string region_tag;
ioport_port *color = ioport("COLOR");
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (!m_cart_rom) // this should never happen, since we make carts mandatory!
m_cart_rom = memregion("maincpu");

6
src/mess/drivers/pb1000.c
View File

@ -458,12 +458,12 @@ TIMER_CALLBACK_MEMBER(pb1000_state::keyboard_timer)
void pb1000_state::machine_start()
{
astring region_tag;
std::string region_tag;
m_rom_reg = memregion("rom");
if (m_card1)
m_card1_reg = memregion(region_tag.cpy(m_card1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_card1_reg = memregion(region_tag.assign(m_card1->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (m_card2)
m_card2_reg = memregion(region_tag.cpy(m_card2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_card2_reg = memregion(region_tag.assign(m_card2->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
membank("bank1")->set_base(m_rom_reg->base());

8
src/mess/drivers/pc2000.c
View File

@ -740,9 +740,9 @@ INPUT_PORTS_END
void pc2000_state::machine_start()
{
astring region_tag;
std::string region_tag;
UINT8 *bios = memregion("bios")->base();
UINT8 *cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base();
UINT8 *cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base();
if (!cart)
cart = memregion("bios")->base();
@ -754,9 +754,9 @@ void pc2000_state::machine_start()
void gl4004_state::machine_start()
{
astring region_tag;
std::string region_tag;
UINT8 *bios = memregion("bios")->base();
UINT8 *cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base();
UINT8 *cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base();
if (!cart)
cart = memregion("bios")->base();

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

@ -2078,8 +2078,8 @@ void pc6001_state::machine_reset()
if (m_cart->exists())
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x5fff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_port_c_8255=0;
@ -2096,8 +2096,8 @@ MACHINE_RESET_MEMBER(pc6001_state,pc6001m2)
{
m_video_ram = m_region_maincpu->base() + 0xc000 + 0x28000;
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
// hackish way to simplify bankswitch handling
if (m_cart_rom)
memcpy(m_region_maincpu->base() + 0x48000, m_cart_rom->base(), 0x4000);
@ -2135,8 +2135,8 @@ MACHINE_RESET_MEMBER(pc6001_state,pc6001sr)
{
m_video_ram = m_region_maincpu->base() + 0x70000;
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
// should this be mirrored into the EXROM regions? hard to tell without an actual cart dump...
m_port_c_8255=0;

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

@ -488,8 +488,8 @@ INPUT_PORTS_END
void pc8401a_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* initialize RTC */
m_rtc->cs_w(1);

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

@ -885,8 +885,8 @@ void pockstat_state::machine_start()
m_rtc_regs.timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pockstat_state::rtc_tick),this));
m_rtc_regs.timer->adjust(attotime::from_hz(1), index);
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
save_item(NAME(m_ftlb_regs.control));
save_item(NAME(m_ftlb_regs.stat));

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

@ -618,8 +618,8 @@ IRQ_CALLBACK_MEMBER(prestige_state::prestige_int_ack)
void prestige_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
UINT8 *rom = memregion("maincpu")->base();
UINT8 *cart = m_cart_rom->base();

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

@ -405,8 +405,8 @@ void pv1000_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0x7fff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
// FIXME: this is needed for gfx decoding, but there is probably a cleaner solution!
astring region_tag;
memcpy(memregion("gfxrom")->base(), memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())->base(), m_cart->get_rom_size());
std::string region_tag;
memcpy(memregion("gfxrom")->base(), memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base(), m_cart->get_rom_size());
}
save_item(NAME(m_io_regs));

6
src/mess/drivers/px4.c
View File

@ -1228,9 +1228,9 @@ DRIVER_INIT_MEMBER( px4p_state, px4p )
void px4_state::machine_start()
{
astring region_tag;
m_caps1_rom = memregion(region_tag.cpy(m_caps1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_caps2_rom = memregion(region_tag.cpy(m_caps2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_caps1_rom = memregion(region_tag.assign(m_caps1->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_caps2_rom = memregion(region_tag.assign(m_caps2->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_nvram->set_base(m_ram->pointer(), 0x10000);

8
src/mess/drivers/socrates.c
View File

@ -317,8 +317,8 @@ void socrates_state::socrates_check_kb_latch( ) // if kb[1] is full and kb[0] i
void socrates_state::machine_reset()
{
astring region_tag;
m_cart_reg = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_reg = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_rom_bank = 0xF3; // actually set semi-randomly on real console but we need to initialize it somewhere...
socrates_set_rom_bank();
@ -896,8 +896,8 @@ WRITE8_MEMBER( iqunlim_state::video_regs_w )
void iqunlim_state::machine_start()
{
astring region_tag;
m_cart_reg = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_reg = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
UINT8 *bios = m_bios_reg->base();
UINT8 *cart = m_cart_reg ? m_cart_reg->base() : m_bios_reg->base();

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

@ -468,8 +468,8 @@ DEVICE_IMAGE_LOAD_MEMBER( svision_state, svision_cart )
void svision_state::machine_start()
{
int num_banks;
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
num_banks = m_cart_rom->bytes() / 0x4000;
m_bank1 = membank("bank1");

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

@ -544,8 +544,8 @@ MACHINE_RESET_MEMBER(spectrum_state,ts2068)
m_port_ff_data = 0;
m_port_f4_data = 0;
astring region_tag;
m_dock_crt = memregion(region_tag.cpy(m_dock->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_dock_crt = memregion(region_tag.assign(m_dock->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_dock_cart_type = m_dock_crt ? TIMEX_CART_DOCK : TIMEX_CART_NONE;
ts2068_update_memory();

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

@ -354,8 +354,8 @@ void tispeak_state::init_cartridge()
{
if (m_cart != NULL && m_cart->exists())
{
astring region_tag;
memory_region *src = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
memory_region *src = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (src)
memcpy(m_cart_base, src->base(), src->bytes());
}

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

@ -225,8 +225,8 @@ public:
void tutor_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_tape_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tutor_state::tape_interrupt_handler),this));

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

@ -607,8 +607,8 @@ void tvc_state::machine_start()
m_ext = memregion("ext");
m_vram = memregion("vram");
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
}
void tvc_state::machine_reset()

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

@ -1173,8 +1173,8 @@ void vboy_state::machine_start()
// trampoline (but forces us to alloc always a 0x200000-wide region)
if (m_cart->exists())
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(VBOYSLOT_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(VBOYSLOT_ROM_REGION_TAG).c_str());
m_maincpu->space(AS_PROGRAM).install_read_bank(0x07000000, 0x071fffff, 0, 0x0e00000, "prog_cart_bank");
m_maincpu->space(AS_IO).install_read_bank(0x07000000, 0x071fffff, 0, 0x0e00000, "io_cart_bank");

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

@ -1023,8 +1023,8 @@ void vii_state::machine_start()
if (m_cart && m_cart->exists())
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
memcpy(&m_p_cart[0], m_cart_rom->base(), 0x400000 * 2);
}
else if (m_spg243_mode == SPG243_VII) // Vii bios is banked

4
src/mess/machine/advision.c
View File

@ -27,8 +27,8 @@
void advision_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
/* configure EA banking */
m_bank1->configure_entry(0, memregion(I8048_TAG)->base());

8
src/mess/machine/amstrad.c
View File

@ -3032,8 +3032,8 @@ MACHINE_START_MEMBER(amstrad_state,plus)
m_system_type = SYSTEM_PLUS;
m_centronics->write_data7(0);
astring region_tag;
m_region_cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_region_cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (!m_region_cart) // this should never happen, since we make carts mandatory!
m_region_cart = memregion("maincpu");
}
@ -3076,8 +3076,8 @@ MACHINE_START_MEMBER(amstrad_state,gx4000)
m_asic.ram = m_region_user1->base(); // 16kB RAM for ASIC, memory-mapped registers.
m_system_type = SYSTEM_GX4000;
astring region_tag;
m_region_cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_region_cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (!m_region_cart) // this should never happen, since we make carts mandatory!
m_region_cart = memregion("maincpu");
}

16
src/mess/machine/bbc.c
View File

@ -2033,22 +2033,22 @@ DRIVER_INIT_MEMBER(bbc_state,bbcm)
// setup pointers for optional EPROMs
void bbc_state::bbc_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size)
{
astring region_tag;
std::string region_tag;
memory_region *tmp_reg;
UINT8 *eprom[4];
if (m_exp1 && (tmp_reg = memregion(region_tag.cpy(m_exp1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp1 && (tmp_reg = memregion(region_tag.assign(m_exp1->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[0] = tmp_reg->base() + shift;
else
eprom[0] = m_region_opt->base() + 0x0000 + shift;
if (m_exp2 && (tmp_reg = memregion(region_tag.cpy(m_exp2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp2 && (tmp_reg = memregion(region_tag.assign(m_exp2->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[1] = tmp_reg->base() + shift;
else
eprom[1] = m_region_opt->base() + 0x4000 + shift;
if (m_exp3 && (tmp_reg = memregion(region_tag.cpy(m_exp3->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp3 && (tmp_reg = memregion(region_tag.assign(m_exp3->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[2] = tmp_reg->base() + shift;
else
eprom[2] = m_region_opt->base() + 0x8000 + shift;
if (m_exp4 && (tmp_reg = memregion(region_tag.cpy(m_exp4->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp4 && (tmp_reg = memregion(region_tag.assign(m_exp4->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[3] = tmp_reg->base() + shift;
else
eprom[3] = m_region_opt->base() + 0xc000 + shift;
@ -2067,14 +2067,14 @@ void bbc_state::bbc_setup_banks(memory_bank *membank, int banks, UINT32 shift, U
void bbc_state::bbcm_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size)
{
astring region_tag;
std::string region_tag;
memory_region *tmp_reg;
UINT8 *eprom[2];
if (m_exp1 && (tmp_reg = memregion(region_tag.cpy(m_exp1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp1 && (tmp_reg = memregion(region_tag.assign(m_exp1->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[0] = tmp_reg->base() + shift;
else
eprom[0] = m_region_opt->base() + 0x0000 + shift;
if (m_exp2 && (tmp_reg = memregion(region_tag.cpy(m_exp2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str())))
if (m_exp2 && (tmp_reg = memregion(region_tag.assign(m_exp2->tag()).append(GENERIC_ROM_REGION_TAG).c_str())))
eprom[1] = tmp_reg->base() + shift;
else
eprom[1] = m_region_opt->base() + 0x8000 + shift;

4
src/mess/machine/electron.c
View File

@ -346,8 +346,8 @@ void electron_state::machine_reset()
void electron_state::machine_start()
{
UINT8 *lo_rom, *up_rom;
astring region_tag;
memory_region *cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
memory_region *cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
if (cart_rom)
up_rom = cart_rom->base();

6
src/mess/machine/gamecom.c
View File

@ -25,9 +25,9 @@ void gamecom_state::machine_reset()
m_lcv_reg = 0x27;
m_lcdc_reg = 0xb0;
astring region_tag;
m_cart1_rom = memregion(region_tag.cpy(m_cart1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_cart2_rom = memregion(region_tag.cpy(m_cart2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart1_rom = memregion(region_tag.assign(m_cart1->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_cart2_rom = memregion(region_tag.assign(m_cart2->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
}
void gamecom_state::gamecom_set_mmu(UINT8 mmu, UINT8 data)

6
src/mess/machine/primo.c
View File

@ -242,9 +242,9 @@ void primo_state::primo_common_machine_init ()
void primo_state::machine_start()
{
astring region_tag;
m_cart1_rom = memregion(region_tag.cpy(m_cart1->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
m_cart2_rom = memregion(region_tag.cpy(m_cart2->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart1_rom = memregion(region_tag.assign(m_cart1->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_cart2_rom = memregion(region_tag.assign(m_cart2->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
}
void primo_state::machine_reset()

4
src/mess/machine/svi318.c
View File

@ -421,8 +421,8 @@ DRIVER_INIT_MEMBER(svi318_state, svi328_806)
void svi318_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
m_bios_rom = memregion("maincpu");
// 80 column card start

2
src/mess/machine/ti99/gromport.c
View File

@ -2285,7 +2285,7 @@ rpk_socket* rpk_reader::load_ram_resource(emu_options &options, xml_data_node* r
global_free_array(contents);
throw rpk_exception(RPK_INVALID_RAM_SPEC, "<ram type='persistent'> must have a 'file' attribute");
}
astring ram_pathname = astring(system_name).cat(PATH_SEPARATOR).cat(ram_filename);
std::string ram_pathname = std::string(system_name).append(PATH_SEPARATOR).append(ram_filename);
ram_pname = core_strdup(ram_pathname.c_str());
// load, and fill rest with 00
if (VERBOSE>6) LOG("gromport/RPK: Loading NVRAM contents from '%s'\n", ram_pname);

2
src/mess/machine/ti99/gromport.h
View File

@ -509,7 +509,7 @@ public:
const char* to_string()
{
if (m_detail==NULL) return error_text[(int)m_err];
astring errormsg = astring(error_text[(int)m_err]).cat(": ").cat(m_detail);
std::string errormsg = std::string(error_text[(int)m_err]).append(": ").append(m_detail);
return core_strdup(errormsg.c_str());
}

4
src/mess/machine/vtech2.c
View File

@ -73,8 +73,8 @@ DRIVER_INIT_MEMBER(vtech2_state,laser)
m_mem = memregion("maincpu")->base();
// check ROM expansion
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG).c_str());
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
for (i = 0; i < ARRAY_LENGTH(m_laser_bank); i++)
m_laser_bank[i] = -1;