Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 00:38:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace strformat, strprintf and strcatprintf with type-safe steam_format and string_format

Browse Source 
Update MAME to use new function
Instantiate ODR-used static constant members
Make some of the UI code more localisable
Remove use of retired functions in tools
This commit is contained in:
Vas Crabb 2016-02-28 11:09:00 +11:00
parent 3cba23966f
commit aec01e7407
186 changed files with 2889 additions and 1577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/cpu/adsp2100/adsp2100.cpp
View File

@ -545,13 +545,13 @@ void adsp21xx_device::device_start()
state_add(ADSP2100_SR1_SEC, "SR1_SEC", m_alt.sr.srx.sr1.u);
for (int ireg = 0; ireg < 8; ireg++)
state_add(ADSP2100_I0 + ireg, strformat("I%d", ireg).c_str(), m_i[ireg]).mask(0x3fff).callimport();
state_add(ADSP2100_I0 + ireg, string_format("I%d", ireg).c_str(), m_i[ireg]).mask(0x3fff).callimport();
for (int lreg = 0; lreg < 8; lreg++)
state_add(ADSP2100_L0 + lreg, strformat("L%d", lreg).c_str(), m_l[lreg]).mask(0x3fff).callimport();
state_add(ADSP2100_L0 + lreg, string_format("L%d", lreg).c_str(), m_l[lreg]).mask(0x3fff).callimport();
for (int mreg = 0; mreg < 8; mreg++)
state_add(ADSP2100_M0 + mreg, strformat("M%d", mreg).c_str(), m_m[mreg]).signed_mask(0x3fff);
state_add(ADSP2100_M0 + mreg, string_format("M%d", mreg).c_str(), m_m[mreg]).signed_mask(0x3fff);
state_add(ADSP2100_PX, "PX", m_px);
state_add(ADSP2100_CNTR, "CNTR", m_cntr).mask(0x3fff);
@ -570,7 +570,7 @@ void adsp21xx_device::device_start()
for (int irqnum = 0; irqnum < 4; irqnum++)
if (irqnum < 4 || m_chip_type == CHIP_TYPE_ADSP2100)
state_add(ADSP2100_IRQSTATE0 + irqnum, strformat("IRQ%d", irqnum).c_str(), m_irq_state[irqnum]).mask(1).callimport();
state_add(ADSP2100_IRQSTATE0 + irqnum, string_format("IRQ%d", irqnum).c_str(), m_irq_state[irqnum]).mask(1).callimport();
state_add(ADSP2100_FLAGIN, "FLAGIN", m_flagin).mask(1);
state_add(ADSP2100_FLAGOUT, "FLAGOUT", m_flagout).mask(1);
@ -724,7 +724,7 @@ void adsp21xx_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_astat & 0x80 ? 'X':'.',
m_astat & 0x40 ? 'M':'.',
m_astat & 0x20 ? 'Q':'.',

2
src/devices/cpu/alph8201/alph8201.cpp
View File

@ -532,7 +532,7 @@ void alpha8201_cpu_device::state_string_export(const device_state_entry &entry,
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c", m_cf ? 'C' : '.', m_zf ? 'Z' : '.');
str = string_format("%c%c", m_cf ? 'C' : '.', m_zf ? 'Z' : '.');
break;
}
}

13
src/devices/cpu/alto2/alto2cpu.cpp
View File

@ -1009,14 +1009,15 @@ void alto2_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case A2_TASK:
strprintf(str, "%s", task_name(m_task));
str = string_format("%s", task_name(m_task));
break;
case STATE_GENFLAGS:
strprintf(str, "%s%s%s%s",
m_aluc0 ? "C":"-",
m_laluc0 ? "c":"-",
m_shifter == 0 ? "0":"-",
static_cast<INT16>(m_shifter) < 0 ? "<":"-");
str = string_format(
"%c%c%c%c",
m_aluc0 ? 'C' : '-',
m_laluc0 ? 'c' : '-',
(m_shifter == 0) ? '0' : '-',
(INT16(m_shifter) < 0) ? '<' : '-');
break;
}
}

21
src/devices/cpu/am29000/am29000.cpp
View File

@ -409,16 +409,17 @@ void am29000_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c|%3d", m_alu & ALU_V ? 'V' : '.',
m_alu & ALU_Z ? 'Z' : '.',
m_alu & ALU_N ? 'N' : '.',
m_alu & ALU_C ? 'C' : '.',
m_cps & CPS_IP ? 'I' : '.',
m_cps & CPS_FZ ? 'F' : '.',
m_cps & CPS_SM ? 'S' : 'U',
m_cps & CPS_DI ? 'I' : '.',
m_cps & CPS_DA ? 'D' : '.',
(m_r[1] >> 2) & 0x7f);
str = string_format("%c%c%c%c%c%c%c%c%c|%3d",
m_alu & ALU_V ? 'V' : '.',
m_alu & ALU_Z ? 'Z' : '.',
m_alu & ALU_N ? 'N' : '.',
m_alu & ALU_C ? 'C' : '.',
m_cps & CPS_IP ? 'I' : '.',
m_cps & CPS_FZ ? 'F' : '.',
m_cps & CPS_SM ? 'S' : 'U',
m_cps & CPS_DI ? 'I' : '.',
m_cps & CPS_DA ? 'D' : '.',
(m_r[1] >> 2) & 0x7f);
break;
}
}

2
src/devices/cpu/amis2000/amis2000.cpp
View File

@ -75,7 +75,7 @@ void amis2000_base_device::state_string_export(const device_state_entry &entry,
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c",
m_f & 0x20 ? '6':'.',
m_f & 0x10 ? '5':'.',
m_f & 0x08 ? '4':'.',

2
src/devices/cpu/apexc/apexc.cpp
View File

@ -819,7 +819,7 @@ void apexc_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c", m_running ? 'R' : 'S');
str = string_format("%c", m_running ? 'R' : 'S');
break;
}
}

4
src/devices/cpu/arm/arm.cpp
View File

@ -559,14 +559,14 @@ void arm_cpu_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c %s",
str = string_format("%c%c%c%c%c%c %s",
(m_sArmRegister[15] & N_MASK) ? 'N' : '-',
(m_sArmRegister[15] & Z_MASK) ? 'Z' : '-',
(m_sArmRegister[15] & C_MASK) ? 'C' : '-',
(m_sArmRegister[15] & V_MASK) ? 'V' : '-',
(m_sArmRegister[15] & I_MASK) ? 'I' : '-',
(m_sArmRegister[15] & F_MASK) ? 'F' : '-',
s[m_sArmRegister[15] & 3] );
s[m_sArmRegister[15] & 3]);
break;
}
}

4
src/devices/cpu/arm7/arm7.cpp
View File

@ -569,7 +569,7 @@ void arm7_cpu_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c %s",
str = string_format("%c%c%c%c%c%c%c%c %s",
(ARM7REG(eCPSR) & N_MASK) ? 'N' : '-',
(ARM7REG(eCPSR) & Z_MASK) ? 'Z' : '-',
(ARM7REG(eCPSR) & C_MASK) ? 'C' : '-',
@ -578,7 +578,7 @@ void arm7_cpu_device::state_string_export(const device_state_entry &entry, std::
(ARM7REG(eCPSR) & I_MASK) ? 'I' : '-',
(ARM7REG(eCPSR) & F_MASK) ? 'F' : '-',
(ARM7REG(eCPSR) & T_MASK) ? 'T' : '-',
GetModeText(ARM7REG(eCPSR)) );
GetModeText(ARM7REG(eCPSR)));
break;
}
}

16
src/devices/cpu/asap/asap.cpp
View File

@ -193,7 +193,7 @@ void asap_device::device_start()
state_add(ASAP_PC, "PC", m_pc);
state_add(ASAP_PS, "PS", m_flagsio).callimport().callexport();
for (int regnum = 0; regnum < 32; regnum++)
state_add(ASAP_R0 + regnum, strformat("R%d", regnum).c_str(), m_src2val[REGBASE + regnum]);
state_add(ASAP_R0 + regnum, string_format("R%d", regnum).c_str(), m_src2val[REGBASE + regnum]);
// register our state for saving
save_item(NAME(m_pc));
@ -285,13 +285,13 @@ void asap_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c",
m_pflag ? 'P' : '.',
m_iflag ? 'I' : '.',
((INT32)m_znflag < 0) ? 'N' : '.',
(m_znflag == 0) ? 'Z' : '.',
((m_vflag >> 30) & PS_VFLAG) ? 'V' : '.',
m_cflag ? 'C' : '.');
str = string_format("%c%c%c%c%c%c",
m_pflag ? 'P' : '.',
m_iflag ? 'I' : '.',
((INT32)m_znflag < 0) ? 'N' : '.',
(m_znflag == 0) ? 'Z' : '.',
((m_vflag >> 30) & PS_VFLAG) ? 'V' : '.',
m_cflag ? 'C' : '.');
break;
}
}

2
src/devices/cpu/avr8/avr8.cpp
View File

@ -910,7 +910,7 @@ void avr8_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_r[AVR8_REGIDX_SREG] & 0x80) ? 'I' : '-',
(m_r[AVR8_REGIDX_SREG] & 0x40) ? 'T' : '-',
(m_r[AVR8_REGIDX_SREG] & 0x20) ? 'H' : '-',

2
src/devices/cpu/ccpu/ccpu.cpp
View File

@ -145,7 +145,7 @@ void ccpu_cpu_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c",
TEST_A0 ? '0' : 'o',
TEST_NC ? 'N' : 'n',
TEST_LT ? 'L' : 'l',

8
src/devices/cpu/cop400/cop400.cpp
View File

@ -1210,10 +1210,10 @@ void cop400_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c",
m_c ? 'C' : '.',
m_skl ? 'S' : '.',
m_skt_latch ? 'T' : '.');
str = string_format("%c%c%c",
m_c ? 'C' : '.',
m_skl ? 'S' : '.',
m_skt_latch ? 'T' : '.');
break;
}
}

10
src/devices/cpu/cosmac/cosmac.cpp
View File

@ -354,7 +354,7 @@ void cosmac_device::device_start()
state_add(COSMAC_N, "N", m_n).mask(0xf);
for (int regnum = 0; regnum < 16; regnum++)
state_add(COSMAC_R0 + regnum, strformat("R%x", regnum).c_str(), m_r[regnum]);
state_add(COSMAC_R0 + regnum, string_format("R%x", regnum).c_str(), m_r[regnum]);
state_add(COSMAC_DF, "DF", m_df).mask(0x1).noshow();
state_add(COSMAC_IE, "IE", m_ie).mask(0x1).noshow();
@ -473,10 +473,10 @@ void cosmac_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c",
m_df ? 'D' : '.',
m_ie ? 'I' : '.',
m_q ? 'Q' : '.');
str = string_format("%c%c%c",
m_df ? 'D' : '.',
m_ie ? 'I' : '.',
m_q ? 'Q' : '.');
break;
}
}

2
src/devices/cpu/cp1610/cp1610.cpp
View File

@ -3406,7 +3406,7 @@ void cp1610_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c",
str = string_format("%c%c%c%c",
m_flags & 0x80 ? 'S':'.',
m_flags & 0x40 ? 'Z':'.',
m_flags & 0x20 ? 'V':'.',

16
src/devices/cpu/cubeqcpu/cubeqcpu.cpp
View File

@ -352,9 +352,10 @@ void cquestrot_cpu_device::state_string_export(const device_state_entry &entry,
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c", m_cflag ? 'C' : '.',
m_vflag ? 'V' : '.',
m_f ? '.' : 'Z');
str = string_format("%c%c%c",
m_cflag ? 'C' : '.',
m_vflag ? 'V' : '.',
m_f ? '.' : 'Z');
break;
}
}
@ -476,10 +477,11 @@ void cquestlin_cpu_device::state_string_export(const device_state_entry &entry,
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c|%cG", m_cflag ? 'C' : '.',
m_vflag ? 'V' : '.',
m_f ? '.' : 'Z',
( m_clkcnt & 3 ) ? 'B' : 'F');
str = string_format("%c%c%c|%cG",
m_cflag ? 'C' : '.',
m_vflag ? 'V' : '.',
m_f ? '.' : 'Z',
( m_clkcnt & 3 ) ? 'B' : 'F');
break;
}
}

9
src/devices/cpu/drcbec.cpp
View File

@ -12,10 +12,7 @@
#include "debugger.h"
#include "drcbec.h"
#ifdef _MSC_VER
#include <float.h>
#define isnan _isnan
#endif
#include <cmath>
using namespace uml;
@ -1898,7 +1895,7 @@ int drcbe_c::execute(code_handle &entry)
break;
case MAKE_OPCODE_SHORT(OP_FCMP, 4, 1): // FSCMP src1,src2
if (isnan(FSPARAM0) || isnan(FSPARAM1))
if (std::isnan(FSPARAM0) || std::isnan(FSPARAM1))
flags = FLAG_U;
else
flags = (FSPARAM0 < FSPARAM1) | ((FSPARAM0 == FSPARAM1) << 2);
@ -2037,7 +2034,7 @@ int drcbe_c::execute(code_handle &entry)
break;
case MAKE_OPCODE_SHORT(OP_FCMP, 8, 1): // FDCMP src1,src2
if (isnan(FDPARAM0) || isnan(FDPARAM1))
if (std::isnan(FDPARAM0) || std::isnan(FDPARAM1))
flags = FLAG_U;
else
flags = (FDPARAM0 < FDPARAM1) | ((FDPARAM0 == FDPARAM1) << 2);

2
src/devices/cpu/drcbex64.cpp
View File

