Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

astring to std::string in bus section (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-04-19 09:29:57 +02:00
parent 3c3ee1d177
commit 3dcf442d7b
55 changed files with 131 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/emu/bus/a7800/a78_slot.c
View File

@ -66,8 +66,8 @@ void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(A78SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(A78SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -733,75 +733,75 @@ void a78_cart_slot_device::internal_header_logging(UINT8 *header, UINT32 len)
UINT8 head_ctrl1 = header[55];
UINT8 head_ctrl2 = header[56];
UINT8 head_ispal = header[57];
astring cart_mapper, ctrl1, ctrl2;
std::string cart_mapper, ctrl1, ctrl2;
memcpy(head_title, header + 0x11, 0x20);
switch (head_mapper)
{
case 0x0000:
cart_mapper.cpy("No Bankswitch");
cart_mapper.assign("No Bankswitch");
break;
case 0x0001:
cart_mapper.cpy("No Bankswitch + POKEY");
cart_mapper.assign("No Bankswitch + POKEY");
break;
case 0x0002:
cart_mapper.cpy("SuperCart Bankswitch");
cart_mapper.assign("SuperCart Bankswitch");
break;
case 0x0003:
cart_mapper.cpy("SuperCart Bankswitch + POKEY");
cart_mapper.assign("SuperCart Bankswitch + POKEY");
break;
case 0x0006:
cart_mapper.cpy("SuperCart Bankswitch + RAM");
cart_mapper.assign("SuperCart Bankswitch + RAM");
break;
case 0x000a:
cart_mapper.cpy("SuperCart 9Banks");
cart_mapper.assign("SuperCart 9Banks");
break;
case 0x000b:
cart_mapper.cpy("SuperCart XM Compatible");
cart_mapper.assign("SuperCart XM Compatible");
break;
case 0x0020:
cart_mapper.cpy("SuperCart Bankswitch + 32K RAM");
cart_mapper.assign("SuperCart Bankswitch + 32K RAM");
break;
case 0x0100:
cart_mapper.cpy("Activision Bankswitch");
cart_mapper.assign("Activision Bankswitch");
break;
case 0x0200:
cart_mapper.cpy("Absolute Bankswitch");
cart_mapper.assign("Absolute Bankswitch");
break;
default:
cart_mapper.cpy("Unknown mapper");
cart_mapper.assign("Unknown mapper");
break;
}
switch (head_ctrl1)
{
case 0x00:
ctrl1.cpy("None");
ctrl1.assign("None");
break;
case 0x01:
ctrl1.cpy("Joystick");
ctrl1.assign("Joystick");
break;
case 0x02:
ctrl1.cpy("Light Gun");
ctrl1.assign("Light Gun");
break;
default:
ctrl1.cpy("Unknown controller");
ctrl1.assign("Unknown controller");
break;
}
switch (head_ctrl2)
{
case 0x00:
ctrl2.cpy("None");
ctrl2.assign("None");
break;
case 0x01:
ctrl2.cpy("Joystick");
ctrl2.assign("Joystick");
break;
case 0x02:
ctrl2.cpy("Light Gun");
ctrl2.assign("Light Gun");
break;
default:
ctrl2.cpy("Unknown controller");
ctrl2.assign("Unknown controller");
break;
}

8
src/emu/bus/a800/a800_slot.c
View File

@ -63,8 +63,8 @@ void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(A800SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(A800SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -460,8 +460,8 @@ void a5200_cart_slot_device::get_default_card_software(std::string &result)
core_fread(m_file, &head[0], 0x10);
type = identify_cart_type(&head[0]);
astring info;
if (hashfile_extrainfo(*this, info) && info.cmp("A13MIRRORING")==0)
std::string info;
if (hashfile_extrainfo(*this, info) && info.compare("A13MIRRORING")==0)
type = A5200_16K_2CHIPS;
}
if (type < A5200_4K)

4
src/emu/bus/apf/slot.c
View File

@ -49,8 +49,8 @@ void device_apf_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(APFSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(APFSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/arcadia/slot.c
View File

@ -49,8 +49,8 @@ void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(EA2001SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(EA2001SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/astrocde/slot.c
View File

@ -49,8 +49,8 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(ASTROCADESLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(ASTROCADESLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/chanf/slot.c
View File

@ -49,8 +49,8 @@ void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(CHANFSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(CHANFSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/crvision/slot.c
View File

@ -49,8 +49,8 @@ void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(CRVSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(CRVSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/gameboy/gb_slot.c
View File

@ -61,8 +61,8 @@ void device_gb_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(GBSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(GBSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/gba/gba_slot.c
View File

@ -48,8 +48,8 @@ void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(GBASLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(GBASLOT_ROM_REGION_TAG);
// we always alloc 32MB of rom region!
m_rom = (UINT32 *)device().machine().memory().region_alloc(tempstring.c_str(), 0x2000000, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size;

4
src/emu/bus/generic/slot.c
View File

@ -59,8 +59,8 @@ void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(GENERIC_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(GENERIC_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, width, endian)->base();
m_rom_size = size;
}

4
src/emu/bus/intv/ecs.c
View File

@ -54,8 +54,8 @@ void intv_ecs_device::device_start()
// if the ECS is mounted directly in the system, use device rom and alloc RAM
if (m_rom == NULL)
{
astring region_tag;
m_rom = memregion(region_tag.cpy(tag()).cat(":ecs").c_str())->base();
std::string region_tag;
m_rom = memregion(region_tag.assign(tag()).append(":ecs").c_str())->base();
}
if (m_ram.empty())
{

8
src/emu/bus/intv/slot.c
View File

@ -118,8 +118,8 @@ void device_intv_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(INTVSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(INTVSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
memset(m_rom, 0xff, size);
m_rom_size = size;
@ -310,7 +310,7 @@ int intv_cart_slot_device::load_fullpath()
// 7. extra = 1 ECS, 2 Intellivoice
int start, size;
int mapper, rom[5], ram, extra;
astring extrainfo;
std::string extrainfo;
m_cart->rom_alloc(0x20000, tag());
ROM = (UINT8 *)m_cart->get_rom_base();
@ -479,7 +479,7 @@ void intv_cart_slot_device::get_default_card_software(std::string &result)
// assume it's .BIN and try to use .hsi file to determine type (just RAM)
int start;
int mapper, rom[5], ram, extra;
astring extrainfo;
std::string extrainfo;
if (hashfile_extrainfo(*this, extrainfo))
{

4
src/emu/bus/macpds/pds_tpdfpd.c
View File

@ -88,7 +88,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig,
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SEDISPLAY_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SEDISPLAY_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -97,7 +97,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig,
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SEDISPLAY_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SEDISPLAY_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/macpds/pds_tpdfpd.h
View File

@ -43,7 +43,7 @@ public:
UINT32 m_vbl_disable;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

16
src/emu/bus/megadrive/md_slot.c
View File

@ -85,8 +85,8 @@ void device_md_cart_interface::rom_alloc(size_t size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(MDSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(MDSLOT_ROM_REGION_TAG);
m_rom = (UINT16 *)device().machine().memory().region_alloc(tempstring.c_str(), size, 2, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
@ -989,7 +989,7 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32
UINT32 rom_start, rom_end, ram_start, ram_end, sram_start = 0, sram_end = 0;
UINT16 checksum, csum = 0;
bool valid_sram = FALSE, is_pico = FALSE;
astring ctrl(""), reg("");
std::string ctrl(""), reg("");
// LOG FILE DETAILS
logerror("FILE DETAILS\n");
@ -1027,9 +1027,9 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32
{
io[i] = ROM8[0x190 + (i ^ 1)];
if (io[i] == 'J')
ctrl.cat(" - Joypad 3 buttons [J]\n");
ctrl.append(" - Joypad 3 buttons [J]\n");
if (io[i] == '6')
ctrl.cat(" - Joypad 6 buttons [6]\n");
ctrl.append(" - Joypad 6 buttons [6]\n");
}
rom_start = (ROM8[0x1a1] << 24 | ROM8[0x1a0] << 16 | ROM8[0x1a3] << 8 | ROM8[0x1a2]);
@ -1051,11 +1051,11 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32
{
country[i] = ROM8[0x1f0 + (i ^ 1)];
if (country[i] == 'J')
reg.cat(" - Japan [J]\n");
reg.append(" - Japan [J]\n");
if (country[i] == 'U')
reg.cat(" - USA [U]\n");
reg.append(" - USA [U]\n");
if (country[i] == 'E')
reg.cat(" - Europe [E]\n");
reg.append(" - Europe [E]\n");
}
// compute cart checksum to compare with expected one

4
src/emu/bus/msx_slot/cartridge.c
View File

@ -166,7 +166,7 @@ bool msx_slot_cartridge_device::call_load()
}
// Check if there's some mapper related
astring extrainfo;
std::string extrainfo;
if (hashfile_extrainfo(*this, extrainfo))
{
}
@ -286,7 +286,7 @@ void msx_slot_cartridge_device::get_default_card_software(std::string &result)
int type = NOMAPPER;
// Check if there's some mapper related information in the hashfiles
astring extrainfo;
std::string extrainfo;
if (hashfile_extrainfo(*this, extrainfo))
{
int extrainfo_type = -1;

4
src/emu/bus/nes/nes_ines.inc
View File

@ -342,7 +342,7 @@ void nes_cart_slot_device::call_load_ines()
UINT8 header[0x10];
UINT8 mapper, submapper = 0, local_options;
bool ines20 = FALSE, prg16k;
astring mapinfo;
std::string mapinfo;
int pcb_id = 0, mapint1 = 0, mapint2 = 0, mapint3 = 0, mapint4 = 0;
int crc_hack = 0;
bool bus_conflict = FALSE;
@ -813,7 +813,7 @@ const char * nes_cart_slot_device::get_default_card_ines(UINT8 *ROM, UINT32 len)
{
UINT8 mapper, submapper = 0;
bool ines20 = FALSE;
astring mapinfo;
std::string mapinfo;
int pcb_id = 0, mapint1 = 0, mapint2 = 0, mapint3 = 0, mapint4 = 0;
int crc_hack = 0;

8
src/emu/bus/nes/nes_slot.c
View File

@ -148,8 +148,8 @@ void device_nes_cart_interface::prg_alloc(size_t size, const char *tag)
{
if (m_prg == NULL)
{
astring tempstring(tag);
tempstring.cat(NESSLOT_PRGROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(NESSLOT_PRGROM_REGION_TAG);
m_prg = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_prg_size = size;
m_prg_chunks = size / 0x4000;
@ -217,8 +217,8 @@ void device_nes_cart_interface::vrom_alloc(size_t size, const char *tag)
{
if (m_vrom == NULL)
{
astring tempstring(tag);
tempstring.cat(NESSLOT_CHRROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(NESSLOT_CHRROM_REGION_TAG);
m_vrom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_vrom_size = size;
m_vrom_chunks = size / 0x2000;

2
src/emu/bus/nubus/nubus_48gc.c
View File

@ -79,7 +79,7 @@ jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(GC48_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(GC48_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_48gc.h
View File

@ -45,7 +45,7 @@ public:
UINT32 m_registers[0x100];
int m_xres, m_yres;
bool m_is824;
astring m_assembled_tag;
std::string m_assembled_tag;
};
class nubus_48gc_device : public jmfb_device

4
src/emu/bus/nubus/nubus_m2hires.c
View File

@ -68,7 +68,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2HIRES_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(M2HIRES_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -77,7 +77,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2HIRES_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(M2HIRES_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_m2hires.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/nubus_m2video.c
View File

@ -69,7 +69,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2VIDEO_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(M2VIDEO_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -78,7 +78,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2VIDEO_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(M2VIDEO_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_m2video.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/nubus_radiustpd.c
View File

@ -68,7 +68,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, co
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(RADIUSTPD_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(RADIUSTPD_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -77,7 +77,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, de
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(RADIUSTPD_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(RADIUSTPD_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_radiustpd.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/nubus_spec8.c
View File

@ -70,7 +70,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SPEC8S3_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SPEC8S3_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -79,7 +79,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SPEC8S3_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SPEC8S3_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_spec8.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
private:
//UINT32 m_7xxxxx_regs[0x100000/4];

4
src/emu/bus/nubus/nubus_specpdq.c
View File

@ -86,7 +86,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const
device_nubus_card_interface(mconfig, *this),
m_palette(*this, "palette")
{
m_assembled_tag = astring(tag).cat(":").cat(SPECPDQ_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SPECPDQ_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -96,7 +96,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device
device_nubus_card_interface(mconfig, *this),
m_palette(*this, "palette")
{
m_assembled_tag = astring(tag).cat(":").cat(SPECPDQ_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(SPECPDQ_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_specpdq.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable;
UINT32 m_palette_val[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
private:
UINT32 m_7xxxxx_regs[0x100000/4];

4
src/emu/bus/nubus/nubus_wsportrait.c
View File

@ -71,7 +71,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig,
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(WSPORTRAIT_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(WSPORTRAIT_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -80,7 +80,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig,
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(WSPORTRAIT_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(WSPORTRAIT_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/nubus_wsportrait.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/pds30_30hr.c
View File

@ -71,7 +71,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, co
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEED30HR_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(XCEED30HR_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -80,7 +80,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, de
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEED30HR_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(XCEED30HR_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/pds30_30hr.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/pds30_cb264.c
View File

@ -64,7 +64,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, co
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(CB264SE30_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(CB264SE30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -73,7 +73,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, de
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(CB264SE30_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(CB264SE30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/pds30_cb264.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/pds30_mc30.c
View File

@ -67,7 +67,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, co
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEEDMC30_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(XCEEDMC30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -76,7 +76,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, de
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEEDMC30_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(XCEEDMC30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/pds30_mc30.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/pds30_procolor816.c
View File

@ -70,7 +70,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(PROCOLOR816_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(PROCOLOR816_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -79,7 +79,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(PROCOLOR816_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(PROCOLOR816_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/pds30_procolor816.h
View File

@ -44,7 +44,7 @@ public:
UINT32 m_mode, m_vbl_disable, m_toggle;
UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/nubus/pds30_sigmalview.c
View File

@ -64,7 +64,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(LVIEW_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(LVIEW_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -73,7 +73,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_typ
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(LVIEW_SCREEN_NAME);
m_assembled_tag = std::string(tag).append(":").append(LVIEW_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

2
src/emu/bus/nubus/pds30_sigmalview.h
View File

@ -45,7 +45,7 @@ public:
UINT32 m_palette[256];
emu_timer *m_timer;
int m_protstate;
astring m_assembled_tag;
std::string m_assembled_tag;
};

4
src/emu/bus/odyssey2/slot.c
View File

@ -49,8 +49,8 @@ void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(O2SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(O2SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/pce/pce_slot.c
View File

@ -51,8 +51,8 @@ void device_pce_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(PCESLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(PCESLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/saturn/sat_slot.c
View File

@ -58,8 +58,8 @@ void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(SATSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(SATSLOT_ROM_REGION_TAG);
m_rom = (UINT32 *)device().machine().memory().region_alloc(tempstring.c_str(), size, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/scv/slot.c
View File

@ -49,8 +49,8 @@ void device_scv_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(SCVSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(SCVSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/sega8/sega8_slot.c
View File

@ -76,8 +76,8 @@ void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(S8SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(S8SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
m_rom_page_count = size / 0x4000;

6
src/emu/bus/snes/snes_slot.c
View File

@ -90,8 +90,8 @@ void device_sns_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(SNSSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(SNSSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
@ -796,7 +796,7 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
// otherwise, we need to use the legacy versions including DSP dump in device romset
if (!m_cart->get_addon_bios_size())
{
astring region = astring(m_cart->device().tag()).cat(":addon");
std::string region = std::string(m_cart->device().tag()).append(":addon");
UINT8 *ROM = NULL;
switch (m_addon)

4
src/emu/bus/vboy/slot.c
View File

@ -50,8 +50,8 @@ void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(VBOYSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(VBOYSLOT_ROM_REGION_TAG);
m_rom = (UINT32 *)device().machine().memory().region_alloc(tempstring.c_str(), size, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size/4;
m_rom_mask = m_rom_size - 1;

4
src/emu/bus/vc4000/slot.c
View File

@ -49,8 +49,8 @@ void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(VC4000SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(VC4000SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/vcs/vcs_slot.c
View File

@ -51,8 +51,8 @@ void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(A26SLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(A26SLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/vectrex/slot.c
View File

@ -49,8 +49,8 @@ void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(VECSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(VECSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}

4
src/emu/bus/wswan/slot.c
View File

@ -50,8 +50,8 @@ void device_ws_cart_interface::rom_alloc(UINT32 size, const char *tag)
{
if (m_rom == NULL)
{
astring tempstring(tag);
tempstring.cat(WSSLOT_ROM_REGION_TAG);
std::string tempstring(tag);
tempstring.append(WSSLOT_ROM_REGION_TAG);
m_rom = device().machine().memory().region_alloc(tempstring.c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
m_bank_mask = ((m_rom_size >> 16) - 1);

12
src/emu/hashfile.c
View File

@ -51,7 +51,6 @@ struct hash_file
{
emu_file *file;
object_pool *pool;
astring functions[IO_COUNT];
hash_info **preloaded_hashes;
int preloaded_hash_count;
@ -176,7 +175,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut
hash_info *hi;
char **text_dest;
hash_collection hashes;
astring all_functions;
std::string all_functions;
char functions;
// iodevice_t device;
int i;
@ -238,7 +237,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut
if (functions)
{
hashes.add_from_string(functions, attributes[1], strlen(attributes[1]));
all_functions.cat(functions);
all_functions.append(1, functions);
}
attributes += 2;
@ -493,7 +492,6 @@ struct hashlookup_params
static int singular_selector_proc(hash_file *hashfile, void *param, const char *name, const hash_collection *hashes)
{
astring tempstr;
struct hashlookup_params *hlparams = (struct hashlookup_params *) param;
return (*hashes == *hlparams->hashes);
}
@ -537,7 +535,7 @@ const hash_info *hashfile_lookup(hash_file *hashfile, const hash_collection *has
const char *extra_info = NULL;
bool read_hash_config(device_image_interface &image, const char *sysname, astring &result)
bool read_hash_config(device_image_interface &image, const char *sysname, std::string &result)
{
hash_file *hashfile = NULL;
const hash_info *info = NULL;
@ -556,14 +554,14 @@ bool read_hash_config(device_image_interface &image, const char *sysname, astrin
return false;
}
result.cpy(info->extrainfo);
result.assign(info->extrainfo);
/* copy the relevant entries */
hashfile_close(hashfile);
return true;
}
bool hashfile_extrainfo(device_image_interface &image, astring &result)
bool hashfile_extrainfo(device_image_interface &image, std::string &result)
{
/* now read the hash file */
image.crc();

2
src/emu/hashfile.h
View File

@ -12,6 +12,6 @@
#include "emu.h"
bool hashfile_extrainfo(device_image_interface &image, astring &result);
bool hashfile_extrainfo(device_image_interface &image, std::string &result);
#endif /* __HASHFILE_H__ */