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

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
David Haywood 2015-10-27 19:51:29 +00:00
commit bb77797e97
21 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/devices/cpu/avr8/avr8.c
View File

@ -752,7 +752,6 @@ void avr8_device::device_start()
m_io = &space(AS_IO);
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", m_shifted_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_r[AVR8_REGIDX_SREG]).callimport().callexport().formatstr("%8s").noshow();
state_add(AVR8_SREG, "STATUS", m_r[AVR8_REGIDX_SREG]).mask(0xff);

2
src/devices/cpu/dsp56k/pmove.h
View File

@ -315,8 +315,6 @@ public:
{
INT8 b;
reg_id SD;
std::string args;
b = (char)(word0 & 0x00ff);
decode_HHH_table(BITSn(word1,0x0e00), SD);
assemble_reg_from_W_table(BITSn(word1,0x0100), 'X', SD, b, m_source, m_destination);

1
src/devices/cpu/e132xs/e132xs.c
View File

@ -1562,7 +1562,6 @@ void hyperstone_device::init(int scale_mask)
m_clock_scale_mask = scale_mask;
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", m_global_regs[0]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_global_regs[1]).callimport().callexport().formatstr("%40s").noshow();
state_add(E132XS_PC, "PC", m_global_regs[0]).mask(0xffffffff);

1
src/devices/cpu/esrip/esrip.c
View File

@ -193,7 +193,6 @@ void esrip_device::device_start()
m_direct = &m_program->direct();
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", m_rip_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_status).callimport().callexport().formatstr("%8s").noshow();
state_add(ESRIP_PC, "PC:", m_rip_pc).mask(0xffff);

1
src/devices/cpu/m6805/m6805.c
View File

@ -424,7 +424,6 @@ void m6805_base_device::device_start()
m_icountptr = &m_icount;
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", m_pc.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_cc).callimport().callexport().formatstr("%8s").noshow();
state_add(M6805_A, "A", m_a).mask(0xff);

1
src/devices/cpu/ssem/ssem.c
View File

@ -100,7 +100,6 @@ void ssem_device::device_start()
m_program = &space(AS_PROGRAM);
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_halt).callimport().callexport().formatstr("%1s").noshow();
state_add(SSEM_PC, "PC", m_shifted_pc).mask(0xffff);

1
src/devices/cpu/upd7725/upd7725.c
View File

@ -69,7 +69,6 @@ void necdsp_device::device_start()
m_direct = &m_program->direct();
// register our state for the debugger
std::string tempstr;
state_add(STATE_GENPC, "GENPC", regs.pc).noshow();
state_add(UPD7725_PC, "PC", regs.pc);
state_add(UPD7725_RP, "RP", regs.rp);

2
src/devices/machine/r10696.c
View File

@ -154,7 +154,7 @@ READ8_MEMBER( r10696_device::io_r )
io_a = m_iord(0);
io_b = m_iord(1);
io_c = m_iord(2);
data = (io_a | io_b | io_a) & 0x0f;
data = (io_a | io_b | io_c) & 0x0f;
break;
case 0x01: // Read Groups B | C
io_b = m_iord(1);

1
src/emu/diimage.c
View File