@ -806,7 +806,7 @@ void drcbe_x64::generate(drcuml_block &block, const instruction *instlist, UINT3
if (inst.opcode() == OP_HANDLE)
blockname = inst.param(0).handle().string();
else if (inst.opcode() == OP_HASH)
blockname = strformat("Code: mode=%d PC=%08X", (UINT32)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
blockname = string_format("Code: mode=%d PC=%08X", (UINT32)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
}
// generate code

2
src/devices/cpu/drcbex86.cpp
View File

@ -789,7 +789,7 @@ void drcbe_x86::generate(drcuml_block &block, const instruction *instlist, UINT3
if (inst.opcode() == OP_HANDLE)
blockname = inst.param(0).handle().string();
else if (inst.opcode() == OP_HASH)
blockname = strformat("Code: mode=%d PC=%08X", (UINT32)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
blockname = string_format("Code: mode=%d PC=%08X", (UINT32)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
}
// generate code

2
src/devices/cpu/drcuml.cpp
View File

@ -525,7 +525,7 @@ const char *drcuml_block::get_comment_text(const instruction &inst, std::string
// mapvars comment about their values
else if (inst.opcode() == OP_MAPVAR) {
strprintf(comment,"m%d = $%X", (int)inst.param(0).mapvar() - MAPVAR_M0, (UINT32)inst.param(1).immediate());
comment = string_format("m%d = $%X", (int)inst.param(0).mapvar() - MAPVAR_M0, (UINT32)inst.param(1).immediate());
return comment.c_str();
}

148
src/devices/cpu/dsp16/dsp16.cpp
View File

@ -218,105 +218,105 @@ void dsp16_device::state_string_export(const device_state_entry &entry, std::str
{
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "(below)");
break;
case STATE_GENFLAGS:
str = "(below)";
break;
case DSP16_AUC:
case DSP16_AUC:
{
std::string alignString;
const UINT8 align = m_auc & 0x03;
switch (align)
{
case 0x00: strprintf(alignString,"xy"); break;
case 0x01: strprintf(alignString,"/4"); break;
case 0x02: strprintf(alignString,"x4"); break;
case 0x03: strprintf(alignString,",,"); break;
case 0x00: alignString = "xy"; break;
case 0x01: alignString = "/4"; break;
case 0x02: alignString = "x4"; break;
case 0x03: alignString = ",,"; break;
}
strprintf(str, "%c%c%c%c%c%s",
m_auc & 0x40 ? 'Y':'.',
m_auc & 0x20 ? '1':'.',
m_auc & 0x10 ? '0':'.',
m_auc & 0x08 ? '1':'.',
m_auc & 0x04 ? '0':'.',
alignString.c_str());
break;
str = string_format("%c%c%c%c%c%s",
m_auc & 0x40 ? 'Y':'.',
m_auc & 0x20 ? '1':'.',
m_auc & 0x10 ? '0':'.',
m_auc & 0x08 ? '1':'.',
m_auc & 0x04 ? '0':'.',
alignString);
}
break;
case DSP16_PSW:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_psw & 0x8000 ? 'M':'.',
m_psw & 0x4000 ? 'E':'.',
m_psw & 0x2000 ? 'L':'.',
m_psw & 0x1000 ? 'V':'.',
m_psw & 0x0800 ? ',':',',
m_psw & 0x0400 ? ',':',',
m_psw & 0x0200 ? 'O':'.',
m_psw & 0x0100 ? '1':'.',
m_psw & 0x0080 ? '1':'.',
m_psw & 0x0040 ? '1':'.',
m_psw & 0x0020 ? '1':'.',
m_psw & 0x0010 ? 'O':'.',
m_psw & 0x0008 ? '1':'.',
m_psw & 0x0004 ? '1':'.',
m_psw & 0x0002 ? '1':'.',
m_psw & 0x0001 ? '1':'.');
break;
case DSP16_PSW:
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_psw & 0x8000 ? 'M':'.',
m_psw & 0x4000 ? 'E':'.',
m_psw & 0x2000 ? 'L':'.',
m_psw & 0x1000 ? 'V':'.',
m_psw & 0x0800 ? ',':',',
m_psw & 0x0400 ? ',':',',
m_psw & 0x0200 ? 'O':'.',
m_psw & 0x0100 ? '1':'.',
m_psw & 0x0080 ? '1':'.',
m_psw & 0x0040 ? '1':'.',
m_psw & 0x0020 ? '1':'.',
m_psw & 0x0010 ? 'O':'.',
m_psw & 0x0008 ? '1':'.',
m_psw & 0x0004 ? '1':'.',
m_psw & 0x0002 ? '1':'.',
m_psw & 0x0001 ? '1':'.');
break;
case DSP16_PIOC:
case DSP16_PIOC:
{
std::string strobeString;
const UINT8 strobe = (m_pioc & 0x6000) >> 13;
switch (strobe)
{
case 0x00: strprintf(strobeString, "1T"); break;
case 0x01: strprintf(strobeString, "2T"); break;
case 0x02: strprintf(strobeString, "3T"); break;
case 0x03: strprintf(strobeString, "4T"); break;
case 0x00: strobeString = "1T"; break;
case 0x01: strobeString = "2T"; break;
case 0x02: strobeString = "3T"; break;
case 0x03: strobeString = "4T"; break;
}
strprintf(str, "%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_pioc & 0x8000 ? 'I':'.',
strobeString.c_str(),
m_pioc & 0x1000 ? 'O':'I',
m_pioc & 0x0800 ? 'O':'I',
m_pioc & 0x0400 ? 'S':'.',
m_pioc & 0x0200 ? 'I':'.',
m_pioc & 0x0100 ? 'O':'.',
m_pioc & 0x0080 ? 'P':'.',
m_pioc & 0x0040 ? 'P':'.',
m_pioc & 0x0020 ? 'I':'.',
m_pioc & 0x0010 ? 'I':'.',
m_pioc & 0x0008 ? 'O':'.',
m_pioc & 0x0004 ? 'P':'.',
m_pioc & 0x0002 ? 'P':'.',
m_pioc & 0x0001 ? 'I':'.');
break;
str = string_format("%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_pioc & 0x8000 ? 'I':'.',
strobeString,
m_pioc & 0x1000 ? 'O':'I',
m_pioc & 0x0800 ? 'O':'I',
m_pioc & 0x0400 ? 'S':'.',
m_pioc & 0x0200 ? 'I':'.',
m_pioc & 0x0100 ? 'O':'.',
m_pioc & 0x0080 ? 'P':'.',
m_pioc & 0x0040 ? 'P':'.',
m_pioc & 0x0020 ? 'I':'.',
m_pioc & 0x0010 ? 'I':'.',
m_pioc & 0x0008 ? 'O':'.',
m_pioc & 0x0004 ? 'P':'.',
m_pioc & 0x0002 ? 'P':'.',
m_pioc & 0x0001 ? 'I':'.');
}
break;
// Placeholder for a better view later (TODO)
case DSP16_SIOC:
// Placeholder for a better view later (TODO)
case DSP16_SIOC:
{
std::string clkString;
const UINT8 clk = (m_sioc & 0x0180) >> 7;
switch (clk)
{
case 0x00: strprintf(clkString, "/4"); break;
case 0x01: strprintf(clkString, "12"); break;
case 0x02: strprintf(clkString, "16"); break;
case 0x03: strprintf(clkString, "20"); break;
case 0x00: clkString = "/4"; break;
case 0x01: clkString = "12"; break;
case 0x02: clkString = "16"; break;
case 0x03: clkString = "20"; break;
}
strprintf(str, "%c%s%c%c%c%c%c%c%c",
m_sioc & 0x0200 ? 'I':'O',
clkString.c_str(),
m_sioc & 0x0040 ? 'L':'M',
m_sioc & 0x0020 ? 'I':'O',
m_sioc & 0x0010 ? 'I':'O',
m_sioc & 0x0008 ? 'I':'O',
m_sioc & 0x0004 ? 'I':'O',
m_sioc & 0x0002 ? '2':'1',
m_sioc & 0x0001 ? '2':'1');
break;
str = string_format("%c%s%c%c%c%c%c%c%c",
m_sioc & 0x0200 ? 'I':'O',
clkString,
m_sioc & 0x0040 ? 'L':'M',
m_sioc & 0x0020 ? 'I':'O',
m_sioc & 0x0010 ? 'I':'O',
m_sioc & 0x0008 ? 'I':'O',
m_sioc & 0x0004 ? 'I':'O',
m_sioc & 0x0002 ? '2':'1',
m_sioc & 0x0001 ? '2':'1');
}
break;
}
}

66
src/devices/cpu/dsp16/dsp16dis.cpp
View File

@ -5,29 +5,27 @@
std::string disasmF1Field(const UINT8& F1, const UINT8& D, const UINT8& S)
{
std::string ret = "";
switch (F1)
{
case 0x00: strprintf(ret, "a%d = p, p = x*y", D); break;
case 0x01: strprintf(ret, "a%d = a%d + p, p = x*y", D, S); break;
case 0x02: strprintf(ret, "p = x*y"); break;
case 0x03: strprintf(ret, "a%d = a%d - p, p = x*y", D, S); break;
case 0x04: strprintf(ret, "a%d = p", D); break;
case 0x05: strprintf(ret, "a%d = a%d + p", D, S); break;
case 0x06: strprintf(ret, "NOP"); break;
case 0x07: strprintf(ret, "a%d = a%d - p", D, S); break;
case 0x08: strprintf(ret, "a%d = a%d | y", D, S); break;
case 0x09: strprintf(ret, "a%d = a%d ^ y", D, S); break;
case 0x0a: strprintf(ret, "a%d & y", S); break;
case 0x0b: strprintf(ret, "a%d - y", S); break;
case 0x0c: strprintf(ret, "a%d = y", D); break;
case 0x0d: strprintf(ret, "a%d = a%d + y", D, S); break;
case 0x0e: strprintf(ret, "a%d = a%d & y", D, S); break;
case 0x0f: strprintf(ret, "a%d = a%d - y", D, S); break;
case 0x00: return string_format("a%u = p, p = x*y", D); break;
case 0x01: return string_format("a%u = a%u + p, p = x*y", D, S); break;
case 0x02: return string_format("p = x*y"); break;
case 0x03: return string_format("a%u = a%u - p, p = x*y", D, S); break;
case 0x04: return string_format("a%u = p", D); break;
case 0x05: return string_format("a%u = a%u + p", D, S); break;
case 0x06: return string_format("NOP"); break;
case 0x07: return string_format("a%u = a%u - p", D, S); break;
case 0x08: return string_format("a%u = a%u | y", D, S); break;
case 0x09: return string_format("a%u = a%u ^ y", D, S); break;
case 0x0a: return string_format("a%u & y", S); break;
case 0x0b: return string_format("a%u - y", S); break;
case 0x0c: return string_format("a%u = y", D); break;
case 0x0d: return string_format("a%u = a%u + y", D, S); break;
case 0x0e: return string_format("a%u = a%u & y", D, S); break;
case 0x0f: return string_format("a%u = a%u - y", D, S); break;
default: return "UNKNOWN";
}
return ret;
}
std::string disasmYField(const UINT8& Y)
@ -95,23 +93,23 @@ std::string disasmF2Field(const UINT8& F2, const UINT8& D, const UINT8& S)
std::string ret = "";
switch (F2)
{
case 0x00: strprintf(ret, "a%d = a%d >> 1", D, S); break;
case 0x01: strprintf(ret, "a%d = a%d << 1", D, S); break;
case 0x02: strprintf(ret, "a%d = a%d >> 4", D, S); break;
case 0x03: strprintf(ret, "a%d = a%d << 4", D, S); break;
case 0x04: strprintf(ret, "a%d = a%d >> 8", D, S); break;
case 0x05: strprintf(ret, "a%d = a%d << 8", D, S); break;
case 0x06: strprintf(ret, "a%d = a%d >> 16", D, S); break;
case 0x07: strprintf(ret, "a%d = a%d << 16", D, S); break;
case 0x00: return string_format("a%u = a%u >> 1", D, S); break;
case 0x01: return string_format("a%u = a%u << 1", D, S); break;
case 0x02: return string_format("a%u = a%u >> 4", D, S); break;
case 0x03: return string_format("a%u = a%u << 4", D, S); break;
case 0x04: return string_format("a%u = a%u >> 8", D, S); break;
case 0x05: return string_format("a%u = a%u << 8", D, S); break;
case 0x06: return string_format("a%u = a%u >> 16", D, S); break;
case 0x07: return string_format("a%u = a%u << 16", D, S); break;
case 0x08: strprintf(ret, "a%d = p", D); break;
case 0x09: strprintf(ret, "a%dh = a%dh + 1", D, S); break;
case 0x0a: strprintf(ret, "RESERVED"); break;
case 0x0b: strprintf(ret, "a%d = rnd(a%d)", D, S); break;
case 0x0c: strprintf(ret, "a%d = y", D); break;
case 0x0d: strprintf(ret, "a%d = a%d + 1", D, S); break;
case 0x0e: strprintf(ret, "a%d = a%d", D, S); break;
case 0x0f: strprintf(ret, "a%d = -a%d", D, S); break;
case 0x08: return string_format("a%u = p", D); break;
case 0x09: return string_format("a%uh = a%uh + 1", D, S); break;
case 0x0a: return string_format("RESERVED"); break;
case 0x0b: return string_format("a%u = rnd(a%u)", D, S); break;
case 0x0c: return string_format("a%u = y", D); break;
case 0x0d: return string_format("a%u = a%u + 1", D, S); break;
case 0x0e: return string_format("a%u = a%u", D, S); break;
case 0x0f: return string_format("a%u = -a%u", D, S); break;
default: return "UNKNOWN";
}

6
src/devices/cpu/dsp32/dsp32.cpp
View File

@ -200,7 +200,7 @@ void dsp32c_device::device_start()
state_add(STATE_GENFLAGS, "GENFLAGS", m_iotemp).callimport().callexport().formatstr("%6s").noshow();
state_add(DSP32_PC, "PC", m_r[15]).mask(0xffffff);
for (int regnum = 0; regnum <= 14; regnum++)
state_add(DSP32_R0 + regnum, strformat("R%d", regnum).c_str(), m_r[regnum]).mask(0xffffff);
state_add(DSP32_R0 + regnum, string_format("R%d", regnum).c_str(), m_r[regnum]).mask(0xffffff);
state_add(DSP32_R15, "R15", m_r[17]).mask(0xffffff);
state_add(DSP32_R16, "R16", m_r[18]).mask(0xffffff);
state_add(DSP32_R17, "R17", m_r[19]).mask(0xffffff);
@ -373,7 +373,7 @@ void dsp32c_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
NFLAG ? 'N':'.',
ZFLAG ? 'Z':'.',
UFLAG ? 'U':'.',
@ -388,7 +388,7 @@ void dsp32c_device::state_string_export(const device_state_entry &entry, std::st
case DSP32_A1:
case DSP32_A2:
case DSP32_A3:
strprintf(str, "%8g", *(double *)entry.dataptr());
str = string_format("%8g", *(double *)entry.dataptr());
break;
}
}

10
src/devices/cpu/dsp56k/dsp56k.cpp
View File

@ -347,7 +347,7 @@ void dsp56k_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s%s %s%s%s%s%s%s%s%s %s%s",
str = string_format("%s%s %s%s%s%s%s%s%s%s %s%s",
/* Status Register */
LF_bit(cpustate) ? "L" : ".",
FV_bit(cpustate) ? "F" : ".",
@ -367,19 +367,19 @@ void dsp56k_device::state_string_export(const device_state_entry &entry, std::st
break;
case DSP56K_X:
strprintf(str, "%04x %04x", X1, X0);
str = string_format("%04x %04x", X1, X0);
break;
case DSP56K_Y:
strprintf(str, "%04x %04x", Y1, Y0);
str = string_format("%04x %04x", Y1, Y0);
break;
case DSP56K_A:
strprintf(str, "%02x %04x %04x", A2, A1, A0);
str = string_format("%02x %04x %04x", A2, A1, A0);
break;
case DSP56K_B:
strprintf(str, "%02x %04x %04x", B2, B1, B0);
str = string_format("%02x %04x %04x", B2, B1, B0);
break;
}
}

2
src/devices/cpu/e0c6200/e0c6200.cpp
View File

@ -30,7 +30,7 @@ void e0c6200_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c",
str = string_format("%c%c%c%c",
(m_f & I_FLAG) ? 'I':'i',
(m_f & D_FLAG) ? 'D':'d',
(m_f & Z_FLAG) ? 'Z':'z',

2
src/devices/cpu/e132xs/e132xs.cpp
View File

@ -1853,7 +1853,7 @@ void hyperstone_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c FTE:%X FRM:%X ILC:%d FL:%d FP:%d",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c FTE:%X FRM:%X ILC:%d FL:%d FP:%d",
GET_S ? 'S':'.',
GET_P ? 'P':'.',
GET_T ? 'T':'.',

2
src/devices/cpu/esrip/esrip.cpp
View File

@ -355,7 +355,7 @@ void esrip_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c",
(m_status & 0x80) ? '3' : '.',
(m_status & 0x40) ? '2' : '.',
(m_status & 0x20) ? '1' : '.',

12
src/devices/cpu/f8/f8.cpp
View File

@ -2050,12 +2050,12 @@ void f8_cpu_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c",
m_w & 0x10 ? 'I':'.',
m_w & 0x08 ? 'O':'.',
m_w & 0x04 ? 'Z':'.',
m_w & 0x02 ? 'C':'.',
m_w & 0x01 ? 'S':'.');
str = string_format("%c%c%c%c%c",
m_w & 0x10 ? 'I':'.',
m_w & 0x08 ? 'O':'.',
m_w & 0x04 ? 'Z':'.',
m_w & 0x02 ? 'C':'.',
m_w & 0x01 ? 'S':'.');
break;
}
}

2
src/devices/cpu/g65816/g65816.cpp
View File

@ -957,7 +957,7 @@ void g65816_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_flag_n & NFLAG_SET ? 'N':'.',
m_flag_v & VFLAG_SET ? 'V':'.',
m_flag_m & MFLAG_SET ? 'M':'.',

2
src/devices/cpu/h6280/h6280.cpp
View File

@ -2196,7 +2196,7 @@ void h6280_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_p & 0x80) ? 'N':'.',
(m_p & 0x40) ? 'V':'.',
(m_p & 0x20) ? 'R':'.',

42
src/devices/cpu/h8/h8.cpp
View File