@ -758,7 +758,6 @@ bool device_image_interface::load_software(software_list_device &swlist, const c
{
std::string locationtag, breakstr("%");
const rom_entry *region;
std::string regiontag;
bool retVal = FALSE;
int warningcount = 0;
for (region = start; region != NULL; region = rom_next_region(region))

2
src/emu/emuopts.c
View File

@ -582,7 +582,7 @@ const char *emu_options::sub_value(std::string &buffer, const char *name, const
{
std::string tmp = std::string(",").append(subname).append("=");
buffer = value(name);
int pos = buffer.find(tmp.c_str());
int pos = buffer.find(tmp);
if (pos != -1)
{
int endpos = buffer.find_first_of(',', pos + 1);

12
src/emu/info.c
View File

@ -645,7 +645,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag)
if (strcmp(exec->device().tag(), device.tag()))
{
std::string newtag(exec->device().tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
fprintf(m_output, "\t\t<chip");
fprintf(m_output, " type=\"cpu\"");
@ -663,7 +663,7 @@ void info_xml_creator::output_chips(device_t &device, const char *root_tag)
if (strcmp(sound->device().tag(), device.tag()))
{
std::string newtag(sound->device().tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
fprintf(m_output, "\t\t<chip");
fprintf(m_output, " type=\"audio\"");
@ -691,7 +691,7 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag)
if (strcmp(screendev->tag(), device.tag()))
{
std::string newtag(screendev->tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
fprintf(m_output, "\t\t<display");
fprintf(m_output, " tag=\"%s\"", xml_normalize_string(newtag.c_str()));
@ -1097,7 +1097,7 @@ void info_xml_creator::output_switches(const ioport_list &portlist, const char *
std::string output;
std::string newtag(port->tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
// output the switch name information
std::string normalized_field_name(xml_normalize_string(field->name()));
@ -1228,7 +1228,7 @@ void info_xml_creator::output_images(device_t &device, const char *root_tag)
if (strcmp(imagedev->device().tag(), device.tag()))
{
std::string newtag(imagedev->device().tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
// print m_output device type
fprintf(m_output, "\t\t<device type=\"%s\"", xml_normalize_string(imagedev->image_type_name()));
@ -1286,7 +1286,7 @@ void info_xml_creator::output_slots(device_t &device, const char *root_tag)
if (strcmp(slot->device().tag(), device.tag()))
{
std::string newtag(slot->device().tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag).c_str()) + oldtag.length());
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
// print m_output device type
fprintf(m_output, "\t\t<slot name=\"%s\">\n", xml_normalize_string(newtag.c_str()));

4
src/emu/machine.c
View File

@ -206,7 +206,7 @@ TIMER_CALLBACK_MEMBER(running_machine::autoboot_callback)
else if (strlen(options().autoboot_command())!=0) {
std::string cmd = std::string(options().autoboot_command());
strreplace(cmd, "'", "\\'");
std::string val = std::string("emu.keypost('").append(cmd.c_str()).append("')").c_str();
std::string val = std::string("emu.keypost('").append(cmd).append("')");
manager().lua()->load_string(val.c_str());
}
}
@ -563,7 +563,7 @@ std::string running_machine::get_statename(const char *option)
// handle %d in the template (for image devices)
std::string statename_dev("%d_");
int pos = statename_str.find(statename_dev.c_str());
int pos = statename_str.find(statename_dev);
if (pos != -1)
{

2
src/emu/memory.c
View File

@ -1929,8 +1929,6 @@ void address_space::populate_from_map(address_map *map)
void address_space::populate_map_entry(const address_map_entry &entry, read_or_write readorwrite)
{
const map_handler_data &data = (readorwrite == ROW_READ) ? entry.m_read : entry.m_write;
std::string fulltag;
// based on the handler type, alter the bits, name, funcptr, and object
switch (data.m_type)
{

4
src/emu/romload.c
View File

@ -675,7 +675,7 @@ static int open_rom_file(romload_private *romdata, const char *regiontag, const
}
// prepare locations where we have to load from: list/parentname & list/clonename
std::string swlist(tag1.c_str());
std::string swlist(tag1);
tag2.assign(swlist.append(tag4));
if (has_parent)
{
@ -1076,7 +1076,7 @@ int open_disk_image(emu_options &options, const game_driver *gamedrv, const rom_
}
// prepare locations where we have to load from: list/parentname (if any) & list/clonename
std::string swlist(tag1.c_str());
std::string swlist(tag1);
tag2.assign(swlist.append(tag4));
if (has_parent)
{

4
src/emu/softlist.c
View File

@ -158,7 +158,7 @@ bool software_part::is_compatible(const software_list_device &swlistdev) const
for (int start = 0, end = filt.find_first_of(',',start); end != -1; start = end + 1, end = filt.find_first_of(',', start))
{
std::string token(filt, start, end - start + 1);
if (comp.find(token.c_str()) != -1)
if (comp.find(token) != -1)
return true;
}
return false;
@ -181,7 +181,7 @@ bool software_part::matches_interface(const char *interface_list) const
// then add a comma to the end of our interface and return true if we find it in the list string
std::string our_interface = std::string(m_interface).append(",");
return (interfaces.find(our_interface.c_str()) != -1);
return (interfaces.find(our_interface) != -1);
}

1
src/emu/ui/filemngr.c
View File

@ -104,7 +104,6 @@ void ui_menu_file_manager::populate()
{
std::string buffer, tmp_inst, tmp_name;
bool first_entry = true;
std::string prev_owner;
if (!m_warnings.empty())
{

2
src/emu/ui/inputmap.c
View File

@ -91,7 +91,6 @@ void ui_menu_input_general::populate()
{
input_item_data *itemlist = NULL;
int suborder[SEQ_TYPE_TOTAL];
std::string tempstring;
int sortorder = 1;
/* create a mini lookup table for sort order based on sequence type */
@ -154,7 +153,6 @@ void ui_menu_input_specific::populate()
{
input_item_data *itemlist = NULL;
int suborder[SEQ_TYPE_TOTAL];
std::string tempstring;
int port_count = 0;
/* create a mini lookup table for sort order based on sequence type */

1
src/emu/validity.c
View File

@ -196,7 +196,6 @@ bool validity_checker::check_all()
// if we had warnings or errors, output
if (m_errors > 0 || m_warnings > 0)
{
std::string tempstr;
output_via_delegate(OSD_OUTPUT_CHANNEL_ERROR, "Core: %d errors, %d warnings\n", m_errors, m_warnings);
if (m_errors > 0)
{

2
src/emu/video.c
View File

@ -1126,7 +1126,7 @@ file_error video_manager::open_next(emu_file &file, const char *extension)
// handle %d in the template (for image devices)
std::string snapdev("%d_");
int pos = snapstr.find(snapdev.c_str());
int pos = snapstr.find(snapdev);
if (pos != -1)
{

2
src/mame/machine/315-5881_crypt.c
View File

@ -47,7 +47,7 @@ void sega_315_5881_crypt_device::device_start()
save_item(NAME(line_buffer_pos));
save_item(NAME(line_buffer_size));
std::string skey = parameter("key").c_str();
std::string skey = parameter("key");
if(!skey.empty())
key = strtoll(skey.c_str(), 0, 16);
else

2
src/mame/machine/naomim1.c
View File

@ -32,7 +32,7 @@ void naomi_m1_board::device_start()
{
naomi_board::device_start();
std::string skey = parameter("key").c_str();
std::string skey = parameter("key");
if(!skey.empty())
key = strtoll(skey.c_str(), 0, 16);
else