@ -221,27 +221,27 @@ void h8_device::state_string_export(const device_state_entry &entry, std::string
switch(entry.index()) {
case STATE_GENFLAGS:
if(has_exr)
strprintf(str, "%c%c %c%c%c%c%c%c%c%c",
(EXR & EXR_T) ? 'T' : '-',
'0' + (EXR & EXR_I),
(CCR & F_I) ? 'I' : '-',
(CCR & F_UI) ? 'u' : '-',
(CCR & F_H) ? 'H' : '-',
(CCR & F_U) ? 'U' : '-',
(CCR & F_N) ? 'N' : '-',
(CCR & F_Z) ? 'Z' : '-',
(CCR & F_V) ? 'V' : '-',
(CCR & F_C) ? 'C' : '-');
str = string_format("%c%c %c%c%c%c%c%c%c%c",
(EXR & EXR_T) ? 'T' : '-',
'0' + (EXR & EXR_I),
(CCR & F_I) ? 'I' : '-',
(CCR & F_UI) ? 'u' : '-',
(CCR & F_H) ? 'H' : '-',
(CCR & F_U) ? 'U' : '-',
(CCR & F_N) ? 'N' : '-',
(CCR & F_Z) ? 'Z' : '-',
(CCR & F_V) ? 'V' : '-',
(CCR & F_C) ? 'C' : '-');
else
strprintf(str, "%c%c%c%c%c%c%c%c",
(CCR & F_I) ? 'I' : '-',
(CCR & F_UI) ? 'u' : '-',
(CCR & F_H) ? 'H' : '-',
(CCR & F_U) ? 'U' : '-',
(CCR & F_N) ? 'N' : '-',
(CCR & F_Z) ? 'Z' : '-',
(CCR & F_V) ? 'V' : '-',
(CCR & F_C) ? 'C' : '-');
str = string_format("%c%c%c%c%c%c%c%c",
(CCR & F_I) ? 'I' : '-',
(CCR & F_UI) ? 'u' : '-',
(CCR & F_H) ? 'H' : '-',
(CCR & F_U) ? 'U' : '-',
(CCR & F_N) ? 'N' : '-',
(CCR & F_Z) ? 'Z' : '-',
(CCR & F_V) ? 'V' : '-',
(CCR & F_C) ? 'C' : '-');
break;
case H8_R0:
case H8_R1:
@ -252,7 +252,7 @@ void h8_device::state_string_export(const device_state_entry &entry, std::string
case H8_R6:
case H8_R7: {
int r = entry.index() - H8_R0;
strprintf(str, "%04x %04x", R[r + 8], R[r]);
str = string_format("%04x %04x", R[r + 8], R[r]);
break;
}
}

68
src/devices/cpu/hcd62121/hcd62121.cpp
View File

@ -368,11 +368,11 @@ void hcd62121_cpu_device::state_string_export(const device_state_entry &entry, s
switch (entry.index())
{
case STATE_GENPC:
strprintf(str, "%06X", (m_cseg << 16) | m_ip);
str = string_format("%06X", (m_cseg << 16) | m_ip);
break;
case STATE_GENFLAGS:
strprintf(str, "%s-%s-%s-%c-%c",
str = string_format("%s-%s-%s-%c-%c",
m_f & _FLAG_ZH ? "ZH":"__",
m_f & _FLAG_CL ? "CL":"__",
m_f & _FLAG_ZL ? "ZL":"__",
@ -383,100 +383,100 @@ void hcd62121_cpu_device::state_string_export(const device_state_entry &entry, s
break;
case HCD62121_R00:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x00], m_reg[0x01], m_reg[0x02], m_reg[0x03]);
str = string_format("%02X%02X%02X%02X", m_reg[0x00], m_reg[0x01], m_reg[0x02], m_reg[0x03]);
break;
case HCD62121_R04:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x04], m_reg[0x05], m_reg[0x06], m_reg[0x07]);
str = string_format("%02X%02X%02X%02X", m_reg[0x04], m_reg[0x05], m_reg[0x06], m_reg[0x07]);
break;
case HCD62121_R08:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x08], m_reg[0x09], m_reg[0x0A], m_reg[0x0B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x08], m_reg[0x09], m_reg[0x0A], m_reg[0x0B]);
break;
case HCD62121_R0C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x0C], m_reg[0x0D], m_reg[0x0E], m_reg[0x0F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x0C], m_reg[0x0D], m_reg[0x0E], m_reg[0x0F]);
break;
case HCD62121_R10:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x10], m_reg[0x11], m_reg[0x12], m_reg[0x13]);
str = string_format("%02X%02X%02X%02X", m_reg[0x10], m_reg[0x11], m_reg[0x12], m_reg[0x13]);
break;
case HCD62121_R14:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x14], m_reg[0x15], m_reg[0x16], m_reg[0x17]);
str = string_format("%02X%02X%02X%02X", m_reg[0x14], m_reg[0x15], m_reg[0x16], m_reg[0x17]);
break;
case HCD62121_R18:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x18], m_reg[0x19], m_reg[0x1A], m_reg[0x1B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x18], m_reg[0x19], m_reg[0x1A], m_reg[0x1B]);
break;
case HCD62121_R1C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x1C], m_reg[0x1D], m_reg[0x1E], m_reg[0x1F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x1C], m_reg[0x1D], m_reg[0x1E], m_reg[0x1F]);
break;
case HCD62121_R20:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x20], m_reg[0x21], m_reg[0x22], m_reg[0x23]);
str = string_format("%02X%02X%02X%02X", m_reg[0x20], m_reg[0x21], m_reg[0x22], m_reg[0x23]);
break;
case HCD62121_R24:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x24], m_reg[0x25], m_reg[0x26], m_reg[0x27]);
str = string_format("%02X%02X%02X%02X", m_reg[0x24], m_reg[0x25], m_reg[0x26], m_reg[0x27]);
break;
case HCD62121_R28:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x28], m_reg[0x29], m_reg[0x2A], m_reg[0x2B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x28], m_reg[0x29], m_reg[0x2A], m_reg[0x2B]);
break;
case HCD62121_R2C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x2C], m_reg[0x2D], m_reg[0x2E], m_reg[0x2F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x2C], m_reg[0x2D], m_reg[0x2E], m_reg[0x2F]);
break;
case HCD62121_R30:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x30], m_reg[0x31], m_reg[0x32], m_reg[0x33]);
str = string_format("%02X%02X%02X%02X", m_reg[0x30], m_reg[0x31], m_reg[0x32], m_reg[0x33]);
break;
case HCD62121_R34:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x34], m_reg[0x35], m_reg[0x36], m_reg[0x37]);
str = string_format("%02X%02X%02X%02X", m_reg[0x34], m_reg[0x35], m_reg[0x36], m_reg[0x37]);
break;
case HCD62121_R38:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x38], m_reg[0x39], m_reg[0x3A], m_reg[0x3B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x38], m_reg[0x39], m_reg[0x3A], m_reg[0x3B]);
break;
case HCD62121_R3C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x3C], m_reg[0x3D], m_reg[0x3E], m_reg[0x3F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x3C], m_reg[0x3D], m_reg[0x3E], m_reg[0x3F]);
break;
case HCD62121_R40:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x40], m_reg[0x41], m_reg[0x42], m_reg[0x43]);
str = string_format("%02X%02X%02X%02X", m_reg[0x40], m_reg[0x41], m_reg[0x42], m_reg[0x43]);
break;
case HCD62121_R44:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x44], m_reg[0x45], m_reg[0x46], m_reg[0x47]);
str = string_format("%02X%02X%02X%02X", m_reg[0x44], m_reg[0x45], m_reg[0x46], m_reg[0x47]);
break;
case HCD62121_R48:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x48], m_reg[0x49], m_reg[0x4A], m_reg[0x4B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x48], m_reg[0x49], m_reg[0x4A], m_reg[0x4B]);
break;
case HCD62121_R4C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x4C], m_reg[0x4D], m_reg[0x4E], m_reg[0x4F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x4C], m_reg[0x4D], m_reg[0x4E], m_reg[0x4F]);
break;
case HCD62121_R50:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x50], m_reg[0x51], m_reg[0x52], m_reg[0x53]);
str = string_format("%02X%02X%02X%02X", m_reg[0x50], m_reg[0x51], m_reg[0x52], m_reg[0x53]);
break;
case HCD62121_R54:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x54], m_reg[0x55], m_reg[0x56], m_reg[0x57]);
str = string_format("%02X%02X%02X%02X", m_reg[0x54], m_reg[0x55], m_reg[0x56], m_reg[0x57]);
break;
case HCD62121_R58:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x58], m_reg[0x59], m_reg[0x5A], m_reg[0x5B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x58], m_reg[0x59], m_reg[0x5A], m_reg[0x5B]);
break;
case HCD62121_R5C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x5C], m_reg[0x5D], m_reg[0x5E], m_reg[0x5F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x5C], m_reg[0x5D], m_reg[0x5E], m_reg[0x5F]);
break;
case HCD62121_R60:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x60], m_reg[0x61], m_reg[0x62], m_reg[0x63]);
str = string_format("%02X%02X%02X%02X", m_reg[0x60], m_reg[0x61], m_reg[0x62], m_reg[0x63]);
break;
case HCD62121_R64:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x64], m_reg[0x65], m_reg[0x66], m_reg[0x67]);
str = string_format("%02X%02X%02X%02X", m_reg[0x64], m_reg[0x65], m_reg[0x66], m_reg[0x67]);
break;
case HCD62121_R68:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x68], m_reg[0x69], m_reg[0x6A], m_reg[0x6B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x68], m_reg[0x69], m_reg[0x6A], m_reg[0x6B]);
break;
case HCD62121_R6C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x6C], m_reg[0x6D], m_reg[0x6E], m_reg[0x6F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x6C], m_reg[0x6D], m_reg[0x6E], m_reg[0x6F]);
break;
case HCD62121_R70:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x70], m_reg[0x71], m_reg[0x72], m_reg[0x73]);
str = string_format("%02X%02X%02X%02X", m_reg[0x70], m_reg[0x71], m_reg[0x72], m_reg[0x73]);
break;
case HCD62121_R74:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x74], m_reg[0x75], m_reg[0x76], m_reg[0x77]);
str = string_format("%02X%02X%02X%02X", m_reg[0x74], m_reg[0x75], m_reg[0x76], m_reg[0x77]);
break;
case HCD62121_R78:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x78], m_reg[0x79], m_reg[0x7A], m_reg[0x7B]);
str = string_format("%02X%02X%02X%02X", m_reg[0x78], m_reg[0x79], m_reg[0x7A], m_reg[0x7B]);
break;
case HCD62121_R7C:
strprintf(str, "%02X%02X%02X%02X", m_reg[0x7C], m_reg[0x7D], m_reg[0x7E], m_reg[0x7F]);
str = string_format("%02X%02X%02X%02X", m_reg[0x7C], m_reg[0x7D], m_reg[0x7E], m_reg[0x7F]);
break;
}
}

4
src/devices/cpu/hd61700/hd61700.cpp
View File

@ -183,7 +183,7 @@ void hd61700_cpu_device::device_start()
for (int ireg=0; ireg<32; ireg++)
{
state_add(HD61700_MAINREG + ireg, strformat("R%d", ireg).c_str(), m_regmain[ireg]).callimport().callexport().formatstr("%02X");
state_add(HD61700_MAINREG + ireg, string_format("R%d", ireg).c_str(), m_regmain[ireg]).callimport().callexport().formatstr("%02X");
}
state_add(STATE_GENPC, "curpc", m_curpc).callimport().callexport().formatstr("%8s").noshow();
@ -275,7 +275,7 @@ void hd61700_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c",
m_flags & FLAG_Z ? '.' : 'Z',
m_flags & FLAG_C ? 'C' : '.',
m_flags & FLAG_LZ ? '.' : 'L',

2
src/devices/cpu/hmcs40/hmcs40.cpp
View File

@ -138,7 +138,7 @@ void hmcs40_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c",
str = string_format("%c%c",
m_c ? 'C':'c',
m_s ? 'S':'s'
);

2
src/devices/cpu/hphybrid/hphybrid.cpp
View File

@ -619,7 +619,7 @@ UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
void hp_hybrid_cpu_device::state_string_export(const device_state_entry &entry, std::string &str) const
{
if (entry.index() == STATE_GENFLAGS) {
strprintf(str, "%s %s %c %c",
str = string_format("%s %s %c %c",
BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..",
BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..",
BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.',

34
src/devices/cpu/i386/i386.cpp
View File

@ -3496,55 +3496,55 @@ void i386_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%08X", get_flags());
str = string_format("%08X", get_flags());
break;
case X87_ST0:
strprintf(str, "%f", fx80_to_double(ST(0)));
str = string_format("%f", fx80_to_double(ST(0)));
break;
case X87_ST1:
strprintf(str, "%f", fx80_to_double(ST(1)));
str = string_format("%f", fx80_to_double(ST(1)));
break;
case X87_ST2:
strprintf(str, "%f", fx80_to_double(ST(2)));
str = string_format("%f", fx80_to_double(ST(2)));
break;
case X87_ST3:
strprintf(str, "%f", fx80_to_double(ST(3)));
str = string_format("%f", fx80_to_double(ST(3)));
break;
case X87_ST4:
strprintf(str, "%f", fx80_to_double(ST(4)));
str = string_format("%f", fx80_to_double(ST(4)));
break;
case X87_ST5:
strprintf(str, "%f", fx80_to_double(ST(5)));
str = string_format("%f", fx80_to_double(ST(5)));
break;
case X87_ST6:
strprintf(str, "%f", fx80_to_double(ST(6)));
str = string_format("%f", fx80_to_double(ST(6)));
break;
case X87_ST7:
strprintf(str, "%f", fx80_to_double(ST(7)));
str = string_format("%f", fx80_to_double(ST(7)));
break;
case SSE_XMM0:
strprintf(str, "%08x%08x%08x%08x", XMM(0).d[3], XMM(0).d[2], XMM(0).d[1], XMM(0).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(0).d[3], XMM(0).d[2], XMM(0).d[1], XMM(0).d[0]);
break;
case SSE_XMM1:
strprintf(str, "%08x%08x%08x%08x", XMM(1).d[3], XMM(1).d[2], XMM(1).d[1], XMM(1).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(1).d[3], XMM(1).d[2], XMM(1).d[1], XMM(1).d[0]);
break;
case SSE_XMM2:
strprintf(str, "%08x%08x%08x%08x", XMM(2).d[3], XMM(2).d[2], XMM(2).d[1], XMM(2).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(2).d[3], XMM(2).d[2], XMM(2).d[1], XMM(2).d[0]);
break;
case SSE_XMM3:
strprintf(str, "%08x%08x%08x%08x", XMM(3).d[3], XMM(3).d[2], XMM(3).d[1], XMM(3).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(3).d[3], XMM(3).d[2], XMM(3).d[1], XMM(3).d[0]);
break;
case SSE_XMM4:
strprintf(str, "%08x%08x%08x%08x", XMM(4).d[3], XMM(4).d[2], XMM(4).d[1], XMM(4).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(4).d[3], XMM(4).d[2], XMM(4).d[1], XMM(4).d[0]);
break;
case SSE_XMM5:
strprintf(str, "%08x%08x%08x%08x", XMM(5).d[3], XMM(5).d[2], XMM(5).d[1], XMM(5).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(5).d[3], XMM(5).d[2], XMM(5).d[1], XMM(5).d[0]);
break;
case SSE_XMM6:
strprintf(str, "%08x%08x%08x%08x", XMM(6).d[3], XMM(6).d[2], XMM(6).d[1], XMM(6).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(6).d[3], XMM(6).d[2], XMM(6).d[1], XMM(6).d[0]);
break;
case SSE_XMM7:
strprintf(str, "%08x%08x%08x%08x", XMM(7).d[3], XMM(7).d[2], XMM(7).d[1], XMM(7).d[0]);
str = string_format("%08x%08x%08x%08x", XMM(7).d[3], XMM(7).d[2], XMM(7).d[1], XMM(7).d[0]);
break;
}
}

12
src/devices/cpu/i4004/i4004.cpp
View File

@ -416,19 +416,19 @@ void i4004_cpu_device::device_start()
{
/* set up the state table */
{
state_add(I4004_PC, "PC", m_PC.w.l).mask(0x0fff);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).mask(0x0fff).noshow();
state_add(I4004_PC, "PC", m_PC.w.l).mask(0x0fff);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).mask(0x0fff).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0x0f).callimport().callexport().noshow().formatstr("%4s");
state_add(I4004_A, "A", m_A).mask(0x0f);
state_add(I4004_A, "A", m_A).mask(0x0f);
for (int regnum = 0; regnum < 8; regnum++)
{
state_add(I4004_R01 + regnum, strformat("R%X%X", regnum * 2, regnum * 2 + 1).c_str(), m_R[regnum]);
state_add(I4004_R01 + regnum, string_format("R%X%X", regnum * 2, regnum * 2 + 1).c_str(), m_R[regnum]);
}
for (int addrnum = 0; addrnum < 4; addrnum++)
{
state_add(I4004_ADDR1 + addrnum, strformat("ADDR%d", addrnum + 1).c_str(), m_ADDR[addrnum].w.l).mask(0xfff);
state_add(I4004_ADDR1 + addrnum, string_format("ADDR%d", addrnum + 1).c_str(), m_ADDR[addrnum].w.l).mask(0xfff);
}
state_add(I4004_RAM, "RAM", m_RAM.w.l).mask(0x0fff);
@ -513,7 +513,7 @@ void i4004_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, ".%c%c%c",
str = string_format(".%c%c%c",
(m_A==0) ? 'Z':'.',
m_C ? 'C':'.',
m_TEST ? 'T':'.');

4
src/devices/cpu/i8008/i8008.cpp
View File

@ -93,7 +93,7 @@ void i8008_device::device_start()
state_add(I8008_L, "L", m_L);
for (int addrnum = 0; addrnum < 8; addrnum++)
state_add(I8008_ADDR1 + addrnum, strformat("ADDR%d", addrnum + 1).c_str(), m_ADDR[addrnum].w.l).mask(0xfff);
state_add(I8008_ADDR1 + addrnum, string_format("ADDR%d", addrnum + 1).c_str(), m_ADDR[addrnum].w.l).mask(0xfff);
init_tables();
}
@ -191,7 +191,7 @@ void i8008_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c",
str = string_format("%c%c%c%c",
m_CF ? 'C':'.',
m_ZF ? 'Z':'.',
m_SF ? 'S':'.',

2
src/devices/cpu/i8085/i8085.cpp
View File

@ -1053,7 +1053,7 @@ void i8085a_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_AF.b.l & 0x80 ? 'S':'.',
m_AF.b.l & 0x40 ? 'Z':'.',
m_AF.b.l & 0x20 ? 'X':'.', // X5

14
src/devices/cpu/i8089/i8089.cpp
View File

@ -168,30 +168,30 @@ void i8089_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case SYSBUS:
strprintf(str, "%c", sysbus_width() ? 'W' : '.');
str = string_format("%c", sysbus_width() ? 'W' : '.');
break;
case SOC:
strprintf(str, "%c%c", remotebus_width() ? 'I' : '.', request_grant() ? 'R' : '.');
str = string_format("%c%c", remotebus_width() ? 'I' : '.', request_grant() ? 'R' : '.');
break;
case CH1_GA:
case CH2_GA:
strprintf(str, "%d %05X", ch->m_r[i8089_channel::GA].t & 1, ch->m_r[i8089_channel::GA].w);
str = string_format("%d %05X", ch->m_r[i8089_channel::GA].t & 1, ch->m_r[i8089_channel::GA].w);
break;
case CH1_GB:
case CH2_GB:
strprintf(str, "%d %05X", ch->m_r[i8089_channel::GB].t & 1, ch->m_r[i8089_channel::GB].w);
str = string_format("%d %05X", ch->m_r[i8089_channel::GB].t & 1, ch->m_r[i8089_channel::GB].w);
break;
case CH1_GC:
case CH2_GC:
strprintf(str, "%d %05X", ch->m_r[i8089_channel::GC].t & 1, ch->m_r[i8089_channel::GC].w);
str = string_format("%d %05X", ch->m_r[i8089_channel::GC].t & 1, ch->m_r[i8089_channel::GC].w);
break;
case CH1_TP:
case CH2_TP:
strprintf(str, "%d %05X", ch->m_r[i8089_channel::TP].t & 1, ch->m_r[i8089_channel::TP].w);
str = string_format("%d %05X", ch->m_r[i8089_channel::TP].t & 1, ch->m_r[i8089_channel::TP].w);
break;
case CH1_PSW:
case CH2_PSW:
strprintf(str, "%c%s%c%s%s%s%c%c",
str = string_format("%c%s%c%s%s%s%c%c",
BIT(ch->m_r[i8089_channel::PSW].w, 7) ? 'P':'.',
BIT(ch->m_r[i8089_channel::PSW].w, 6) ? "XF":"..",
BIT(ch->m_r[i8089_channel::PSW].w, 5) ? 'B':'.',

4
src/devices/cpu/i86/i286.cpp
View File

@ -282,13 +282,13 @@ void i80286_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENPC:
strprintf(str, "%08X", m_base[CS] + m_ip);
str = string_format("%08X", m_base[CS] + m_ip);
break;
case STATE_GENFLAGS:
{
UINT16 flags = CompressFlags();
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
flags & 0x8000 ? '0':'.',
flags & 0x4000 ? 'N':'.',
flags & 0x2000 ? 'I':'.',

4
src/devices/cpu/i86/i86.cpp
View File

@ -323,13 +323,13 @@ void i8086_common_cpu_device::state_string_export(const device_state_entry &entr
switch (entry.index())
{
case STATE_GENPC:
strprintf(str, "%08X", (m_sregs[CS] << 4) + m_ip);
str = string_format("%08X", (m_sregs[CS] << 4) + m_ip);
break;
case STATE_GENFLAGS:
{
UINT16 flags = CompressFlags();
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
flags & 0x8000 ? '1':'.',
flags & 0x4000 ? '1':'.',
flags & 0x2000 ? '1':'.',

2
src/devices/cpu/i960/i960.cpp
View File

@ -2091,7 +2091,7 @@ void i960_cpu_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s", conditions[m_AC & 7]);
str = string_format("%s", conditions[m_AC & 7]);
break;
}
}

4
src/devices/cpu/ie15/ie15.cpp
View File

@ -65,7 +65,7 @@ void ie15_device::device_start()
state_add(IE15_A, "A", m_A);
for (int ireg = 0; ireg < 32; ireg++)
state_add(IE15_R0 + ireg, strformat("R%d", ireg).c_str(), m_REGS[ireg]);
state_add(IE15_R0 + ireg, string_format("R%d", ireg).c_str(), m_REGS[ireg]);
}
//-------------------------------------------------
@ -137,7 +137,7 @@ void ie15_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c",
str = string_format("%c%c%c",
m_CF ? 'C':'.',
m_ZF ? 'Z':'.',
m_RF ? 'R':'.');

2
src/devices/cpu/jaguar/jaguar.cpp
View File

@ -405,7 +405,7 @@ void jaguar_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c",
FLAGS & 0x8000 ? 'D':'.',
FLAGS & 0x4000 ? 'A':'.',
FLAGS & 0x0100 ? '4':'.',

2
src/devices/cpu/lc8670/lc8670.cpp
View File

@ -374,7 +374,7 @@ void lc8670_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s%s%s%s",
str = string_format("%s%s%s%s",
GET_CY ? "CY" : "..",
GET_AC ? "AC" : "..",
GET_OV ? "OV" : "..",

2
src/devices/cpu/lh5801/lh5801.cpp
View File

@ -147,7 +147,7 @@ void lh5801_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_t&0x80?'1':'0',
m_t&0x40?'1':'0',
m_t&0x20?'1':'0',

4
src/devices/cpu/lr35902/lr35902.cpp
View File

@ -185,11 +185,11 @@ void lr35902_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case LR35902_SPEED:
strprintf(str, "%02X", 0x7E | ((m_gb_speed - 1) << 7) | m_gb_speed_change_pending);
str = string_format("%02X", 0x7E | ((m_gb_speed - 1) << 7) | m_gb_speed_change_pending);
break;
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c",
str = string_format("%c%c%c%c",
m_F & FLAG_Z ? 'Z' : '.',
m_F & FLAG_N ? 'N' : '.',
m_F & FLAG_H ? 'H' : '.',

2
src/devices/cpu/m37710/m37710.cpp
View File

@ -1141,7 +1141,7 @@ void m37710_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_flag_n & NFLAG_SET ? 'N':'.',
m_flag_v & VFLAG_SET ? 'V':'.',
m_flag_m & MFLAG_SET ? 'M':'.',

2
src/devices/cpu/m6502/m6502.cpp
View File

@ -444,7 +444,7 @@ void m6502_device::state_string_export(const device_state_entry &entry, std::str
switch(entry.index()) {
case STATE_GENFLAGS:
case M6502_P:
strprintf(str, "%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c",
P & F_N ? 'N' : '.',
P & F_V ? 'V' : '.',
P & F_D ? 'D' : '.',

4
src/devices/cpu/m6502/m65ce02.cpp
View File

@ -80,7 +80,7 @@ void m65ce02_device::state_string_export(const device_state_entry &entry, std::s
switch(entry.index()) {
case STATE_GENFLAGS:
case M6502_P:
strprintf(str, "%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c",
P & F_N ? 'N' : '.',
P & F_V ? 'V' : '.',
P & F_E ? 'E' : '.',
@ -90,7 +90,7 @@ void m65ce02_device::state_string_export(const device_state_entry &entry, std::s
P & F_C ? 'C' : '.');
break;
case M65CE02_B:
strprintf(str, "%02x", B >> 8);
str = string_format("%02x", B >> 8);
break;
}
}

2
src/devices/cpu/m6502/m740.cpp
View File

@ -58,7 +58,7 @@ void m740_device::state_string_export(const device_state_entry &entry, std::stri
switch(entry.index()) {
case STATE_GENFLAGS:
case M6502_P:
strprintf(str, "%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c",
P & F_N ? 'N' : '.',
P & F_V ? 'V' : '.',
P & F_T ? 'T' : '.',

2
src/devices/cpu/m6800/m6800.cpp
View File

@ -1145,7 +1145,7 @@ void m6800_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_cc & 0x80 ? '?':'.',
m_cc & 0x40 ? '?':'.',
m_cc & 0x20 ? 'H':'.',

24
src/devices/cpu/m68000/m68kcpu.cpp
View File

@ -1173,40 +1173,40 @@ void m68000_base_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case M68K_FP0:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[0]));
str = string_format("%f", fx80_to_double(REG_FP(this)[0]));
break;
case M68K_FP1:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[1]));
str = string_format("%f", fx80_to_double(REG_FP(this)[1]));
break;
case M68K_FP2:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[2]));
str = string_format("%f", fx80_to_double(REG_FP(this)[2]));
break;
case M68K_FP3:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[3]));
str = string_format("%f", fx80_to_double(REG_FP(this)[3]));
break;
case M68K_FP4:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[4]));
str = string_format("%f", fx80_to_double(REG_FP(this)[4]));
break;
case M68K_FP5:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[5]));
str = string_format("%f", fx80_to_double(REG_FP(this)[5]));
break;
case M68K_FP6:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[6]));
str = string_format("%f", fx80_to_double(REG_FP(this)[6]));
break;
case M68K_FP7:
strprintf(str,"%f", fx80_to_double(REG_FP(this)[7]));
str = string_format("%f", fx80_to_double(REG_FP(this)[7]));
break;
case STATE_GENFLAGS:
sr = m68ki_get_sr(this);
strprintf(str,"%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
sr & 0x8000 ? 'T':'.',
sr & 0x4000 ? 't':'.',
sr & 0x2000 ? 'S':'.',
@ -1735,10 +1735,10 @@ void m68000_base_device::define_state(void)
state_add(M68K_MSP, "MSP", iotemp).callimport().callexport();
for (int regnum = 0; regnum < 8; regnum++) {
state_add(M68K_D0 + regnum, strformat("D%d", regnum).c_str(), dar[regnum]);
state_add(M68K_D0 + regnum, string_format("D%d", regnum).c_str(), dar[regnum]);
}
for (int regnum = 0; regnum < 8; regnum++) {
state_add(M68K_A0 + regnum, strformat("A%d", regnum).c_str(), dar[8 + regnum]);
state_add(M68K_A0 + regnum, string_format("A%d", regnum).c_str(), dar[8 + regnum]);
}
state_add(M68K_PREF_ADDR, "PREF_ADDR", pref_addr).mask(addrmask);
@ -1760,7 +1760,7 @@ void m68000_base_device::define_state(void)
if (cpu_type & MASK_030_OR_LATER)
{
for (int regnum = 0; regnum < 8; regnum++) {
state_add(M68K_FP0 + regnum, strformat("FP%d", regnum).c_str(), iotemp).callimport().callexport().formatstr("%10s");
state_add(M68K_FP0 + regnum, string_format("FP%d", regnum).c_str(), iotemp).callimport().callexport().formatstr("%10s");
}
state_add(M68K_FPSR, "FPSR", fpsr);
state_add(M68K_FPCR, "FPCR", fpcr);

2
src/devices/cpu/m6805/m6805.cpp
View File

@ -498,7 +498,7 @@ void m6805_base_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_cc & 0x80) ? '?' : '.',
(m_cc & 0x40) ? '?' : '.',
(m_cc & 0x20) ? '?' : '.',

2
src/devices/cpu/m6809/m6809.cpp
View File

@ -307,7 +307,7 @@ void m6809_base_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_cc & 0x80) ? 'E' : '.',
(m_cc & 0x40) ? 'F' : '.',
(m_cc & 0x20) ? 'H' : '.',

2
src/devices/cpu/mb86233/mb86233.cpp
View File

@ -166,7 +166,7 @@ void mb86233_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c", (m_sr & SIGN_FLAG) ? 'N' : 'n', (m_sr & ZERO_FLAG) ? 'Z' : 'z');
str = string_format("%c%c", (m_sr & SIGN_FLAG) ? 'N' : 'n', (m_sr & ZERO_FLAG) ? 'Z' : 'z');
break;
}
}

2
src/devices/cpu/mb86235/mb86235.cpp
View File

@ -113,7 +113,7 @@ void mb86235_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c",
str = string_format("%c%c%c%c",
m_flags & 0x80 ? 'S':'.',
m_flags & 0x40 ? 'Z':'.',
m_flags & 0x20 ? 'V':'.',

2
src/devices/cpu/mb88xx/mb88xx.cpp
View File

@ -274,7 +274,7 @@ void mb88_cpu_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c",
TEST_ST() ? 'T' : 't',
TEST_ZF() ? 'Z' : 'z',
TEST_CF() ? 'C' : 'c',

2
src/devices/cpu/mc68hc11/mc68hc11.cpp
View File

@ -453,7 +453,7 @@ void mc68hc11_cpu_device::state_string_export(const device_state_entry &entry, s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_ccr & CC_S) ? 'S' : '.',
(m_ccr & CC_X) ? 'X' : '.',
(m_ccr & CC_H) ? 'H' : '.',

4
src/devices/cpu/mcs48/mcs48.cpp
View File

@ -979,7 +979,7 @@ void mcs48_cpu_device::device_start()
state_add(MCS48_P2, "P2", m_p2);
for (int regnum = 0; regnum < 8; regnum++) {
state_add(MCS48_R0 + regnum, strformat("R%d", regnum).c_str(), m_rtemp).callimport().callexport();
state_add(MCS48_R0 + regnum, string_format("R%d", regnum).c_str(), m_rtemp).callimport().callexport();
}
state_add(MCS48_EA, "EA", m_ea).mask(0x1);
@ -1301,7 +1301,7 @@ void mcs48_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c %c%c%c%c%c%c%c%c",
str = string_format("%c%c %c%c%c%c%c%c%c%c",
m_irq_state ? 'I':'.',
m_a11 ? 'M':'.',
m_psw & 0x80 ? 'C':'.',

2
src/devices/cpu/mcs51/mcs51.cpp
View File

@ -2218,7 +2218,7 @@ void mcs51_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str,"%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
PSW & 0x80 ? 'C':'.',
PSW & 0x40 ? 'A':'.',
PSW & 0x20 ? 'F':'.',

2
src/devices/cpu/mcs96/mcs96.cpp
View File

@ -133,7 +133,7 @@ void mcs96_device::state_string_export(const device_state_entry &entry, std::str
switch(entry.index()) {
case STATE_GENFLAGS:
case MCS96_PSW:
strprintf(str, "%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
PSW & F_Z ? 'Z' : '.',
PSW & F_N ? 'N' : '.',
PSW & F_V ? 'V' : '.',

2
src/devices/cpu/melps4/melps4.cpp
View File

@ -48,7 +48,7 @@ void melps4_cpu_device::state_string_export(const device_state_entry &entry, std
{
// obviously not from a single flags register, letters are made up
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c %c%c%c",
str = string_format("%c%c%c%c%c %c%c%c",
m_intp ? 'P':'p',
m_inte ? 'I':'i',
m_sm ? 'S':'s',

2
src/devices/cpu/minx/minx.cpp
View File

@ -126,7 +126,7 @@ void minx_cpu_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c-%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c-%c%c%c%c%c",
m_F & FLAG_I ? 'I' : '.',
m_F & FLAG_D ? 'D' : '.',
m_F & FLAG_L ? 'L' : '.',

130
src/devices/cpu/mips/mips3.cpp
View File

@ -645,263 +645,263 @@ void mips3_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case MIPS3_FPS0:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][0]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][0]);
break;
case MIPS3_FPD0:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][0]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][0]);
break;
case MIPS3_FPS1:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][1]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][1]);
break;
case MIPS3_FPD1:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][1]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][1]);
break;
case MIPS3_FPS2:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][2]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][2]);
break;
case MIPS3_FPD2:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][2]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][2]);
break;
case MIPS3_FPS3:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][3]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][3]);
break;
case MIPS3_FPD3:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][3]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][3]);
break;
case MIPS3_FPS4:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][4]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][4]);
break;
case MIPS3_FPD4:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][4]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][4]);
break;
case MIPS3_FPS5:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][5]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][5]);
break;
case MIPS3_FPD5:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][5]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][5]);
break;
case MIPS3_FPS6:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][6]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][6]);
break;
case MIPS3_FPD6:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][6]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][6]);
break;
case MIPS3_FPS7:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][7]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][7]);
break;
case MIPS3_FPD7:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][7]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][7]);
break;
case MIPS3_FPS8:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][8]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][8]);
break;
case MIPS3_FPD8:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][8]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][8]);
break;
case MIPS3_FPS9:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][9]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][9]);
break;
case MIPS3_FPD9:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][9]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][9]);
break;
case MIPS3_FPS10:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][10]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][10]);
break;
case MIPS3_FPD10:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][10]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][10]);
break;
case MIPS3_FPS11:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][11]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][11]);
break;
case MIPS3_FPD11:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][11]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][11]);
break;
case MIPS3_FPS12:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][12]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][12]);
break;
case MIPS3_FPD12:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][12]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][12]);
break;
case MIPS3_FPS13:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][13]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][13]);
break;
case MIPS3_FPD13:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][13]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][13]);
break;
case MIPS3_FPS14:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][14]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][14]);
break;
case MIPS3_FPD14:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][14]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][14]);
break;
case MIPS3_FPS15:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][15]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][15]);
break;
case MIPS3_FPD15:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][15]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][15]);
break;
case MIPS3_FPS16:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][16]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][16]);
break;
case MIPS3_FPD16:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][16]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][16]);
break;
case MIPS3_FPS17:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][17]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][17]);
break;
case MIPS3_FPD17:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][17]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][17]);
break;
case MIPS3_FPS18:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][18]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][18]);
break;
case MIPS3_FPD18:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][18]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][18]);
break;
case MIPS3_FPS19:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][19]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][19]);
break;
case MIPS3_FPD19:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][19]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][19]);
break;
case MIPS3_FPS20:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][20]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][20]);
break;
case MIPS3_FPD20:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][20]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][20]);
break;
case MIPS3_FPS21:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][21]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][21]);
break;
case MIPS3_FPD21:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][21]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][21]);
break;
case MIPS3_FPS22:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][22]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][22]);
break;
case MIPS3_FPD22:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][22]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][22]);
break;
case MIPS3_FPS23:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][23]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][23]);
break;
case MIPS3_FPD23:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][23]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][23]);
break;
case MIPS3_FPS24:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][24]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][24]);
break;
case MIPS3_FPD24:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][24]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][24]);
break;
case MIPS3_FPS25:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][25]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][25]);
break;
case MIPS3_FPD25:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][25]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][25]);
break;
case MIPS3_FPS26:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][26]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][26]);
break;
case MIPS3_FPD26:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][26]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][26]);
break;
case MIPS3_FPS27:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][27]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][27]);
break;
case MIPS3_FPD27:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][27]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][27]);
break;
case MIPS3_FPS28:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][28]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][28]);
break;
case MIPS3_FPD28:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][28]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][28]);
break;
case MIPS3_FPS29:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][29]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][29]);
break;
case MIPS3_FPD29:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][29]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][29]);
break;
case MIPS3_FPS30:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][30]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][30]);
break;
case MIPS3_FPD30:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][30]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][30]);
break;
case MIPS3_FPS31:
strprintf(str, "!%16g", *(float *)&m_core->cpr[1][31]);
str = string_format("!%16g", *(float *)&m_core->cpr[1][31]);
break;
case MIPS3_FPD31:
strprintf(str, "!%16g", *(double *)&m_core->cpr[1][31]);
str = string_format("!%16g", *(double *)&m_core->cpr[1][31]);
break;
case STATE_GENFLAGS:
strprintf(str, " ");
str = " ";
break;
}
}

2
src/devices/cpu/mn10200/mn10200.cpp
View File

@ -56,7 +56,7 @@ void mn10200_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
str = string_format("S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
(m_psw >> 12) & 3,
m_psw & FLAG_IE ? "on " : "off",
(m_psw >> 8) & 7,

2
src/devices/cpu/nec/nec.cpp
View File

@ -444,7 +444,7 @@ void nec_common_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
flags & 0x8000 ? 'N':'E',
flags & 0x4000 ? '?':'.',
flags & 0x2000 ? '?':'.',

2
src/devices/cpu/nec/v25.cpp
View File

@ -532,7 +532,7 @@ void v25_common_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c %d %c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c %d %c%c%c%c%c%c%c%c%c%c%c%c",
flags & 0x8000 ? 'N':'S',
(flags & 0x7000) >> 12,
flags & 0x0800 ? 'O':'.',

2
src/devices/cpu/pdp1/pdp1.cpp
View File

@ -742,7 +742,7 @@ void pdp1_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c-%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c-%c%c%c%c%c%c",
(FLAGS & 040) ? '1' : '.',
(FLAGS & 020) ? '2' : '.',
(FLAGS & 010) ? '3' : '.',

4
src/devices/cpu/pic16c5x/pic16c5x.cpp
View File

@ -928,11 +928,11 @@ void pic16c5x_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case PIC16C5x_PSCL:
strprintf(str, "%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
str = string_format("%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
break;
case STATE_GENFLAGS:
strprintf(str, "%01x%c%c%c%c%c %c%c%c%03x",
str = string_format("%01x%c%c%c%c%c %c%c%c%03x",
(STATUS & 0xe0) >> 5,
STATUS & 0x10 ? '.':'O', /* WDT Overflow */
STATUS & 0x08 ? 'P':'D', /* Power/Down */

4
src/devices/cpu/pic16c62x/pic16c62x.cpp
View File

@ -995,11 +995,11 @@ void pic16c62x_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case PIC16C62x_PSCL:
strprintf(str, "%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
str = string_format("%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
break;
case STATE_GENFLAGS:
strprintf(str, "%01x%c%c%c%c%c %c%c%c%03x",
str = string_format("%01x%c%c%c%c%c %c%c%c%03x",
(STATUS & 0xe0) >> 5,
STATUS & 0x10 ? '.':'O', /* WDT Overflow */
STATUS & 0x08 ? 'P':'D', /* Power/Down */

64
src/devices/cpu/powerpc/ppccom.cpp
View File

@ -1014,131 +1014,131 @@ void ppc_device::state_string_export(const device_state_entry &entry, std::strin
switch (entry.index())
{
case PPC_F0:
strprintf(str, "%12f", m_core->f[0]);
str = string_format("%12f", m_core->f[0]);
break;
case PPC_F1:
strprintf(str, "%12f", m_core->f[1]);
str = string_format("%12f", m_core->f[1]);
break;
case PPC_F2:
strprintf(str, "%12f", m_core->f[2]);
str = string_format("%12f", m_core->f[2]);
break;
case PPC_F3:
strprintf(str, "%12f", m_core->f[3]);
str = string_format("%12f", m_core->f[3]);
break;
case PPC_F4:
strprintf(str, "%12f", m_core->f[4]);
str = string_format("%12f", m_core->f[4]);
break;
case PPC_F5:
strprintf(str, "%12f", m_core->f[5]);
str = string_format("%12f", m_core->f[5]);
break;
case PPC_F6:
strprintf(str, "%12f", m_core->f[6]);
str = string_format("%12f", m_core->f[6]);
break;
case PPC_F7:
strprintf(str, "%12f", m_core->f[7]);
str = string_format("%12f", m_core->f[7]);
break;
case PPC_F8:
strprintf(str, "%12f", m_core->f[8]);
str = string_format("%12f", m_core->f[8]);
break;
case PPC_F9:
strprintf(str, "%12f", m_core->f[9]);
str = string_format("%12f", m_core->f[9]);
break;
case PPC_F10:
strprintf(str, "%12f", m_core->f[10]);
str = string_format("%12f", m_core->f[10]);
break;
case PPC_F11:
strprintf(str, "%12f", m_core->f[11]);
str = string_format("%12f", m_core->f[11]);
break;
case PPC_F12:
strprintf(str, "%12f", m_core->f[12]);
str = string_format("%12f", m_core->f[12]);
break;
case PPC_F13:
strprintf(str, "%12f", m_core->f[13]);
str = string_format("%12f", m_core->f[13]);
break;
case PPC_F14:
strprintf(str, "%12f", m_core->f[14]);
str = string_format("%12f", m_core->f[14]);
break;
case PPC_F15:
strprintf(str, "%12f", m_core->f[15]);
str = string_format("%12f", m_core->f[15]);
break;
case PPC_F16:
strprintf(str, "%12f", m_core->f[16]);
str = string_format("%12f", m_core->f[16]);
break;
case PPC_F17:
strprintf(str, "%12f", m_core->f[17]);
str = string_format("%12f", m_core->f[17]);
break;
case PPC_F18:
strprintf(str, "%12f", m_core->f[18]);
str = string_format("%12f", m_core->f[18]);
break;
case PPC_F19:
strprintf(str, "%12f", m_core->f[19]);
str = string_format("%12f", m_core->f[19]);
break;
case PPC_F20:
strprintf(str, "%12f", m_core->f[20]);
str = string_format("%12f", m_core->f[20]);
break;
case PPC_F21:
strprintf(str, "%12f", m_core->f[21]);
str = string_format("%12f", m_core->f[21]);
break;
case PPC_F22:
strprintf(str, "%12f", m_core->f[22]);
str = string_format("%12f", m_core->f[22]);
break;
case PPC_F23:
strprintf(str, "%12f", m_core->f[23]);
str = string_format("%12f", m_core->f[23]);
break;
case PPC_F24:
strprintf(str, "%12f", m_core->f[24]);
str = string_format("%12f", m_core->f[24]);
break;
case PPC_F25:
strprintf(str, "%12f", m_core->f[25]);
str = string_format("%12f", m_core->f[25]);
break;
case PPC_F26:
strprintf(str, "%12f", m_core->f[26]);
str = string_format("%12f", m_core->f[26]);
break;
case PPC_F27:
strprintf(str, "%12f", m_core->f[27]);
str = string_format("%12f", m_core->f[27]);
break;
case PPC_F28:
strprintf(str, "%12f", m_core->f[28]);
str = string_format("%12f", m_core->f[28]);
break;
case PPC_F29:
strprintf(str, "%12f", m_core->f[29]);
str = string_format("%12f", m_core->f[29]);
break;
case PPC_F30:
strprintf(str, "%12f", m_core->f[30]);
str = string_format("%12f", m_core->f[30]);
break;
case PPC_F31:
strprintf(str, "%12f", m_core->f[31]);
str = string_format("%12f", m_core->f[31]);
break;
}
}

2
src/devices/cpu/pps4/pps4.cpp
View File

@ -1557,7 +1557,7 @@ void pps4_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c",
str = string_format("%c%c%c",
m_C ? 'C':'.',
m_FF1 ? '1':'.',
m_FF2 ? '2':'.');

4
src/devices/cpu/psx/psx.cpp
View File

@ -2033,11 +2033,11 @@ void psxcpu_device::state_string_export( const device_state_entry &entry, std::s
case PSXCPU_DELAYR:
if( m_delayr <= PSXCPU_DELAYR_NOTPC )
{
strprintf(str, "%02x %-3s", m_delayr, delayn[m_delayr]);
str = string_format("%02x %-3s", m_delayr, delayn[m_delayr]);
}
else
{
strprintf(str, "%02x ---", m_delayr);
str = string_format("%02x ---", m_delayr);
}
break;
}

2
src/devices/cpu/rsp/rsp.cpp
View File

@ -548,7 +548,7 @@ void rsp_device::state_string_export(const device_state_entry &entry, std::strin
}
else if (index == STATE_GENFLAGS)
{
strprintf(str, "%s", "");
str = "";
}
}

64
src/devices/cpu/rsp/rspcp2.cpp
View File

@ -751,100 +751,100 @@ void rsp_cop2::state_string_export(const int index, std::string &str) const
switch (index)
{
case RSP_V0:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 0, 0), (UINT16)VREG_S( 0, 1), (UINT16)VREG_S( 0, 2), (UINT16)VREG_S( 0, 3), (UINT16)VREG_S( 0, 4), (UINT16)VREG_S( 0, 5), (UINT16)VREG_S( 0, 6), (UINT16)VREG_S( 0, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 0, 0), (UINT16)VREG_S( 0, 1), (UINT16)VREG_S( 0, 2), (UINT16)VREG_S( 0, 3), (UINT16)VREG_S( 0, 4), (UINT16)VREG_S( 0, 5), (UINT16)VREG_S( 0, 6), (UINT16)VREG_S( 0, 7));
break;
case RSP_V1:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 1, 0), (UINT16)VREG_S( 1, 1), (UINT16)VREG_S( 1, 2), (UINT16)VREG_S( 1, 3), (UINT16)VREG_S( 1, 4), (UINT16)VREG_S( 1, 5), (UINT16)VREG_S( 1, 6), (UINT16)VREG_S( 1, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 1, 0), (UINT16)VREG_S( 1, 1), (UINT16)VREG_S( 1, 2), (UINT16)VREG_S( 1, 3), (UINT16)VREG_S( 1, 4), (UINT16)VREG_S( 1, 5), (UINT16)VREG_S( 1, 6), (UINT16)VREG_S( 1, 7));
break;
case RSP_V2:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 2, 0), (UINT16)VREG_S( 2, 1), (UINT16)VREG_S( 2, 2), (UINT16)VREG_S( 2, 3), (UINT16)VREG_S( 2, 4), (UINT16)VREG_S( 2, 5), (UINT16)VREG_S( 2, 6), (UINT16)VREG_S( 2, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 2, 0), (UINT16)VREG_S( 2, 1), (UINT16)VREG_S( 2, 2), (UINT16)VREG_S( 2, 3), (UINT16)VREG_S( 2, 4), (UINT16)VREG_S( 2, 5), (UINT16)VREG_S( 2, 6), (UINT16)VREG_S( 2, 7));
break;
case RSP_V3:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 3, 0), (UINT16)VREG_S( 3, 1), (UINT16)VREG_S( 3, 2), (UINT16)VREG_S( 3, 3), (UINT16)VREG_S( 3, 4), (UINT16)VREG_S( 3, 5), (UINT16)VREG_S( 3, 6), (UINT16)VREG_S( 3, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 3, 0), (UINT16)VREG_S( 3, 1), (UINT16)VREG_S( 3, 2), (UINT16)VREG_S( 3, 3), (UINT16)VREG_S( 3, 4), (UINT16)VREG_S( 3, 5), (UINT16)VREG_S( 3, 6), (UINT16)VREG_S( 3, 7));
break;
case RSP_V4:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 4, 0), (UINT16)VREG_S( 4, 1), (UINT16)VREG_S( 4, 2), (UINT16)VREG_S( 4, 3), (UINT16)VREG_S( 4, 4), (UINT16)VREG_S( 4, 5), (UINT16)VREG_S( 4, 6), (UINT16)VREG_S( 4, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 4, 0), (UINT16)VREG_S( 4, 1), (UINT16)VREG_S( 4, 2), (UINT16)VREG_S( 4, 3), (UINT16)VREG_S( 4, 4), (UINT16)VREG_S( 4, 5), (UINT16)VREG_S( 4, 6), (UINT16)VREG_S( 4, 7));
break;
case RSP_V5:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 5, 0), (UINT16)VREG_S( 5, 1), (UINT16)VREG_S( 5, 2), (UINT16)VREG_S( 5, 3), (UINT16)VREG_S( 5, 4), (UINT16)VREG_S( 5, 5), (UINT16)VREG_S( 5, 6), (UINT16)VREG_S( 5, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 5, 0), (UINT16)VREG_S( 5, 1), (UINT16)VREG_S( 5, 2), (UINT16)VREG_S( 5, 3), (UINT16)VREG_S( 5, 4), (UINT16)VREG_S( 5, 5), (UINT16)VREG_S( 5, 6), (UINT16)VREG_S( 5, 7));
break;
case RSP_V6:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 6, 0), (UINT16)VREG_S( 6, 1), (UINT16)VREG_S( 6, 2), (UINT16)VREG_S( 6, 3), (UINT16)VREG_S( 6, 4), (UINT16)VREG_S( 6, 5), (UINT16)VREG_S( 6, 6), (UINT16)VREG_S( 6, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 6, 0), (UINT16)VREG_S( 6, 1), (UINT16)VREG_S( 6, 2), (UINT16)VREG_S( 6, 3), (UINT16)VREG_S( 6, 4), (UINT16)VREG_S( 6, 5), (UINT16)VREG_S( 6, 6), (UINT16)VREG_S( 6, 7));
break;
case RSP_V7:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 7, 0), (UINT16)VREG_S( 7, 1), (UINT16)VREG_S( 7, 2), (UINT16)VREG_S( 7, 3), (UINT16)VREG_S( 7, 4), (UINT16)VREG_S( 7, 5), (UINT16)VREG_S( 7, 6), (UINT16)VREG_S( 7, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 7, 0), (UINT16)VREG_S( 7, 1), (UINT16)VREG_S( 7, 2), (UINT16)VREG_S( 7, 3), (UINT16)VREG_S( 7, 4), (UINT16)VREG_S( 7, 5), (UINT16)VREG_S( 7, 6), (UINT16)VREG_S( 7, 7));
break;
case RSP_V8:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 8, 0), (UINT16)VREG_S( 8, 1), (UINT16)VREG_S( 8, 2), (UINT16)VREG_S( 8, 3), (UINT16)VREG_S( 8, 4), (UINT16)VREG_S( 8, 5), (UINT16)VREG_S( 8, 6), (UINT16)VREG_S( 8, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 8, 0), (UINT16)VREG_S( 8, 1), (UINT16)VREG_S( 8, 2), (UINT16)VREG_S( 8, 3), (UINT16)VREG_S( 8, 4), (UINT16)VREG_S( 8, 5), (UINT16)VREG_S( 8, 6), (UINT16)VREG_S( 8, 7));
break;
case RSP_V9:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 9, 0), (UINT16)VREG_S( 9, 1), (UINT16)VREG_S( 9, 2), (UINT16)VREG_S( 9, 3), (UINT16)VREG_S( 9, 4), (UINT16)VREG_S( 9, 5), (UINT16)VREG_S( 9, 6), (UINT16)VREG_S( 9, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 9, 0), (UINT16)VREG_S( 9, 1), (UINT16)VREG_S( 9, 2), (UINT16)VREG_S( 9, 3), (UINT16)VREG_S( 9, 4), (UINT16)VREG_S( 9, 5), (UINT16)VREG_S( 9, 6), (UINT16)VREG_S( 9, 7));
break;
case RSP_V10:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(10, 0), (UINT16)VREG_S(10, 1), (UINT16)VREG_S(10, 2), (UINT16)VREG_S(10, 3), (UINT16)VREG_S(10, 4), (UINT16)VREG_S(10, 5), (UINT16)VREG_S(10, 6), (UINT16)VREG_S(10, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(10, 0), (UINT16)VREG_S(10, 1), (UINT16)VREG_S(10, 2), (UINT16)VREG_S(10, 3), (UINT16)VREG_S(10, 4), (UINT16)VREG_S(10, 5), (UINT16)VREG_S(10, 6), (UINT16)VREG_S(10, 7));
break;
case RSP_V11:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(11, 0), (UINT16)VREG_S(11, 1), (UINT16)VREG_S(11, 2), (UINT16)VREG_S(11, 3), (UINT16)VREG_S(11, 4), (UINT16)VREG_S(11, 5), (UINT16)VREG_S(11, 6), (UINT16)VREG_S(11, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(11, 0), (UINT16)VREG_S(11, 1), (UINT16)VREG_S(11, 2), (UINT16)VREG_S(11, 3), (UINT16)VREG_S(11, 4), (UINT16)VREG_S(11, 5), (UINT16)VREG_S(11, 6), (UINT16)VREG_S(11, 7));
break;
case RSP_V12:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(12, 0), (UINT16)VREG_S(12, 1), (UINT16)VREG_S(12, 2), (UINT16)VREG_S(12, 3), (UINT16)VREG_S(12, 4), (UINT16)VREG_S(12, 5), (UINT16)VREG_S(12, 6), (UINT16)VREG_S(12, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(12, 0), (UINT16)VREG_S(12, 1), (UINT16)VREG_S(12, 2), (UINT16)VREG_S(12, 3), (UINT16)VREG_S(12, 4), (UINT16)VREG_S(12, 5), (UINT16)VREG_S(12, 6), (UINT16)VREG_S(12, 7));
break;
case RSP_V13:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(13, 0), (UINT16)VREG_S(13, 1), (UINT16)VREG_S(13, 2), (UINT16)VREG_S(13, 3), (UINT16)VREG_S(13, 4), (UINT16)VREG_S(13, 5), (UINT16)VREG_S(13, 6), (UINT16)VREG_S(13, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(13, 0), (UINT16)VREG_S(13, 1), (UINT16)VREG_S(13, 2), (UINT16)VREG_S(13, 3), (UINT16)VREG_S(13, 4), (UINT16)VREG_S(13, 5), (UINT16)VREG_S(13, 6), (UINT16)VREG_S(13, 7));
break;
case RSP_V14:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(14, 0), (UINT16)VREG_S(14, 1), (UINT16)VREG_S(14, 2), (UINT16)VREG_S(14, 3), (UINT16)VREG_S(14, 4), (UINT16)VREG_S(14, 5), (UINT16)VREG_S(14, 6), (UINT16)VREG_S(14, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(14, 0), (UINT16)VREG_S(14, 1), (UINT16)VREG_S(14, 2), (UINT16)VREG_S(14, 3), (UINT16)VREG_S(14, 4), (UINT16)VREG_S(14, 5), (UINT16)VREG_S(14, 6), (UINT16)VREG_S(14, 7));
break;
case RSP_V15:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(15, 0), (UINT16)VREG_S(15, 1), (UINT16)VREG_S(15, 2), (UINT16)VREG_S(15, 3), (UINT16)VREG_S(15, 4), (UINT16)VREG_S(15, 5), (UINT16)VREG_S(15, 6), (UINT16)VREG_S(15, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(15, 0), (UINT16)VREG_S(15, 1), (UINT16)VREG_S(15, 2), (UINT16)VREG_S(15, 3), (UINT16)VREG_S(15, 4), (UINT16)VREG_S(15, 5), (UINT16)VREG_S(15, 6), (UINT16)VREG_S(15, 7));
break;
case RSP_V16:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(16, 0), (UINT16)VREG_S(16, 1), (UINT16)VREG_S(16, 2), (UINT16)VREG_S(16, 3), (UINT16)VREG_S(16, 4), (UINT16)VREG_S(16, 5), (UINT16)VREG_S(16, 6), (UINT16)VREG_S(16, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(16, 0), (UINT16)VREG_S(16, 1), (UINT16)VREG_S(16, 2), (UINT16)VREG_S(16, 3), (UINT16)VREG_S(16, 4), (UINT16)VREG_S(16, 5), (UINT16)VREG_S(16, 6), (UINT16)VREG_S(16, 7));
break;
case RSP_V17:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(17, 0), (UINT16)VREG_S(17, 1), (UINT16)VREG_S(17, 2), (UINT16)VREG_S(17, 3), (UINT16)VREG_S(17, 4), (UINT16)VREG_S(17, 5), (UINT16)VREG_S(17, 6), (UINT16)VREG_S(17, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(17, 0), (UINT16)VREG_S(17, 1), (UINT16)VREG_S(17, 2), (UINT16)VREG_S(17, 3), (UINT16)VREG_S(17, 4), (UINT16)VREG_S(17, 5), (UINT16)VREG_S(17, 6), (UINT16)VREG_S(17, 7));
break;
case RSP_V18:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(18, 0), (UINT16)VREG_S(18, 1), (UINT16)VREG_S(18, 2), (UINT16)VREG_S(18, 3), (UINT16)VREG_S(18, 4), (UINT16)VREG_S(18, 5), (UINT16)VREG_S(18, 6), (UINT16)VREG_S(18, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(18, 0), (UINT16)VREG_S(18, 1), (UINT16)VREG_S(18, 2), (UINT16)VREG_S(18, 3), (UINT16)VREG_S(18, 4), (UINT16)VREG_S(18, 5), (UINT16)VREG_S(18, 6), (UINT16)VREG_S(18, 7));
break;
case RSP_V19:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(19, 0), (UINT16)VREG_S(19, 1), (UINT16)VREG_S(19, 2), (UINT16)VREG_S(19, 3), (UINT16)VREG_S(19, 4), (UINT16)VREG_S(19, 5), (UINT16)VREG_S(19, 6), (UINT16)VREG_S(19, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(19, 0), (UINT16)VREG_S(19, 1), (UINT16)VREG_S(19, 2), (UINT16)VREG_S(19, 3), (UINT16)VREG_S(19, 4), (UINT16)VREG_S(19, 5), (UINT16)VREG_S(19, 6), (UINT16)VREG_S(19, 7));
break;
case RSP_V20:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(20, 0), (UINT16)VREG_S(20, 1), (UINT16)VREG_S(20, 2), (UINT16)VREG_S(20, 3), (UINT16)VREG_S(20, 4), (UINT16)VREG_S(20, 5), (UINT16)VREG_S(20, 6), (UINT16)VREG_S(20, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(20, 0), (UINT16)VREG_S(20, 1), (UINT16)VREG_S(20, 2), (UINT16)VREG_S(20, 3), (UINT16)VREG_S(20, 4), (UINT16)VREG_S(20, 5), (UINT16)VREG_S(20, 6), (UINT16)VREG_S(20, 7));
break;
case RSP_V21:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(21, 0), (UINT16)VREG_S(21, 1), (UINT16)VREG_S(21, 2), (UINT16)VREG_S(21, 3), (UINT16)VREG_S(21, 4), (UINT16)VREG_S(21, 5), (UINT16)VREG_S(21, 6), (UINT16)VREG_S(21, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(21, 0), (UINT16)VREG_S(21, 1), (UINT16)VREG_S(21, 2), (UINT16)VREG_S(21, 3), (UINT16)VREG_S(21, 4), (UINT16)VREG_S(21, 5), (UINT16)VREG_S(21, 6), (UINT16)VREG_S(21, 7));
break;
case RSP_V22:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(22, 0), (UINT16)VREG_S(22, 1), (UINT16)VREG_S(22, 2), (UINT16)VREG_S(22, 3), (UINT16)VREG_S(22, 4), (UINT16)VREG_S(22, 5), (UINT16)VREG_S(22, 6), (UINT16)VREG_S(22, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(22, 0), (UINT16)VREG_S(22, 1), (UINT16)VREG_S(22, 2), (UINT16)VREG_S(22, 3), (UINT16)VREG_S(22, 4), (UINT16)VREG_S(22, 5), (UINT16)VREG_S(22, 6), (UINT16)VREG_S(22, 7));
break;
case RSP_V23:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(23, 0), (UINT16)VREG_S(23, 1), (UINT16)VREG_S(23, 2), (UINT16)VREG_S(23, 3), (UINT16)VREG_S(23, 4), (UINT16)VREG_S(23, 5), (UINT16)VREG_S(23, 6), (UINT16)VREG_S(23, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(23, 0), (UINT16)VREG_S(23, 1), (UINT16)VREG_S(23, 2), (UINT16)VREG_S(23, 3), (UINT16)VREG_S(23, 4), (UINT16)VREG_S(23, 5), (UINT16)VREG_S(23, 6), (UINT16)VREG_S(23, 7));
break;
case RSP_V24:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(24, 0), (UINT16)VREG_S(24, 1), (UINT16)VREG_S(24, 2), (UINT16)VREG_S(24, 3), (UINT16)VREG_S(24, 4), (UINT16)VREG_S(24, 5), (UINT16)VREG_S(24, 6), (UINT16)VREG_S(24, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(24, 0), (UINT16)VREG_S(24, 1), (UINT16)VREG_S(24, 2), (UINT16)VREG_S(24, 3), (UINT16)VREG_S(24, 4), (UINT16)VREG_S(24, 5), (UINT16)VREG_S(24, 6), (UINT16)VREG_S(24, 7));
break;
case RSP_V25:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(25, 0), (UINT16)VREG_S(25, 1), (UINT16)VREG_S(25, 2), (UINT16)VREG_S(25, 3), (UINT16)VREG_S(25, 4), (UINT16)VREG_S(25, 5), (UINT16)VREG_S(25, 6), (UINT16)VREG_S(25, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(25, 0), (UINT16)VREG_S(25, 1), (UINT16)VREG_S(25, 2), (UINT16)VREG_S(25, 3), (UINT16)VREG_S(25, 4), (UINT16)VREG_S(25, 5), (UINT16)VREG_S(25, 6), (UINT16)VREG_S(25, 7));
break;
case RSP_V26:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(26, 0), (UINT16)VREG_S(26, 1), (UINT16)VREG_S(26, 2), (UINT16)VREG_S(26, 3), (UINT16)VREG_S(26, 4), (UINT16)VREG_S(26, 5), (UINT16)VREG_S(26, 6), (UINT16)VREG_S(26, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(26, 0), (UINT16)VREG_S(26, 1), (UINT16)VREG_S(26, 2), (UINT16)VREG_S(26, 3), (UINT16)VREG_S(26, 4), (UINT16)VREG_S(26, 5), (UINT16)VREG_S(26, 6), (UINT16)VREG_S(26, 7));
break;
case RSP_V27:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(27, 0), (UINT16)VREG_S(27, 1), (UINT16)VREG_S(27, 2), (UINT16)VREG_S(27, 3), (UINT16)VREG_S(27, 4), (UINT16)VREG_S(27, 5), (UINT16)VREG_S(27, 6), (UINT16)VREG_S(27, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(27, 0), (UINT16)VREG_S(27, 1), (UINT16)VREG_S(27, 2), (UINT16)VREG_S(27, 3), (UINT16)VREG_S(27, 4), (UINT16)VREG_S(27, 5), (UINT16)VREG_S(27, 6), (UINT16)VREG_S(27, 7));
break;
case RSP_V28:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(28, 0), (UINT16)VREG_S(28, 1), (UINT16)VREG_S(28, 2), (UINT16)VREG_S(28, 3), (UINT16)VREG_S(28, 4), (UINT16)VREG_S(28, 5), (UINT16)VREG_S(28, 6), (UINT16)VREG_S(28, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(28, 0), (UINT16)VREG_S(28, 1), (UINT16)VREG_S(28, 2), (UINT16)VREG_S(28, 3), (UINT16)VREG_S(28, 4), (UINT16)VREG_S(28, 5), (UINT16)VREG_S(28, 6), (UINT16)VREG_S(28, 7));
break;
case RSP_V29:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(29, 0), (UINT16)VREG_S(29, 1), (UINT16)VREG_S(29, 2), (UINT16)VREG_S(29, 3), (UINT16)VREG_S(29, 4), (UINT16)VREG_S(29, 5), (UINT16)VREG_S(29, 6), (UINT16)VREG_S(29, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(29, 0), (UINT16)VREG_S(29, 1), (UINT16)VREG_S(29, 2), (UINT16)VREG_S(29, 3), (UINT16)VREG_S(29, 4), (UINT16)VREG_S(29, 5), (UINT16)VREG_S(29, 6), (UINT16)VREG_S(29, 7));
break;
case RSP_V30:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(30, 0), (UINT16)VREG_S(30, 1), (UINT16)VREG_S(30, 2), (UINT16)VREG_S(30, 3), (UINT16)VREG_S(30, 4), (UINT16)VREG_S(30, 5), (UINT16)VREG_S(30, 6), (UINT16)VREG_S(30, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(30, 0), (UINT16)VREG_S(30, 1), (UINT16)VREG_S(30, 2), (UINT16)VREG_S(30, 3), (UINT16)VREG_S(30, 4), (UINT16)VREG_S(30, 5), (UINT16)VREG_S(30, 6), (UINT16)VREG_S(30, 7));
break;
case RSP_V31:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(31, 0), (UINT16)VREG_S(31, 1), (UINT16)VREG_S(31, 2), (UINT16)VREG_S(31, 3), (UINT16)VREG_S(31, 4), (UINT16)VREG_S(31, 5), (UINT16)VREG_S(31, 6), (UINT16)VREG_S(31, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(31, 0), (UINT16)VREG_S(31, 1), (UINT16)VREG_S(31, 2), (UINT16)VREG_S(31, 3), (UINT16)VREG_S(31, 4), (UINT16)VREG_S(31, 5), (UINT16)VREG_S(31, 6), (UINT16)VREG_S(31, 7));
break;
}
}

64
src/devices/cpu/rsp/rspcp2d.cpp
View File

@ -152,100 +152,100 @@ void rsp_cop2_drc::state_string_export(const int index, std::string &str) const
switch (index)
{
case RSP_V0:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 0, 0), (UINT16)VREG_S( 0, 1), (UINT16)VREG_S( 0, 2), (UINT16)VREG_S( 0, 3), (UINT16)VREG_S( 0, 4), (UINT16)VREG_S( 0, 5), (UINT16)VREG_S( 0, 6), (UINT16)VREG_S( 0, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 0, 0), (UINT16)VREG_S( 0, 1), (UINT16)VREG_S( 0, 2), (UINT16)VREG_S( 0, 3), (UINT16)VREG_S( 0, 4), (UINT16)VREG_S( 0, 5), (UINT16)VREG_S( 0, 6), (UINT16)VREG_S( 0, 7));
break;
case RSP_V1:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 1, 0), (UINT16)VREG_S( 1, 1), (UINT16)VREG_S( 1, 2), (UINT16)VREG_S( 1, 3), (UINT16)VREG_S( 1, 4), (UINT16)VREG_S( 1, 5), (UINT16)VREG_S( 1, 6), (UINT16)VREG_S( 1, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 1, 0), (UINT16)VREG_S( 1, 1), (UINT16)VREG_S( 1, 2), (UINT16)VREG_S( 1, 3), (UINT16)VREG_S( 1, 4), (UINT16)VREG_S( 1, 5), (UINT16)VREG_S( 1, 6), (UINT16)VREG_S( 1, 7));
break;
case RSP_V2:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 2, 0), (UINT16)VREG_S( 2, 1), (UINT16)VREG_S( 2, 2), (UINT16)VREG_S( 2, 3), (UINT16)VREG_S( 2, 4), (UINT16)VREG_S( 2, 5), (UINT16)VREG_S( 2, 6), (UINT16)VREG_S( 2, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 2, 0), (UINT16)VREG_S( 2, 1), (UINT16)VREG_S( 2, 2), (UINT16)VREG_S( 2, 3), (UINT16)VREG_S( 2, 4), (UINT16)VREG_S( 2, 5), (UINT16)VREG_S( 2, 6), (UINT16)VREG_S( 2, 7));
break;
case RSP_V3:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 3, 0), (UINT16)VREG_S( 3, 1), (UINT16)VREG_S( 3, 2), (UINT16)VREG_S( 3, 3), (UINT16)VREG_S( 3, 4), (UINT16)VREG_S( 3, 5), (UINT16)VREG_S( 3, 6), (UINT16)VREG_S( 3, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 3, 0), (UINT16)VREG_S( 3, 1), (UINT16)VREG_S( 3, 2), (UINT16)VREG_S( 3, 3), (UINT16)VREG_S( 3, 4), (UINT16)VREG_S( 3, 5), (UINT16)VREG_S( 3, 6), (UINT16)VREG_S( 3, 7));
break;
case RSP_V4:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 4, 0), (UINT16)VREG_S( 4, 1), (UINT16)VREG_S( 4, 2), (UINT16)VREG_S( 4, 3), (UINT16)VREG_S( 4, 4), (UINT16)VREG_S( 4, 5), (UINT16)VREG_S( 4, 6), (UINT16)VREG_S( 4, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 4, 0), (UINT16)VREG_S( 4, 1), (UINT16)VREG_S( 4, 2), (UINT16)VREG_S( 4, 3), (UINT16)VREG_S( 4, 4), (UINT16)VREG_S( 4, 5), (UINT16)VREG_S( 4, 6), (UINT16)VREG_S( 4, 7));
break;
case RSP_V5:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 5, 0), (UINT16)VREG_S( 5, 1), (UINT16)VREG_S( 5, 2), (UINT16)VREG_S( 5, 3), (UINT16)VREG_S( 5, 4), (UINT16)VREG_S( 5, 5), (UINT16)VREG_S( 5, 6), (UINT16)VREG_S( 5, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 5, 0), (UINT16)VREG_S( 5, 1), (UINT16)VREG_S( 5, 2), (UINT16)VREG_S( 5, 3), (UINT16)VREG_S( 5, 4), (UINT16)VREG_S( 5, 5), (UINT16)VREG_S( 5, 6), (UINT16)VREG_S( 5, 7));
break;
case RSP_V6:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 6, 0), (UINT16)VREG_S( 6, 1), (UINT16)VREG_S( 6, 2), (UINT16)VREG_S( 6, 3), (UINT16)VREG_S( 6, 4), (UINT16)VREG_S( 6, 5), (UINT16)VREG_S( 6, 6), (UINT16)VREG_S( 6, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 6, 0), (UINT16)VREG_S( 6, 1), (UINT16)VREG_S( 6, 2), (UINT16)VREG_S( 6, 3), (UINT16)VREG_S( 6, 4), (UINT16)VREG_S( 6, 5), (UINT16)VREG_S( 6, 6), (UINT16)VREG_S( 6, 7));
break;
case RSP_V7:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 7, 0), (UINT16)VREG_S( 7, 1), (UINT16)VREG_S( 7, 2), (UINT16)VREG_S( 7, 3), (UINT16)VREG_S( 7, 4), (UINT16)VREG_S( 7, 5), (UINT16)VREG_S( 7, 6), (UINT16)VREG_S( 7, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 7, 0), (UINT16)VREG_S( 7, 1), (UINT16)VREG_S( 7, 2), (UINT16)VREG_S( 7, 3), (UINT16)VREG_S( 7, 4), (UINT16)VREG_S( 7, 5), (UINT16)VREG_S( 7, 6), (UINT16)VREG_S( 7, 7));
break;
case RSP_V8:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 8, 0), (UINT16)VREG_S( 8, 1), (UINT16)VREG_S( 8, 2), (UINT16)VREG_S( 8, 3), (UINT16)VREG_S( 8, 4), (UINT16)VREG_S( 8, 5), (UINT16)VREG_S( 8, 6), (UINT16)VREG_S( 8, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 8, 0), (UINT16)VREG_S( 8, 1), (UINT16)VREG_S( 8, 2), (UINT16)VREG_S( 8, 3), (UINT16)VREG_S( 8, 4), (UINT16)VREG_S( 8, 5), (UINT16)VREG_S( 8, 6), (UINT16)VREG_S( 8, 7));
break;
case RSP_V9:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 9, 0), (UINT16)VREG_S( 9, 1), (UINT16)VREG_S( 9, 2), (UINT16)VREG_S( 9, 3), (UINT16)VREG_S( 9, 4), (UINT16)VREG_S( 9, 5), (UINT16)VREG_S( 9, 6), (UINT16)VREG_S( 9, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S( 9, 0), (UINT16)VREG_S( 9, 1), (UINT16)VREG_S( 9, 2), (UINT16)VREG_S( 9, 3), (UINT16)VREG_S( 9, 4), (UINT16)VREG_S( 9, 5), (UINT16)VREG_S( 9, 6), (UINT16)VREG_S( 9, 7));
break;
case RSP_V10:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(10, 0), (UINT16)VREG_S(10, 1), (UINT16)VREG_S(10, 2), (UINT16)VREG_S(10, 3), (UINT16)VREG_S(10, 4), (UINT16)VREG_S(10, 5), (UINT16)VREG_S(10, 6), (UINT16)VREG_S(10, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(10, 0), (UINT16)VREG_S(10, 1), (UINT16)VREG_S(10, 2), (UINT16)VREG_S(10, 3), (UINT16)VREG_S(10, 4), (UINT16)VREG_S(10, 5), (UINT16)VREG_S(10, 6), (UINT16)VREG_S(10, 7));
break;
case RSP_V11:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(11, 0), (UINT16)VREG_S(11, 1), (UINT16)VREG_S(11, 2), (UINT16)VREG_S(11, 3), (UINT16)VREG_S(11, 4), (UINT16)VREG_S(11, 5), (UINT16)VREG_S(11, 6), (UINT16)VREG_S(11, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(11, 0), (UINT16)VREG_S(11, 1), (UINT16)VREG_S(11, 2), (UINT16)VREG_S(11, 3), (UINT16)VREG_S(11, 4), (UINT16)VREG_S(11, 5), (UINT16)VREG_S(11, 6), (UINT16)VREG_S(11, 7));
break;
case RSP_V12:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(12, 0), (UINT16)VREG_S(12, 1), (UINT16)VREG_S(12, 2), (UINT16)VREG_S(12, 3), (UINT16)VREG_S(12, 4), (UINT16)VREG_S(12, 5), (UINT16)VREG_S(12, 6), (UINT16)VREG_S(12, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(12, 0), (UINT16)VREG_S(12, 1), (UINT16)VREG_S(12, 2), (UINT16)VREG_S(12, 3), (UINT16)VREG_S(12, 4), (UINT16)VREG_S(12, 5), (UINT16)VREG_S(12, 6), (UINT16)VREG_S(12, 7));
break;
case RSP_V13:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(13, 0), (UINT16)VREG_S(13, 1), (UINT16)VREG_S(13, 2), (UINT16)VREG_S(13, 3), (UINT16)VREG_S(13, 4), (UINT16)VREG_S(13, 5), (UINT16)VREG_S(13, 6), (UINT16)VREG_S(13, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(13, 0), (UINT16)VREG_S(13, 1), (UINT16)VREG_S(13, 2), (UINT16)VREG_S(13, 3), (UINT16)VREG_S(13, 4), (UINT16)VREG_S(13, 5), (UINT16)VREG_S(13, 6), (UINT16)VREG_S(13, 7));
break;
case RSP_V14:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(14, 0), (UINT16)VREG_S(14, 1), (UINT16)VREG_S(14, 2), (UINT16)VREG_S(14, 3), (UINT16)VREG_S(14, 4), (UINT16)VREG_S(14, 5), (UINT16)VREG_S(14, 6), (UINT16)VREG_S(14, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(14, 0), (UINT16)VREG_S(14, 1), (UINT16)VREG_S(14, 2), (UINT16)VREG_S(14, 3), (UINT16)VREG_S(14, 4), (UINT16)VREG_S(14, 5), (UINT16)VREG_S(14, 6), (UINT16)VREG_S(14, 7));
break;
case RSP_V15:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(15, 0), (UINT16)VREG_S(15, 1), (UINT16)VREG_S(15, 2), (UINT16)VREG_S(15, 3), (UINT16)VREG_S(15, 4), (UINT16)VREG_S(15, 5), (UINT16)VREG_S(15, 6), (UINT16)VREG_S(15, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(15, 0), (UINT16)VREG_S(15, 1), (UINT16)VREG_S(15, 2), (UINT16)VREG_S(15, 3), (UINT16)VREG_S(15, 4), (UINT16)VREG_S(15, 5), (UINT16)VREG_S(15, 6), (UINT16)VREG_S(15, 7));
break;
case RSP_V16:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(16, 0), (UINT16)VREG_S(16, 1), (UINT16)VREG_S(16, 2), (UINT16)VREG_S(16, 3), (UINT16)VREG_S(16, 4), (UINT16)VREG_S(16, 5), (UINT16)VREG_S(16, 6), (UINT16)VREG_S(16, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(16, 0), (UINT16)VREG_S(16, 1), (UINT16)VREG_S(16, 2), (UINT16)VREG_S(16, 3), (UINT16)VREG_S(16, 4), (UINT16)VREG_S(16, 5), (UINT16)VREG_S(16, 6), (UINT16)VREG_S(16, 7));
break;
case RSP_V17:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(17, 0), (UINT16)VREG_S(17, 1), (UINT16)VREG_S(17, 2), (UINT16)VREG_S(17, 3), (UINT16)VREG_S(17, 4), (UINT16)VREG_S(17, 5), (UINT16)VREG_S(17, 6), (UINT16)VREG_S(17, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(17, 0), (UINT16)VREG_S(17, 1), (UINT16)VREG_S(17, 2), (UINT16)VREG_S(17, 3), (UINT16)VREG_S(17, 4), (UINT16)VREG_S(17, 5), (UINT16)VREG_S(17, 6), (UINT16)VREG_S(17, 7));
break;
case RSP_V18:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(18, 0), (UINT16)VREG_S(18, 1), (UINT16)VREG_S(18, 2), (UINT16)VREG_S(18, 3), (UINT16)VREG_S(18, 4), (UINT16)VREG_S(18, 5), (UINT16)VREG_S(18, 6), (UINT16)VREG_S(18, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(18, 0), (UINT16)VREG_S(18, 1), (UINT16)VREG_S(18, 2), (UINT16)VREG_S(18, 3), (UINT16)VREG_S(18, 4), (UINT16)VREG_S(18, 5), (UINT16)VREG_S(18, 6), (UINT16)VREG_S(18, 7));
break;
case RSP_V19:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(19, 0), (UINT16)VREG_S(19, 1), (UINT16)VREG_S(19, 2), (UINT16)VREG_S(19, 3), (UINT16)VREG_S(19, 4), (UINT16)VREG_S(19, 5), (UINT16)VREG_S(19, 6), (UINT16)VREG_S(19, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(19, 0), (UINT16)VREG_S(19, 1), (UINT16)VREG_S(19, 2), (UINT16)VREG_S(19, 3), (UINT16)VREG_S(19, 4), (UINT16)VREG_S(19, 5), (UINT16)VREG_S(19, 6), (UINT16)VREG_S(19, 7));
break;
case RSP_V20:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(20, 0), (UINT16)VREG_S(20, 1), (UINT16)VREG_S(20, 2), (UINT16)VREG_S(20, 3), (UINT16)VREG_S(20, 4), (UINT16)VREG_S(20, 5), (UINT16)VREG_S(20, 6), (UINT16)VREG_S(20, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(20, 0), (UINT16)VREG_S(20, 1), (UINT16)VREG_S(20, 2), (UINT16)VREG_S(20, 3), (UINT16)VREG_S(20, 4), (UINT16)VREG_S(20, 5), (UINT16)VREG_S(20, 6), (UINT16)VREG_S(20, 7));
break;
case RSP_V21:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(21, 0), (UINT16)VREG_S(21, 1), (UINT16)VREG_S(21, 2), (UINT16)VREG_S(21, 3), (UINT16)VREG_S(21, 4), (UINT16)VREG_S(21, 5), (UINT16)VREG_S(21, 6), (UINT16)VREG_S(21, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(21, 0), (UINT16)VREG_S(21, 1), (UINT16)VREG_S(21, 2), (UINT16)VREG_S(21, 3), (UINT16)VREG_S(21, 4), (UINT16)VREG_S(21, 5), (UINT16)VREG_S(21, 6), (UINT16)VREG_S(21, 7));
break;
case RSP_V22:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(22, 0), (UINT16)VREG_S(22, 1), (UINT16)VREG_S(22, 2), (UINT16)VREG_S(22, 3), (UINT16)VREG_S(22, 4), (UINT16)VREG_S(22, 5), (UINT16)VREG_S(22, 6), (UINT16)VREG_S(22, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(22, 0), (UINT16)VREG_S(22, 1), (UINT16)VREG_S(22, 2), (UINT16)VREG_S(22, 3), (UINT16)VREG_S(22, 4), (UINT16)VREG_S(22, 5), (UINT16)VREG_S(22, 6), (UINT16)VREG_S(22, 7));
break;
case RSP_V23:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(23, 0), (UINT16)VREG_S(23, 1), (UINT16)VREG_S(23, 2), (UINT16)VREG_S(23, 3), (UINT16)VREG_S(23, 4), (UINT16)VREG_S(23, 5), (UINT16)VREG_S(23, 6), (UINT16)VREG_S(23, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(23, 0), (UINT16)VREG_S(23, 1), (UINT16)VREG_S(23, 2), (UINT16)VREG_S(23, 3), (UINT16)VREG_S(23, 4), (UINT16)VREG_S(23, 5), (UINT16)VREG_S(23, 6), (UINT16)VREG_S(23, 7));
break;
case RSP_V24:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(24, 0), (UINT16)VREG_S(24, 1), (UINT16)VREG_S(24, 2), (UINT16)VREG_S(24, 3), (UINT16)VREG_S(24, 4), (UINT16)VREG_S(24, 5), (UINT16)VREG_S(24, 6), (UINT16)VREG_S(24, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(24, 0), (UINT16)VREG_S(24, 1), (UINT16)VREG_S(24, 2), (UINT16)VREG_S(24, 3), (UINT16)VREG_S(24, 4), (UINT16)VREG_S(24, 5), (UINT16)VREG_S(24, 6), (UINT16)VREG_S(24, 7));
break;
case RSP_V25:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(25, 0), (UINT16)VREG_S(25, 1), (UINT16)VREG_S(25, 2), (UINT16)VREG_S(25, 3), (UINT16)VREG_S(25, 4), (UINT16)VREG_S(25, 5), (UINT16)VREG_S(25, 6), (UINT16)VREG_S(25, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(25, 0), (UINT16)VREG_S(25, 1), (UINT16)VREG_S(25, 2), (UINT16)VREG_S(25, 3), (UINT16)VREG_S(25, 4), (UINT16)VREG_S(25, 5), (UINT16)VREG_S(25, 6), (UINT16)VREG_S(25, 7));
break;
case RSP_V26:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(26, 0), (UINT16)VREG_S(26, 1), (UINT16)VREG_S(26, 2), (UINT16)VREG_S(26, 3), (UINT16)VREG_S(26, 4), (UINT16)VREG_S(26, 5), (UINT16)VREG_S(26, 6), (UINT16)VREG_S(26, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(26, 0), (UINT16)VREG_S(26, 1), (UINT16)VREG_S(26, 2), (UINT16)VREG_S(26, 3), (UINT16)VREG_S(26, 4), (UINT16)VREG_S(26, 5), (UINT16)VREG_S(26, 6), (UINT16)VREG_S(26, 7));
break;
case RSP_V27:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(27, 0), (UINT16)VREG_S(27, 1), (UINT16)VREG_S(27, 2), (UINT16)VREG_S(27, 3), (UINT16)VREG_S(27, 4), (UINT16)VREG_S(27, 5), (UINT16)VREG_S(27, 6), (UINT16)VREG_S(27, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(27, 0), (UINT16)VREG_S(27, 1), (UINT16)VREG_S(27, 2), (UINT16)VREG_S(27, 3), (UINT16)VREG_S(27, 4), (UINT16)VREG_S(27, 5), (UINT16)VREG_S(27, 6), (UINT16)VREG_S(27, 7));
break;
case RSP_V28:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(28, 0), (UINT16)VREG_S(28, 1), (UINT16)VREG_S(28, 2), (UINT16)VREG_S(28, 3), (UINT16)VREG_S(28, 4), (UINT16)VREG_S(28, 5), (UINT16)VREG_S(28, 6), (UINT16)VREG_S(28, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(28, 0), (UINT16)VREG_S(28, 1), (UINT16)VREG_S(28, 2), (UINT16)VREG_S(28, 3), (UINT16)VREG_S(28, 4), (UINT16)VREG_S(28, 5), (UINT16)VREG_S(28, 6), (UINT16)VREG_S(28, 7));
break;
case RSP_V29:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(29, 0), (UINT16)VREG_S(29, 1), (UINT16)VREG_S(29, 2), (UINT16)VREG_S(29, 3), (UINT16)VREG_S(29, 4), (UINT16)VREG_S(29, 5), (UINT16)VREG_S(29, 6), (UINT16)VREG_S(29, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(29, 0), (UINT16)VREG_S(29, 1), (UINT16)VREG_S(29, 2), (UINT16)VREG_S(29, 3), (UINT16)VREG_S(29, 4), (UINT16)VREG_S(29, 5), (UINT16)VREG_S(29, 6), (UINT16)VREG_S(29, 7));
break;
case RSP_V30:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(30, 0), (UINT16)VREG_S(30, 1), (UINT16)VREG_S(30, 2), (UINT16)VREG_S(30, 3), (UINT16)VREG_S(30, 4), (UINT16)VREG_S(30, 5), (UINT16)VREG_S(30, 6), (UINT16)VREG_S(30, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(30, 0), (UINT16)VREG_S(30, 1), (UINT16)VREG_S(30, 2), (UINT16)VREG_S(30, 3), (UINT16)VREG_S(30, 4), (UINT16)VREG_S(30, 5), (UINT16)VREG_S(30, 6), (UINT16)VREG_S(30, 7));
break;
case RSP_V31:
strprintf(str, "%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(31, 0), (UINT16)VREG_S(31, 1), (UINT16)VREG_S(31, 2), (UINT16)VREG_S(31, 3), (UINT16)VREG_S(31, 4), (UINT16)VREG_S(31, 5), (UINT16)VREG_S(31, 6), (UINT16)VREG_S(31, 7));
str = string_format("%04X|%04X|%04X|%04X|%04X|%04X|%04X|%04X", (UINT16)VREG_S(31, 0), (UINT16)VREG_S(31, 1), (UINT16)VREG_S(31, 2), (UINT16)VREG_S(31, 3), (UINT16)VREG_S(31, 4), (UINT16)VREG_S(31, 5), (UINT16)VREG_S(31, 6), (UINT16)VREG_S(31, 7));
break;
}
}

2
src/devices/cpu/s2650/s2650.cpp
View File

@ -881,7 +881,7 @@ void s2650_device::state_string_export(const device_state_entry &entry, std::str
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_psu & 0x80 ? 'S':'.',
m_psu & 0x40 ? 'O':'.',
m_psu & 0x20 ? 'I':'.',

22
src/devices/cpu/saturn/saturn.cpp
View File

@ -177,47 +177,47 @@ void saturn_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case SATURN_A:
strprintf(str, Reg64Format, Reg64Data(m_reg[A]) );
str = string_format( Reg64Format, Reg64Data(m_reg[A]) );
break;
case SATURN_B:
strprintf(str, Reg64Format, Reg64Data(m_reg[B]) );
str = string_format( Reg64Format, Reg64Data(m_reg[B]) );
break;
case SATURN_C:
strprintf(str, Reg64Format, Reg64Data(m_reg[C]) );
str = string_format( Reg64Format, Reg64Data(m_reg[C]) );
break;
case SATURN_D:
strprintf(str, Reg64Format, Reg64Data(m_reg[D]) );
str = string_format( Reg64Format, Reg64Data(m_reg[D]) );
break;
case SATURN_R0:
strprintf(str, Reg64Format, Reg64Data(m_reg[R0]) );
str = string_format( Reg64Format, Reg64Data(m_reg[R0]) );
break;
case SATURN_R1:
strprintf(str, Reg64Format, Reg64Data(m_reg[R1]) );
str = string_format( Reg64Format, Reg64Data(m_reg[R1]) );
break;
case SATURN_R2:
strprintf(str, Reg64Format, Reg64Data(m_reg[R2]) );
str = string_format( Reg64Format, Reg64Data(m_reg[R2]) );
break;
case SATURN_R3:
strprintf(str, Reg64Format, Reg64Data(m_reg[R3]) );
str = string_format( Reg64Format, Reg64Data(m_reg[R3]) );
break;
case SATURN_R4:
strprintf(str, Reg64Format, Reg64Data(m_reg[R4]) );
str = string_format( Reg64Format, Reg64Data(m_reg[R4]) );
break;
case SATURN_IRQ_STATE:
strprintf(str, "%c%c%c%i", m_in_irq?'S':'.', m_irq_enable?'e':'.', m_pending_irq?'p':'.', m_irq_state );
str = string_format( "%c%c%c%i", m_in_irq?'S':'.', m_irq_enable?'e':'.', m_pending_irq?'p':'.', m_irq_state );
break;
case STATE_GENFLAGS:
strprintf(str, "%c%c", m_decimal?'D':'.', m_carry ? 'C':'.' );
str = string_format( "%c%c", m_decimal?'D':'.', m_carry ? 'C':'.' );
break;
}
}

2
src/devices/cpu/sc61860/sc61860.cpp
View File

@ -176,7 +176,7 @@ void sc61860_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c", m_zero ? 'Z' : '.', m_carry ? 'C' : '.');
str = string_format("%c%c", m_zero ? 'Z' : '.', m_carry ? 'C' : '.');
break;
}
}

2
src/devices/cpu/scmp/scmp.cpp
View File

@ -552,7 +552,7 @@ void scmp_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_SR & 0x80) ? 'C' : '.',
(m_SR & 0x40) ? 'V' : '.',
(m_SR & 0x20) ? 'B' : '.',

8
src/devices/cpu/score/score.cpp
View File

@ -81,13 +81,13 @@ void score7_cpu_device::device_start()
state_add(SCORE_PC , "PC" , m_pc).callimport().callexport().formatstr("%08X");
for(int i=0; i<0x20; i++)
state_add(SCORE_GPR + i, strformat("r%d", i).c_str(), m_gpr[i]).callimport().callexport().formatstr("%08X");
state_add(SCORE_GPR + i, string_format("r%d", i).c_str(), m_gpr[i]).callimport().callexport().formatstr("%08X");
for(int i=0; i<0x20; i++)
state_add(SCORE_CR + i, strformat("cr%d", i).c_str(), m_cr[i]).callimport().callexport().formatstr("%08X");
state_add(SCORE_CR + i, string_format("cr%d", i).c_str(), m_cr[i]).callimport().callexport().formatstr("%08X");
for(int i=0; i<3; i++)
state_add(SCORE_SR + i, strformat("sr%d", i).c_str(), m_sr[i]).callimport().callexport().formatstr("%08X");
state_add(SCORE_SR + i, string_format("sr%d", i).c_str(), m_sr[i]).callimport().callexport().formatstr("%08X");
state_add(SCORE_CEH, "ceh", REG_CEH).callimport().callexport().formatstr("%08X");
state_add(SCORE_CEL, "cel", REG_CEL).callimport().callexport().formatstr("%08X");
@ -135,7 +135,7 @@ void score7_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s%s%s%s%s",
str = string_format("%s%s%s%s%s",
REG_CR & FLAG_V ? "V" : ".",
REG_CR & FLAG_C ? "C" : ".",
REG_CR & FLAG_Z ? "Z" : ".",

2
src/devices/cpu/scudsp/scudsp.cpp
View File

@ -1015,7 +1015,7 @@ void scudsp_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s%s%s%c%c%c%c%c%s%s%s",
str = string_format("%s%s%s%c%c%c%c%c%s%s%s",
m_flags & 0x4000000 ? "PR":"..",
m_flags & 0x2000000 ? "EP":"..",
m_flags & 0x800000 ? "T0":"..",

2
src/devices/cpu/se3208/se3208.cpp
View File

@ -1814,7 +1814,7 @@ void se3208_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c %c%c%c%c%c",
str = string_format("%c%c%c%c %c%c%c%c%c",
m_SR&FLAG_C?'C':'.',
m_SR&FLAG_V?'V':'.',
m_SR&FLAG_S?'S':'.',

2
src/devices/cpu/sh2/sh2.cpp
View File

@ -2588,7 +2588,7 @@ void sh2_device::state_string_export(const device_state_entry &entry, std::strin
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%d%c%c",
str = string_format("%c%c%d%c%c",
m_sh2_state->sr & M ? 'M':'.',
m_sh2_state->sr & Q ? 'Q':'.',
(m_sh2_state->sr & I) >> 4,

66
src/devices/cpu/sh4/sh4.cpp
View File

@ -4458,7 +4458,7 @@ void sh34_base_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%s%s%s%s%c%c%d%c%c",
str = string_format("%s%s%s%s%c%c%d%c%c",
m_sr & MD ? "MD ":" ",
m_sr & sRB ? "RB ":" ",
m_sr & BL ? "BL ":" ",
@ -4471,131 +4471,131 @@ void sh34_base_device::state_string_export(const device_state_entry &entry, std:
break;
case SH4_FR0:
strprintf(str, "%08X %f", m_fr[0 ^ fpu_xor], (double)FP_RFS(0 ^ fpu_xor));
str = string_format("%08X %f", m_fr[0 ^ fpu_xor], (double)FP_RFS(0 ^ fpu_xor));
break;
case SH4_FR1:
strprintf(str, "%08X %f", m_fr[1 ^ fpu_xor], (double)FP_RFS(1 ^ fpu_xor));
str = string_format("%08X %f", m_fr[1 ^ fpu_xor], (double)FP_RFS(1 ^ fpu_xor));
break;
case SH4_FR2:
strprintf(str, "%08X %f", m_fr[2 ^ fpu_xor], (double)FP_RFS(2 ^ fpu_xor));
str = string_format("%08X %f", m_fr[2 ^ fpu_xor], (double)FP_RFS(2 ^ fpu_xor));
break;
case SH4_FR3:
strprintf(str, "%08X %f", m_fr[3 ^ fpu_xor], (double)FP_RFS(3 ^ fpu_xor));
str = string_format("%08X %f", m_fr[3 ^ fpu_xor], (double)FP_RFS(3 ^ fpu_xor));
break;
case SH4_FR4:
strprintf(str, "%08X %f", m_fr[4 ^ fpu_xor], (double)FP_RFS(4 ^ fpu_xor));
str = string_format("%08X %f", m_fr[4 ^ fpu_xor], (double)FP_RFS(4 ^ fpu_xor));
break;
case SH4_FR5:
strprintf(str, "%08X %f", m_fr[5 ^ fpu_xor], (double)FP_RFS(5 ^ fpu_xor));
str = string_format("%08X %f", m_fr[5 ^ fpu_xor], (double)FP_RFS(5 ^ fpu_xor));
break;
case SH4_FR6:
strprintf(str, "%08X %f", m_fr[6 ^ fpu_xor], (double)FP_RFS(6 ^ fpu_xor));
str = string_format("%08X %f", m_fr[6 ^ fpu_xor], (double)FP_RFS(6 ^ fpu_xor));
break;
case SH4_FR7:
strprintf(str, "%08X %f", m_fr[7 ^ fpu_xor], (double)FP_RFS(7 ^ fpu_xor));
str = string_format("%08X %f", m_fr[7 ^ fpu_xor], (double)FP_RFS(7 ^ fpu_xor));
break;
case SH4_FR8:
strprintf(str, "%08X %f", m_fr[8 ^ fpu_xor], (double)FP_RFS(8 ^ fpu_xor));
str = string_format("%08X %f", m_fr[8 ^ fpu_xor], (double)FP_RFS(8 ^ fpu_xor));
break;
case SH4_FR9:
strprintf(str, "%08X %f", m_fr[9 ^ fpu_xor], (double)FP_RFS(9 ^ fpu_xor));
str = string_format("%08X %f", m_fr[9 ^ fpu_xor], (double)FP_RFS(9 ^ fpu_xor));
break;
case SH4_FR10:
strprintf(str, "%08X %f", m_fr[10 ^ fpu_xor], (double)FP_RFS(10 ^ fpu_xor));
str = string_format("%08X %f", m_fr[10 ^ fpu_xor], (double)FP_RFS(10 ^ fpu_xor));
break;
case SH4_FR11:
strprintf(str, "%08X %f", m_fr[11 ^ fpu_xor], (double)FP_RFS(11 ^ fpu_xor));
str = string_format("%08X %f", m_fr[11 ^ fpu_xor], (double)FP_RFS(11 ^ fpu_xor));
break;
case SH4_FR12:
strprintf(str, "%08X %f", m_fr[12 ^ fpu_xor], (double)FP_RFS(12 ^ fpu_xor));
str = string_format("%08X %f", m_fr[12 ^ fpu_xor], (double)FP_RFS(12 ^ fpu_xor));
break;
case SH4_FR13:
strprintf(str, "%08X %f", m_fr[13 ^ fpu_xor], (double)FP_RFS(13 ^ fpu_xor));
str = string_format("%08X %f", m_fr[13 ^ fpu_xor], (double)FP_RFS(13 ^ fpu_xor));
break;
case SH4_FR14:
strprintf(str, "%08X %f", m_fr[14 ^ fpu_xor], (double)FP_RFS(14 ^ fpu_xor));
str = string_format("%08X %f", m_fr[14 ^ fpu_xor], (double)FP_RFS(14 ^ fpu_xor));
break;
case SH4_FR15:
strprintf(str, "%08X %f", m_fr[15 ^ fpu_xor], (double)FP_RFS(15 ^ fpu_xor));
str = string_format("%08X %f", m_fr[15 ^ fpu_xor], (double)FP_RFS(15 ^ fpu_xor));
break;
case SH4_XF0:
strprintf(str, "%08X %f", m_xf[0 ^ fpu_xor], (double)FP_XFS(0 ^ fpu_xor));
str = string_format("%08X %f", m_xf[0 ^ fpu_xor], (double)FP_XFS(0 ^ fpu_xor));
break;
case SH4_XF1:
strprintf(str, "%08X %f", m_xf[1 ^ fpu_xor], (double)FP_XFS(1 ^ fpu_xor));
str = string_format("%08X %f", m_xf[1 ^ fpu_xor], (double)FP_XFS(1 ^ fpu_xor));
break;
case SH4_XF2:
strprintf(str, "%08X %f", m_xf[2 ^ fpu_xor], (double)FP_XFS(2 ^ fpu_xor));
str = string_format("%08X %f", m_xf[2 ^ fpu_xor], (double)FP_XFS(2 ^ fpu_xor));
break;
case SH4_XF3:
strprintf(str, "%08X %f", m_xf[3 ^ fpu_xor], (double)FP_XFS(3 ^ fpu_xor));
str = string_format("%08X %f", m_xf[3 ^ fpu_xor], (double)FP_XFS(3 ^ fpu_xor));
break;
case SH4_XF4:
strprintf(str, "%08X %f", m_xf[4 ^ fpu_xor], (double)FP_XFS(4 ^ fpu_xor));
str = string_format("%08X %f", m_xf[4 ^ fpu_xor], (double)FP_XFS(4 ^ fpu_xor));
break;
case SH4_XF5:
strprintf(str, "%08X %f", m_xf[5 ^ fpu_xor], (double)FP_XFS(5 ^ fpu_xor));
str = string_format("%08X %f", m_xf[5 ^ fpu_xor], (double)FP_XFS(5 ^ fpu_xor));
break;
case SH4_XF6:
strprintf(str, "%08X %f", m_xf[6 ^ fpu_xor], (double)FP_XFS(6 ^ fpu_xor));
str = string_format("%08X %f", m_xf[6 ^ fpu_xor], (double)FP_XFS(6 ^ fpu_xor));
break;
case SH4_XF7:
strprintf(str, "%08X %f", m_xf[7 ^ fpu_xor], (double)FP_XFS(7 ^ fpu_xor));
str = string_format("%08X %f", m_xf[7 ^ fpu_xor], (double)FP_XFS(7 ^ fpu_xor));
break;
case SH4_XF8:
strprintf(str, "%08X %f", m_xf[8 ^ fpu_xor], (double)FP_XFS(8 ^ fpu_xor));
str = string_format("%08X %f", m_xf[8 ^ fpu_xor], (double)FP_XFS(8 ^ fpu_xor));
break;
case SH4_XF9:
strprintf(str, "%08X %f", m_xf[9 ^ fpu_xor], (double)FP_XFS(9 ^ fpu_xor));
str = string_format("%08X %f", m_xf[9 ^ fpu_xor], (double)FP_XFS(9 ^ fpu_xor));
break;
case SH4_XF10:
strprintf(str, "%08X %f", m_xf[10 ^ fpu_xor], (double)FP_XFS(10 ^ fpu_xor));
str = string_format("%08X %f", m_xf[10 ^ fpu_xor], (double)FP_XFS(10 ^ fpu_xor));
break;
case SH4_XF11:
strprintf(str, "%08X %f", m_xf[11 ^ fpu_xor], (double)FP_XFS(11 ^ fpu_xor));
str = string_format("%08X %f", m_xf[11 ^ fpu_xor], (double)FP_XFS(11 ^ fpu_xor));
break;
case SH4_XF12:
strprintf(str, "%08X %f", m_xf[12 ^ fpu_xor], (double)FP_XFS(12 ^ fpu_xor));
str = string_format("%08X %f", m_xf[12 ^ fpu_xor], (double)FP_XFS(12 ^ fpu_xor));
break;
case SH4_XF13:
strprintf(str, "%08X %f", m_xf[13 ^ fpu_xor], (double)FP_XFS(13 ^ fpu_xor));
str = string_format("%08X %f", m_xf[13 ^ fpu_xor], (double)FP_XFS(13 ^ fpu_xor));
break;
case SH4_XF14:
strprintf(str, "%08X %f", m_xf[14 ^ fpu_xor], (double)FP_XFS(14 ^ fpu_xor));
str = string_format("%08X %f", m_xf[14 ^ fpu_xor], (double)FP_XFS(14 ^ fpu_xor));
break;
case SH4_XF15:
strprintf(str, "%08X %f", m_xf[15 ^ fpu_xor], (double)FP_XFS(15 ^ fpu_xor));
str = string_format("%08X %f", m_xf[15 ^ fpu_xor], (double)FP_XFS(15 ^ fpu_xor));
break;
}

20
src/devices/cpu/sm8500/sm8500.cpp
View File

@ -146,43 +146,43 @@ void sm8500_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case SM8500_PS:
strprintf(str, "%04X", ( m_PS0 << 8 ) | m_PS1 );
str = string_format("%04X", ( m_PS0 << 8 ) | m_PS1 );
break;
case SM8500_RR0:
strprintf(str, "%04X", mem_readword( 0x00 ) );
str = string_format("%04X", mem_readword( 0x00 ) );
break;
case SM8500_RR2:
strprintf(str, "%04X", mem_readword( 0x02 ) );
str = string_format("%04X", mem_readword( 0x02 ) );
break;
case SM8500_RR4:
strprintf(str, "%04X", mem_readword( 0x04 ) );
str = string_format("%04X", mem_readword( 0x04 ) );
break;
case SM8500_RR6:
strprintf(str, "%04X", mem_readword( 0x06 ) );
str = string_format("%04X", mem_readword( 0x06 ) );
break;
case SM8500_RR8:
strprintf(str, "%04X", mem_readword( 0x08 ) );
str = string_format("%04X", mem_readword( 0x08 ) );
break;
case SM8500_RR10:
strprintf(str, "%04X", mem_readword( 0x0a ) );
str = string_format("%04X", mem_readword( 0x0a ) );
break;
case SM8500_RR12:
strprintf(str, "%04X", mem_readword( 0x0c ) );
str = string_format("%04X", mem_readword( 0x0c ) );
break;
case SM8500_RR14:
strprintf(str, "%04X", mem_readword( 0x0e ) );
str = string_format("%04X", mem_readword( 0x0e ) );
break;
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_PS1 & FLAG_C ? 'C' : '.',
m_PS1 & FLAG_Z ? 'Z' : '.',
m_PS1 & FLAG_S ? 'S' : '.',

2
src/devices/cpu/spc700/spc700.cpp
View File

@ -1249,7 +1249,7 @@ void spc700_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(m_flag_n & 0x80) ? 'N':'.',
((m_flag_v & 0x80) >> 1) ? 'V':'.',
(m_flag_p>>3) ? 'P':'.',

2
src/devices/cpu/ssem/ssem.cpp
View File

@ -154,7 +154,7 @@ void ssem_device::state_string_export(const device_state_entry &entry, std::stri
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c", m_halt ? 'H' : '.');
str = string_format("%c", m_halt ? 'H' : '.');
break;
}
}

7
src/devices/cpu/ssp1601/ssp1601.cpp
View File

@ -552,8 +552,11 @@ void ssp1601_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c", (rST&SSP_FLAG_N) ? 'N' : '.', (rST&SSP_FLAG_V) ? 'V' : '.',
(rST&SSP_FLAG_Z)?'Z':'.', (rST&SSP_FLAG_L)?'L':'.'
str = string_format("%c%c%c%c",
(rST&SSP_FLAG_N) ? 'N' : '.',
(rST&SSP_FLAG_V) ? 'V' : '.',
(rST&SSP_FLAG_Z) ? 'Z' : '.',
(rST&SSP_FLAG_L) ? 'L' : '.'
);
break;
}

4
src/devices/cpu/t11/t11.cpp
View File

@ -296,7 +296,7 @@ void t11_device::state_string_export(const device_state_entry &entry, std::strin
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_psw.b.l & 0x80 ? '?':'.',
m_psw.b.l & 0x40 ? 'I':'.',
m_psw.b.l & 0x20 ? 'I':'.',
@ -315,7 +315,7 @@ void k1801vm2_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c",
m_psw.b.l & 0x100 ? 'H':'.',
m_psw.b.l & 0x80 ? 'P':'.',
m_psw.b.l & 0x40 ? '?':'.',

2
src/devices/cpu/tlcs90/tlcs90.cpp
View File

@ -2771,7 +2771,7 @@ void tlcs90_device::state_string_export(const device_state_entry &entry, std::st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
F & 0x80 ? 'S':'.',
F & 0x40 ? 'Z':'.',
F & 0x20 ? 'I':'.',

2
src/devices/cpu/tlcs900/tlcs900.cpp
View File

@ -389,7 +389,7 @@ void tlcs900h_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%d%c%d%c%c%c%c%c%c%c%c",
str = string_format("%c%d%c%d%c%c%c%c%c%c%c%c",
m_sr.w.l & 0x8000 ? 'S' : 'U',
( m_sr.w.l & 0x7000 ) >> 12,
m_sr.w.l & 0x0800 ? 'M' : 'N',

2
src/devices/cpu/tms0980/tms0980.cpp
View File

@ -480,7 +480,7 @@ void tms1xxx_cpu_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENPC:
strprintf(str, "%03X", m_rom_address << ((m_byte_bits > 8) ? 1 : 0));
str = string_format("%03X", m_rom_address << ((m_byte_bits > 8) ? 1 : 0));
break;
}
}

2
src/devices/cpu/tms32010/tms32010.cpp
View File

@ -900,7 +900,7 @@ void tms32010_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_STR & 0x8000 ? 'O':'.',
m_STR & 0x4000 ? 'M':'.',
m_STR & 0x2000 ? 'I':'.',

2
src/devices/cpu/tms32025/tms32025.cpp
View File

@ -1806,7 +1806,7 @@ void tms32025_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "arp%d%c%c%c%cdp%03x arb%d%c%c%c%c%c%c%c%c%c%c%cpm%d",
str = string_format("arp%d%c%c%c%cdp%03x arb%d%c%c%c%c%c%c%c%c%c%c%cpm%d",
(m_STR0 & 0xe000) >> 13,
m_STR0 & 0x1000 ? 'O':'.',
m_STR0 & 0x0800 ? 'M':'.',

4
src/devices/cpu/tms32031/tms32031.cpp
View File

@ -541,12 +541,12 @@ void tms3203x_device::state_string_export(const device_state_entry &entry, std::
case TMS3203X_R5F:
case TMS3203X_R6F:
case TMS3203X_R7F:
strprintf(str, "%12g", m_r[TMR_R0 + (entry.index() - TMS3203X_R0F)].as_double());
str = string_format("%12g", m_r[TMR_R0 + (entry.index() - TMS3203X_R0F)].as_double());
break;
case STATE_GENFLAGS:
UINT32 temp = m_r[TMR_ST].i32[0];
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
(temp & 0x80) ? 'O':'.',
(temp & 0x40) ? 'U':'.',
(temp & 0x20) ? 'V':'.',

4
src/devices/cpu/tms32082/tms32082.cpp
View File

@ -219,7 +219,7 @@ void tms32082_mp_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "?");
str = "?";
break;
}
}
@ -516,7 +516,7 @@ void tms32082_pp_device::state_string_export(const device_state_entry &entry, st
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "?");
str = "?";
break;
}
}

6
src/devices/cpu/tms34010/tms34010.cpp
View File

@ -594,11 +594,11 @@ void tms340x0_device::device_start()
for (int regnum = 0; regnum < 15; regnum++)
{
state_add(TMS34010_A0 + regnum, strformat("A%d", regnum).c_str(), m_regs[regnum].reg);
state_add(TMS34010_A0 + regnum, string_format("A%d", regnum).c_str(), m_regs[regnum].reg);
}
for (int regnum = 0; regnum < 15; regnum++)
{
state_add(TMS34010_B0 + regnum, strformat("B%d", regnum).c_str(), m_regs[30 - regnum].reg);
state_add(TMS34010_B0 + regnum, string_format("B%d", regnum).c_str(), m_regs[30 - regnum].reg);
}
}
@ -1603,7 +1603,7 @@ void tms340x0_device::state_string_export(const device_state_entry &entry, std::
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
m_st & 0x80000000 ? 'N':'.',
m_st & 0x40000000 ? 'C':'.',
m_st & 0x20000000 ? 'Z':'.',

2
src/devices/cpu/tms7000/tms7000.cpp
View File

@ -262,7 +262,7 @@ void tms7000_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
strprintf(str, "%c%c%c%c%c%c%c%c",
str = string_format("%c%c%c%c%c%c%c%c",
m_sr & 0x80 ? 'C':'c',
m_sr & 0x40 ? 'N':'n',
m_sr & 0x20 ? 'Z':'z',

Some files were not shown because too many files have changed in this diff Show More