Previous 199869 Revisions Next

r37138 Sunday 12th April, 2015 at 14:54:10 UTC by Miodrag Milanović
string -> str rename due to future conflicts (nw)
[src/emu]cheat.c cheat.h clifront.c distate.c distate.h input.c input.h ioport.c ioport.h sound.c sound.h validity.c validity.h video.c video.h
[src/emu/cpu]uml.h
[src/emu/cpu/8x300]8x300.c 8x300.h
[src/emu/cpu/adsp2100]adsp2100.c adsp2100.h
[src/emu/cpu/alph8201]alph8201.c alph8201.h
[src/emu/cpu/alto2]alto2cpu.c alto2cpu.h
[src/emu/cpu/am29000]am29000.c am29000.h
[src/emu/cpu/amis2000]amis2000.c amis2000.h
[src/emu/cpu/apexc]apexc.c apexc.h
[src/emu/cpu/arm]arm.c arm.h
[src/emu/cpu/arm7]arm7.c arm7.h
[src/emu/cpu/asap]asap.c asap.h
[src/emu/cpu/avr8]avr8.c avr8.h
[src/emu/cpu/ccpu]ccpu.c ccpu.h
[src/emu/cpu/cop400]cop400.c cop400.h
[src/emu/cpu/cosmac]cosmac.c cosmac.h
[src/emu/cpu/cp1610]cp1610.c cp1610.h
[src/emu/cpu/cubeqcpu]cubeqcpu.c cubeqcpu.h
[src/emu/cpu/dsp16]dsp16.c dsp16.h
[src/emu/cpu/dsp32]dsp32.c dsp32.h
[src/emu/cpu/dsp56k]dsp56k.c dsp56k.h
[src/emu/cpu/e132xs]e132xs.c e132xs.h
[src/emu/cpu/esrip]esrip.c esrip.h
[src/emu/cpu/f8]f8.c f8.h
[src/emu/cpu/g65816]g65816.c g65816.h
[src/emu/cpu/h6280]h6280.c h6280.h
[src/emu/cpu/h8]h8.c h8.h
[src/emu/cpu/hcd62121]hcd62121.c hcd62121.h
[src/emu/cpu/hd61700]hd61700.c hd61700.h
[src/emu/cpu/hmcs40]hmcs40.c hmcs40.h
[src/emu/cpu/i386]i386.c i386.h
[src/emu/cpu/i4004]i4004.c i4004.h
[src/emu/cpu/i8008]i8008.c i8008.h
[src/emu/cpu/i8085]i8085.c i8085.h
[src/emu/cpu/i8089]i8089.c i8089.h
[src/emu/cpu/i86]i286.c i286.h i86.c i86.h
[src/emu/cpu/i960]i960.c i960.h
[src/emu/cpu/ie15]ie15.c ie15.h
[src/emu/cpu/jaguar]jaguar.c jaguar.h
[src/emu/cpu/lc8670]lc8670.c lc8670.h
[src/emu/cpu/lh5801]lh5801.c lh5801.h
[src/emu/cpu/lr35902]lr35902.c lr35902.h
[src/emu/cpu/m37710]m37710.c m37710.h
[src/emu/cpu/m6502]m6502.c m6502.h m65ce02.c m65ce02.h m740.c m740.h
[src/emu/cpu/m6800]m6800.c m6800.h
[src/emu/cpu/m68000]m68000.h m68kcpu.c
[src/emu/cpu/m6805]m6805.c m6805.h
[src/emu/cpu/m6809]m6809.c m6809.h
[src/emu/cpu/mb86233]mb86233.c mb86233.h
[src/emu/cpu/mb86235]mb86235.c mb86235.h
[src/emu/cpu/mb88xx]mb88xx.c mb88xx.h
[src/emu/cpu/mc68hc11]mc68hc11.c mc68hc11.h
[src/emu/cpu/mcs48]mcs48.c mcs48.h
[src/emu/cpu/mcs51]mcs51.c mcs51.h
[src/emu/cpu/mcs96]mcs96.c mcs96.h
[src/emu/cpu/minx]minx.c minx.h
[src/emu/cpu/mips]mips3.c mips3.h r3000.c r3000.h
[src/emu/cpu/mn10200]mn10200.c mn10200.h
[src/emu/cpu/nec]nec.c nec.h v25.c v25.h
[src/emu/cpu/pdp1]pdp1.c pdp1.h
[src/emu/cpu/pic16c5x]pic16c5x.c pic16c5x.h
[src/emu/cpu/pic16c62x]pic16c62x.c pic16c62x.h
[src/emu/cpu/powerpc]ppc.h ppccom.c
[src/emu/cpu/pps4]pps4.c pps4.h
[src/emu/cpu/psx]psx.c psx.h
[src/emu/cpu/rsp]rsp.c rsp.h rspcp2.c rspcp2.h rspcp2d.c rspcp2d.h rspcp2s.c rspcp2s.h
[src/emu/cpu/s2650]s2650.c s2650.h
[src/emu/cpu/saturn]saturn.c saturn.h
[src/emu/cpu/sc61860]sc61860.c sc61860.h
[src/emu/cpu/scmp]scmp.c scmp.h
[src/emu/cpu/score]score.c score.h
[src/emu/cpu/scudsp]scudsp.c scudsp.h
[src/emu/cpu/se3208]se3208.c se3208.h
[src/emu/cpu/sh2]sh2.c sh2.h
[src/emu/cpu/sh4]sh4.c sh4.h
[src/emu/cpu/sm8500]sm8500.c sm8500.h
[src/emu/cpu/spc700]spc700.c spc700.h
[src/emu/cpu/ssem]ssem.c ssem.h
[src/emu/cpu/ssp1601]ssp1601.c ssp1601.h
[src/emu/cpu/t11]t11.c t11.h
[src/emu/cpu/tlcs90]tlcs90.c tlcs90.h
[src/emu/cpu/tlcs900]tlcs900.c tlcs900.h
[src/emu/cpu/tms0980]tms0980.c tms0980.h
[src/emu/cpu/tms32010]tms32010.c tms32010.h
[src/emu/cpu/tms32025]tms32025.c tms32025.h
[src/emu/cpu/tms32031]tms32031.c tms32031.h
[src/emu/cpu/tms32082]tms32082.c tms32082.h
[src/emu/cpu/tms34010]tms34010.c tms34010.h
[src/emu/cpu/tms7000]tms7000.c tms7000.h
[src/emu/cpu/tms9900]tms9900.c tms9900.h tms9995.c tms9995.h
[src/emu/cpu/ucom4]ucom4.c ucom4.h
[src/emu/cpu/upd7725]upd7725.c upd7725.h
[src/emu/cpu/upd7810]upd7810.c upd7810.h
[src/emu/cpu/v30mz]v30mz.c v30mz.h
[src/emu/cpu/v810]v810.c v810.h
[src/emu/cpu/z180]z180.c z180.h
[src/emu/cpu/z8]z8.c z8.h
[src/emu/cpu/z80]z80.c z80.h
[src/emu/cpu/z8000]z8000.c z8000.h
[src/emu/machine]netlist.h
[src/emu/ui]devopt.c info.c ui.c ui.h
[src/mame/etc]template_cpu.c template_cpu.h
[src/tools]chdman.c

trunk/src/emu/cheat.c
r245649r245650
101101//  the format
102102//-------------------------------------------------
103103
104inline const char *number_and_format::format(astring &string) const
104inline const char *number_and_format::format(astring &str) const
105105{
106106   switch (m_format)
107107   {
108108      default:
109109      case XML_INT_FORMAT_DECIMAL:
110         string.printf("%d", (UINT32)m_value);
110         str.printf("%d", (UINT32)m_value);
111111         break;
112112
113113      case XML_INT_FORMAT_DECIMAL_POUND:
114         string.printf("#%d", (UINT32)m_value);
114         str.printf("#%d", (UINT32)m_value);
115115         break;
116116
117117      case XML_INT_FORMAT_HEX_DOLLAR:
118         string.printf("$%X", (UINT32)m_value);
118         str.printf("$%X", (UINT32)m_value);
119119         break;
120120
121121      case XML_INT_FORMAT_HEX_C:
122         string.printf("0x%X", (UINT32)m_value);
122         str.printf("0x%X", (UINT32)m_value);
123123         break;
124124   }
125   return string.c_str();
125   return str.c_str();
126126}
127127
128128
r245649r245650
205205   cheatfile.printf("\t\t<parameter");
206206
207207   // if no items, just output min/max/step
208   astring string;
208   astring str;
209209   if (!has_itemlist())
210210   {
211211      if (m_minval != 0)
212         cheatfile.printf(" min=\"%s\"", m_minval.format(string));
212         cheatfile.printf(" min=\"%s\"", m_minval.format(str));
213213      if (m_maxval != 0)
214         cheatfile.printf(" max=\"%s\"", m_maxval.format(string));
214         cheatfile.printf(" max=\"%s\"", m_maxval.format(str));
215215      if (m_stepval != 1)
216         cheatfile.printf(" step=\"%s\"", m_stepval.format(string));
216         cheatfile.printf(" step=\"%s\"", m_stepval.format(str));
217217      cheatfile.printf("/>\n");
218218   }
219219
r245649r245650
221221   else
222222   {
223223      for (const item *curitem = m_itemlist.first(); curitem != NULL; curitem = curitem->next())
224         cheatfile.printf("\t\t\t<item value=\"%s\">%s</item>\n", curitem->value().format(string), curitem->text());
224         cheatfile.printf("\t\t\t<item value=\"%s\">%s</item>\n", curitem->value().format(str), curitem->text());
225225      cheatfile.printf("\t\t</parameter>\n");
226226   }
227227}
r245649r245650
12631263//  document
12641264//-------------------------------------------------
12651265
1266const char *cheat_manager::quote_expression(astring &string, const parsed_expression &expression)
1266const char *cheat_manager::quote_expression(astring &str, const parsed_expression &expression)
12671267{
1268   string.cpy(expression.original_string());
1268   str.cpy(expression.original_string());
12691269
1270   string.replace(0, " && ", " and ");
1271   string.replace(0, " &&", " and ");
1272   string.replace(0, "&& ", " and ");
1273   string.replace(0, "&&", " and ");
1270   str.replace(0, " && ", " and ");
1271   str.replace(0, " &&", " and ");
1272   str.replace(0, "&& ", " and ");
1273   str.replace(0, "&&", " and ");
12741274
1275   string.replace(0, " & ", " band ");
1276   string.replace(0, " &", " band ");
1277   string.replace(0, "& ", " band ");
1278   string.replace(0, "&", " band ");
1275   str.replace(0, " & ", " band ");
1276   str.replace(0, " &", " band ");
1277   str.replace(0, "& ", " band ");
1278   str.replace(0, "&", " band ");
12791279
1280   string.replace(0, " <= ", " le ");
1281   string.replace(0, " <=", " le ");
1282   string.replace(0, "<= ", " le ");
1283   string.replace(0, "<=", " le ");
1280   str.replace(0, " <= ", " le ");
1281   str.replace(0, " <=", " le ");
1282   str.replace(0, "<= ", " le ");
1283   str.replace(0, "<=", " le ");
12841284
1285   string.replace(0, " < ", " lt ");
1286   string.replace(0, " <", " lt ");
1287   string.replace(0, "< ", " lt ");
1288   string.replace(0, "<", " lt ");
1285   str.replace(0, " < ", " lt ");
1286   str.replace(0, " <", " lt ");
1287   str.replace(0, "< ", " lt ");
1288   str.replace(0, "<", " lt ");
12891289
1290   string.replace(0, " << ", " lshift ");
1291   string.replace(0, " <<", " lshift ");
1292   string.replace(0, "<< ", " lshift ");
1293   string.replace(0, "<<", " lshift ");
1290   str.replace(0, " << ", " lshift ");
1291   str.replace(0, " <<", " lshift ");
1292   str.replace(0, "<< ", " lshift ");
1293   str.replace(0, "<<", " lshift ");
12941294
1295   return string.c_str();
1295   return str.c_str();
12961296}
12971297
12981298
trunk/src/emu/cheat.h
r245649r245650
5656   operator const UINT64 &() const { return m_value; }
5757
5858   // format the number according to its format
59   const char *format(astring &string) const;
59   const char *format(astring &str) const;
6060
6161private:
6262   // internal state
r245649r245650
308308   astring &get_output_astring(int row, int justify);
309309
310310   // global helpers
311   static const char *quote_expression(astring &string, const parsed_expression &expression);
311   static const char *quote_expression(astring &str, const parsed_expression &expression);
312312   static UINT64 execute_frombcd(symbol_table &table, void *ref, int params, const UINT64 *param);
313313   static UINT64 execute_tobcd(symbol_table &table, void *ref, int params, const UINT64 *param);
314314
trunk/src/emu/clifront.c
r245649r245650
225225   // handle exceptions of various types
226226   catch (emu_fatalerror &fatal)
227227   {
228      astring string(fatal.string());
229      osd_printf_error("%s\n", string.trimspace().c_str());
228      astring str(fatal.string());
229      osd_printf_error("%s\n", str.trimspace().c_str());
230230      m_result = (fatal.exitcode() != 0) ? fatal.exitcode() : MAMERR_FATALERROR;
231231
232232      // if a game was specified, wasn't a wildcard, and our error indicates this was the
trunk/src/emu/cpu/8x300/8x300.c
r245649r245650
143143   m_icountptr = &m_icount;
144144}
145145
146void n8x300_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
146void n8x300_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
147147{
148148   switch (entry.index())
149149   {
trunk/src/emu/cpu/8x300/8x300.h
r245649r245650
6464   }
6565
6666   // device_state_interface overrides
67   void state_string_export(const device_state_entry &entry, astring &string);
67   void state_string_export(const device_state_entry &entry, astring &str);
6868
6969   // device_disasm_interface overrides
7070   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/adsp2100/adsp2100.c
r245649r245650
720720//  for the debugger
721721//-------------------------------------------------
722722
723void adsp21xx_device::state_string_export(const device_state_entry &entry, astring &string)
723void adsp21xx_device::state_string_export(const device_state_entry &entry, astring &str)
724724{
725725   switch (entry.index())
726726   {
727727      case STATE_GENFLAGS:
728         string.printf("%c%c%c%c%c%c%c%c",
728         str.printf("%c%c%c%c%c%c%c%c",
729729            m_astat & 0x80 ? 'X':'.',
730730            m_astat & 0x40 ? 'M':'.',
731731            m_astat & 0x20 ? 'Q':'.',
trunk/src/emu/cpu/adsp2100/adsp2100.h
r245649r245650
237237
238238   // device_state_interface overrides
239239   virtual void state_import(const device_state_entry &entry);
240   virtual void state_string_export(const device_state_entry &entry, astring &string);
240   virtual void state_string_export(const device_state_entry &entry, astring &str);
241241
242242   // device_disasm_interface overrides
243243   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/alph8201/alph8201.c
r245649r245650
513513}
514514
515515
516void alpha8201_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
516void alpha8201_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
517517{
518518   switch (entry.index())
519519   {
520520      case STATE_GENFLAGS:
521         string.printf("%c%c", m_cf?'C':'.', m_zf?'Z':'.');
521         str.printf("%c%c", m_cf ? 'C' : '.', m_zf ? 'Z' : '.');
522522         break;
523523   }
524524}
trunk/src/emu/cpu/alph8201/alph8201.h
r245649r245650
6161   // device_state_interface overrides
6262   virtual void state_import(const device_state_entry &entry);
6363   virtual void state_export(const device_state_entry &entry);
64   void state_string_export(const device_state_entry &entry, astring &string);
64   void state_string_export(const device_state_entry &entry, astring &str);
6565
6666   // device_disasm_interface overrides
6767   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/alto2/alto2cpu.c
r245649r245650
10041004//  for the debugger
10051005//-------------------------------------------------
10061006
1007void alto2_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1007void alto2_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
10081008{
10091009   switch (entry.index())
10101010   {
10111011   case A2_TASK:
1012      string.printf("%s", task_name(m_task));
1012      str.printf("%s", task_name(m_task));
10131013      break;
10141014   case STATE_GENFLAGS:
1015      string.printf("%s%s%s%s",
1015      str.printf("%s%s%s%s",
10161016                  m_aluc0 ? "C":"-",
10171017                  m_laluc0 ? "c":"-",
10181018                  m_shifter == 0 ? "0":"-",
trunk/src/emu/cpu/alto2/alto2cpu.h
r245649r245650
215215   //! device (P)ROMs
216216   virtual const rom_entry *device_rom_region() const;
217217   //! device_state_interface overrides
218   void state_string_export(const device_state_entry &entry, astring &string);
218   void state_string_export(const device_state_entry &entry, astring &str);
219219
220220   //! device_disasm_interface overrides
221221   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/am29000/am29000.c
r245649r245650
402402}
403403
404404
405void am29000_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
405void am29000_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
406406{
407407   switch (entry.index())
408408   {
409409      case STATE_GENFLAGS:
410         string.printf("%c%c%c%c%c%c%c%c%c|%3d", m_alu & ALU_V ? 'V' : '.',
410         str.printf("%c%c%c%c%c%c%c%c%c|%3d", m_alu & ALU_V ? 'V' : '.',
411411                                       m_alu & ALU_Z ? 'Z' : '.',
412412                                       m_alu & ALU_N ? 'N' : '.',
413413                                       m_alu & ALU_C ? 'C' : '.',
trunk/src/emu/cpu/am29000/am29000.h
r245649r245650
460460   }
461461
462462   // device_state_interface overrides
463   void state_string_export(const device_state_entry &entry, astring &string);
463   void state_string_export(const device_state_entry &entry, astring &str);
464464
465465   // device_disasm_interface overrides
466466   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/amis2000/amis2000.c
r245649r245650
7272
7373
7474// disasm
75void amis2000_base_device::state_string_export(const device_state_entry &entry, astring &string)
75void amis2000_base_device::state_string_export(const device_state_entry &entry, astring &str)
7676{
7777   switch (entry.index())
7878   {
7979      case STATE_GENFLAGS:
80         string.printf("%c%c%c%c%c%c",
80         str.printf("%c%c%c%c%c%c",
8181            m_f & 0x20 ? '6':'.',
8282            m_f & 0x10 ? '5':'.',
8383            m_f & 0x08 ? '4':'.',
trunk/src/emu/cpu/amis2000/amis2000.h
r245649r245650
8989   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
9090   virtual UINT32 disasm_max_opcode_bytes() const { return 1; }
9191   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
92   void state_string_export(const device_state_entry &entry, astring &string);
92   void state_string_export(const device_state_entry &entry, astring &str);
9393
9494   address_space_config m_program_config;
9595   address_space_config m_data_config;
trunk/src/emu/cpu/apexc/apexc.c
r245649r245650
812812}
813813
814814
815void apexc_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
815void apexc_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
816816{
817817   switch (entry.index())
818818   {
819819      case STATE_GENFLAGS:
820         string.printf("%c", m_running ? 'R' : 'S' );
820         str.printf("%c", m_running ? 'R' : 'S');
821821         break;
822822   }
823823}
trunk/src/emu/cpu/apexc/apexc.h
r245649r245650
4242   // device_state_interface overrides
4343   virtual void state_import(const device_state_entry &entry);
4444   virtual void state_export(const device_state_entry &entry);
45   void state_string_export(const device_state_entry &entry, astring &string);
45   void state_string_export(const device_state_entry &entry, astring &str);
4646
4747   // device_disasm_interface overrides
4848   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/arm/arm.c
r245649r245650
550550}
551551
552552
553void arm_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
553void arm_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
554554{
555555   static const char *s[4] = { "USER", "FIRQ", "IRQ ", "SVC " };
556556
557557   switch (entry.index())
558558   {
559559      case STATE_GENFLAGS:
560         string.printf("%c%c%c%c%c%c %s",
560         str.printf("%c%c%c%c%c%c %s",
561561            (m_sArmRegister[15] & N_MASK) ? 'N' : '-',
562562            (m_sArmRegister[15] & Z_MASK) ? 'Z' : '-',
563563            (m_sArmRegister[15] & C_MASK) ? 'C' : '-',
trunk/src/emu/cpu/arm/arm.h
r245649r245650
5959   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
6060
6161   // device_state_interface overrides
62   void state_string_export(const device_state_entry &entry, astring &string);
62   void state_string_export(const device_state_entry &entry, astring &str);
6363
6464   // device_disasm_interface overrides
6565   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/arm7/arm7.c
r245649r245650
574574}
575575
576576
577void arm7_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
577void arm7_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
578578{
579579   switch (entry.index())
580580   {
581581      case STATE_GENFLAGS:
582         string.printf("%c%c%c%c%c%c%c%c %s",
582         str.printf("%c%c%c%c%c%c%c%c %s",
583583            (ARM7REG(eCPSR) & N_MASK) ? 'N' : '-',
584584            (ARM7REG(eCPSR) & Z_MASK) ? 'Z' : '-',
585585            (ARM7REG(eCPSR) & C_MASK) ? 'C' : '-',
trunk/src/emu/cpu/arm7/arm7.h
r245649r245650
9797
9898   // device_state_interface overrides
9999   virtual void state_export(const device_state_entry &entry);
100   void state_string_export(const device_state_entry &entry, astring &string);
100   void state_string_export(const device_state_entry &entry, astring &str);
101101
102102   // device_disasm_interface overrides
103103   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/asap/asap.c
r245649r245650
281281//  for the debugger
282282//-------------------------------------------------
283283
284void asap_device::state_string_export(const device_state_entry &entry, astring &string)
284void asap_device::state_string_export(const device_state_entry &entry, astring &str)
285285{
286286   switch (entry.index())
287287   {
288288      case STATE_GENFLAGS:
289         string.printf("%c%c%c%c%c%c",
289         str.printf("%c%c%c%c%c%c",
290290                     m_pflag ? 'P' : '.',
291291                     m_iflag ? 'I' : '.',
292292                     ((INT32)m_znflag < 0) ? 'N' : '.',
trunk/src/emu/cpu/asap/asap.h
r245649r245650
4848   // device_state_interface overrides
4949   virtual void state_import(const device_state_entry &entry);
5050   virtual void state_export(const device_state_entry &entry);
51   virtual void state_string_export(const device_state_entry &entry, astring &string);
51   virtual void state_string_export(const device_state_entry &entry, astring &str);
5252
5353   // device_disasm_interface overrides
5454   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/avr8/avr8.c
r245649r245650
902902//  for the debugger
903903//-------------------------------------------------
904904
905void avr8_device::state_string_export(const device_state_entry &entry, astring &string)
905void avr8_device::state_string_export(const device_state_entry &entry, astring &str)
906906{
907907   switch (entry.index())
908908   {
909909      case STATE_GENFLAGS:
910         string.printf("%c%c%c%c%c%c%c%c",
910         str.printf("%c%c%c%c%c%c%c%c",
911911            (m_r[AVR8_REGIDX_SREG] & 0x80) ? 'I' : '-',
912912            (m_r[AVR8_REGIDX_SREG] & 0x40) ? 'T' : '-',
913913            (m_r[AVR8_REGIDX_SREG] & 0x20) ? 'H' : '-',
trunk/src/emu/cpu/avr8/avr8.h
r245649r245650
132132   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
133133
134134   // device_state_interface overrides
135   virtual void state_string_export(const device_state_entry &entry, astring &string);
135   virtual void state_string_export(const device_state_entry &entry, astring &str);
136136
137137   // address spaces
138138   const address_space_config m_program_config;
trunk/src/emu/cpu/ccpu/ccpu.c
r245649r245650
139139}
140140
141141
142void ccpu_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
142void ccpu_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
143143{
144144   switch (entry.index())
145145   {
146146      case STATE_GENFLAGS:
147         string.printf("%c%c%c%c%c%c",
147         str.printf("%c%c%c%c%c%c",
148148               TEST_A0 ? '0' : 'o',
149149               TEST_NC ? 'N' : 'n',
150150               TEST_LT ? 'L' : 'l',
trunk/src/emu/cpu/ccpu/ccpu.h
r245649r245650
8282   }
8383
8484   // device_state_interface overrides
85   void state_string_export(const device_state_entry &entry, astring &string);
85   void state_string_export(const device_state_entry &entry, astring &str);
8686
8787   // device_disasm_interface overrides
8888   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/cop400/cop400.c
r245649r245650
12391239   }
12401240}
12411241
1242void cop400_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1242void cop400_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
12431243{
12441244   switch (entry.index())
12451245   {
12461246      case STATE_GENFLAGS:
1247         string.printf("%c%c%c",
1247         str.printf("%c%c%c",
12481248                     m_c ? 'C' : '.',
12491249                     m_skl ? 'S' : '.',
12501250                     m_skt_latch ? 'T' : '.');
trunk/src/emu/cpu/cop400/cop400.h
r245649r245650
139139   // device_state_interface overrides
140140   virtual void state_import(const device_state_entry &entry);
141141   virtual void state_export(const device_state_entry &entry);
142   void state_string_export(const device_state_entry &entry, astring &string);
142   void state_string_export(const device_state_entry &entry, astring &str);
143143
144144   // device_disasm_interface overrides
145145   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/cosmac/cosmac.c
r245649r245650
472472//  for the debugger
473473//-------------------------------------------------
474474
475void cosmac_device::state_string_export(const device_state_entry &entry, astring &string)
475void cosmac_device::state_string_export(const device_state_entry &entry, astring &str)
476476{
477477   switch (entry.index())
478478   {
479479      case STATE_GENFLAGS:
480         string.printf("%c%c%c",
480         str.printf("%c%c%c",
481481                     m_df ? 'D' : '.',
482482                     m_ie ? 'I' : '.',
483483                     m_q  ? 'Q' : '.');
trunk/src/emu/cpu/cosmac/cosmac.h
r245649r245650
235235   // device_state_interface overrides
236236   virtual void state_import(const device_state_entry &entry);
237237   virtual void state_export(const device_state_entry &entry);
238   virtual void state_string_export(const device_state_entry &entry, astring &string);
238   virtual void state_string_export(const device_state_entry &entry, astring &str);
239239
240240   // device_disasm_interface overrides
241241   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/cp1610/cp1610.c
r245649r245650
34273427}
34283428
34293429
3430void cp1610_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
3430void cp1610_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
34313431{
34323432   switch (entry.index())
34333433   {
34343434      case STATE_GENFLAGS:
3435         string.printf("%c%c%c%c",
3435         str.printf("%c%c%c%c",
34363436            m_flags & 0x80 ? 'S':'.',
34373437            m_flags & 0x40 ? 'Z':'.',
34383438            m_flags & 0x20 ? 'V':'.',
trunk/src/emu/cpu/cp1610/cp1610.h
r245649r245650
6464   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
6565
6666   // device_state_interface overrides
67   void state_string_export(const device_state_entry &entry, astring &string);
67   void state_string_export(const device_state_entry &entry, astring &str);
6868
6969   // device_disasm_interface overrides
7070   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/cubeqcpu/cubeqcpu.c
r245649r245650
345345}
346346
347347
348void cquestrot_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
348void cquestrot_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
349349{
350350   switch (entry.index())
351351   {
352352      case STATE_GENFLAGS:
353         string.printf( "%c%c%c", m_cflag ? 'C' : '.',
353         str.printf("%c%c%c", m_cflag ? 'C' : '.',
354354                              m_vflag ? 'V' : '.',
355355                              m_f ? '.' : 'Z');
356356         break;
r245649r245650
469469}
470470
471471
472void cquestlin_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
472void cquestlin_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
473473{
474474   switch (entry.index())
475475   {
476476      case STATE_GENFLAGS:
477         string.printf( "%c%c%c|%cG", m_cflag ? 'C' : '.',
477         str.printf("%c%c%c|%cG", m_cflag ? 'C' : '.',
478478                                 m_vflag ? 'V' : '.',
479479                                 m_f ? '.' : 'Z',
480480                                 ( m_clkcnt & 3 ) ? 'B' : 'F');
trunk/src/emu/cpu/cubeqcpu/cubeqcpu.h
r245649r245650
230230   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
231231
232232   // device_state_interface overrides
233   void state_string_export(const device_state_entry &entry, astring &string);
233   void state_string_export(const device_state_entry &entry, astring &str);
234234
235235   // device_disasm_interface overrides
236236   virtual UINT32 disasm_min_opcode_bytes() const { return 8; }
r245649r245650
314314   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
315315
316316   // device_state_interface overrides
317   void state_string_export(const device_state_entry &entry, astring &string);
317   void state_string_export(const device_state_entry &entry, astring &str);
318318
319319   // device_disasm_interface overrides
320320   virtual UINT32 disasm_min_opcode_bytes() const { return 8; }
trunk/src/emu/cpu/dsp16/dsp16.c
r245649r245650
212212//  for the debugger
213213//-------------------------------------------------
214214
215void dsp16_device::state_string_export(const device_state_entry &entry, astring &string)
215void dsp16_device::state_string_export(const device_state_entry &entry, astring &str)
216216{
217217   switch (entry.index())
218218   {
219219      case STATE_GENFLAGS:
220      string.printf("(below)");
220         str.printf("(below)");
221221         break;
222222
223223      case DSP16_AUC:
r245649r245650
231231            case 0x02: alignString.printf("x4"); break;
232232            case 0x03: alignString.printf(",,"); break;
233233         }
234         string.printf("%c%c%c%c%c%s",
234         str.printf("%c%c%c%c%c%s",
235235                     m_auc & 0x40 ? 'Y':'.',
236236                     m_auc & 0x20 ? '1':'.',
237237                     m_auc & 0x10 ? '0':'.',
r245649r245650
242242      }
243243
244244      case DSP16_PSW:
245         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
245         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
246246                     m_psw & 0x8000 ? 'M':'.',
247247                     m_psw & 0x4000 ? 'E':'.',
248248                     m_psw & 0x2000 ? 'L':'.',
r245649r245650
272272            case 0x02: strobeString.printf("3T"); break;
273273            case 0x03: strobeString.printf("4T"); break;
274274         }
275         string.printf("%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
275         str.printf("%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
276276                     m_pioc & 0x8000 ? 'I':'.',
277277                     strobeString.c_str(),
278278                     m_pioc & 0x1000 ? 'O':'I',
r245649r245650
303303            case 0x02: clkString.printf("16"); break;
304304            case 0x03: clkString.printf("20"); break;
305305         }
306         string.printf("%c%s%c%c%c%c%c%c%c",
306         str.printf("%c%s%c%c%c%c%c%c%c",
307307                     m_sioc & 0x0200 ? 'I':'O',
308308                     clkString.c_str(),
309309                     m_sioc & 0x0040 ? 'L':'M',
trunk/src/emu/cpu/dsp16/dsp16.h
r245649r245650
4444   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
4545
4646   // device_state_interface overrides
47   virtual void state_string_export(const device_state_entry &entry, astring &string);
47   virtual void state_string_export(const device_state_entry &entry, astring &str);
4848
4949   // device_disasm_interface overrides
5050   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/dsp32/dsp32.c
r245649r245650
369369//  for the debugger
370370//-------------------------------------------------
371371
372void dsp32c_device::state_string_export(const device_state_entry &entry, astring &string)
372void dsp32c_device::state_string_export(const device_state_entry &entry, astring &str)
373373{
374374   switch (entry.index())
375375   {
376376      case STATE_GENFLAGS:
377         string.printf("%c%c%c%c%c%c%c%c",
377         str.printf("%c%c%c%c%c%c%c%c",
378378            NFLAG ? 'N':'.',
379379            ZFLAG ? 'Z':'.',
380380            UFLAG ? 'U':'.',
r245649r245650
389389      case DSP32_A1:
390390      case DSP32_A2:
391391      case DSP32_A3:
392         string.printf("%8g", *(double *)entry.dataptr());
392         str.printf("%8g", *(double *)entry.dataptr());
393393         break;
394394   }
395395}
trunk/src/emu/cpu/dsp32/dsp32.h
r245649r245650
123123   // device_state_interface overrides
124124   virtual void state_import(const device_state_entry &entry);
125125   virtual void state_export(const device_state_entry &entry);
126   virtual void state_string_export(const device_state_entry &entry, astring &string);
126   virtual void state_string_export(const device_state_entry &entry, astring &str);
127127
128128   // device_disasm_interface overrides
129129   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/dsp56k/dsp56k.c
r245649r245650
357357}
358358
359359
360void dsp56k_device::state_string_export(const device_state_entry &entry, astring &string)
360void dsp56k_device::state_string_export(const device_state_entry &entry, astring &str)
361361{
362362   dsp56k_core *cpustate = &m_dsp56k_core;
363363
364364   switch (entry.index())
365365   {
366366      case STATE_GENFLAGS:
367         string.printf("%s%s %s%s%s%s%s%s%s%s %s%s",
367         str.printf("%s%s %s%s%s%s%s%s%s%s %s%s",
368368            /* Status Register */
369369            LF_bit(cpustate) ? "L" : ".",
370370            FV_bit(cpustate) ? "F" : ".",
r245649r245650
384384         break;
385385
386386      case DSP56K_X:
387         string.printf("%04x %04x", X1, X0);
387         str.printf("%04x %04x", X1, X0);
388388         break;
389389
390390      case DSP56K_Y:
391         string.printf("%04x %04x", Y1, Y0);
391         str.printf("%04x %04x", Y1, Y0);
392392         break;
393393
394394      case DSP56K_A:
395         string.printf("%02x %04x %04x", A2,A1,A0);
395         str.printf("%02x %04x %04x", A2, A1, A0);
396396         break;
397397
398398      case DSP56K_B:
399         string.printf("%02x %04x %04x", B2,B1,B0);
399         str.printf("%02x %04x %04x", B2, B1, B0);
400400         break;
401401   }
402402}
trunk/src/emu/cpu/dsp56k/dsp56k.h
r245649r245650
232232   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : NULL ); }
233233
234234   // device_state_interface overrides
235   void state_string_export(const device_state_entry &entry, astring &string);
235   void state_string_export(const device_state_entry &entry, astring &str);
236236
237237   // device_disasm_interface overrides
238238   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/e132xs/e132xs.c
r245649r245650
18471847//  for the debugger
18481848//-------------------------------------------------
18491849
1850void hyperstone_device::state_string_export(const device_state_entry &entry, astring &string)
1850void hyperstone_device::state_string_export(const device_state_entry &entry, astring &str)
18511851{
18521852   switch (entry.index())
18531853   {
18541854      case STATE_GENFLAGS:
1855         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c FTE:%X FRM:%X ILC:%d FL:%d FP:%d",
1855         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c FTE:%X FRM:%X ILC:%d FL:%d FP:%d",
18561856            GET_S ? 'S':'.',
18571857            GET_P ? 'P':'.',
18581858            GET_T ? 'T':'.',
trunk/src/emu/cpu/e132xs/e132xs.h
r245649r245650
241241   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
242242
243243   // device_state_interface overrides
244   virtual void state_string_export(const device_state_entry &entry, astring &string);
244   virtual void state_string_export(const device_state_entry &entry, astring &str);
245245
246246   // address spaces
247247   const address_space_config m_program_config;
trunk/src/emu/cpu/esrip/esrip.c
r245649r245650
349349//  for the debugger
350350//-------------------------------------------------
351351
352void esrip_device::state_string_export(const device_state_entry &entry, astring &string)
352void esrip_device::state_string_export(const device_state_entry &entry, astring &str)
353353{
354354   switch (entry.index())
355355   {
356356      case STATE_GENFLAGS:
357         string.printf("%c%c%c%c%c%c%c%c%c",
357         str.printf("%c%c%c%c%c%c%c%c%c",
358358            (m_status & 0x80) ? '3' : '.',
359359            (m_status & 0x40) ? '2' : '.',
360360            (m_status & 0x20) ? '1' : '.',
trunk/src/emu/cpu/esrip/esrip.h
r245649r245650
150150   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
151151
152152   // device_state_interface overrides
153   virtual void state_string_export(const device_state_entry &entry, astring &string);
153   virtual void state_string_export(const device_state_entry &entry, astring &str);
154154
155155   // address spaces
156156   const address_space_config m_program_config;
trunk/src/emu/cpu/f8/f8.c
r245649r245650
20572057}
20582058
20592059
2060void f8_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
2060void f8_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
20612061{
20622062   switch (entry.index())
20632063   {
20642064      case STATE_GENFLAGS:
2065         string.printf("%c%c%c%c%c",
2065         str.printf("%c%c%c%c%c",
20662066                     m_w & 0x10 ? 'I':'.',
20672067                     m_w & 0x08 ? 'O':'.',
20682068                     m_w & 0x04 ? 'Z':'.',
trunk/src/emu/cpu/f8/f8.h
r245649r245650
6363   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
6464
6565   // device_state_interface overrides
66   void state_string_export(const device_state_entry &entry, astring &string);
66   void state_string_export(const device_state_entry &entry, astring &str);
6767
6868   // device_disasm_interface overrides
6969   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/g65816/g65816.c
r245649r245650
955955   }
956956}
957957
958void g65816_device::state_string_export(const device_state_entry &entry, astring &string)
958void g65816_device::state_string_export(const device_state_entry &entry, astring &str)
959959{
960960   switch (entry.index())
961961   {
962962      case STATE_GENFLAGS:
963         string.printf("%c%c%c%c%c%c%c%c",
963         str.printf("%c%c%c%c%c%c%c%c",
964964            m_flag_n & NFLAG_SET ? 'N':'.',
965965            m_flag_v & VFLAG_SET ? 'V':'.',
966966            m_flag_m & MFLAG_SET ? 'M':'.',
trunk/src/emu/cpu/g65816/g65816.h
r245649r245650
8585   // device_state_interface overrides
8686   virtual void state_import(const device_state_entry &entry);
8787   virtual void state_export(const device_state_entry &entry);
88   virtual void state_string_export(const device_state_entry &entry, astring &string);
88   virtual void state_string_export(const device_state_entry &entry, astring &str);
8989
9090   // device_disasm_interface overrides
9191   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/h6280/h6280.c
r245649r245650
21892189//  for the debugger
21902190//-------------------------------------------------
21912191
2192void h6280_device::state_string_export(const device_state_entry &entry, astring &string)
2192void h6280_device::state_string_export(const device_state_entry &entry, astring &str)
21932193{
21942194   switch (entry.index())
21952195   {
21962196      case STATE_GENFLAGS:
2197         string.printf("%c%c%c%c%c%c%c%c",
2197         str.printf("%c%c%c%c%c%c%c%c",
21982198            (m_p & 0x80) ? 'N':'.',
21992199            (m_p & 0x40) ? 'V':'.',
22002200            (m_p & 0x20) ? 'R':'.',
trunk/src/emu/cpu/h6280/h6280.h
r245649r245650
9696   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
9797
9898   // device_state_interface overrides
99   virtual void state_string_export(const device_state_entry &entry, astring &string);
99   virtual void state_string_export(const device_state_entry &entry, astring &str);
100100
101101   // opcode accessors
102102   UINT8 program_read8(offs_t addr);
trunk/src/emu/cpu/h8/h8.c
r245649r245650
243243{
244244}
245245
246void h8_device::state_string_export(const device_state_entry &entry, astring &string)
246void h8_device::state_string_export(const device_state_entry &entry, astring &str)
247247{
248248   switch(entry.index()) {
249249   case STATE_GENFLAGS:
250250      if(has_exr)
251         string.printf("%c%c %c%c%c%c%c%c%c%c",
251         str.printf("%c%c %c%c%c%c%c%c%c%c",
252252                     (EXR & EXR_T) ? 'T' : '-',
253253                     '0' + (EXR & EXR_I),
254254                     (CCR & F_I)  ? 'I' : '-',
r245649r245650
260260                     (CCR & F_V)  ? 'V' : '-',
261261                     (CCR & F_C)  ? 'C' : '-');
262262      else
263         string.printf("%c%c%c%c%c%c%c%c",
263         str.printf("%c%c%c%c%c%c%c%c",
264264                     (CCR & F_I)  ? 'I' : '-',
265265                     (CCR & F_UI) ? 'u' : '-',
266266                     (CCR & F_H)  ? 'H' : '-',
r245649r245650
279279   case H8_R6:
280280   case H8_R7: {
281281      int r = entry.index() - H8_R0;
282      string.printf("%04x %04x", R[r+8], R[r]);
282      str.printf("%04x %04x", R[r + 8], R[r]);
283283      break;
284284   }
285285   }
trunk/src/emu/cpu/h8/h8.h
r245649r245650
185185   // device_state_interface overrides
186186   virtual void state_import(const device_state_entry &entry);
187187   virtual void state_export(const device_state_entry &entry);
188   virtual void state_string_export(const device_state_entry &entry, astring &string);
188   virtual void state_string_export(const device_state_entry &entry, astring &str);
189189
190190   // device_disasm_interface overrides
191191   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/hcd62121/hcd62121.c
r245649r245650
361361}
362362
363363
364void hcd62121_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
364void hcd62121_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
365365{
366366   switch (entry.index())
367367   {
368368      case STATE_GENPC:
369         string.printf("%06X", ( m_cseg << 16 ) | m_ip);
369         str.printf("%06X", (m_cseg << 16) | m_ip);
370370         break;
371371
372372      case STATE_GENFLAGS:
373         string.printf("%s-%s-%s-%c-%c",
373         str.printf("%s-%s-%s-%c-%c",
374374            m_f & _FLAG_ZH ? "ZH":"__",
375375            m_f & _FLAG_CL ? "CL":"__",
376376            m_f & _FLAG_ZL ? "ZL":"__",
r245649r245650
381381         break;
382382
383383      case HCD62121_R00:
384         string.printf("%02X%02X%02X%02X", m_reg[0x00], m_reg[0x01], m_reg[0x02], m_reg[0x03]);
384         str.printf("%02X%02X%02X%02X", m_reg[0x00], m_reg[0x01], m_reg[0x02], m_reg[0x03]);
385385         break;
386386      case HCD62121_R04:
387         string.printf("%02X%02X%02X%02X", m_reg[0x04], m_reg[0x05], m_reg[0x06], m_reg[0x07]);
387         str.printf("%02X%02X%02X%02X", m_reg[0x04], m_reg[0x05], m_reg[0x06], m_reg[0x07]);
388388         break;
389389      case HCD62121_R08:
390         string.printf("%02X%02X%02X%02X", m_reg[0x08], m_reg[0x09], m_reg[0x0A], m_reg[0x0B]);
390         str.printf("%02X%02X%02X%02X", m_reg[0x08], m_reg[0x09], m_reg[0x0A], m_reg[0x0B]);
391391         break;
392392      case HCD62121_R0C:
393         string.printf("%02X%02X%02X%02X", m_reg[0x0C], m_reg[0x0D], m_reg[0x0E], m_reg[0x0F]);
393         str.printf("%02X%02X%02X%02X", m_reg[0x0C], m_reg[0x0D], m_reg[0x0E], m_reg[0x0F]);
394394         break;
395395      case HCD62121_R10:
396         string.printf("%02X%02X%02X%02X", m_reg[0x10], m_reg[0x11], m_reg[0x12], m_reg[0x13]);
396         str.printf("%02X%02X%02X%02X", m_reg[0x10], m_reg[0x11], m_reg[0x12], m_reg[0x13]);
397397         break;
398398      case HCD62121_R14:
399         string.printf("%02X%02X%02X%02X", m_reg[0x14], m_reg[0x15], m_reg[0x16], m_reg[0x17]);
399         str.printf("%02X%02X%02X%02X", m_reg[0x14], m_reg[0x15], m_reg[0x16], m_reg[0x17]);
400400         break;
401401      case HCD62121_R18:
402         string.printf("%02X%02X%02X%02X", m_reg[0x18], m_reg[0x19], m_reg[0x1A], m_reg[0x1B]);
402         str.printf("%02X%02X%02X%02X", m_reg[0x18], m_reg[0x19], m_reg[0x1A], m_reg[0x1B]);
403403         break;
404404      case HCD62121_R1C:
405         string.printf("%02X%02X%02X%02X", m_reg[0x1C], m_reg[0x1D], m_reg[0x1E], m_reg[0x1F]);
405         str.printf("%02X%02X%02X%02X", m_reg[0x1C], m_reg[0x1D], m_reg[0x1E], m_reg[0x1F]);
406406         break;
407407      case HCD62121_R20:
408         string.printf("%02X%02X%02X%02X", m_reg[0x20], m_reg[0x21], m_reg[0x22], m_reg[0x23]);
408         str.printf("%02X%02X%02X%02X", m_reg[0x20], m_reg[0x21], m_reg[0x22], m_reg[0x23]);
409409         break;
410410      case HCD62121_R24:
411         string.printf("%02X%02X%02X%02X", m_reg[0x24], m_reg[0x25], m_reg[0x26], m_reg[0x27]);
411         str.printf("%02X%02X%02X%02X", m_reg[0x24], m_reg[0x25], m_reg[0x26], m_reg[0x27]);
412412         break;
413413      case HCD62121_R28:
414         string.printf("%02X%02X%02X%02X", m_reg[0x28], m_reg[0x29], m_reg[0x2A], m_reg[0x2B]);
414         str.printf("%02X%02X%02X%02X", m_reg[0x28], m_reg[0x29], m_reg[0x2A], m_reg[0x2B]);
415415         break;
416416      case HCD62121_R2C:
417         string.printf("%02X%02X%02X%02X", m_reg[0x2C], m_reg[0x2D], m_reg[0x2E], m_reg[0x2F]);
417         str.printf("%02X%02X%02X%02X", m_reg[0x2C], m_reg[0x2D], m_reg[0x2E], m_reg[0x2F]);
418418         break;
419419      case HCD62121_R30:
420         string.printf("%02X%02X%02X%02X", m_reg[0x30], m_reg[0x31], m_reg[0x32], m_reg[0x33]);
420         str.printf("%02X%02X%02X%02X", m_reg[0x30], m_reg[0x31], m_reg[0x32], m_reg[0x33]);
421421         break;
422422      case HCD62121_R34:
423         string.printf("%02X%02X%02X%02X", m_reg[0x34], m_reg[0x35], m_reg[0x36], m_reg[0x37]);
423         str.printf("%02X%02X%02X%02X", m_reg[0x34], m_reg[0x35], m_reg[0x36], m_reg[0x37]);
424424         break;
425425      case HCD62121_R38:
426         string.printf("%02X%02X%02X%02X", m_reg[0x38], m_reg[0x39], m_reg[0x3A], m_reg[0x3B]);
426         str.printf("%02X%02X%02X%02X", m_reg[0x38], m_reg[0x39], m_reg[0x3A], m_reg[0x3B]);
427427         break;
428428      case HCD62121_R3C:
429         string.printf("%02X%02X%02X%02X", m_reg[0x3C], m_reg[0x3D], m_reg[0x3E], m_reg[0x3F]);
429         str.printf("%02X%02X%02X%02X", m_reg[0x3C], m_reg[0x3D], m_reg[0x3E], m_reg[0x3F]);
430430         break;
431431      case HCD62121_R40:
432         string.printf("%02X%02X%02X%02X", m_reg[0x40], m_reg[0x41], m_reg[0x42], m_reg[0x43]);
432         str.printf("%02X%02X%02X%02X", m_reg[0x40], m_reg[0x41], m_reg[0x42], m_reg[0x43]);
433433         break;
434434      case HCD62121_R44:
435         string.printf("%02X%02X%02X%02X", m_reg[0x44], m_reg[0x45], m_reg[0x46], m_reg[0x47]);
435         str.printf("%02X%02X%02X%02X", m_reg[0x44], m_reg[0x45], m_reg[0x46], m_reg[0x47]);
436436         break;
437437      case HCD62121_R48:
438         string.printf("%02X%02X%02X%02X", m_reg[0x48], m_reg[0x49], m_reg[0x4A], m_reg[0x4B]);
438         str.printf("%02X%02X%02X%02X", m_reg[0x48], m_reg[0x49], m_reg[0x4A], m_reg[0x4B]);
439439         break;
440440      case HCD62121_R4C:
441         string.printf("%02X%02X%02X%02X", m_reg[0x4C], m_reg[0x4D], m_reg[0x4E], m_reg[0x4F]);
441         str.printf("%02X%02X%02X%02X", m_reg[0x4C], m_reg[0x4D], m_reg[0x4E], m_reg[0x4F]);
442442         break;
443443      case HCD62121_R50:
444         string.printf("%02X%02X%02X%02X", m_reg[0x50], m_reg[0x51], m_reg[0x52], m_reg[0x53]);
444         str.printf("%02X%02X%02X%02X", m_reg[0x50], m_reg[0x51], m_reg[0x52], m_reg[0x53]);
445445         break;
446446      case HCD62121_R54:
447         string.printf("%02X%02X%02X%02X", m_reg[0x54], m_reg[0x55], m_reg[0x56], m_reg[0x57]);
447         str.printf("%02X%02X%02X%02X", m_reg[0x54], m_reg[0x55], m_reg[0x56], m_reg[0x57]);
448448         break;
449449      case HCD62121_R58:
450         string.printf("%02X%02X%02X%02X", m_reg[0x58], m_reg[0x59], m_reg[0x5A], m_reg[0x5B]);
450         str.printf("%02X%02X%02X%02X", m_reg[0x58], m_reg[0x59], m_reg[0x5A], m_reg[0x5B]);
451451         break;
452452      case HCD62121_R5C:
453         string.printf("%02X%02X%02X%02X", m_reg[0x5C], m_reg[0x5D], m_reg[0x5E], m_reg[0x5F]);
453         str.printf("%02X%02X%02X%02X", m_reg[0x5C], m_reg[0x5D], m_reg[0x5E], m_reg[0x5F]);
454454         break;
455455      case HCD62121_R60:
456         string.printf("%02X%02X%02X%02X", m_reg[0x60], m_reg[0x61], m_reg[0x62], m_reg[0x63]);
456         str.printf("%02X%02X%02X%02X", m_reg[0x60], m_reg[0x61], m_reg[0x62], m_reg[0x63]);
457457         break;
458458      case HCD62121_R64:
459         string.printf("%02X%02X%02X%02X", m_reg[0x64], m_reg[0x65], m_reg[0x66], m_reg[0x67]);
459         str.printf("%02X%02X%02X%02X", m_reg[0x64], m_reg[0x65], m_reg[0x66], m_reg[0x67]);
460460         break;
461461      case HCD62121_R68:
462         string.printf("%02X%02X%02X%02X", m_reg[0x68], m_reg[0x69], m_reg[0x6A], m_reg[0x6B]);
462         str.printf("%02X%02X%02X%02X", m_reg[0x68], m_reg[0x69], m_reg[0x6A], m_reg[0x6B]);
463463         break;
464464      case HCD62121_R6C:
465         string.printf("%02X%02X%02X%02X", m_reg[0x6C], m_reg[0x6D], m_reg[0x6E], m_reg[0x6F]);
465         str.printf("%02X%02X%02X%02X", m_reg[0x6C], m_reg[0x6D], m_reg[0x6E], m_reg[0x6F]);
466466         break;
467467      case HCD62121_R70:
468         string.printf("%02X%02X%02X%02X", m_reg[0x70], m_reg[0x71], m_reg[0x72], m_reg[0x73]);
468         str.printf("%02X%02X%02X%02X", m_reg[0x70], m_reg[0x71], m_reg[0x72], m_reg[0x73]);
469469         break;
470470      case HCD62121_R74:
471         string.printf("%02X%02X%02X%02X", m_reg[0x74], m_reg[0x75], m_reg[0x76], m_reg[0x77]);
471         str.printf("%02X%02X%02X%02X", m_reg[0x74], m_reg[0x75], m_reg[0x76], m_reg[0x77]);
472472         break;
473473      case HCD62121_R78:
474         string.printf("%02X%02X%02X%02X", m_reg[0x78], m_reg[0x79], m_reg[0x7A], m_reg[0x7B]);
474         str.printf("%02X%02X%02X%02X", m_reg[0x78], m_reg[0x79], m_reg[0x7A], m_reg[0x7B]);
475475         break;
476476      case HCD62121_R7C:
477         string.printf("%02X%02X%02X%02X", m_reg[0x7C], m_reg[0x7D], m_reg[0x7E], m_reg[0x7F]);
477         str.printf("%02X%02X%02X%02X", m_reg[0x7C], m_reg[0x7D], m_reg[0x7E], m_reg[0x7F]);
478478         break;
479479   }
480480}
trunk/src/emu/cpu/hcd62121/hcd62121.h
r245649r245650
5252   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
5353
5454   // device_state_interface overrides
55   void state_string_export(const device_state_entry &entry, astring &string);
55   void state_string_export(const device_state_entry &entry, astring &str);
5656
5757   // device_disasm_interface overrides
5858   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/hd61700/hd61700.c
r245649r245650
271271//  for the debugger
272272//-------------------------------------------------
273273
274void hd61700_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
274void hd61700_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
275275{
276276   switch (entry.index())
277277   {
278278      case STATE_GENFLAGS:
279         string.printf("%c%c%c%c%c%c",
279         str.printf("%c%c%c%c%c%c",
280280            m_flags & FLAG_Z   ? '.' : 'Z',
281281            m_flags & FLAG_C   ? 'C' : '.',
282282            m_flags & FLAG_LZ  ? '.' : 'L',
trunk/src/emu/cpu/hd61700/hd61700.h
r245649r245650
9292
9393   // device_state_interface overrides
9494   virtual void state_import(const device_state_entry &entry);
95   void state_string_export(const device_state_entry &entry, astring &string);
95   void state_string_export(const device_state_entry &entry, astring &str);
9696
9797   // device_memory_interface overrides
9898   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
trunk/src/emu/cpu/hmcs40/hmcs40.c
r245649r245650
144144
145145
146146// disasm
147void hmcs40_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
147void hmcs40_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
148148{
149149   switch (entry.index())
150150   {
151151      case STATE_GENFLAGS:
152         string.printf("%c%c",
152         str.printf("%c%c",
153153            m_c ? 'C':'c',
154154            m_s ? 'S':'s'
155155         );
trunk/src/emu/cpu/hmcs40/hmcs40.h
r245649r245650
159159   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
160160   virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
161161   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
162   void state_string_export(const device_state_entry &entry, astring &string);
162   void state_string_export(const device_state_entry &entry, astring &str);
163163
164164   address_space_config m_program_config;
165165   address_space_config m_data_config;
trunk/src/emu/cpu/i386/i386.c
r245649r245650
34683468   }
34693469}
34703470
3471void i386_device::state_string_export(const device_state_entry &entry, astring &string)
3471void i386_device::state_string_export(const device_state_entry &entry, astring &str)
34723472{
34733473   switch (entry.index())
34743474   {
34753475      case STATE_GENFLAGS:
3476         string.printf("%08X", get_flags());
3476         str.printf("%08X", get_flags());
34773477         break;
34783478      case X87_ST0:
3479         string.printf("%f", fx80_to_double(ST(0)));
3479         str.printf("%f", fx80_to_double(ST(0)));
34803480         break;
34813481      case X87_ST1:
3482         string.printf("%f", fx80_to_double(ST(1)));
3482         str.printf("%f", fx80_to_double(ST(1)));
34833483         break;
34843484      case X87_ST2:
3485         string.printf("%f", fx80_to_double(ST(2)));
3485         str.printf("%f", fx80_to_double(ST(2)));
34863486         break;
34873487      case X87_ST3:
3488         string.printf("%f", fx80_to_double(ST(3)));
3488         str.printf("%f", fx80_to_double(ST(3)));
34893489         break;
34903490      case X87_ST4:
3491         string.printf("%f", fx80_to_double(ST(4)));
3491         str.printf("%f", fx80_to_double(ST(4)));
34923492         break;
34933493      case X87_ST5:
3494         string.printf("%f", fx80_to_double(ST(5)));
3494         str.printf("%f", fx80_to_double(ST(5)));
34953495         break;
34963496      case X87_ST6:
3497         string.printf("%f", fx80_to_double(ST(6)));
3497         str.printf("%f", fx80_to_double(ST(6)));
34983498         break;
34993499      case X87_ST7:
3500         string.printf("%f", fx80_to_double(ST(7)));
3500         str.printf("%f", fx80_to_double(ST(7)));
35013501         break;
35023502      case SSE_XMM0:
3503         string.printf("%08x%08x%08x%08x", XMM(0).d[3], XMM(0).d[2], XMM(0).d[1], XMM(0).d[0]);
3503         str.printf("%08x%08x%08x%08x", XMM(0).d[3], XMM(0).d[2], XMM(0).d[1], XMM(0).d[0]);
35043504         break;
35053505      case SSE_XMM1:
3506         string.printf("%08x%08x%08x%08x", XMM(1).d[3], XMM(1).d[2], XMM(1).d[1], XMM(1).d[0]);
3506         str.printf("%08x%08x%08x%08x", XMM(1).d[3], XMM(1).d[2], XMM(1).d[1], XMM(1).d[0]);
35073507         break;
35083508      case SSE_XMM2:
3509         string.printf("%08x%08x%08x%08x", XMM(2).d[3], XMM(2).d[2], XMM(2).d[1], XMM(2).d[0]);
3509         str.printf("%08x%08x%08x%08x", XMM(2).d[3], XMM(2).d[2], XMM(2).d[1], XMM(2).d[0]);
35103510         break;
35113511      case SSE_XMM3:
3512         string.printf("%08x%08x%08x%08x", XMM(3).d[3], XMM(3).d[2], XMM(3).d[1], XMM(3).d[0]);
3512         str.printf("%08x%08x%08x%08x", XMM(3).d[3], XMM(3).d[2], XMM(3).d[1], XMM(3).d[0]);
35133513         break;
35143514      case SSE_XMM4:
3515         string.printf("%08x%08x%08x%08x", XMM(4).d[3], XMM(4).d[2], XMM(4).d[1], XMM(4).d[0]);
3515         str.printf("%08x%08x%08x%08x", XMM(4).d[3], XMM(4).d[2], XMM(4).d[1], XMM(4).d[0]);
35163516         break;
35173517      case SSE_XMM5:
3518         string.printf("%08x%08x%08x%08x", XMM(5).d[3], XMM(5).d[2], XMM(5).d[1], XMM(5).d[0]);
3518         str.printf("%08x%08x%08x%08x", XMM(5).d[3], XMM(5).d[2], XMM(5).d[1], XMM(5).d[0]);
35193519         break;
35203520      case SSE_XMM6:
3521         string.printf("%08x%08x%08x%08x", XMM(6).d[3], XMM(6).d[2], XMM(6).d[1], XMM(6).d[0]);
3521         str.printf("%08x%08x%08x%08x", XMM(6).d[3], XMM(6).d[2], XMM(6).d[1], XMM(6).d[0]);
35223522         break;
35233523      case SSE_XMM7:
3524         string.printf("%08x%08x%08x%08x", XMM(7).d[3], XMM(7).d[2], XMM(7).d[1], XMM(7).d[0]);
3524         str.printf("%08x%08x%08x%08x", XMM(7).d[3], XMM(7).d[2], XMM(7).d[1], XMM(7).d[0]);
35253525         break;
35263526   }
35273527}
trunk/src/emu/cpu/i386/i386.h
r245649r245650
5858   // device_state_interface overrides
5959   virtual void state_import(const device_state_entry &entry);
6060   virtual void state_export(const device_state_entry &entry);
61   virtual void state_string_export(const device_state_entry &entry, astring &string);
61   virtual void state_string_export(const device_state_entry &entry, astring &str);
6262
6363   // device_disasm_interface overrides
6464   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/i4004/i4004.c
r245649r245650
507507   }
508508}
509509
510void i4004_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
510void i4004_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
511511{
512512   switch (entry.index())
513513   {
514514      case STATE_GENFLAGS:
515         string.printf(".%c%c%c",
515         str.printf(".%c%c%c",
516516            (m_A==0) ? 'Z':'.',
517517            m_C      ? 'C':'.',
518518            m_TEST   ? 'T':'.');
trunk/src/emu/cpu/i4004/i4004.h
r245649r245650
5757   // device_state_interface overrides
5858   virtual void state_import(const device_state_entry &entry);
5959   virtual void state_export(const device_state_entry &entry);
60   virtual void state_string_export(const device_state_entry &entry, astring &string);
60   virtual void state_string_export(const device_state_entry &entry, astring &str);
6161
6262   // device_disasm_interface overrides
6363   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/i8008/i8008.c
r245649r245650
187187//  for the debugger
188188//-------------------------------------------------
189189
190void i8008_device::state_string_export(const device_state_entry &entry, astring &string)
190void i8008_device::state_string_export(const device_state_entry &entry, astring &str)
191191{
192192   switch (entry.index())
193193   {
194194      case STATE_GENFLAGS:
195         string.printf("%c%c%c%c",
195         str.printf("%c%c%c%c",
196196            m_CF ? 'C':'.',
197197            m_ZF ? 'Z':'.',
198198            m_SF ? 'S':'.',
trunk/src/emu/cpu/i8008/i8008.h
r245649r245650
4848   // device_state_interface overrides
4949   virtual void state_import(const device_state_entry &entry);
5050   virtual void state_export(const device_state_entry &entry);
51   virtual void state_string_export(const device_state_entry &entry, astring &string);
51   virtual void state_string_export(const device_state_entry &entry, astring &str);
5252
5353
5454   // device_disasm_interface overrides
trunk/src/emu/cpu/i8085/i8085.c
r245649r245650
10811081   }
10821082}
10831083
1084void i8085a_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1084void i8085a_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
10851085{
10861086   switch (entry.index())
10871087   {
10881088      case STATE_GENFLAGS:
1089         string.printf("%c%c%c%c%c%c%c%c",
1089         str.printf("%c%c%c%c%c%c%c%c",
10901090            m_AF.b.l & 0x80 ? 'S':'.',
10911091            m_AF.b.l & 0x40 ? 'Z':'.',
10921092            m_AF.b.l & 0x20 ? 'X':'.', // X5
trunk/src/emu/cpu/i8085/i8085.h
r245649r245650
8282   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
8383
8484   // device_state_interface overrides
85   void state_string_export(const device_state_entry &entry, astring &string);
85   void state_string_export(const device_state_entry &entry, astring &str);
8686   void state_export(const device_state_entry &entry);
8787   void state_import(const device_state_entry &entry);
8888
trunk/src/emu/cpu/i8089/i8089.c
r245649r245650
159159//  for the debugger
160160//-------------------------------------------------
161161
162void i8089_device::state_string_export(const device_state_entry &entry, astring &string)
162void i8089_device::state_string_export(const device_state_entry &entry, astring &str)
163163{
164164   i8089_channel *ch = m_ch1;
165165
r245649r245650
169169   switch (entry.index())
170170   {
171171   case SYSBUS:
172      string.printf("%c", sysbus_width() ? 'W' : '.');
172      str.printf("%c", sysbus_width() ? 'W' : '.');
173173      break;
174174   case SOC:
175      string.printf("%c%c", remotebus_width() ? 'I' : '.', request_grant() ? 'R' : '.');
175      str.printf("%c%c", remotebus_width() ? 'I' : '.', request_grant() ? 'R' : '.');
176176      break;
177177   case CH1_GA:
178178   case CH2_GA:
179      string.printf("%d %05X", ch->m_r[i8089_channel::GA].t & 1, ch->m_r[i8089_channel::GA].w);
179      str.printf("%d %05X", ch->m_r[i8089_channel::GA].t & 1, ch->m_r[i8089_channel::GA].w);
180180      break;
181181   case CH1_GB:
182182   case CH2_GB:
183      string.printf("%d %05X", ch->m_r[i8089_channel::GB].t & 1, ch->m_r[i8089_channel::GB].w);
183      str.printf("%d %05X", ch->m_r[i8089_channel::GB].t & 1, ch->m_r[i8089_channel::GB].w);
184184      break;
185185   case CH1_GC:
186186   case CH2_GC:
187      string.printf("%d %05X", ch->m_r[i8089_channel::GC].t & 1, ch->m_r[i8089_channel::GC].w);
187      str.printf("%d %05X", ch->m_r[i8089_channel::GC].t & 1, ch->m_r[i8089_channel::GC].w);
188188      break;
189189   case CH1_TP:
190190   case CH2_TP:
191      string.printf("%d %05X", ch->m_r[i8089_channel::TP].t & 1, ch->m_r[i8089_channel::TP].w);
191      str.printf("%d %05X", ch->m_r[i8089_channel::TP].t & 1, ch->m_r[i8089_channel::TP].w);
192192      break;
193193   case CH1_PSW:
194194   case CH2_PSW:
195      string.printf("%c%s%c%s%s%s%c%c",
195      str.printf("%c%s%c%s%s%s%c%c",
196196         BIT(ch->m_r[i8089_channel::PSW].w, 7) ? 'P':'.',
197197         BIT(ch->m_r[i8089_channel::PSW].w, 6) ? "XF":"..",
198198         BIT(ch->m_r[i8089_channel::PSW].w, 5) ? 'B':'.',
trunk/src/emu/cpu/i8089/i8089.h
r245649r245650
8989   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
9090
9191   // device_state_interface overrides
92   virtual void state_string_export(const device_state_entry &entry, astring &string);
92   virtual void state_string_export(const device_state_entry &entry, astring &str);
9393
9494   // optional information overrides
9595   virtual machine_config_constructor device_mconfig_additions() const;
trunk/src/emu/cpu/i86/i286.c
r245649r245650
275275   m_out_shutdown_func.resolve_safe();
276276}
277277
278void i80286_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
278void i80286_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
279279{
280280   switch (entry.index())
281281   {
282282      case STATE_GENPC:
283         string.printf("%08X", pc() );
283         str.printf("%08X", pc());
284284         break;
285285
286286      case STATE_GENFLAGS:
287287         {
288288            UINT16 flags = CompressFlags();
289            string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
289            str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
290290               flags & 0x8000 ? '0':'.',
291291               flags & 0x4000 ? 'N':'.',
292292               flags & 0x2000 ? 'I':'.',
trunk/src/emu/cpu/i86/i286.h
r245649r245650
7575   virtual void execute_run();
7676   virtual void device_reset();
7777   virtual void device_start();
78   virtual void state_string_export(const device_state_entry &entry, astring &string);
78   virtual void state_string_export(const device_state_entry &entry, astring &str);
7979   virtual UINT32 execute_input_lines() const { return 1; }
8080   virtual void execute_set_input(int inputnum, int state);
8181   bool memory_translate(address_spacenum spacenum, int intention, offs_t &address);
trunk/src/emu/cpu/i86/i86.c
r245649r245650
310310   memset(m_sregs, 0x00, sizeof(m_sregs));
311311}
312312
313void i8086_common_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
313void i8086_common_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
314314{
315315   switch (entry.index())
316316   {
317317      case STATE_GENPC:
318         string.printf("%08X", pc() );
318         str.printf("%08X", pc());
319319         break;
320320
321321      case STATE_GENFLAGS:
322322         {
323323            UINT16 flags = CompressFlags();
324            string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
324            str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
325325               flags & 0x8000 ? '1':'.',
326326               flags & 0x4000 ? '1':'.',
327327               flags & 0x2000 ? '1':'.',
trunk/src/emu/cpu/i86/i86.h
r245649r245650
118118   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
119119
120120   // device_state_interface overrides
121   virtual void state_string_export(const device_state_entry &entry, astring &string);
121   virtual void state_string_export(const device_state_entry &entry, astring &str);
122122
123123   virtual void interrupt(int int_num, int trap = 1);
124124   bool common_op(UINT8 op);
trunk/src/emu/cpu/i960/i960.c
r245649r245650
20782078   m_icountptr = &m_icount;
20792079}
20802080
2081void i960_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
2081void i960_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
20822082{
20832083   static const char *const conditions[8] =
20842084   {
r245649r245650
20882088   switch (entry.index())
20892089   {
20902090      case STATE_GENFLAGS:
2091         string.printf("%s", conditions[m_AC & 7]);
2091         str.printf("%s", conditions[m_AC & 7]);
20922092         break;
20932093   }
20942094}
trunk/src/emu/cpu/i960/i960.h
r245649r245650
9393   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
9494
9595   // device_state_interface overrides
96   void state_string_export(const device_state_entry &entry, astring &string);
96   void state_string_export(const device_state_entry &entry, astring &str);
9797
9898   // device_disasm_interface overrides
9999   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/ie15/ie15.c
r245649r245650
131131//  for the debugger
132132//-------------------------------------------------
133133
134void ie15_device::state_string_export(const device_state_entry &entry, astring &string)
134void ie15_device::state_string_export(const device_state_entry &entry, astring &str)
135135{
136136   switch (entry.index())
137137   {
138138      case STATE_GENFLAGS:
139         string.printf("%c%c%c",
139         str.printf("%c%c%c",
140140            m_CF ? 'C':'.',
141141            m_ZF ? 'Z':'.',
142142            m_RF ? 'R':'.');
trunk/src/emu/cpu/ie15/ie15.h
r245649r245650
4646   // device_state_interface overrides
4747   virtual void state_import(const device_state_entry &entry);
4848   virtual void state_export(const device_state_entry &entry);
49   virtual void state_string_export(const device_state_entry &entry, astring &string);
49   virtual void state_string_export(const device_state_entry &entry, astring &str);
5050
5151   // device_disasm_interface overrides
5252   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/jaguar/jaguar.c
r245649r245650
403403}
404404
405405
406void jaguar_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
406void jaguar_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
407407{
408408   switch (entry.index())
409409   {
410410      case STATE_GENFLAGS:
411         string.printf( "%c%c%c%c%c%c%c%c%c%c%c",
411         str.printf("%c%c%c%c%c%c%c%c%c%c%c",
412412            FLAGS & 0x8000 ? 'D':'.',
413413            FLAGS & 0x4000 ? 'A':'.',
414414            FLAGS & 0x0100 ? '4':'.',
trunk/src/emu/cpu/jaguar/jaguar.h
r245649r245650
127127   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
128128
129129   // device_state_interface overrides
130   void state_string_export(const device_state_entry &entry, astring &string);
130   void state_string_export(const device_state_entry &entry, astring &str);
131131
132132   // device_disasm_interface overrides
133133   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/lc8670/lc8670.c
r245649r245650
369369//  for the debugger
370370//-------------------------------------------------
371371
372void lc8670_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
372void lc8670_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
373373{
374374   switch (entry.index())
375375   {
376376      case STATE_GENFLAGS:
377         string.printf("%s%s%s%s",
377         str.printf("%s%s%s%s",
378378            GET_CY ? "CY" : "..",
379379            GET_AC ? "AC" : "..",
380380            GET_OV ? "OV" : "..",
trunk/src/emu/cpu/lc8670/lc8670.h
r245649r245650
110110
111111   // device_state_interface overrides
112112   virtual void state_import(const device_state_entry &entry);
113   void state_string_export(const device_state_entry &entry, astring &string);
113   void state_string_export(const device_state_entry &entry, astring &str);
114114
115115   // device_memory_interface overrides
116116   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
trunk/src/emu/cpu/lh5801/lh5801.c
r245649r245650
154154   m_icountptr = &m_icount;
155155}
156156
157void lh5801_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
157void lh5801_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
158158{
159159   switch (entry.index())
160160   {
161161      case STATE_GENFLAGS:
162         string.printf("%c%c%c%c%c%c%c%c",
162         str.printf("%c%c%c%c%c%c%c%c",
163163            m_t&0x80?'1':'0',
164164            m_t&0x40?'1':'0',
165165            m_t&0x20?'1':'0',
trunk/src/emu/cpu/lh5801/lh5801.h
r245649r245650
101101   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
102102
103103   // device_state_interface overrides
104   void state_string_export(const device_state_entry &entry, astring &string);
104   void state_string_export(const device_state_entry &entry, astring &str);
105105
106106   // device_disasm_interface overrides
107107   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/lr35902/lr35902.c
r245649r245650
178178}
179179
180180
181void lr35902_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
181void lr35902_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
182182{
183183   switch (entry.index())
184184   {
185185      case LR35902_SPEED:
186         string.printf("%02X", 0x7E | ( ( m_gb_speed - 1 ) << 7 ) | m_gb_speed_change_pending );
186         str.printf("%02X", 0x7E | ((m_gb_speed - 1) << 7) | m_gb_speed_change_pending);
187187         break;
188188
189189      case STATE_GENFLAGS:
190         string.printf("%c%c%c%c",
190         str.printf("%c%c%c%c",
191191            m_F & FLAG_Z   ? 'Z' : '.',
192192            m_F & FLAG_N   ? 'N' : '.',
193193            m_F & FLAG_H   ? 'H' : '.',
trunk/src/emu/cpu/lr35902/lr35902.h
r245649r245650
6868   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
6969
7070   // device_state_interface overrides
71   void state_string_export(const device_state_entry &entry, astring &string);
71   void state_string_export(const device_state_entry &entry, astring &str);
7272
7373   // device_disasm_interface overrides
7474   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/m37710/m37710.c
r245649r245650
11341134}
11351135
11361136
1137void m37710_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1137void m37710_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
11381138{
11391139   switch (entry.index())
11401140   {
11411141      case STATE_GENFLAGS:
1142         string.printf("%c%c%c%c%c%c%c%c",
1142         str.printf("%c%c%c%c%c%c%c%c",
11431143            m_flag_n & NFLAG_SET ? 'N':'.',
11441144            m_flag_v & VFLAG_SET ? 'V':'.',
11451145            m_flag_m & MFLAG_SET ? 'M':'.',
trunk/src/emu/cpu/m37710/m37710.h
r245649r245650
115115   // device_state_interface overrides
116116   virtual void state_import(const device_state_entry &entry);
117117   virtual void state_export(const device_state_entry &entry);
118   void state_string_export(const device_state_entry &entry, astring &string);
118   void state_string_export(const device_state_entry &entry, astring &str);
119119
120120   // device_disasm_interface overrides
121121   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/m6502/m6502.c
r245649r245650
456456{
457457}
458458
459void m6502_device::state_string_export(const device_state_entry &entry, astring &string)
459void m6502_device::state_string_export(const device_state_entry &entry, astring &str)
460460{
461461   switch(entry.index()) {
462462   case STATE_GENFLAGS:
463463   case M6502_P:
464      string.printf("%c%c%c%c%c%c",
464      str.printf("%c%c%c%c%c%c",
465465                  P & F_N ? 'N' : '.',
466466                  P & F_V ? 'V' : '.',
467467                  P & F_D ? 'D' : '.',
trunk/src/emu/cpu/m6502/m6502.h
r245649r245650
173173   // device_state_interface overrides
174174   virtual void state_import(const device_state_entry &entry);
175175   virtual void state_export(const device_state_entry &entry);
176   virtual void state_string_export(const device_state_entry &entry, astring &string);
176   virtual void state_string_export(const device_state_entry &entry, astring &str);
177177
178178   // device_disasm_interface overrides
179179   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/m6502/m65ce02.c
r245649r245650
104104{
105105}
106106
107void m65ce02_device::state_string_export(const device_state_entry &entry, astring &string)
107void m65ce02_device::state_string_export(const device_state_entry &entry, astring &str)
108108{
109109   switch(entry.index()) {
110110   case STATE_GENFLAGS:
111111   case M6502_P:
112      string.printf("%c%c%c%c%c%c%c",
112      str.printf("%c%c%c%c%c%c%c",
113113                  P & F_N ? 'N' : '.',
114114                  P & F_V ? 'V' : '.',
115115                  P & F_E ? 'E' : '.',
r245649r245650
119119                  P & F_C ? 'C' : '.');
120120      break;
121121   case M65CE02_B:
122      string.printf("%02x", B >> 8);
122      str.printf("%02x", B >> 8);
123123      break;
124124   }
125125}
trunk/src/emu/cpu/m6502/m65ce02.h
r245649r245650
6363   virtual void device_reset();
6464   virtual void state_import(const device_state_entry &entry);
6565   virtual void state_export(const device_state_entry &entry);
66   virtual void state_string_export(const device_state_entry &entry, astring &string);
66   virtual void state_string_export(const device_state_entry &entry, astring &str);
6767
6868   inline void dec_SP_ce() { if(P & F_E) SP = set_l(SP, SP-1); else SP--; }
6969   inline void inc_SP_ce() { if(P & F_E) SP = set_l(SP, SP+1); else SP++; }
trunk/src/emu/cpu/m6502/m740.c
r245649r245650
8282   SP = 0x00ff;
8383}
8484
85void m740_device::state_string_export(const device_state_entry &entry, astring &string)
85void m740_device::state_string_export(const device_state_entry &entry, astring &str)
8686{
8787   switch(entry.index()) {
8888   case STATE_GENFLAGS:
8989   case M6502_P:
90      string.printf("%c%c%c%c%c%c%c",
90      str.printf("%c%c%c%c%c%c%c",
9191                  P & F_N ? 'N' : '.',
9292                  P & F_V ? 'V' : '.',
9393                  P & F_T ? 'T' : '.',
trunk/src/emu/cpu/m6502/m740.h
r245649r245650
7373
7474      static const disasm_entry disasm_entries[0x200];
7575
76      virtual void state_string_export(const device_state_entry &entry, astring &string);
76      virtual void state_string_export(const device_state_entry &entry, astring &str);
7777
7878      virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
7979      virtual void do_exec_full();
trunk/src/emu/cpu/m6800/m6800.c
r245649r245650
11231123   m_icountptr = &m_icount;
11241124}
11251125
1126void m6800_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1126void m6800_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
11271127{
11281128   switch (entry.index())
11291129   {
11301130      case STATE_GENFLAGS:
1131         string.printf( "%c%c%c%c%c%c%c%c",
1131         str.printf("%c%c%c%c%c%c%c%c",
11321132            m_cc & 0x80 ? '?':'.',
11331133            m_cc & 0x40 ? '?':'.',
11341134            m_cc & 0x20 ? 'H':'.',
trunk/src/emu/cpu/m6800/m6800.h
r245649r245650
8585   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO && m_has_io) ? &m_io_config : NULL ); }
8686
8787   // device_state_interface overrides
88   void state_string_export(const device_state_entry &entry, astring &string);
88   void state_string_export(const device_state_entry &entry, astring &str);
8989
9090   // device_disasm_interface overrides
9191   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/m68000/m68000.h
r245649r245650
398398   // device_state_interface overrides
399399   virtual void state_import(const device_state_entry &entry);
400400   virtual void state_export(const device_state_entry &entry);
401   virtual void state_string_export(const device_state_entry &entry, astring &string);
401   virtual void state_string_export(const device_state_entry &entry, astring &str);
402402
403403   // device_memory_interface overrides
404404   virtual bool memory_translate(address_spacenum space, int intention, offs_t &address);
trunk/src/emu/cpu/m68000/m68kcpu.c
r245649r245650
11731173   }
11741174}
11751175
1176void m68000_base_device::state_string_export(const device_state_entry &entry, astring &string)
1176void m68000_base_device::state_string_export(const device_state_entry &entry, astring &str)
11771177{
11781178   UINT16 sr;
11791179
11801180   switch (entry.index())
11811181   {
11821182      case M68K_FP0:
1183         string.printf("%f", fx80_to_double(REG_FP(this)[0]));
1183         str.printf("%f", fx80_to_double(REG_FP(this)[0]));
11841184         break;
11851185
11861186      case M68K_FP1:
1187         string.printf("%f", fx80_to_double(REG_FP(this)[1]));
1187         str.printf("%f", fx80_to_double(REG_FP(this)[1]));
11881188         break;
11891189
11901190      case M68K_FP2:
1191         string.printf("%f", fx80_to_double(REG_FP(this)[2]));
1191         str.printf("%f", fx80_to_double(REG_FP(this)[2]));
11921192         break;
11931193
11941194      case M68K_FP3:
1195         string.printf("%f", fx80_to_double(REG_FP(this)[3]));
1195         str.printf("%f", fx80_to_double(REG_FP(this)[3]));
11961196         break;
11971197
11981198      case M68K_FP4:
1199         string.printf("%f", fx80_to_double(REG_FP(this)[4]));
1199         str.printf("%f", fx80_to_double(REG_FP(this)[4]));
12001200         break;
12011201
12021202      case M68K_FP5:
1203         string.printf("%f", fx80_to_double(REG_FP(this)[5]));
1203         str.printf("%f", fx80_to_double(REG_FP(this)[5]));
12041204         break;
12051205
12061206      case M68K_FP6:
1207         string.printf("%f", fx80_to_double(REG_FP(this)[6]));
1207         str.printf("%f", fx80_to_double(REG_FP(this)[6]));
12081208         break;
12091209
12101210      case M68K_FP7:
1211         string.printf("%f", fx80_to_double(REG_FP(this)[7]));
1211         str.printf("%f", fx80_to_double(REG_FP(this)[7]));
12121212         break;
12131213
12141214      case STATE_GENFLAGS:
12151215         sr = m68ki_get_sr(this);
1216         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
1216         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
12171217            sr & 0x8000 ? 'T':'.',
12181218            sr & 0x4000 ? 't':'.',
12191219            sr & 0x2000 ? 'S':'.',
trunk/src/emu/cpu/m6805/m6805.c
r245649r245650
492492//  for the debugger
493493//-------------------------------------------------
494494
495void m6805_base_device::state_string_export(const device_state_entry &entry, astring &string)
495void m6805_base_device::state_string_export(const device_state_entry &entry, astring &str)
496496{
497497   switch (entry.index())
498498   {
499499      case STATE_GENFLAGS:
500         string.printf("%c%c%c%c%c%c%c%c",
500         str.printf("%c%c%c%c%c%c%c%c",
501501            (m_cc & 0x80) ? '?' : '.',
502502            (m_cc & 0x40) ? '?' : '.',
503503            (m_cc & 0x20) ? '?' : '.',
trunk/src/emu/cpu/m6805/m6805.h
r245649r245650
4949   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
5050
5151   // device_state_interface overrides
52   virtual void state_string_export(const device_state_entry &entry, astring &string);
52   virtual void state_string_export(const device_state_entry &entry, astring &str);
5353
5454private:
5555   // opcode/condition tables
trunk/src/emu/cpu/m6809/m6809.c
r245649r245650
292292//  for the debugger
293293//-------------------------------------------------
294294
295void m6809_base_device::state_string_export(const device_state_entry &entry, astring &string)
295void m6809_base_device::state_string_export(const device_state_entry &entry, astring &str)
296296{
297297   switch (entry.index())
298298   {
299299      case STATE_GENFLAGS:
300         string.printf("%c%c%c%c%c%c%c%c",
300         str.printf("%c%c%c%c%c%c%c%c",
301301            (m_cc & 0x80) ? 'E' : '.',
302302            (m_cc & 0x40) ? 'F' : '.',
303303            (m_cc & 0x20) ? 'H' : '.',
trunk/src/emu/cpu/m6809/m6809.h
r245649r245650
6161   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
6262
6363   // device_state_interface overrides
64   virtual void state_string_export(const device_state_entry &entry, astring &string);
64   virtual void state_string_export(const device_state_entry &entry, astring &str);
6565
6666   // addressing modes
6767   enum
trunk/src/emu/cpu/mb86233/mb86233.c
r245649r245650
158158}
159159
160160
161void mb86233_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
161void mb86233_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
162162{
163163   switch (entry.index())
164164   {
165165      case STATE_GENFLAGS:
166         string.printf("%c%c", (m_sr & SIGN_FLAG) ? 'N' : 'n', (m_sr & ZERO_FLAG) ? 'Z' : 'z' );
166         str.printf("%c%c", (m_sr & SIGN_FLAG) ? 'N' : 'n', (m_sr & ZERO_FLAG) ? 'Z' : 'z');
167167         break;
168168   }
169169}
trunk/src/emu/cpu/mb86233/mb86233.h
r245649r245650
7272   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config :  NULL ); }
7373
7474   // device_state_interface overrides
75   void state_string_export(const device_state_entry &entry, astring &string);
75   void state_string_export(const device_state_entry &entry, astring &str);
7676
7777   // device_disasm_interface overrides
7878   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/mb86235/mb86235.c
r245649r245650
108108}
109109
110110
111void mb86235_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
111void mb86235_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
112112{
113113   switch (entry.index())
114114   {
115115      case STATE_GENFLAGS:
116         string.printf("%c%c%c%c",
116         str.printf("%c%c%c%c",
117117            m_flags & 0x80 ? 'S':'.',
118118            m_flags & 0x40 ? 'Z':'.',
119119            m_flags & 0x20 ? 'V':'.',
trunk/src/emu/cpu/mb86235/mb86235.h
r245649r245650
4242   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
4343
4444   // device_state_interface overrides
45   void state_string_export(const device_state_entry &entry, astring &string);
45   void state_string_export(const device_state_entry &entry, astring &str);
4646
4747   // device_disasm_interface overrides
4848   virtual UINT32 disasm_min_opcode_bytes() const { return 8; }
trunk/src/emu/cpu/mb88xx/mb88xx.c
r245649r245650
267267}
268268
269269
270void mb88_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
270void mb88_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
271271{
272272   switch (entry.index())
273273   {
274274      case STATE_GENFLAGS:
275         string.printf("%c%c%c%c%c%c",
275         str.printf("%c%c%c%c%c%c",
276276               TEST_ST() ? 'T' : 't',
277277               TEST_ZF() ? 'Z' : 'z',
278278               TEST_CF() ? 'C' : 'c',
trunk/src/emu/cpu/mb88xx/mb88xx.h
r245649r245650
8888   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ) ); }
8989
9090   // device_state_interface overrides
91   void state_string_export(const device_state_entry &entry, astring &string);
91   void state_string_export(const device_state_entry &entry, astring &str);
9292   void state_import(const device_state_entry &entry);
9393   void state_export(const device_state_entry &entry);
9494
trunk/src/emu/cpu/mc68hc11/mc68hc11.c
r245649r245650
448448}
449449
450450
451void mc68hc11_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
451void mc68hc11_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
452452{
453453   switch (entry.index())
454454   {
455455      case STATE_GENFLAGS:
456         string.printf("%c%c%c%c%c%c%c%c",
456         str.printf("%c%c%c%c%c%c%c%c",
457457            (m_ccr & CC_S) ? 'S' : '.',
458458            (m_ccr & CC_X) ? 'X' : '.',
459459            (m_ccr & CC_H) ? 'H' : '.',
trunk/src/emu/cpu/mc68hc11/mc68hc11.h
r245649r245650
6868   }
6969
7070   // device_state_interface overrides
71   void state_string_export(const device_state_entry &entry, astring &string);
71   void state_string_export(const device_state_entry &entry, astring &str);
7272
7373   // device_disasm_interface overrides
7474   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/mcs48/mcs48.c
r245649r245650
12951295   }
12961296}
12971297
1298void mcs48_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1298void mcs48_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
12991299{
13001300   switch (entry.index())
13011301   {
13021302      case STATE_GENFLAGS:
1303         string.printf("%c%c %c%c%c%c%c%c%c%c",
1303         str.printf("%c%c %c%c%c%c%c%c%c%c",
13041304            m_irq_state ? 'I':'.',
13051305            m_a11       ? 'M':'.',
13061306            m_psw & 0x80 ? 'C':'.',
trunk/src/emu/cpu/mcs48/mcs48.h
r245649r245650
150150   // device_state_interface overrides
151151   virtual void state_import(const device_state_entry &entry);
152152   virtual void state_export(const device_state_entry &entry);
153   void state_string_export(const device_state_entry &entry, astring &string);
153   void state_string_export(const device_state_entry &entry, astring &str);
154154
155155   // device_disasm_interface overrides
156156   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/mcs51/mcs51.c
r245649r245650
22232223   }
22242224}
22252225
2226void mcs51_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
2226void mcs51_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
22272227{
22282228   switch (entry.index())
22292229   {
22302230      case STATE_GENFLAGS:
2231         string.printf("%c%c%c%c%c%c%c%c",
2231         str.printf("%c%c%c%c%c%c%c%c",
22322232            PSW & 0x80 ? 'C':'.',
22332233            PSW & 0x40 ? 'A':'.',
22342234            PSW & 0x20 ? 'F':'.',
trunk/src/emu/cpu/mcs51/mcs51.h
r245649r245650
119119   // device_state_interface overrides
120120   virtual void state_import(const device_state_entry &entry);
121121   virtual void state_export(const device_state_entry &entry);
122   void state_string_export(const device_state_entry &entry, astring &string);
122   void state_string_export(const device_state_entry &entry, astring &str);
123123
124124   // device_disasm_interface overrides
125125   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/mcs96/mcs96.c
r245649r245650
156156{
157157}
158158
159void mcs96_device::state_string_export(const device_state_entry &entry, astring &string)
159void mcs96_device::state_string_export(const device_state_entry &entry, astring &str)
160160{
161161   switch(entry.index()) {
162162   case STATE_GENFLAGS:
163163   case MCS96_PSW:
164      string.printf("%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
164      str.printf("%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
165165                  PSW & F_Z  ? 'Z' : '.',
166166                  PSW & F_N  ? 'N' : '.',
167167                  PSW & F_V  ? 'V' : '.',
trunk/src/emu/cpu/mcs96/mcs96.h
r245649r245650
114114   // device_state_interface overrides
115115   virtual void state_import(const device_state_entry &entry);
116116   virtual void state_export(const device_state_entry &entry);
117   virtual void state_string_export(const device_state_entry &entry, astring &string);
117   virtual void state_string_export(const device_state_entry &entry, astring &str);
118118
119119   // device_disasm_interface overrides
120120   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/minx/minx.c
r245649r245650
119119}
120120
121121
122void minx_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
122void minx_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
123123{
124124   switch (entry.index())
125125   {
126126      case STATE_GENFLAGS:
127         string.printf( "%c%c%c%c%c%c%c%c-%c%c%c%c%c",
127         str.printf("%c%c%c%c%c%c%c%c-%c%c%c%c%c",
128128            m_F & FLAG_I ? 'I' : '.',
129129            m_F & FLAG_D ? 'D' : '.',
130130            m_F & FLAG_L ? 'L' : '.',
trunk/src/emu/cpu/minx/minx.h
r245649r245650
3434   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
3535
3636   // device_state_interface overrides
37   void state_string_export(const device_state_entry &entry, astring &string);
37   void state_string_export(const device_state_entry &entry, astring &str);
3838
3939   // device_disasm_interface overrides
4040   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/mips/mips3.c
r245649r245650
661661}
662662
663663
664void mips3_device::state_string_export(const device_state_entry &entry, astring &string)
664void mips3_device::state_string_export(const device_state_entry &entry, astring &str)
665665{
666666   switch (entry.index())
667667   {
668668      case MIPS3_FPS0:
669         string.printf("!%16g", *(float *)&m_core->cpr[1][0]);
669         str.printf("!%16g", *(float *)&m_core->cpr[1][0]);
670670         break;
671671
672672      case MIPS3_FPD0:
673         string.printf("!%16g", *(double *)&m_core->cpr[1][0]);
673         str.printf("!%16g", *(double *)&m_core->cpr[1][0]);
674674         break;
675675
676676      case MIPS3_FPS1:
677         string.printf("!%16g", *(float *)&m_core->cpr[1][1]);
677         str.printf("!%16g", *(float *)&m_core->cpr[1][1]);
678678         break;
679679
680680      case MIPS3_FPD1:
681         string.printf("!%16g", *(double *)&m_core->cpr[1][1]);
681         str.printf("!%16g", *(double *)&m_core->cpr[1][1]);
682682         break;
683683
684684      case MIPS3_FPS2:
685         string.printf("!%16g", *(float *)&m_core->cpr[1][2]);
685         str.printf("!%16g", *(float *)&m_core->cpr[1][2]);
686686         break;
687687
688688      case MIPS3_FPD2:
689         string.printf("!%16g", *(double *)&m_core->cpr[1][2]);
689         str.printf("!%16g", *(double *)&m_core->cpr[1][2]);
690690         break;
691691
692692      case MIPS3_FPS3:
693         string.printf("!%16g", *(float *)&m_core->cpr[1][3]);
693         str.printf("!%16g", *(float *)&m_core->cpr[1][3]);
694694         break;
695695
696696      case MIPS3_FPD3:
697         string.printf("!%16g", *(double *)&m_core->cpr[1][3]);
697         str.printf("!%16g", *(double *)&m_core->cpr[1][3]);
698698         break;
699699
700700      case MIPS3_FPS4:
701         string.printf("!%16g", *(float *)&m_core->cpr[1][4]);
701         str.printf("!%16g", *(float *)&m_core->cpr[1][4]);
702702         break;
703703
704704      case MIPS3_FPD4:
705         string.printf("!%16g", *(double *)&m_core->cpr[1][4]);
705         str.printf("!%16g", *(double *)&m_core->cpr[1][4]);
706706         break;
707707
708708      case MIPS3_FPS5:
709         string.printf("!%16g", *(float *)&m_core->cpr[1][5]);
709         str.printf("!%16g", *(float *)&m_core->cpr[1][5]);
710710         break;
711711
712712      case MIPS3_FPD5:
713         string.printf("!%16g", *(double *)&m_core->cpr[1][5]);
713         str.printf("!%16g", *(double *)&m_core->cpr[1][5]);
714714         break;
715715
716716      case MIPS3_FPS6:
717         string.printf("!%16g", *(float *)&m_core->cpr[1][6]);
717         str.printf("!%16g", *(float *)&m_core->cpr[1][6]);
718718         break;
719719
720720      case MIPS3_FPD6:
721         string.printf("!%16g", *(double *)&m_core->cpr[1][6]);
721         str.printf("!%16g", *(double *)&m_core->cpr[1][6]);
722722         break;
723723
724724      case MIPS3_FPS7:
725         string.printf("!%16g", *(float *)&m_core->cpr[1][7]);
725         str.printf("!%16g", *(float *)&m_core->cpr[1][7]);
726726         break;
727727
728728      case MIPS3_FPD7:
729         string.printf("!%16g", *(double *)&m_core->cpr[1][7]);
729         str.printf("!%16g", *(double *)&m_core->cpr[1][7]);
730730         break;
731731
732732      case MIPS3_FPS8:
733         string.printf("!%16g", *(float *)&m_core->cpr[1][8]);
733         str.printf("!%16g", *(float *)&m_core->cpr[1][8]);
734734         break;
735735
736736      case MIPS3_FPD8:
737         string.printf("!%16g", *(double *)&m_core->cpr[1][8]);
737         str.printf("!%16g", *(double *)&m_core->cpr[1][8]);
738738         break;
739739
740740      case MIPS3_FPS9:
741         string.printf("!%16g", *(float *)&m_core->cpr[1][9]);
741         str.printf("!%16g", *(float *)&m_core->cpr[1][9]);
742742         break;
743743
744744      case MIPS3_FPD9:
745         string.printf("!%16g", *(double *)&m_core->cpr[1][9]);
745         str.printf("!%16g", *(double *)&m_core->cpr[1][9]);
746746         break;
747747
748748      case MIPS3_FPS10:
749         string.printf("!%16g", *(float *)&m_core->cpr[1][10]);
749         str.printf("!%16g", *(float *)&m_core->cpr[1][10]);
750750         break;
751751
752752      case MIPS3_FPD10:
753         string.printf("!%16g", *(double *)&m_core->cpr[1][10]);
753         str.printf("!%16g", *(double *)&m_core->cpr[1][10]);
754754         break;
755755
756756      case MIPS3_FPS11:
757         string.printf("!%16g", *(float *)&m_core->cpr[1][11]);
757         str.printf("!%16g", *(float *)&m_core->cpr[1][11]);
758758         break;
759759
760760      case MIPS3_FPD11:
761         string.printf("!%16g", *(double *)&m_core->cpr[1][11]);
761         str.printf("!%16g", *(double *)&m_core->cpr[1][11]);
762762         break;
763763
764764      case MIPS3_FPS12:
765         string.printf("!%16g", *(float *)&m_core->cpr[1][12]);
765         str.printf("!%16g", *(float *)&m_core->cpr[1][12]);
766766         break;
767767
768768      case MIPS3_FPD12:
769         string.printf("!%16g", *(double *)&m_core->cpr[1][12]);
769         str.printf("!%16g", *(double *)&m_core->cpr[1][12]);
770770         break;
771771
772772      case MIPS3_FPS13:
773         string.printf("!%16g", *(float *)&m_core->cpr[1][13]);
773         str.printf("!%16g", *(float *)&m_core->cpr[1][13]);
774774         break;
775775
776776      case MIPS3_FPD13:
777         string.printf("!%16g", *(double *)&m_core->cpr[1][13]);
777         str.printf("!%16g", *(double *)&m_core->cpr[1][13]);
778778         break;
779779
780780      case MIPS3_FPS14:
781         string.printf("!%16g", *(float *)&m_core->cpr[1][14]);
781         str.printf("!%16g", *(float *)&m_core->cpr[1][14]);
782782         break;
783783
784784      case MIPS3_FPD14:
785         string.printf("!%16g", *(double *)&m_core->cpr[1][14]);
785         str.printf("!%16g", *(double *)&m_core->cpr[1][14]);
786786         break;
787787
788788      case MIPS3_FPS15:
789         string.printf("!%16g", *(float *)&m_core->cpr[1][15]);
789         str.printf("!%16g", *(float *)&m_core->cpr[1][15]);
790790         break;
791791
792792      case MIPS3_FPD15:
793         string.printf("!%16g", *(double *)&m_core->cpr[1][15]);
793         str.printf("!%16g", *(double *)&m_core->cpr[1][15]);
794794         break;
795795
796796      case MIPS3_FPS16:
797         string.printf("!%16g", *(float *)&m_core->cpr[1][16]);
797         str.printf("!%16g", *(float *)&m_core->cpr[1][16]);
798798         break;
799799
800800      case MIPS3_FPD16:
801         string.printf("!%16g", *(double *)&m_core->cpr[1][16]);
801         str.printf("!%16g", *(double *)&m_core->cpr[1][16]);
802802         break;
803803
804804      case MIPS3_FPS17:
805         string.printf("!%16g", *(float *)&m_core->cpr[1][17]);
805         str.printf("!%16g", *(float *)&m_core->cpr[1][17]);
806806         break;
807807
808808      case MIPS3_FPD17:
809         string.printf("!%16g", *(double *)&m_core->cpr[1][17]);
809         str.printf("!%16g", *(double *)&m_core->cpr[1][17]);
810810         break;
811811
812812      case MIPS3_FPS18:
813         string.printf("!%16g", *(float *)&m_core->cpr[1][18]);
813         str.printf("!%16g", *(float *)&m_core->cpr[1][18]);
814814         break;
815815
816816      case MIPS3_FPD18:
817         string.printf("!%16g", *(double *)&m_core->cpr[1][18]);
817         str.printf("!%16g", *(double *)&m_core->cpr[1][18]);
818818         break;
819819
820820      case MIPS3_FPS19:
821         string.printf("!%16g", *(float *)&m_core->cpr[1][19]);
821         str.printf("!%16g", *(float *)&m_core->cpr[1][19]);
822822         break;
823823
824824      case MIPS3_FPD19:
825         string.printf("!%16g", *(double *)&m_core->cpr[1][19]);
825         str.printf("!%16g", *(double *)&m_core->cpr[1][19]);
826826         break;
827827
828828      case MIPS3_FPS20:
829         string.printf("!%16g", *(float *)&m_core->cpr[1][20]);
829         str.printf("!%16g", *(float *)&m_core->cpr[1][20]);
830830         break;
831831
832832      case MIPS3_FPD20:
833         string.printf("!%16g", *(double *)&m_core->cpr[1][20]);
833         str.printf("!%16g", *(double *)&m_core->cpr[1][20]);
834834         break;
835835
836836      case MIPS3_FPS21:
837         string.printf("!%16g", *(float *)&m_core->cpr[1][21]);
837         str.printf("!%16g", *(float *)&m_core->cpr[1][21]);
838838         break;
839839
840840      case MIPS3_FPD21:
841         string.printf("!%16g", *(double *)&m_core->cpr[1][21]);
841         str.printf("!%16g", *(double *)&m_core->cpr[1][21]);
842842         break;
843843
844844      case MIPS3_FPS22:
845         string.printf("!%16g", *(float *)&m_core->cpr[1][22]);
845         str.printf("!%16g", *(float *)&m_core->cpr[1][22]);
846846         break;
847847
848848      case MIPS3_FPD22:
849         string.printf("!%16g", *(double *)&m_core->cpr[1][22]);
849         str.printf("!%16g", *(double *)&m_core->cpr[1][22]);
850850         break;
851851
852852      case MIPS3_FPS23:
853         string.printf("!%16g", *(float *)&m_core->cpr[1][23]);
853         str.printf("!%16g", *(float *)&m_core->cpr[1][23]);
854854         break;
855855
856856      case MIPS3_FPD23:
857         string.printf("!%16g", *(double *)&m_core->cpr[1][23]);
857         str.printf("!%16g", *(double *)&m_core->cpr[1][23]);
858858         break;
859859
860860      case MIPS3_FPS24:
861         string.printf("!%16g", *(float *)&m_core->cpr[1][24]);
861         str.printf("!%16g", *(float *)&m_core->cpr[1][24]);
862862         break;
863863
864864      case MIPS3_FPD24:
865         string.printf("!%16g", *(double *)&m_core->cpr[1][24]);
865         str.printf("!%16g", *(double *)&m_core->cpr[1][24]);
866866         break;
867867
868868      case MIPS3_FPS25:
869         string.printf("!%16g", *(float *)&m_core->cpr[1][25]);
869         str.printf("!%16g", *(float *)&m_core->cpr[1][25]);
870870         break;
871871
872872      case MIPS3_FPD25:
873         string.printf("!%16g", *(double *)&m_core->cpr[1][25]);
873         str.printf("!%16g", *(double *)&m_core->cpr[1][25]);
874874         break;
875875
876876      case MIPS3_FPS26:
877         string.printf("!%16g", *(float *)&m_core->cpr[1][26]);
877         str.printf("!%16g", *(float *)&m_core->cpr[1][26]);
878878         break;
879879
880880      case MIPS3_FPD26:
881         string.printf("!%16g", *(double *)&m_core->cpr[1][26]);
881         str.printf("!%16g", *(double *)&m_core->cpr[1][26]);
882882         break;
883883
884884      case MIPS3_FPS27:
885         string.printf("!%16g", *(float *)&m_core->cpr[1][27]);
885         str.printf("!%16g", *(float *)&m_core->cpr[1][27]);
886886         break;
887887
888888      case MIPS3_FPD27:
889         string.printf("!%16g", *(double *)&m_core->cpr[1][27]);
889         str.printf("!%16g", *(double *)&m_core->cpr[1][27]);
890890         break;
891891
892892      case MIPS3_FPS28:
893         string.printf("!%16g", *(float *)&m_core->cpr[1][28]);
893         str.printf("!%16g", *(float *)&m_core->cpr[1][28]);
894894         break;
895895
896896      case MIPS3_FPD28:
897         string.printf("!%16g", *(double *)&m_core->cpr[1][28]);
897         str.printf("!%16g", *(double *)&m_core->cpr[1][28]);
898898         break;
899899
900900      case MIPS3_FPS29:
901         string.printf("!%16g", *(float *)&m_core->cpr[1][29]);
901         str.printf("!%16g", *(float *)&m_core->cpr[1][29]);
902902         break;
903903
904904      case MIPS3_FPD29:
905         string.printf("!%16g", *(double *)&m_core->cpr[1][29]);
905         str.printf("!%16g", *(double *)&m_core->cpr[1][29]);
906906         break;
907907
908908      case MIPS3_FPS30:
909         string.printf("!%16g", *(float *)&m_core->cpr[1][30]);
909         str.printf("!%16g", *(float *)&m_core->cpr[1][30]);
910910         break;
911911
912912      case MIPS3_FPD30:
913         string.printf("!%16g", *(double *)&m_core->cpr[1][30]);
913         str.printf("!%16g", *(double *)&m_core->cpr[1][30]);
914914         break;
915915
916916      case MIPS3_FPS31:
917         string.printf("!%16g", *(float *)&m_core->cpr[1][31]);
917         str.printf("!%16g", *(float *)&m_core->cpr[1][31]);
918918         break;
919919
920920      case MIPS3_FPD31:
921         string.printf("!%16g", *(double *)&m_core->cpr[1][31]);
921         str.printf("!%16g", *(double *)&m_core->cpr[1][31]);
922922         break;
923923
924924      case STATE_GENFLAGS:
925         string.printf(" ");
925         str.printf(" ");
926926         break;
927927   }
928928}
trunk/src/emu/cpu/mips/mips3.h
r245649r245650
320320
321321   // device_state_interface overrides
322322   virtual void state_export(const device_state_entry &entry);
323   void state_string_export(const device_state_entry &entry, astring &string);
323   void state_string_export(const device_state_entry &entry, astring &str);
324324
325325   // device_disasm_interface overrides
326326   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/mips/r3000.c
r245649r245650
443443//  for the debugger
444444//-------------------------------------------------
445445
446void r3000_device::state_string_export(const device_state_entry &entry, astring &string)
446void r3000_device::state_string_export(const device_state_entry &entry, astring &str)
447447{
448448   switch (entry.index())
449449   {
trunk/src/emu/cpu/mips/r3000.h
r245649r245650
126126   // device_state_interface overrides
127127   virtual void state_import(const device_state_entry &entry);
128128   virtual void state_export(const device_state_entry &entry);
129   virtual void state_string_export(const device_state_entry &entry, astring &string);
129   virtual void state_string_export(const device_state_entry &entry, astring &str);
130130
131131   // device_disasm_interface overrides
132132   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/mn10200/mn10200.c
r245649r245650
174174}
175175
176176
177void mn10200_device::state_string_export(const device_state_entry &entry, astring &string)
177void mn10200_device::state_string_export(const device_state_entry &entry, astring &str)
178178{
179179   switch (entry.index())
180180   {
181181      case STATE_GENFLAGS:
182         string.printf( "S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
182         str.printf("S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
183183            (m_psw >> 12) & 3,
184184            m_psw & FLAG_IE ? "on " : "off",
185185            (m_psw >> 8) & 7,
trunk/src/emu/cpu/mn10200/mn10200.h
r245649r245650
8686   }
8787
8888   // device_state_interface overrides
89   void state_string_export(const device_state_entry &entry, astring &string);
89   void state_string_export(const device_state_entry &entry, astring &str);
9090
9191   // device_disasm_interface overrides
9292   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/nec/nec.c
r245649r245650
435435   m_icountptr = &m_icount;
436436}
437437
438void nec_common_device::state_string_export(const device_state_entry &entry, astring &string)
438void nec_common_device::state_string_export(const device_state_entry &entry, astring &str)
439439{
440440   UINT16 flags = CompressFlags();
441441
442442   switch (entry.index())
443443   {
444444      case STATE_GENFLAGS:
445         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
445         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
446446            flags & 0x8000 ? 'N':'E',
447447            flags & 0x4000 ? '?':'.',
448448            flags & 0x2000 ? '?':'.',
trunk/src/emu/cpu/nec/nec.h
r245649r245650
4040   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL); }
4141
4242   // device_state_interface overrides
43   void state_string_export(const device_state_entry &entry, astring &string);
43   void state_string_export(const device_state_entry &entry, astring &str);
4444   virtual void state_import(const device_state_entry &entry);
4545   virtual void state_export(const device_state_entry &entry);
4646
trunk/src/emu/cpu/nec/v25.c
r245649r245650
523523}
524524
525525
526void v25_common_device::state_string_export(const device_state_entry &entry, astring &string)
526void v25_common_device::state_string_export(const device_state_entry &entry, astring &str)
527527{
528528   UINT16 flags = CompressFlags();
529529
530530   switch (entry.index())
531531   {
532532      case STATE_GENFLAGS:
533         string.printf("%c %d %c%c%c%c%c%c%c%c%c%c%c%c",
533         str.printf("%c %d %c%c%c%c%c%c%c%c%c%c%c%c",
534534            flags & 0x8000 ? 'N':'S',
535535            (flags & 0x7000) >> 12,
536536            flags & 0x0800 ? 'O':'.',
trunk/src/emu/cpu/nec/v25.h
r245649r245650
5757   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL); }
5858
5959   // device_state_interface overrides
60   void state_string_export(const device_state_entry &entry, astring &string);
60   void state_string_export(const device_state_entry &entry, astring &str);
6161   virtual void state_import(const device_state_entry &entry);
6262   virtual void state_export(const device_state_entry &entry);
6363
trunk/src/emu/cpu/pdp1/pdp1.c
r245649r245650
735735}
736736
737737
738void pdp1_device::state_string_export(const device_state_entry &entry, astring &string)
738void pdp1_device::state_string_export(const device_state_entry &entry, astring &str)
739739{
740740   switch (entry.index())
741741   {
742742      case STATE_GENFLAGS:
743         string.printf("%c%c%c%c%c%c-%c%c%c%c%c%c",
743         str.printf("%c%c%c%c%c%c-%c%c%c%c%c%c",
744744               (FLAGS & 040) ? '1' : '.',
745745               (FLAGS & 020) ? '2' : '.',
746746               (FLAGS & 010) ? '3' : '.',
trunk/src/emu/cpu/pdp1/pdp1.h
r245649r245650
105105   // device_state_interface overrides
106106   virtual void state_import(const device_state_entry &entry);
107107   virtual void state_export(const device_state_entry &entry);
108   void state_string_export(const device_state_entry &entry, astring &string);
108   void state_string_export(const device_state_entry &entry, astring &str);
109109
110110   // device_disasm_interface overrides
111111   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/pic16c5x/pic16c5x.c
r245649r245650
921921   }
922922}
923923
924void pic16c5x_device::state_string_export(const device_state_entry &entry, astring &string)
924void pic16c5x_device::state_string_export(const device_state_entry &entry, astring &str)
925925{
926926   switch (entry.index())
927927   {
928928      case PIC16C5x_PSCL:
929         string.printf("%c%02X", ((m_OPTION & 0x08) ? 'W':'T'), m_prescaler);
929         str.printf("%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
930930         break;
931931
932932      case STATE_GENFLAGS:
933         string.printf("%01x%c%c%c%c%c %c%c%c%03x",
933         str.printf("%01x%c%c%c%c%c %c%c%c%03x",
934934            (STATUS & 0xe0) >> 5,
935935            STATUS & 0x10 ? '.':'O',      /* WDT Overflow */
936936            STATUS & 0x08 ? 'P':'D',      /* Power/Down */
trunk/src/emu/cpu/pic16c5x/pic16c5x.h
r245649r245650
115115   // device_state_interface overrides
116116   virtual void state_import(const device_state_entry &entry);
117117   virtual void state_export(const device_state_entry &entry);
118   void state_string_export(const device_state_entry &entry, astring &string);
118   void state_string_export(const device_state_entry &entry, astring &str);
119119
120120   // device_disasm_interface overrides
121121   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/pic16c62x/pic16c62x.c
r245649r245650
979979   }
980980}
981981
982void pic16c62x_device::state_string_export(const device_state_entry &entry, astring &string)
982void pic16c62x_device::state_string_export(const device_state_entry &entry, astring &str)
983983{
984984   switch (entry.index())
985985   {
986986      case PIC16C62x_PSCL:
987         string.printf("%c%02X", ((m_OPTION & 0x08) ? 'W':'T'), m_prescaler);
987         str.printf("%c%02X", ((m_OPTION & 0x08) ? 'W' : 'T'), m_prescaler);
988988         break;
989989
990990      case STATE_GENFLAGS:
991         string.printf("%01x%c%c%c%c%c %c%c%c%03x",
991         str.printf("%01x%c%c%c%c%c %c%c%c%03x",
992992            (STATUS & 0xe0) >> 5,
993993            STATUS & 0x10 ? '.':'O',      /* WDT Overflow */
994994            STATUS & 0x08 ? 'P':'D',      /* Power/Down */
trunk/src/emu/cpu/pic16c62x/pic16c62x.h
r245649r245650
8686   // device_state_interface overrides
8787   virtual void state_import(const device_state_entry &entry);
8888   virtual void state_export(const device_state_entry &entry);
89   void state_string_export(const device_state_entry &entry, astring &string);
89   void state_string_export(const device_state_entry &entry, astring &str);
9090
9191   // device_disasm_interface overrides
9292   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/powerpc/ppc.h
r245649r245650
265265   // device_state_interface overrides
266266   virtual void state_export(const device_state_entry &entry);
267267   virtual void state_import(const device_state_entry &entry);
268   virtual void state_string_export(const device_state_entry &entry, astring &string);
268   virtual void state_string_export(const device_state_entry &entry, astring &str);
269269
270270   // device_disasm_interface overrides
271271   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/powerpc/ppccom.c
r245649r245650
10071007}
10081008
10091009
1010void ppc_device::state_string_export(const device_state_entry &entry, astring &string)
1010void ppc_device::state_string_export(const device_state_entry &entry, astring &str)
10111011{
10121012   switch (entry.index())
10131013   {
10141014      case PPC_F0:
1015         string.printf("%12f", m_core->f[0]);
1015         str.printf("%12f", m_core->f[0]);
10161016         break;
10171017
10181018      case PPC_F1:
1019         string.printf("%12f", m_core->f[1]);
1019         str.printf("%12f", m_core->f[1]);
10201020         break;
10211021
10221022      case PPC_F2:
1023         string.printf("%12f", m_core->f[2]);
1023         str.printf("%12f", m_core->f[2]);
10241024         break;
10251025
10261026      case PPC_F3:
1027         string.printf("%12f", m_core->f[3]);
1027         str.printf("%12f", m_core->f[3]);
10281028         break;
10291029
10301030      case PPC_F4:
1031         string.printf("%12f", m_core->f[4]);
1031         str.printf("%12f", m_core->f[4]);
10321032         break;
10331033
10341034      case PPC_F5:
1035         string.printf("%12f", m_core->f[5]);
1035         str.printf("%12f", m_core->f[5]);
10361036         break;
10371037
10381038      case PPC_F6:
1039         string.printf("%12f", m_core->f[6]);
1039         str.printf("%12f", m_core->f[6]);
10401040         break;
10411041
10421042      case PPC_F7:
1043         string.printf("%12f", m_core->f[7]);
1043         str.printf("%12f", m_core->f[7]);
10441044         break;
10451045
10461046      case PPC_F8:
1047         string.printf("%12f", m_core->f[8]);
1047         str.printf("%12f", m_core->f[8]);
10481048         break;
10491049
10501050      case PPC_F9:
1051         string.printf("%12f", m_core->f[9]);
1051         str.printf("%12f", m_core->f[9]);
10521052         break;
10531053
10541054      case PPC_F10:
1055         string.printf("%12f", m_core->f[10]);
1055         str.printf("%12f", m_core->f[10]);
10561056         break;
10571057
10581058      case PPC_F11:
1059         string.printf("%12f", m_core->f[11]);
1059         str.printf("%12f", m_core->f[11]);
10601060         break;
10611061
10621062      case PPC_F12:
1063         string.printf("%12f", m_core->f[12]);
1063         str.printf("%12f", m_core->f[12]);
10641064         break;
10651065
10661066      case PPC_F13:
1067         string.printf("%12f", m_core->f[13]);
1067         str.printf("%12f", m_core->f[13]);
10681068         break;
10691069
10701070      case PPC_F14:
1071         string.printf("%12f", m_core->f[14]);
1071         str.printf("%12f", m_core->f[14]);
10721072         break;
10731073
10741074      case PPC_F15:
1075         string.printf("%12f", m_core->f[15]);
1075         str.printf("%12f", m_core->f[15]);
10761076         break;
10771077
10781078      case PPC_F16:
1079         string.printf("%12f", m_core->f[16]);
1079         str.printf("%12f", m_core->f[16]);
10801080         break;
10811081
10821082      case PPC_F17:
1083         string.printf("%12f", m_core->f[17]);
1083         str.printf("%12f", m_core->f[17]);
10841084         break;
10851085
10861086      case PPC_F18:
1087         string.printf("%12f", m_core->f[18]);
1087         str.printf("%12f", m_core->f[18]);
10881088         break;
10891089
10901090      case PPC_F19:
1091         string.printf("%12f", m_core->f[19]);
1091         str.printf("%12f", m_core->f[19]);
10921092         break;
10931093
10941094      case PPC_F20:
1095         string.printf("%12f", m_core->f[20]);
1095         str.printf("%12f", m_core->f[20]);
10961096         break;
10971097
10981098      case PPC_F21:
1099         string.printf("%12f", m_core->f[21]);
1099         str.printf("%12f", m_core->f[21]);
11001100         break;
11011101
11021102      case PPC_F22:
1103         string.printf("%12f", m_core->f[22]);
1103         str.printf("%12f", m_core->f[22]);
11041104         break;
11051105
11061106      case PPC_F23:
1107         string.printf("%12f", m_core->f[23]);
1107         str.printf("%12f", m_core->f[23]);
11081108         break;
11091109
11101110      case PPC_F24:
1111         string.printf("%12f", m_core->f[24]);
1111         str.printf("%12f", m_core->f[24]);
11121112         break;
11131113
11141114      case PPC_F25:
1115         string.printf("%12f", m_core->f[25]);
1115         str.printf("%12f", m_core->f[25]);
11161116         break;
11171117
11181118      case PPC_F26:
1119         string.printf("%12f", m_core->f[26]);
1119         str.printf("%12f", m_core->f[26]);
11201120         break;
11211121
11221122      case PPC_F27:
1123         string.printf("%12f", m_core->f[27]);
1123         str.printf("%12f", m_core->f[27]);
11241124         break;
11251125
11261126      case PPC_F28:
1127         string.printf("%12f", m_core->f[28]);
1127         str.printf("%12f", m_core->f[28]);
11281128         break;
11291129
11301130      case PPC_F29:
1131         string.printf("%12f", m_core->f[29]);
1131         str.printf("%12f", m_core->f[29]);
11321132         break;
11331133
11341134      case PPC_F30:
1135         string.printf("%12f", m_core->f[30]);
1135         str.printf("%12f", m_core->f[30]);
11361136         break;
11371137
11381138      case PPC_F31:
1139         string.printf("%12f", m_core->f[31]);
1139         str.printf("%12f", m_core->f[31]);
11401140         break;
11411141   }
11421142}
trunk/src/emu/cpu/pps4/pps4.c
r245649r245650
15521552   m_icountptr = &m_icount;
15531553}
15541554
1555void pps4_device::state_string_export(const device_state_entry &entry, astring &string)
1555void pps4_device::state_string_export(const device_state_entry &entry, astring &str)
15561556{
15571557   switch (entry.index())
15581558   {
15591559      case STATE_GENFLAGS:
1560         string.printf("%c%c%c",
1560         str.printf("%c%c%c",
15611561            m_C ? 'C':'.',
15621562            m_FF1 ? '1':'.',
15631563            m_FF2 ? '2':'.');
trunk/src/emu/cpu/pps4/pps4.h
r245649r245650
6262   }
6363
6464   // device_state_interface overrides
65   void state_string_export(const device_state_entry &entry, astring &string);
65   void state_string_export(const device_state_entry &entry, astring &str);
6666
6767   // device_disasm_interface overrides
6868   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/psx/psx.c
r245649r245650
20252025//  for the debugger
20262026//-------------------------------------------------
20272027
2028void psxcpu_device::state_string_export( const device_state_entry &entry, astring &string )
2028void psxcpu_device::state_string_export( const device_state_entry &entry, astring &str )
20292029{
20302030   switch( entry.index() )
20312031   {
20322032   case PSXCPU_DELAYR:
20332033      if( m_delayr <= PSXCPU_DELAYR_NOTPC )
20342034      {
2035         string.printf( "%02x %-3s", m_delayr, delayn[ m_delayr ] );
2035         str.printf("%02x %-3s", m_delayr, delayn[m_delayr]);
20362036      }
20372037      else
20382038      {
2039         string.printf( "%02x ---", m_delayr );
2039         str.printf("%02x ---", m_delayr);
20402040      }
20412041      break;
20422042   }
trunk/src/emu/cpu/psx/psx.h
r245649r245650
220220
221221   // device_state_interface overrides
222222   virtual void state_import(const device_state_entry &entry);
223   virtual void state_string_export(const device_state_entry &entry, astring &string);
223   virtual void state_string_export(const device_state_entry &entry, astring &str);
224224
225225   // device_disasm_interface overrides
226226   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/rsp/rsp.c
r245649r245650
537537   }
538538}
539539
540void rsp_device::state_string_export(const device_state_entry &entry, astring &string)
540void rsp_device::state_string_export(const device_state_entry &entry, astring &str)
541541{
542542   const int index = entry.index();
543543   if (index >= RSP_V0 && index <= RSP_V31)
544544   {
545      m_cop2->state_string_export(index, string);
545      m_cop2->state_string_export(index, str);
546546   }
547547   else if (index == STATE_GENFLAGS)
548548   {
549      string.printf("%s","");
549      str.printf("%s", "");
550550   }
551551}
552552
trunk/src/emu/cpu/rsp/rsp.h
r245649r245650
185185   // device_state_interface overrides
186186   virtual void state_import(const device_state_entry &entry);
187187   virtual void state_export(const device_state_entry &entry);
188   void state_string_export(const device_state_entry &entry, astring &string);
188   void state_string_export(const device_state_entry &entry, astring &str);
189189
190190   // device_disasm_interface overrides
191191   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/rsp/rspcp2.c
r245649r245650
171171   }
172172}
173173
174void rsp_cop2::state_string_export(const int index, astring &string)
174void rsp_cop2::state_string_export(const int index, astring &str)
175175{
176176   switch (index)
177177   {
178178      case RSP_V0:
179         string.printf("%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));
179         str.printf("%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));
180180         break;
181181      case RSP_V1:
182         string.printf("%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));
182         str.printf("%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));
183183         break;
184184      case RSP_V2:
185         string.printf("%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));
185         str.printf("%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));
186186         break;
187187      case RSP_V3:
188         string.printf("%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));
188         str.printf("%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));
189189         break;
190190      case RSP_V4:
191         string.printf("%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));
191         str.printf("%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));
192192         break;
193193      case RSP_V5:
194         string.printf("%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));
194         str.printf("%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));
195195         break;
196196      case RSP_V6:
197         string.printf("%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));
197         str.printf("%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));
198198         break;
199199      case RSP_V7:
200         string.printf("%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));
200         str.printf("%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));
201201         break;
202202      case RSP_V8:
203         string.printf("%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));
203         str.printf("%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));
204204         break;
205205      case RSP_V9:
206         string.printf("%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));
206         str.printf("%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));
207207         break;
208208      case RSP_V10:
209         string.printf("%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));
209         str.printf("%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));
210210         break;
211211      case RSP_V11:
212         string.printf("%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));
212         str.printf("%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));
213213         break;
214214      case RSP_V12:
215         string.printf("%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));
215         str.printf("%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));
216216         break;
217217      case RSP_V13:
218         string.printf("%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));
218         str.printf("%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));
219219         break;
220220      case RSP_V14:
221         string.printf("%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));
221         str.printf("%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));
222222         break;
223223      case RSP_V15:
224         string.printf("%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));
224         str.printf("%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));
225225         break;
226226      case RSP_V16:
227         string.printf("%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));
227         str.printf("%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));
228228         break;
229229      case RSP_V17:
230         string.printf("%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));
230         str.printf("%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));
231231         break;
232232      case RSP_V18:
233         string.printf("%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));
233         str.printf("%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));
234234         break;
235235      case RSP_V19:
236         string.printf("%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));
236         str.printf("%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));
237237         break;
238238      case RSP_V20:
239         string.printf("%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));
239         str.printf("%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));
240240         break;
241241      case RSP_V21:
242         string.printf("%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));
242         str.printf("%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));
243243         break;
244244      case RSP_V22:
245         string.printf("%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));
245         str.printf("%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));
246246         break;
247247      case RSP_V23:
248         string.printf("%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));
248         str.printf("%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));
249249         break;
250250      case RSP_V24:
251         string.printf("%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));
251         str.printf("%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));
252252         break;
253253      case RSP_V25:
254         string.printf("%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));
254         str.printf("%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));
255255         break;
256256      case RSP_V26:
257         string.printf("%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));
257         str.printf("%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));
258258         break;
259259      case RSP_V27:
260         string.printf("%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));
260         str.printf("%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));
261261         break;
262262      case RSP_V28:
263         string.printf("%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));
263         str.printf("%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));
264264         break;
265265      case RSP_V29:
266         string.printf("%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));
266         str.printf("%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));
267267         break;
268268      case RSP_V30:
269         string.printf("%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));
269         str.printf("%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));
270270         break;
271271      case RSP_V31:
272         string.printf("%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));
272         str.printf("%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));
273273         break;
274274   }
275275}
trunk/src/emu/cpu/rsp/rspcp2.h
r245649r245650
5252   virtual int generate_lwc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
5353   virtual int generate_swc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
5454
55   virtual void state_string_export(const int index, astring &string);
55   virtual void state_string_export(const int index, astring &str);
5656
5757public:
5858   virtual ~rsp_cop2();
trunk/src/emu/cpu/rsp/rspcp2d.c
r245649r245650
150150   ((rsp_cop2 *)param)->cfunc_unimplemented_opcode();
151151}
152152
153void rsp_cop2_drc::state_string_export(const int index, astring &string)
153void rsp_cop2_drc::state_string_export(const int index, astring &str)
154154{
155155   switch (index)
156156   {
157157      case RSP_V0:
158         string.printf("%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));
158         str.printf("%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));
159159         break;
160160      case RSP_V1:
161         string.printf("%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));
161         str.printf("%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));
162162         break;
163163      case RSP_V2:
164         string.printf("%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));
164         str.printf("%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));
165165         break;
166166      case RSP_V3:
167         string.printf("%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));
167         str.printf("%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));
168168         break;
169169      case RSP_V4:
170         string.printf("%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));
170         str.printf("%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));
171171         break;
172172      case RSP_V5:
173         string.printf("%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));
173         str.printf("%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));
174174         break;
175175      case RSP_V6:
176         string.printf("%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));
176         str.printf("%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));
177177         break;
178178      case RSP_V7:
179         string.printf("%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));
179         str.printf("%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));
180180         break;
181181      case RSP_V8:
182         string.printf("%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));
182         str.printf("%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));
183183         break;
184184      case RSP_V9:
185         string.printf("%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));
185         str.printf("%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));
186186         break;
187187      case RSP_V10:
188         string.printf("%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));
188         str.printf("%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));
189189         break;
190190      case RSP_V11:
191         string.printf("%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));
191         str.printf("%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));
192192         break;
193193      case RSP_V12:
194         string.printf("%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));
194         str.printf("%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));
195195         break;
196196      case RSP_V13:
197         string.printf("%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));
197         str.printf("%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));
198198         break;
199199      case RSP_V14:
200         string.printf("%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));
200         str.printf("%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));
201201         break;
202202      case RSP_V15:
203         string.printf("%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));
203         str.printf("%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));
204204         break;
205205      case RSP_V16:
206         string.printf("%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));
206         str.printf("%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));
207207         break;
208208      case RSP_V17:
209         string.printf("%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));
209         str.printf("%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));
210210         break;
211211      case RSP_V18:
212         string.printf("%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));
212         str.printf("%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));
213213         break;
214214      case RSP_V19:
215         string.printf("%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));
215         str.printf("%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));
216216         break;
217217      case RSP_V20:
218         string.printf("%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));
218         str.printf("%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));
219219         break;
220220      case RSP_V21:
221         string.printf("%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));
221         str.printf("%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));
222222         break;
223223      case RSP_V22:
224         string.printf("%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));
224         str.printf("%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));
225225         break;
226226      case RSP_V23:
227         string.printf("%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));
227         str.printf("%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));
228228         break;
229229      case RSP_V24:
230         string.printf("%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));
230         str.printf("%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));
231231         break;
232232      case RSP_V25:
233         string.printf("%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));
233         str.printf("%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));
234234         break;
235235      case RSP_V26:
236         string.printf("%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));
236         str.printf("%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));
237237         break;
238238      case RSP_V27:
239         string.printf("%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));
239         str.printf("%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));
240240         break;
241241      case RSP_V28:
242         string.printf("%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));
242         str.printf("%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));
243243         break;
244244      case RSP_V29:
245         string.printf("%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));
245         str.printf("%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));
246246         break;
247247      case RSP_V30:
248         string.printf("%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));
248         str.printf("%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));
249249         break;
250250      case RSP_V31:
251         string.printf("%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));
251         str.printf("%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));
252252         break;
253253   }
254254}
trunk/src/emu/cpu/rsp/rspcp2d.h
r245649r245650
3030   virtual int generate_lwc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
3131   virtual int generate_swc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
3232
33   virtual void state_string_export(const int index, astring &string);
33   virtual void state_string_export(const int index, astring &str);
3434
3535   void cfunc_unimplemented_opcode();
3636public:
trunk/src/emu/cpu/rsp/rspcp2s.c
r245649r245650
295295   vec_flag_reverse = _mm_set_epi16(0x0100, 0x0302, 0x0504, 0x0706, 0x0908, 0x0b0a, 0x0d0c, 0x0f0e);
296296}
297297
298void rsp_cop2_simd::state_string_export(const int index, astring &string)
298void rsp_cop2_simd::state_string_export(const int index, astring &str)
299299{
300300   switch (index)
301301   {
trunk/src/emu/cpu/rsp/rspcp2s.h
r245649r245650
3232   virtual int generate_lwc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
3333   virtual int generate_swc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
3434
35   virtual void state_string_export(const int index, astring &string);
35   virtual void state_string_export(const int index, astring &str);
3636
3737public:
3838   virtual void lbv();
trunk/src/emu/cpu/s2650/s2650.c
r245649r245650
870870   }
871871}
872872
873void s2650_device::state_string_export(const device_state_entry &entry, astring &string)
873void s2650_device::state_string_export(const device_state_entry &entry, astring &str)
874874{
875875   switch (entry.index())
876876   {
877877      case STATE_GENFLAGS:
878         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
878         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
879879            m_psu & 0x80 ? 'S':'.',
880880            m_psu & 0x40 ? 'O':'.',
881881            m_psu & 0x20 ? 'I':'.',
trunk/src/emu/cpu/s2650/s2650.h
r245649r245650
6060   // device_state_interface overrides
6161   virtual void state_import(const device_state_entry &entry);
6262   virtual void state_export(const device_state_entry &entry);
63   void state_string_export(const device_state_entry &entry, astring &string);
63   void state_string_export(const device_state_entry &entry, astring &str);
6464
6565   // device_disasm_interface overrides
6666   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/saturn/saturn.c
r245649r245650
181181   m_icountptr = &m_icount;
182182}
183183
184void saturn_device::state_string_export(const device_state_entry &entry, astring &string)
184void saturn_device::state_string_export(const device_state_entry &entry, astring &str)
185185{
186186#define Reg64Data(s) s[15],s[14],s[13],s[12],s[11],s[10],s[9],s[8],s[7],s[6],s[5],s[4],s[3],s[2],s[1],s[0]
187187#define Reg64Format "%x %x%x%x%x%x%x%x %x%x%x %x%x%x%x%x"
r245649r245650
189189   switch (entry.index())
190190   {
191191      case SATURN_A:
192         string.printf( Reg64Format, Reg64Data(m_reg[A]) );
192         str.printf( Reg64Format, Reg64Data(m_reg[A]) );
193193         break;
194194
195195      case SATURN_B:
196         string.printf( Reg64Format, Reg64Data(m_reg[B]) );
196         str.printf( Reg64Format, Reg64Data(m_reg[B]) );
197197         break;
198198
199199      case SATURN_C:
200         string.printf( Reg64Format, Reg64Data(m_reg[C]) );
200         str.printf( Reg64Format, Reg64Data(m_reg[C]) );
201201         break;
202202
203203      case SATURN_D:
204         string.printf( Reg64Format, Reg64Data(m_reg[D]) );
204         str.printf( Reg64Format, Reg64Data(m_reg[D]) );
205205         break;
206206
207207      case SATURN_R0:
208         string.printf( Reg64Format, Reg64Data(m_reg[R0]) );
208         str.printf( Reg64Format, Reg64Data(m_reg[R0]) );
209209         break;
210210
211211      case SATURN_R1:
212         string.printf( Reg64Format, Reg64Data(m_reg[R1]) );
212         str.printf( Reg64Format, Reg64Data(m_reg[R1]) );
213213         break;
214214
215215      case SATURN_R2:
216         string.printf( Reg64Format, Reg64Data(m_reg[R2]) );
216         str.printf( Reg64Format, Reg64Data(m_reg[R2]) );
217217         break;
218218
219219      case SATURN_R3:
220         string.printf( Reg64Format, Reg64Data(m_reg[R3]) );
220         str.printf( Reg64Format, Reg64Data(m_reg[R3]) );
221221         break;
222222
223223      case SATURN_R4:
224         string.printf( Reg64Format, Reg64Data(m_reg[R4]) );
224         str.printf( Reg64Format, Reg64Data(m_reg[R4]) );
225225         break;
226226
227227      case SATURN_IRQ_STATE:
228         string.printf( "%c%c%c%i", m_in_irq?'S':'.', m_irq_enable?'e':'.', m_pending_irq?'p':'.', m_irq_state );
228         str.printf( "%c%c%c%i", m_in_irq?'S':'.', m_irq_enable?'e':'.', m_pending_irq?'p':'.', m_irq_state );
229229         break;
230230
231231      case STATE_GENFLAGS:
232         string.printf( "%c%c", m_decimal?'D':'.', m_carry ? 'C':'.' );
232         str.printf( "%c%c", m_decimal?'D':'.', m_carry ? 'C':'.' );
233233         break;
234234   }
235235}
trunk/src/emu/cpu/saturn/saturn.h
r245649r245650
117117   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
118118
119119   // device_state_interface overrides
120   void state_string_export(const device_state_entry &entry, astring &string);
120   void state_string_export(const device_state_entry &entry, astring &str);
121121   virtual void state_import(const device_state_entry &entry);
122122   virtual void state_export(const device_state_entry &entry);
123123
trunk/src/emu/cpu/sc61860/sc61860.c
r245649r245650
181181}
182182
183183
184void sc61860_device::state_string_export(const device_state_entry &entry, astring &string)
184void sc61860_device::state_string_export(const device_state_entry &entry, astring &str)
185185{
186186   switch (entry.index())
187187   {
188188      case STATE_GENFLAGS:
189         string.printf("%c%c", m_zero?'Z':'.', m_carry ? 'C':'.');
189         str.printf("%c%c", m_zero ? 'Z' : '.', m_carry ? 'C' : '.');
190190         break;
191191   }
192192}
trunk/src/emu/cpu/sc61860/sc61860.h
r245649r245650
116116   // device_state_interface overrides
117117   virtual void state_import(const device_state_entry &entry);
118118   virtual void state_export(const device_state_entry &entry);
119   void state_string_export(const device_state_entry &entry, astring &string);
119   void state_string_export(const device_state_entry &entry, astring &str);
120120
121121   // device_disasm_interface overrides
122122   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/scmp/scmp.c
r245649r245650
547547    COMMON STATE IMPORT/EXPORT
548548***************************************************************************/
549549
550void scmp_device::state_string_export(const device_state_entry &entry, astring &string)
550void scmp_device::state_string_export(const device_state_entry &entry, astring &str)
551551{
552552   switch (entry.index())
553553   {
554554      case STATE_GENFLAGS:
555         string.printf("%c%c%c%c%c%c%c%c",
555         str.printf("%c%c%c%c%c%c%c%c",
556556            (m_SR & 0x80) ? 'C' : '.',
557557            (m_SR & 0x40) ? 'V' : '.',
558558            (m_SR & 0x20) ? 'B' : '.',
trunk/src/emu/cpu/scmp/scmp.h
r245649r245650
5656   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
5757
5858   // device_state_interface overrides
59   void state_string_export(const device_state_entry &entry, astring &string);
59   void state_string_export(const device_state_entry &entry, astring &str);
6060
6161   // device_disasm_interface overrides
6262   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/score/score.c
r245649r245650
132132//  for the debugger
133133//-------------------------------------------------
134134
135void score7_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
135void score7_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
136136{
137137   switch (entry.index())
138138   {
139139      case STATE_GENFLAGS:
140         string.printf("%s%s%s%s%s",
140         str.printf("%s%s%s%s%s",
141141            REG_CR & FLAG_V ? "V" : ".",
142142            REG_CR & FLAG_C ? "C" : ".",
143143            REG_CR & FLAG_Z ? "Z" : ".",
trunk/src/emu/cpu/score/score.h
r245649r245650
4747   virtual void execute_set_input(int inputnum, int state);
4848
4949   // device_state_interface overrides
50   void state_string_export(const device_state_entry &entry, astring &string);
50   void state_string_export(const device_state_entry &entry, astring &str);
5151
5252   // device_memory_interface overrides
5353   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
trunk/src/emu/cpu/scudsp/scudsp.c
r245649r245650
10211021}
10221022
10231023
1024void scudsp_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
1024void scudsp_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
10251025{
10261026   switch (entry.index())
10271027   {
10281028      case STATE_GENFLAGS:
1029         string.printf("%s%s%s%c%c%c%c%c%s%s%s",
1029         str.printf("%s%s%s%c%c%c%c%c%s%s%s",
10301030            m_flags & 0x4000000 ? "PR":"..",
10311031            m_flags & 0x2000000 ? "EP":"..",
10321032            m_flags & 0x800000 ? "T0":"..",
trunk/src/emu/cpu/scudsp/scudsp.h
r245649r245650
9494   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ); }
9595
9696   // device_state_interface overrides
97   void state_string_export(const device_state_entry &entry, astring &string);
97   void state_string_export(const device_state_entry &entry, astring &str);
9898
9999   // device_disasm_interface overrides
100100   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/emu/cpu/se3208/se3208.c
r245649r245650
17951795}
17961796
17971797
1798void se3208_device::state_string_export(const device_state_entry &entry, astring &string)
1798void se3208_device::state_string_export(const device_state_entry &entry, astring &str)
17991799{
18001800   switch (entry.index())
18011801   {
18021802      case STATE_GENFLAGS:
1803         string.printf("%c%c%c%c %c%c%c%c%c",
1803         str.printf("%c%c%c%c %c%c%c%c%c",
18041804               m_SR&FLAG_C?'C':'.',
18051805               m_SR&FLAG_V?'V':'.',
18061806               m_SR&FLAG_S?'S':'.',
trunk/src/emu/cpu/se3208/se3208.h
r245649r245650
3030   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
3131
3232   // device_state_interface overrides
33   void state_string_export(const device_state_entry &entry, astring &string);
33   void state_string_export(const device_state_entry &entry, astring &str);
3434
3535   // device_disasm_interface overrides
3636   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/sh2/sh2.c
r245649r245650
26102610}
26112611
26122612
2613void sh2_device::state_string_export(const device_state_entry &entry, astring &string)
2613void sh2_device::state_string_export(const device_state_entry &entry, astring &str)
26142614{
26152615   switch (entry.index())
26162616   {
26172617      case STATE_GENFLAGS:
2618         string.printf("%c%c%d%c%c",
2618         str.printf("%c%c%d%c%c",
26192619               m_sh2_state->sr & M ? 'M':'.',
26202620               m_sh2_state->sr & Q ? 'Q':'.',
26212621               (m_sh2_state->sr & I) >> 4,
trunk/src/emu/cpu/sh2/sh2.h
r245649r245650
156156   // device_state_interface overrides
157157   virtual void state_import(const device_state_entry &entry);
158158   virtual void state_export(const device_state_entry &entry);
159   void state_string_export(const device_state_entry &entry, astring &string);
159   void state_string_export(const device_state_entry &entry, astring &str);
160160
161161   // device_disasm_interface overrides
162162   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/sh4/sh4.c
r245649r245650
44454445   }
44464446}
44474447
4448void sh34_base_device::state_string_export(const device_state_entry &entry, astring &string)
4448void sh34_base_device::state_string_export(const device_state_entry &entry, astring &str)
44494449{
44504450#ifdef LSB_FIRST
44514451   UINT8 fpu_xor = m_fpu_pr;
r245649r245650
44564456   switch (entry.index())
44574457   {
44584458      case STATE_GENFLAGS:
4459         string.printf("%s%s%s%s%c%c%d%c%c",
4459         str.printf("%s%s%s%s%c%c%d%c%c",
44604460               m_sr & MD ? "MD ":"   ",
44614461               m_sr & sRB ? "RB ":"   ",
44624462               m_sr & BL ? "BL ":"   ",
r245649r245650
44694469         break;
44704470
44714471      case SH4_FR0:
4472         string.printf("%08X %f", m_fr[0 ^ fpu_xor], (double)FP_RFS(0 ^ fpu_xor));
4472         str.printf("%08X %f", m_fr[0 ^ fpu_xor], (double)FP_RFS(0 ^ fpu_xor));
44734473         break;
44744474
44754475      case SH4_FR1:
4476         string.printf("%08X %f", m_fr[1 ^ fpu_xor], (double)FP_RFS(1 ^ fpu_xor));
4476         str.printf("%08X %f", m_fr[1 ^ fpu_xor], (double)FP_RFS(1 ^ fpu_xor));
44774477         break;
44784478
44794479      case SH4_FR2:
4480         string.printf("%08X %f", m_fr[2 ^ fpu_xor], (double)FP_RFS(2 ^ fpu_xor));
4480         str.printf("%08X %f", m_fr[2 ^ fpu_xor], (double)FP_RFS(2 ^ fpu_xor));
44814481         break;
44824482
44834483      case SH4_FR3:
4484         string.printf("%08X %f", m_fr[3 ^ fpu_xor], (double)FP_RFS(3 ^ fpu_xor));
4484         str.printf("%08X %f", m_fr[3 ^ fpu_xor], (double)FP_RFS(3 ^ fpu_xor));
44854485         break;
44864486
44874487      case SH4_FR4:
4488         string.printf("%08X %f", m_fr[4 ^ fpu_xor], (double)FP_RFS(4 ^ fpu_xor));
4488         str.printf("%08X %f", m_fr[4 ^ fpu_xor], (double)FP_RFS(4 ^ fpu_xor));
44894489         break;
44904490
44914491      case SH4_FR5:
4492         string.printf("%08X %f", m_fr[5 ^ fpu_xor], (double)FP_RFS(5 ^ fpu_xor));
4492         str.printf("%08X %f", m_fr[5 ^ fpu_xor], (double)FP_RFS(5 ^ fpu_xor));
44934493         break;
44944494
44954495      case SH4_FR6:
4496         string.printf("%08X %f", m_fr[6 ^ fpu_xor], (double)FP_RFS(6 ^ fpu_xor));
4496         str.printf("%08X %f", m_fr[6 ^ fpu_xor], (double)FP_RFS(6 ^ fpu_xor));
44974497         break;
44984498
44994499      case SH4_FR7:
4500         string.printf("%08X %f", m_fr[7 ^ fpu_xor], (double)FP_RFS(7 ^ fpu_xor));
4500         str.printf("%08X %f", m_fr[7 ^ fpu_xor], (double)FP_RFS(7 ^ fpu_xor));
45014501         break;
45024502
45034503      case SH4_FR8:
4504         string.printf("%08X %f", m_fr[8 ^ fpu_xor], (double)FP_RFS(8 ^ fpu_xor));
4504         str.printf("%08X %f", m_fr[8 ^ fpu_xor], (double)FP_RFS(8 ^ fpu_xor));
45054505         break;
45064506
45074507      case SH4_FR9:
4508         string.printf("%08X %f", m_fr[9 ^ fpu_xor], (double)FP_RFS(9 ^ fpu_xor));
4508         str.printf("%08X %f", m_fr[9 ^ fpu_xor], (double)FP_RFS(9 ^ fpu_xor));
45094509         break;
45104510
45114511      case SH4_FR10:
4512         string.printf("%08X %f", m_fr[10 ^ fpu_xor], (double)FP_RFS(10 ^ fpu_xor));
4512         str.printf("%08X %f", m_fr[10 ^ fpu_xor], (double)FP_RFS(10 ^ fpu_xor));
45134513         break;
45144514
45154515      case SH4_FR11:
4516         string.printf("%08X %f", m_fr[11 ^ fpu_xor], (double)FP_RFS(11 ^ fpu_xor));
4516         str.printf("%08X %f", m_fr[11 ^ fpu_xor], (double)FP_RFS(11 ^ fpu_xor));
45174517         break;
45184518
45194519      case SH4_FR12:
4520         string.printf("%08X %f", m_fr[12 ^ fpu_xor], (double)FP_RFS(12 ^ fpu_xor));
4520         str.printf("%08X %f", m_fr[12 ^ fpu_xor], (double)FP_RFS(12 ^ fpu_xor));
45214521         break;
45224522
45234523      case SH4_FR13:
4524         string.printf("%08X %f", m_fr[13 ^ fpu_xor], (double)FP_RFS(13 ^ fpu_xor));
4524         str.printf("%08X %f", m_fr[13 ^ fpu_xor], (double)FP_RFS(13 ^ fpu_xor));
45254525         break;
45264526
45274527      case SH4_FR14:
4528         string.printf("%08X %f", m_fr[14 ^ fpu_xor], (double)FP_RFS(14 ^ fpu_xor));
4528         str.printf("%08X %f", m_fr[14 ^ fpu_xor], (double)FP_RFS(14 ^ fpu_xor));
45294529         break;
45304530
45314531      case SH4_FR15:
4532         string.printf("%08X %f", m_fr[15 ^ fpu_xor], (double)FP_RFS(15 ^ fpu_xor));
4532         str.printf("%08X %f", m_fr[15 ^ fpu_xor], (double)FP_RFS(15 ^ fpu_xor));
45334533         break;
45344534
45354535      case SH4_XF0:
4536         string.printf("%08X %f", m_xf[0 ^ fpu_xor], (double)FP_XFS(0 ^ fpu_xor));
4536         str.printf("%08X %f", m_xf[0 ^ fpu_xor], (double)FP_XFS(0 ^ fpu_xor));
45374537         break;
45384538
45394539      case SH4_XF1:
4540         string.printf("%08X %f", m_xf[1 ^ fpu_xor], (double)FP_XFS(1 ^ fpu_xor));
4540         str.printf("%08X %f", m_xf[1 ^ fpu_xor], (double)FP_XFS(1 ^ fpu_xor));
45414541         break;
45424542
45434543      case SH4_XF2:
4544         string.printf("%08X %f", m_xf[2 ^ fpu_xor], (double)FP_XFS(2 ^ fpu_xor));
4544         str.printf("%08X %f", m_xf[2 ^ fpu_xor], (double)FP_XFS(2 ^ fpu_xor));
45454545         break;
45464546
45474547      case SH4_XF3:
4548         string.printf("%08X %f", m_xf[3 ^ fpu_xor], (double)FP_XFS(3 ^ fpu_xor));
4548         str.printf("%08X %f", m_xf[3 ^ fpu_xor], (double)FP_XFS(3 ^ fpu_xor));
45494549         break;
45504550
45514551      case SH4_XF4:
4552         string.printf("%08X %f", m_xf[4 ^ fpu_xor], (double)FP_XFS(4 ^ fpu_xor));
4552         str.printf("%08X %f", m_xf[4 ^ fpu_xor], (double)FP_XFS(4 ^ fpu_xor));
45534553         break;
45544554
45554555      case SH4_XF5:
4556         string.printf("%08X %f", m_xf[5 ^ fpu_xor], (double)FP_XFS(5 ^ fpu_xor));
4556         str.printf("%08X %f", m_xf[5 ^ fpu_xor], (double)FP_XFS(5 ^ fpu_xor));
45574557         break;
45584558
45594559      case SH4_XF6:
4560         string.printf("%08X %f", m_xf[6 ^ fpu_xor], (double)FP_XFS(6 ^ fpu_xor));
4560         str.printf("%08X %f", m_xf[6 ^ fpu_xor], (double)FP_XFS(6 ^ fpu_xor));
45614561         break;
45624562
45634563      case SH4_XF7:
4564         string.printf("%08X %f", m_xf[7 ^ fpu_xor], (double)FP_XFS(7 ^ fpu_xor));
4564         str.printf("%08X %f", m_xf[7 ^ fpu_xor], (double)FP_XFS(7 ^ fpu_xor));
45654565         break;
45664566
45674567      case SH4_XF8:
4568         string.printf("%08X %f", m_xf[8 ^ fpu_xor], (double)FP_XFS(8 ^ fpu_xor));
4568         str.printf("%08X %f", m_xf[8 ^ fpu_xor], (double)FP_XFS(8 ^ fpu_xor));
45694569         break;
45704570
45714571      case SH4_XF9:
4572         string.printf("%08X %f", m_xf[9 ^ fpu_xor], (double)FP_XFS(9 ^ fpu_xor));
4572         str.printf("%08X %f", m_xf[9 ^ fpu_xor], (double)FP_XFS(9 ^ fpu_xor));
45734573         break;
45744574
45754575      case SH4_XF10:
4576         string.printf("%08X %f", m_xf[10 ^ fpu_xor], (double)FP_XFS(10 ^ fpu_xor));
4576         str.printf("%08X %f", m_xf[10 ^ fpu_xor], (double)FP_XFS(10 ^ fpu_xor));
45774577         break;
45784578
45794579      case SH4_XF11:
4580         string.printf("%08X %f", m_xf[11 ^ fpu_xor], (double)FP_XFS(11 ^ fpu_xor));
4580         str.printf("%08X %f", m_xf[11 ^ fpu_xor], (double)FP_XFS(11 ^ fpu_xor));
45814581         break;
45824582
45834583      case SH4_XF12:
4584         string.printf("%08X %f", m_xf[12 ^ fpu_xor], (double)FP_XFS(12 ^ fpu_xor));
4584         str.printf("%08X %f", m_xf[12 ^ fpu_xor], (double)FP_XFS(12 ^ fpu_xor));
45854585         break;
45864586
45874587      case SH4_XF13:
4588         string.printf("%08X %f", m_xf[13 ^ fpu_xor], (double)FP_XFS(13 ^ fpu_xor));
4588         str.printf("%08X %f", m_xf[13 ^ fpu_xor], (double)FP_XFS(13 ^ fpu_xor));
45894589         break;
45904590
45914591      case SH4_XF14:
4592         string.printf("%08X %f", m_xf[14 ^ fpu_xor], (double)FP_XFS(14 ^ fpu_xor));
4592         str.printf("%08X %f", m_xf[14 ^ fpu_xor], (double)FP_XFS(14 ^ fpu_xor));
45934593         break;
45944594
45954595      case SH4_XF15:
4596         string.printf("%08X %f", m_xf[15 ^ fpu_xor], (double)FP_XFS(15 ^ fpu_xor));
4596         str.printf("%08X %f", m_xf[15 ^ fpu_xor], (double)FP_XFS(15 ^ fpu_xor));
45974597         break;
45984598
45994599   }
trunk/src/emu/cpu/sh4/sh4.h
r245649r245650
218218   // device_state_interface overrides
219219   virtual void state_import(const device_state_entry &entry);
220220   virtual void state_export(const device_state_entry &entry);
221   virtual void state_string_export(const device_state_entry &entry, astring &string);
221   virtual void state_string_export(const device_state_entry &entry, astring &str);
222222
223223   // device_disasm_interface overrides
224224   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/sm8500/sm8500.c
r245649r245650
139139}
140140
141141
142void sm8500_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
142void sm8500_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
143143{
144144   switch (entry.index())
145145   {
146146      case SM8500_PS:
147         string.printf( "%04X", ( m_PS0 << 8 ) | m_PS1 );
147         str.printf( "%04X", ( m_PS0 << 8 ) | m_PS1 );
148148         break;
149149
150150      case SM8500_RR0:
151         string.printf( "%04X", mem_readword( 0x00 ) );
151         str.printf( "%04X", mem_readword( 0x00 ) );
152152         break;
153153
154154      case SM8500_RR2:
155         string.printf( "%04X", mem_readword( 0x02 ) );
155         str.printf( "%04X", mem_readword( 0x02 ) );
156156         break;
157157
158158      case SM8500_RR4:
159         string.printf( "%04X", mem_readword( 0x04 ) );
159         str.printf( "%04X", mem_readword( 0x04 ) );
160160         break;
161161
162162      case SM8500_RR6:
163         string.printf( "%04X", mem_readword( 0x06 ) );
163         str.printf( "%04X", mem_readword( 0x06 ) );
164164         break;
165165
166166      case SM8500_RR8:
167         string.printf( "%04X", mem_readword( 0x08 ) );
167         str.printf( "%04X", mem_readword( 0x08 ) );
168168         break;
169169
170170      case SM8500_RR10:
171         string.printf( "%04X", mem_readword( 0x0a ) );
171         str.printf( "%04X", mem_readword( 0x0a ) );
172172         break;
173173
174174      case SM8500_RR12:
175         string.printf( "%04X", mem_readword( 0x0c ) );
175         str.printf( "%04X", mem_readword( 0x0c ) );
176176         break;
177177
178178      case SM8500_RR14:
179         string.printf( "%04X", mem_readword( 0x0e ) );
179         str.printf( "%04X", mem_readword( 0x0e ) );
180180         break;
181181
182182      case STATE_GENFLAGS:
183         string.printf( "%c%c%c%c%c%c%c%c",
183         str.printf( "%c%c%c%c%c%c%c%c",
184184            m_PS1 & FLAG_C ? 'C' : '.',
185185            m_PS1 & FLAG_Z ? 'Z' : '.',
186186            m_PS1 & FLAG_S ? 'S' : '.',
trunk/src/emu/cpu/sm8500/sm8500.h
r245649r245650
6969   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
7070
7171   // device_state_interface overrides
72   void state_string_export(const device_state_entry &entry, astring &string);
72   void state_string_export(const device_state_entry &entry, astring &str);
7373
7474   // device_disasm_interface overrides
7575   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/spc700/spc700.c
r245649r245650
12421242}
12431243
12441244
1245void spc700_device::state_string_export(const device_state_entry &entry, astring &string)
1245void spc700_device::state_string_export(const device_state_entry &entry, astring &str)
12461246{
12471247   switch (entry.index())
12481248   {
12491249      case STATE_GENFLAGS:
1250         string.printf("%c%c%c%c%c%c%c%c",
1250         str.printf("%c%c%c%c%c%c%c%c",
12511251            (m_flag_n & 0x80)        ? 'N':'.',
12521252            ((m_flag_v & 0x80) >> 1) ? 'V':'.',
12531253            (m_flag_p>>3)            ? 'P':'.',
trunk/src/emu/cpu/spc700/spc700.h
r245649r245650
2828   // device_state_interface overrides
2929   virtual void state_import(const device_state_entry &entry);
3030   virtual void state_export(const device_state_entry &entry);
31   void state_string_export(const device_state_entry &entry, astring &string);
31   void state_string_export(const device_state_entry &entry, astring &str);
3232
3333   // device_disasm_interface overrides
3434   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/ssem/ssem.c
r245649r245650
148148//  for the debugger
149149//-------------------------------------------------
150150
151void ssem_device::state_string_export(const device_state_entry &entry, astring &string)
151void ssem_device::state_string_export(const device_state_entry &entry, astring &str)
152152{
153153   switch (entry.index())
154154   {
155155      case STATE_GENFLAGS:
156         string.printf("%c", m_halt ? 'H' : '.');
156         str.printf("%c", m_halt ? 'H' : '.');
157157         break;
158158   }
159159}
trunk/src/emu/cpu/ssem/ssem.h
r245649r245650
4343   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
4444
4545   // device_state_interface overrides
46   virtual void state_string_export(const device_state_entry &entry, astring &string);
46   virtual void state_string_export(const device_state_entry &entry, astring &str);
4747
4848   // address spaces
4949   const address_space_config m_program_config;
trunk/src/emu/cpu/ssp1601/ssp1601.c
r245649r245650
548548}
549549
550550
551void ssp1601_device::state_string_export(const device_state_entry &entry, astring &string)
551void ssp1601_device::state_string_export(const device_state_entry &entry, astring &str)
552552{
553553   switch (entry.index())
554554   {
555555      case STATE_GENFLAGS:
556         string.printf( "%c%c%c%c", (rST&SSP_FLAG_N)?'N':'.', (rST&SSP_FLAG_V)?'V':'.',
556         str.printf("%c%c%c%c", (rST&SSP_FLAG_N) ? 'N' : '.', (rST&SSP_FLAG_V) ? 'V' : '.',
557557            (rST&SSP_FLAG_Z)?'Z':'.', (rST&SSP_FLAG_L)?'L':'.'
558558         );
559559         break;
trunk/src/emu/cpu/ssp1601/ssp1601.h
r245649r245650
3838   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : NULL); }
3939
4040   // device_state_interface overrides
41   void state_string_export(const device_state_entry &entry, astring &string);
41   void state_string_export(const device_state_entry &entry, astring &str);
4242
4343   // device_disasm_interface overrides
4444   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/t11/t11.c
r245649r245650
275275   m_icountptr = &m_icount;
276276}
277277
278void t11_device::state_string_export(const device_state_entry &entry, astring &string)
278void t11_device::state_string_export(const device_state_entry &entry, astring &str)
279279{
280280   switch (entry.index())
281281   {
282282      case STATE_GENFLAGS:
283         string.printf("%c%c%c%c%c%c%c%c",
283         str.printf("%c%c%c%c%c%c%c%c",
284284            m_psw.b.l & 0x80 ? '?':'.',
285285            m_psw.b.l & 0x40 ? 'I':'.',
286286            m_psw.b.l & 0x20 ? 'I':'.',
trunk/src/emu/cpu/t11/t11.h
r245649r245650
5656   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
5757
5858   // device_state_interface overrides
59   void state_string_export(const device_state_entry &entry, astring &string);
59   void state_string_export(const device_state_entry &entry, astring &str);
6060
6161   // device_disasm_interface overrides
6262   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/tlcs90/tlcs90.c
r245649r245650
27612761}
27622762
27632763
2764void tlcs90_device::state_string_export(const device_state_entry &entry, astring &string)
2764void tlcs90_device::state_string_export(const device_state_entry &entry, astring &str)
27652765{
27662766   switch (entry.index())
27672767   {
27682768      case STATE_GENFLAGS:
2769         string.printf("%c%c%c%c%c%c%c%c",
2769         str.printf("%c%c%c%c%c%c%c%c",
27702770            F & 0x80 ? 'S':'.',
27712771            F & 0x40 ? 'Z':'.',
27722772            F & 0x20 ? 'I':'.',
trunk/src/emu/cpu/tlcs90/tlcs90.h
r245649r245650
4949   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
5050
5151   // device_state_interface overrides
52   void state_string_export(const device_state_entry &entry, astring &string);
52   void state_string_export(const device_state_entry &entry, astring &str);
5353
5454   // device_disasm_interface overrides
5555   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/tlcs900/tlcs900.c
r245649r245650
374374}
375375
376376
377void tlcs900h_device::state_string_export(const device_state_entry &entry, astring &string)
377void tlcs900h_device::state_string_export(const device_state_entry &entry, astring &str)
378378{
379379   switch (entry.index())
380380   {
381381      case STATE_GENFLAGS:
382         string.printf("%c%d%c%d%c%c%c%c%c%c%c%c",
382         str.printf("%c%d%c%d%c%c%c%c%c%c%c%c",
383383               m_sr.w.l & 0x8000 ? 'S' : 'U',
384384               ( m_sr.w.l & 0x7000 ) >> 12,
385385               m_sr.w.l & 0x0800 ? 'M' : 'N',
trunk/src/emu/cpu/tlcs900/tlcs900.h
r245649r245650
7070   }
7171
7272   // device_state_interface overrides
73   void state_string_export(const device_state_entry &entry, astring &string);
73   void state_string_export(const device_state_entry &entry, astring &str);
7474
7575   // device_disasm_interface overrides
7676   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/tms0980/tms0980.c
r245649r245650
392392   return CPU_DISASSEMBLE_NAME(tms0980)(this, buffer, pc, oprom, opram, options);
393393}
394394
395void tms1xxx_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
395void tms1xxx_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
396396{
397397   switch (entry.index())
398398   {
399399      case STATE_GENPC:
400         string.printf("%03X", m_rom_address << ((m_byte_bits > 8) ? 1 : 0));
400         str.printf("%03X", m_rom_address << ((m_byte_bits > 8) ? 1 : 0));
401401         break;
402402   }
403403}
trunk/src/emu/cpu/tms0980/tms0980.h
r245649r245650
9696   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
9797   virtual UINT32 disasm_max_opcode_bytes() const { return 1; }
9898
99   void state_string_export(const device_state_entry &entry, astring &string);
99   void state_string_export(const device_state_entry &entry, astring &str);
100100
101101   void next_pc();
102102
trunk/src/emu/cpu/tms32010/tms32010.c
r245649r245650
893893}
894894
895895
896void tms32010_device::state_string_export(const device_state_entry &entry, astring &string)
896void tms32010_device::state_string_export(const device_state_entry &entry, astring &str)
897897{
898898   switch (entry.index())
899899   {
900900      case STATE_GENFLAGS:
901         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
901         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
902902            m_STR & 0x8000 ? 'O':'.',
903903            m_STR & 0x4000 ? 'M':'.',
904904            m_STR & 0x2000 ? 'I':'.',
trunk/src/emu/cpu/tms32010/tms32010.h
r245649r245650
7070   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ) ); }
7171
7272   // device_state_interface overrides
73   void state_string_export(const device_state_entry &entry, astring &string);
73   void state_string_export(const device_state_entry &entry, astring &str);
7474
7575   // device_disasm_interface overrides
7676   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/tms32025/tms32025.c
r245649r245650
17991799}
18001800
18011801
1802void tms32025_device::state_string_export(const device_state_entry &entry, astring &string)
1802void tms32025_device::state_string_export(const device_state_entry &entry, astring &str)
18031803{
18041804   switch (entry.index())
18051805   {
18061806      case STATE_GENFLAGS:
1807         string.printf("arp%d%c%c%c%cdp%03x  arb%d%c%c%c%c%c%c%c%c%c%c%cpm%d",
1807         str.printf("arp%d%c%c%c%cdp%03x  arb%d%c%c%c%c%c%c%c%c%c%c%cpm%d",
18081808            (m_STR0 & 0xe000) >> 13,
18091809            m_STR0 & 0x1000 ? 'O':'.',
18101810            m_STR0 & 0x0800 ? 'M':'.',
trunk/src/emu/cpu/tms32025/tms32025.h
r245649r245650
9595   // device_state_interface overrides
9696   virtual void state_import(const device_state_entry &entry);
9797   virtual void state_export(const device_state_entry &entry);
98   void state_string_export(const device_state_entry &entry, astring &string);
98   void state_string_export(const device_state_entry &entry, astring &str);
9999
100100   // device_disasm_interface overrides
101101   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/tms32031/tms32031.c
r245649r245650
529529//  for the debugger
530530//-------------------------------------------------
531531
532void tms3203x_device::state_string_export(const device_state_entry &entry, astring &string)
532void tms3203x_device::state_string_export(const device_state_entry &entry, astring &str)
533533{
534534   switch (entry.index())
535535   {
r245649r245650
541541      case TMS3203X_R5F:
542542      case TMS3203X_R6F:
543543      case TMS3203X_R7F:
544         string.printf("%12g", m_r[TMR_R0 + (entry.index() - TMS3203X_R0F)].as_double());
544         str.printf("%12g", m_r[TMR_R0 + (entry.index() - TMS3203X_R0F)].as_double());
545545         break;
546546
547547      case STATE_GENFLAGS:
548548         UINT32 temp = m_r[TMR_ST].i32[0];
549         string.printf("%c%c%c%c%c%c%c%c",
549         str.printf("%c%c%c%c%c%c%c%c",
550550            (temp & 0x80) ? 'O':'.',
551551            (temp & 0x40) ? 'U':'.',
552552            (temp & 0x20) ? 'V':'.',
trunk/src/emu/cpu/tms32031/tms32031.h
r245649r245650
179179   // device_state_interface overrides
180180   virtual void state_import(const device_state_entry &entry);
181181   virtual void state_export(const device_state_entry &entry);
182   virtual void state_string_export(const device_state_entry &entry, astring &string);
182   virtual void state_string_export(const device_state_entry &entry, astring &str);
183183
184184   // device_disasm_interface overrides
185185   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/tms32082/tms32082.c
r245649r245650
203203   m_icountptr = &m_icount;
204204}
205205
206void tms32082_mp_device::state_string_export(const device_state_entry &entry, astring &string)
206void tms32082_mp_device::state_string_export(const device_state_entry &entry, astring &str)
207207{
208208   switch (entry.index())
209209   {
210210      case STATE_GENFLAGS:
211         string.printf("?");
211         str.printf("?");
212212         break;
213213   }
214214}
r245649r245650
502502   m_icountptr = &m_icount;
503503}
504504
505void tms32082_pp_device::state_string_export(const device_state_entry &entry, astring &string)
505void tms32082_pp_device::state_string_export(const device_state_entry &entry, astring &str)
506506{
507507   switch (entry.index())
508508   {
509509      case STATE_GENFLAGS:
510         string.printf("?");
510         str.printf("?");
511511         break;
512512   }
513513}
trunk/src/emu/cpu/tms32082/tms32082.h
r245649r245650
9191   }
9292
9393   // device_state_interface overrides
94   void state_string_export(const device_state_entry &entry, astring &string);
94   void state_string_export(const device_state_entry &entry, astring &str);
9595
9696   // device_disasm_interface overrides
9797   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
r245649r245650
181181   }
182182
183183   // device_state_interface overrides
184   void state_string_export(const device_state_entry &entry, astring &string);
184   void state_string_export(const device_state_entry &entry, astring &str);
185185
186186   // device_disasm_interface overrides
187187   virtual UINT32 disasm_min_opcode_bytes() const { return 8; }
trunk/src/emu/cpu/tms34010/tms34010.c
r245649r245650
15961596}
15971597
15981598
1599void tms340x0_device::state_string_export(const device_state_entry &entry, astring &string)
1599void tms340x0_device::state_string_export(const device_state_entry &entry, astring &str)
16001600{
16011601   switch (entry.index())
16021602   {
16031603      case STATE_GENFLAGS:
1604         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
1604         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
16051605            m_st & 0x80000000 ? 'N':'.',
16061606            m_st & 0x40000000 ? 'C':'.',
16071607            m_st & 0x20000000 ? 'Z':'.',
trunk/src/emu/cpu/tms34010/tms34010.h
r245649r245650
280280   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
281281
282282   // device_state_interface overrides
283   virtual void state_string_export(const device_state_entry &entry, astring &string);
283   virtual void state_string_export(const device_state_entry &entry, astring &str);
284284
285285   // device_disasm_interface overrides
286286   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/tms7000/tms7000.c
r245649r245650
271271   state_add(STATE_GENFLAGS, "GENFLAGS", m_sr).formatstr("%8s").noshow();
272272}
273273
274void tms7000_device::state_string_export(const device_state_entry &entry, astring &string)
274void tms7000_device::state_string_export(const device_state_entry &entry, astring &str)
275275{
276276   switch (entry.index())
277277   {
278278      case STATE_GENFLAGS:
279         string.printf("%c%c%c%c%c%c%c%c",
279         str.printf("%c%c%c%c%c%c%c%c",
280280            m_sr & 0x80 ? 'C':'c',
281281            m_sr & 0x40 ? 'N':'n',
282282            m_sr & 0x20 ? 'Z':'z',
trunk/src/emu/cpu/tms7000/tms7000.h
r245649r245650
9191   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
9292
9393   // device_state_interface overrides
94   void state_string_export(const device_state_entry &entry, astring &string);
94   void state_string_export(const device_state_entry &entry, astring &str);
9595
9696   // device_disasm_interface overrides
9797   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/tms9900/tms9900.c
r245649r245650
349349/*
350350    state_string_export - export state as a string for the debugger
351351*/
352void tms99xx_device::state_string_export(const device_state_entry &entry, astring &string)
352void tms99xx_device::state_string_export(const device_state_entry &entry, astring &str)
353353{
354354   static const char *statestr = "LAECOPX-----IIII";
355355   char flags[17];
r245649r245650
363363         val = (val >> 1) & 0x7fff;
364364      }
365365   }
366   string.cpy(flags);
366   str.cpy(flags);
367367}
368368
369369/**************************************************************************/
trunk/src/emu/cpu/tms9900/tms9900.h
r245649r245650
226226   static const char* s_statename[];
227227   void    state_import(const device_state_entry &entry);
228228   void    state_export(const device_state_entry &entry);
229   void    state_string_export(const device_state_entry &entry, astring &string);
229   void    state_string_export(const device_state_entry &entry, astring &str);
230230
231231   // Interrupt handling
232232   void service_interrupt();
trunk/src/emu/cpu/tms9900/tms9995.c
r245649r245650
372372/*
373373    state_string_export - export state as a string for the debugger
374374*/
375void tms9995_device::state_string_export(const device_state_entry &entry, astring &string)
375void tms9995_device::state_string_export(const device_state_entry &entry, astring &str)
376376{
377377   static const char *statestr = "LAECOPX-----IIII";
378378   char flags[17];
r245649r245650
386386         val = (val >> 1) & 0x7fff;
387387      }
388388   }
389   string.cpy(flags);
389   str.cpy(flags);
390390}
391391
392392/*
trunk/src/emu/cpu/tms9900/tms9995.h
r245649r245650
106106   static const char* s_statename[];
107107   void    state_import(const device_state_entry &entry);
108108   void    state_export(const device_state_entry &entry);
109   void    state_string_export(const device_state_entry &entry, astring &string);
109   void    state_string_export(const device_state_entry &entry, astring &str);
110110   UINT16  read_workspace_register_debug(int reg);
111111   void    write_workspace_register_debug(int reg, UINT16 data);
112112
trunk/src/emu/cpu/ucom4/ucom4.c
r245649r245650
7575
7676
7777// disasm
78void ucom4_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
78void ucom4_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
7979{
8080   switch (entry.index())
8181   {
8282      // obviously not from a single flags register
8383      case STATE_GENFLAGS:
84         string.printf("%c%c%c%c%c",
84         str.printf("%c%c%c%c%c",
8585            m_inte_f    ? 'E':'e',
8686            m_int_f     ? 'I':'i',
8787            m_timer_f   ? 'T':'t',
trunk/src/emu/cpu/ucom4/ucom4.h
r245649r245650
151151   virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
152152   virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
153153
154   void state_string_export(const device_state_entry &entry, astring &string);
154   void state_string_export(const device_state_entry &entry, astring &str);
155155
156156   address_space_config m_program_config;
157157   address_space_config m_data_config;
trunk/src/emu/cpu/uml.h
r245649r245650
409409      void set_mapvar(int paramnum, UINT32 value) { assert(paramnum < m_numparams); assert(m_param[paramnum].is_mapvar()); m_param[paramnum] = value; }
410410
411411      // misc
412      const char *disasm(astring &string, drcuml_state *drcuml = NULL) const;
412      const char *disasm(astring &str, drcuml_state *drcuml = NULL) const;
413413      UINT8 input_flags() const;
414414      UINT8 output_flags() const;
415415      UINT8 modified_flags() const;
trunk/src/emu/cpu/upd7725/upd7725.c
r245649r245650
201201//  for the debugger
202202//-------------------------------------------------
203203
204void necdsp_device::state_string_export(const device_state_entry &entry, astring &string)
204void necdsp_device::state_string_export(const device_state_entry &entry, astring &str)
205205{
206206   switch (entry.index())
207207   {
208208      case UPD7725_FLAGA:
209         string.printf("%s %s %c%c %s %s %s %s",
209         str.printf("%s %s %c%c %s %s %s %s",
210210                     regs.flaga.s1 ? "S1" : "s1",
211211                     regs.flaga.s0 ? "S0" : "s0",
212212                     regs.flaga.c ? 'C' : 'c',
r245649r245650
218218         break;
219219
220220      case UPD7725_FLAGB:
221         string.printf("%s %s %c%c %s %s %s %s",
221         str.printf("%s %s %c%c %s %s %s %s",
222222                     regs.flagb.s1 ? "S1" : "s1",
223223                     regs.flagb.s0 ? "S0" : "s0",
224224                     regs.flagb.c ? 'C' : 'c',
trunk/src/emu/cpu/upd7725/upd7725.h
r245649r245650
108108   // device_state_interface overrides
109109   virtual void state_import(const device_state_entry &entry);
110110   virtual void state_export(const device_state_entry &entry);
111   virtual void state_string_export(const device_state_entry &entry, astring &string);
111   virtual void state_string_export(const device_state_entry &entry, astring &str);
112112
113113   // device_disasm_interface overrides
114114   virtual UINT32 disasm_min_opcode_bytes() const;
trunk/src/emu/cpu/upd7810/upd7810.c
r245649r245650
17321732
17331733}
17341734
1735void upd7810_device::state_string_export(const device_state_entry &entry, astring &string)
1735void upd7810_device::state_string_export(const device_state_entry &entry, astring &str)
17361736{
17371737   switch (entry.index())
17381738   {
17391739      case STATE_GENFLAGS:
1740         string.printf("%s:%s:%s:%s:%s:%s",
1740         str.printf("%s:%s:%s:%s:%s:%s",
17411741            m_psw & 0x40 ? "ZF":"--",
17421742            m_psw & 0x20 ? "SK":"--",
17431743            m_psw & 0x10 ? "HC":"--",
trunk/src/emu/cpu/upd7810/upd7810.h
r245649r245650
168168   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
169169
170170   // device_state_interface overrides
171   void state_string_export(const device_state_entry &entry, astring &string);
171   void state_string_export(const device_state_entry &entry, astring &str);
172172
173173   // device_disasm_interface overrides
174174   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/v30mz/v30mz.c
r245649r245650
183183}
184184
185185
186void v30mz_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
186void v30mz_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
187187{
188188   switch (entry.index())
189189   {
190190      case STATE_GENPC:
191         string.printf("%08X", pc() );
191         str.printf("%08X", pc());
192192         break;
193193
194194      case STATE_GENFLAGS:
195195         {
196196            UINT16 flags = CompressFlags();
197            string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
197            str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
198198               flags & 0x8000 ? 'M':'.',
199199               flags & 0x4000 ? '?':'.',
200200               flags & 0x2000 ? '?':'.',
trunk/src/emu/cpu/v30mz/v30mz.h
r245649r245650
4242   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
4343
4444   // device_state_interface overrides
45   void state_string_export(const device_state_entry &entry, astring &string);
45   void state_string_export(const device_state_entry &entry, astring &str);
4646
4747   // device_disasm_interface overrides
4848   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/v810/v810.c
r245649r245650
13171317   m_icountptr = &m_icount;
13181318}
13191319
1320void v810_device::state_string_export(const device_state_entry &entry, astring &string)
1320void v810_device::state_string_export(const device_state_entry &entry, astring &str)
13211321{
13221322   switch (entry.index())
13231323   {
13241324      case STATE_GENFLAGS:
1325         string.printf( "%c%c%c%c%c%c%c%c",
1325         str.printf("%c%c%c%c%c%c%c%c",
13261326            GET_AE ? 'A':'.',
13271327            GET_NP ? 'N':'.',
13281328            GET_EP ? 'E':'.',
trunk/src/emu/cpu/v810/v810.h
r245649r245650
9999   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : NULL); }
100100
101101   // device_state_interface overrides
102   void state_string_export(const device_state_entry &entry, astring &string);
102   void state_string_export(const device_state_entry &entry, astring &str);
103103
104104   // device_disasm_interface overrides
105105   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/cpu/z180/z180.c
r245649r245650
25812581   }
25822582}
25832583
2584void z180_device::state_string_export(const device_state_entry &entry, astring &string)
2584void z180_device::state_string_export(const device_state_entry &entry, astring &str)
25852585{
25862586   switch (entry.index())
25872587   {
25882588      case STATE_GENFLAGS:
2589         string.printf("%c%c%c%c%c%c%c%c",
2589         str.printf("%c%c%c%c%c%c%c%c",
25902590            m_AF.b.l & 0x80 ? 'S':'.',
25912591            m_AF.b.l & 0x40 ? 'Z':'.',
25922592            m_AF.b.l & 0x20 ? '5':'.',
trunk/src/emu/cpu/z180/z180.h
r245649r245650
157157   // device_state_interface overrides
158158   virtual void state_import(const device_state_entry &entry);
159159   virtual void state_export(const device_state_entry &entry);
160   void state_string_export(const device_state_entry &entry, astring &string);
160   void state_string_export(const device_state_entry &entry, astring &str);
161161
162162   // device_disasm_interface overrides
163163   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/z8/z8.c
r245649r245650
807807   }
808808}
809809
810void z8_device::state_string_export(const device_state_entry &entry, astring &string)
810void z8_device::state_string_export(const device_state_entry &entry, astring &str)
811811{
812812   switch (entry.index())
813813   {
814      case STATE_GENFLAGS: string.printf("%c%c%c%c%c%c",
814      case STATE_GENFLAGS: str.printf("%c%c%c%c%c%c",
815815                              m_r[Z8_REGISTER_FLAGS] & Z8_FLAGS_C ? 'C' : '.',
816816                              m_r[Z8_REGISTER_FLAGS] & Z8_FLAGS_Z ? 'Z' : '.',
817817                              m_r[Z8_REGISTER_FLAGS] & Z8_FLAGS_S ? 'S' : '.',
trunk/src/emu/cpu/z8/z8.h
r245649r245650
6060   // device_state_interface overrides
6161   virtual void state_import(const device_state_entry &entry);
6262   virtual void state_export(const device_state_entry &entry);
63   void state_string_export(const device_state_entry &entry, astring &string);
63   void state_string_export(const device_state_entry &entry, astring &str);
6464
6565   // device_disasm_interface overrides
6666   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/z80/z80.c
r245649r245650
36663666   }
36673667}
36683668
3669void z80_device::state_string_export(const device_state_entry &entry, astring &string)
3669void z80_device::state_string_export(const device_state_entry &entry, astring &str)
36703670{
36713671   switch (entry.index())
36723672   {
36733673      case STATE_GENFLAGS:
3674         string.printf("%c%c%c%c%c%c%c%c",
3674         str.printf("%c%c%c%c%c%c%c%c",
36753675            F & 0x80 ? 'S':'.',
36763676            F & 0x40 ? 'Z':'.',
36773677            F & 0x20 ? 'Y':'.',
trunk/src/emu/cpu/z80/z80.h
r245649r245650
5858   // device_state_interface overrides
5959   virtual void state_import(const device_state_entry &entry);
6060   virtual void state_export(const device_state_entry &entry);
61   virtual void state_string_export(const device_state_entry &entry, astring &string);
61   virtual void state_string_export(const device_state_entry &entry, astring &str);
6262
6363   // device_disasm_interface overrides
6464   virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
trunk/src/emu/cpu/z8000/z8000.c
r245649r245650
648648   state_add( STATE_GENSP, "GENSP", m_nspoff ).noshow();
649649}
650650
651void z8002_device::state_string_export(const device_state_entry &entry, astring &string)
651void z8002_device::state_string_export(const device_state_entry &entry, astring &str)
652652{
653653   switch (entry.index())
654654   {
655655      case STATE_GENFLAGS:
656         string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
656         str.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
657657            m_fcw & 0x8000 ? 'S':'s',
658658            m_fcw & 0x4000 ? 'n':'N',
659659            m_fcw & 0x2000 ? 'E':'e',
trunk/src/emu/cpu/z8000/z8000.h
r245649r245650
6060   }
6161
6262   // device_state_interface overrides
63   void state_string_export(const device_state_entry &entry, astring &string);
63   void state_string_export(const device_state_entry &entry, astring &str);
6464
6565   // device_disasm_interface overrides
6666   virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
trunk/src/emu/distate.c
r245649r245650
580580//  written to perform any post-processing
581581//-------------------------------------------------
582582
583void device_state_interface::state_string_import(const device_state_entry &entry, astring &string)
583void device_state_interface::state_string_import(const device_state_entry &entry, astring &str)
584584{
585585   // do nothing by default
586586}
r245649r245650
591591//  written to perform any post-processing
592592//-------------------------------------------------
593593
594void device_state_interface::state_string_export(const device_state_entry &entry, astring &string)
594void device_state_interface::state_string_export(const device_state_entry &entry, astring &str)
595595{
596596   // do nothing by default
597597}
trunk/src/emu/distate.h
r245649r245650
162162   // derived class overrides
163163   virtual void state_import(const device_state_entry &entry);
164164   virtual void state_export(const device_state_entry &entry);
165   virtual void state_string_import(const device_state_entry &entry, astring &string);
166   virtual void state_string_export(const device_state_entry &entry, astring &string);
165   virtual void state_string_import(const device_state_entry &entry, astring &str);
166   virtual void state_string_export(const device_state_entry &entry, astring &str);
167167
168168   // internal operation overrides
169169   virtual void interface_post_start();
trunk/src/emu/input.c
r245649r245650
529529//  friendly display
530530//-------------------------------------------------
531531
532const char *joystick_map::to_string(astring &string) const
532const char *joystick_map::to_string(astring &str) const
533533{
534   string.printf("%s\n", m_origstring.c_str());
534   str.printf("%s\n", m_origstring.c_str());
535535   for (int rownum = 0; rownum < 9; rownum++)
536536   {
537      string.catprintf("  ");
537      str.catprintf("  ");
538538      for (int colnum = 0; colnum < 9; colnum++)
539539         switch (m_map[rownum][colnum])
540540         {
541            case JOYSTICK_MAP_UP | JOYSTICK_MAP_LEFT:   string.catprintf("7");  break;
542            case JOYSTICK_MAP_UP:                       string.catprintf("8");  break;
543            case JOYSTICK_MAP_UP | JOYSTICK_MAP_RIGHT:  string.catprintf("9");  break;
544            case JOYSTICK_MAP_LEFT:                     string.catprintf("4");  break;
545            case JOYSTICK_MAP_NEUTRAL:                  string.catprintf("5");  break;
546            case JOYSTICK_MAP_RIGHT:                    string.catprintf("6");  break;
547            case JOYSTICK_MAP_DOWN | JOYSTICK_MAP_LEFT: string.catprintf("1");  break;
548            case JOYSTICK_MAP_DOWN:                     string.catprintf("2");  break;
549            case JOYSTICK_MAP_DOWN | JOYSTICK_MAP_RIGHT:string.catprintf("3");  break;
550            case JOYSTICK_MAP_STICKY:                   string.catprintf("s");  break;
551            default:                                    string.catprintf("?");  break;
541            case JOYSTICK_MAP_UP | JOYSTICK_MAP_LEFT:   str.catprintf("7");  break;
542            case JOYSTICK_MAP_UP:                       str.catprintf("8");  break;
543            case JOYSTICK_MAP_UP | JOYSTICK_MAP_RIGHT:  str.catprintf("9");  break;
544            case JOYSTICK_MAP_LEFT:                     str.catprintf("4");  break;
545            case JOYSTICK_MAP_NEUTRAL:                  str.catprintf("5");  break;
546            case JOYSTICK_MAP_RIGHT:                    str.catprintf("6");  break;
547            case JOYSTICK_MAP_DOWN | JOYSTICK_MAP_LEFT: str.catprintf("1");  break;
548            case JOYSTICK_MAP_DOWN:                     str.catprintf("2");  break;
549            case JOYSTICK_MAP_DOWN | JOYSTICK_MAP_RIGHT:str.catprintf("3");  break;
550            case JOYSTICK_MAP_STICKY:                   str.catprintf("s");  break;
551            default:                                    str.catprintf("?");  break;
552552         }
553553
554      string.catprintf("\n");
554      str.catprintf("\n");
555555   }
556   return string.c_str();
556   return str.c_str();
557557}
558558
559559
r245649r245650
14611461//  friendly name
14621462//-------------------------------------------------
14631463
1464const char *input_manager::code_name(astring &string, input_code code) const
1464const char *input_manager::code_name(astring &str, input_code code) const
14651465{
1466   string.reset();
1466   str.reset();
14671467
14681468   // if nothing there, return an empty string
14691469   input_device_item *item = item_from_code(code);
14701470   if (item == NULL)
1471      return string.c_str();
1471      return str.c_str();
14721472
14731473   // determine the devclass part
14741474   const char *devclass = (*devclass_string_table)[code.device_class()];
r245649r245650
15011501         devcode = "";
15021502
15031503   // concatenate the strings
1504   string.cpy(devclass);
1504   str.cpy(devclass);
15051505   if (devindex)
1506      string.cat(" ").cat(devindex);
1506      str.cat(" ").cat(devindex);
15071507   if (devcode[0] != 0)
1508      string.cat(" ").cat(devcode);
1508      str.cat(" ").cat(devcode);
15091509   if (modifier != NULL)
1510      string.cat(" ").cat(modifier);
1510      str.cat(" ").cat(modifier);
15111511
15121512   // delete any leading spaces
1513   return string.trimspace().c_str();
1513   return str.trimspace().c_str();
15141514}
15151515
15161516
r245649r245650
15181518//  code_to_token - create a token for a given code
15191519//-------------------------------------------------
15201520
1521const char *input_manager::code_to_token(astring &string, input_code code) const
1521const char *input_manager::code_to_token(astring &str, input_code code) const
15221522{
15231523   // determine the devclass part
15241524   const char *devclass = (*devclass_token_table)[code.device_class()];
r245649r245650
15421542      itemclass = (*itemclass_token_table)[code.item_class()];
15431543
15441544   // concatenate the strings
1545   string.cpy(devclass);
1545   str.cpy(devclass);
15461546   if (devindex)
1547      string.cat("_").cat(devindex);
1547      str.cat("_").cat(devindex);
15481548   if (devcode[0] != 0)
1549      string.cat("_").cat(devcode);
1549      str.cat("_").cat(devcode);
15501550   if (modifier != NULL)
1551      string.cat("_").cat(modifier);
1551      str.cat("_").cat(modifier);
15521552   if (itemclass[0] != 0)
1553      string.cat("_").cat(itemclass);
1554   return string.c_str();
1553      str.cat("_").cat(itemclass);
1554   return str.c_str();
15551555}
15561556
15571557
r245649r245650
19251925//  sequence
19261926//-------------------------------------------------
19271927
1928const char *input_manager::seq_name(astring &string, const input_seq &seq) const
1928const char *input_manager::seq_name(astring &str, const input_seq &seq) const
19291929{
19301930   // make a copy of our sequence, removing any invalid bits
19311931   input_code clean_codes[sizeof(seq) / sizeof(input_code)];
r245649r245650
19461946
19471947   // special case: empty
19481948   if (clean_index == 0)
1949      return string.cpy((seq.length() == 0) ? "None" : "n/a").c_str();
1949      return str.cpy((seq.length() == 0) ? "None" : "n/a").c_str();
19501950
19511951   // start with an empty buffer
1952   string.reset();
1952   str.reset();
19531953
19541954   // loop until we hit the end
19551955   for (int codenum = 0; codenum < clean_index; codenum++)
19561956   {
19571957      // append a space if not the first code
19581958      if (codenum != 0)
1959         string.cat(" ");
1959         str.cat(" ");
19601960
19611961      // handle OR/NOT codes here
19621962      input_code code = clean_codes[codenum];
19631963      if (code == input_seq::or_code)
1964         string.cat("or");
1964         str.cat("or");
19651965      else if (code == input_seq::not_code)
1966         string.cat("not");
1966         str.cat("not");
19671967
19681968      // otherwise, assume it is an input code and ask the input system to generate it
19691969      else
1970         string.cat(code_name(codestr, code));
1970         str.cat(code_name(codestr, code));
19711971   }
1972   return string.c_str();
1972   return str.c_str();
19731973}
19741974
19751975
r245649r245650
19781978//  a sequence
19791979//-------------------------------------------------
19801980
1981const char *input_manager::seq_to_tokens(astring &string, const input_seq &seq) const
1981const char *input_manager::seq_to_tokens(astring &str, const input_seq &seq) const
19821982{
19831983   // start with an empty buffer
1984   string.reset();
1984   str.reset();
19851985
19861986   // loop until we hit the end
19871987   astring codestr;
r245649r245650
19891989   {
19901990      // append a space if not the first code
19911991      if (codenum != 0)
1992         string.cat(" ");
1992         str.cat(" ");
19931993
19941994      // handle OR/NOT codes here
19951995      input_code code = seq[codenum];
19961996      if (code == input_seq::or_code)
1997         string.cat("OR");
1997         str.cat("OR");
19981998      else if (code == input_seq::not_code)
1999         string.cat("NOT");
1999         str.cat("NOT");
20002000      else if (code == input_seq::default_code)
2001         string.cat("DEFAULT");
2001         str.cat("DEFAULT");
20022002
20032003      // otherwise, assume it is an input code and ask the input system to generate it
20042004      else
2005         string.cat(code_to_token(codestr, code));
2005         str.cat(code_to_token(codestr, code));
20062006   }
2007   return string.c_str();
2007   return str.c_str();
20082008}
20092009
20102010
trunk/src/emu/input.h
r245649r245650
365365   bool parse(const char *mapstring);
366366
367367   // create a friendly string
368   const char *to_string(astring &string) const;
368   const char *to_string(astring &str) const;
369369
370370   // update the state of a live map
371371   UINT8 update(INT32 xaxisval, INT32 yaxisval);
r245649r245650
655655   input_device *device_from_code(input_code code) const;
656656   input_device_item *item_from_code(input_code code) const;
657657   input_code code_from_itemid(input_item_id itemid) const;
658   const char *code_name(astring &string, input_code code) const;
659   const char *code_to_token(astring &string, input_code code) const;
658   const char *code_name(astring &str, input_code code) const;
659   const char *code_to_token(astring &str, input_code code) const;
660660   input_code code_from_token(const char *_token);
661661
662662   // input sequence readers
r245649r245650
669669   const input_seq &seq_poll_final() const { return m_poll_seq; }
670670
671671   // input sequence helpers
672   const char *seq_name(astring &string, const input_seq &seq) const;
673   const char *seq_to_tokens(astring &string, const input_seq &seq) const;
672   const char *seq_name(astring &str, const input_seq &seq) const;
673   const char *seq_to_tokens(astring &str, const input_seq &seq) const;
674674   void seq_from_tokens(input_seq &seq, const char *_token);
675675
676676   // misc
trunk/src/emu/ioport.c
r245649r245650
13071307//  key_name - returns the name of a specific key
13081308//-------------------------------------------------
13091309
1310const char *natural_keyboard::key_name(astring &string, unicode_char ch)
1310const char *natural_keyboard::key_name(astring &str, unicode_char ch)
13111311{
13121312   // attempt to get the string from the character info table
13131313   const char_info *ci = char_info::find(ch);
13141314   const char *result = (ci != NULL) ? ci->name : NULL;
13151315   if (result != NULL)
1316      string.cpy(result);
1316      str.cpy(result);
13171317
13181318   // if that doesn't work, convert to UTF-8
13191319   else if (ch > 0x7F || isprint(ch))
r245649r245650
13211321      char buf[10];
13221322      int count = utf8_from_uchar(buf, ARRAY_LENGTH(buf), ch);
13231323      buf[count] = 0;
1324      string.cpy(buf);
1324      str.cpy(buf);
13251325   }
13261326
13271327   // otherwise, opt for question marks
13281328   else
1329      string.cpy("???");
1330   return string.c_str();
1329      str.cpy("???");
1330   return str.c_str();
13311331}
13321332
13331333
r245649r245650
43974397//  type and player to a string token
43984398//-------------------------------------------------
43994399
4400const char *ioport_manager::input_type_to_token(astring &string, ioport_type type, int player)
4400const char *ioport_manager::input_type_to_token(astring &str, ioport_type type, int player)
44014401{
44024402   // look up the port and return the token
44034403   input_type_entry *entry = m_type_to_entry[type][player];
44044404   if (entry != NULL)
4405      return string.cpy(entry->token()).c_str();
4405      return str.cpy(entry->token()).c_str();
44064406
44074407   // if that fails, carry on
4408   return string.format("TYPE_OTHER(%d,%d)", type, player).c_str();
4408   return str.format("TYPE_OTHER(%d,%d)", type, player).c_str();
44094409}
44104410
44114411
trunk/src/emu/ioport.h
r245649r245650
830830   void post_coded(const char *text, size_t length = 0, const attotime &rate = attotime::zero);
831831
832832   void frame_update(ioport_port &port, ioport_value &digital);
833   const char *key_name(astring &string, unicode_char ch);
833   const char *key_name(astring &str, unicode_char ch);
834834
835835   // debugging
836836   astring dump();
r245649r245650
13971397   void setup_natural_keyboard(ioport_queue_chars_delegate queue_chars, ioport_accept_char_delegate accept_char, ioport_charqueue_empty_delegate charqueue_empty);
13981398   INT32 frame_interpolate(INT32 oldval, INT32 newval);
13991399   ioport_type token_to_input_type(const char *string, int &player) const;
1400   const char *input_type_to_token(astring &string, ioport_type type, int player);
1400   const char *input_type_to_token(astring &str, ioport_type type, int player);
14011401
14021402private:
14031403   // internal helpers
trunk/src/emu/machine/netlist.h
r245649r245650
268268
269269   //  device_state_interface overrides
270270
271   virtual void state_string_export(const device_state_entry &entry, astring &string)
271   virtual void state_string_export(const device_state_entry &entry, astring &str)
272272   {
273273      if (entry.index() >= 0)
274274      {
275275         if (entry.index() & 1)
276            string.format("%10.6f", *((double *) entry.dataptr()));
276            str.format("%10.6f", *((double *)entry.dataptr()));
277277         else
278            string.format("%d", *((netlist_sig_t *) entry.dataptr()));
278            str.format("%d", *((netlist_sig_t *)entry.dataptr()));
279279      }
280280   }
281281
trunk/src/emu/sound.c
r245649r245650
163163//  on a given stream's input
164164//-------------------------------------------------
165165
166const char *sound_stream::input_name(int inputnum, astring &string) const
166const char *sound_stream::input_name(int inputnum, astring &str) const
167167{
168168   // start with our device name and tag
169169   assert(inputnum >= 0 && inputnum < m_input.count());
170   string.printf("%s '%s': ", m_device.name(), m_device.tag());
170   str.printf("%s '%s': ", m_device.name(), m_device.tag());
171171
172172   // if we have a source, indicate where the sound comes from by device name and tag
173173   if (m_input[inputnum].m_source != NULL && m_input[inputnum].m_source->m_stream != NULL)
174174   {
175175      device_t &source = m_input[inputnum].m_source->m_stream->device();
176      string.catprintf("%s '%s'", source.name(), source.tag());
176      str.catprintf("%s '%s'", source.name(), source.tag());
177177
178178      // get the sound interface; if there is more than 1 output we need to figure out which one
179179      device_sound_interface *sound;
r245649r245650
186186         for (int outputnum = 0; (outstream = sound->output_to_stream_output(outputnum, streamoutputnum)) != NULL; outputnum++)
187187            if (outstream == m_input[inputnum].m_source->m_stream && m_input[inputnum].m_source == &outstream->m_output[streamoutputnum])
188188            {
189               string.catprintf(" Ch.%d", outputnum);
189               str.catprintf(" Ch.%d", outputnum);
190190               break;
191191            }
192192      }
193193   }
194   return string.c_str();
194   return str.c_str();
195195}
196196
197197
trunk/src/emu/sound.h
r245649r245650
106106   attotime sample_period() const { return attotime(0, m_attoseconds_per_sample); }
107107   int input_count() const { return m_input.count(); }
108108   int output_count() const { return m_output.count(); }
109   const char *input_name(int inputnum, astring &string) const;
109   const char *input_name(int inputnum, astring &str) const;
110110   device_t *input_source_device(int inputnum) const;
111111   int input_source_outputnum(int inputnum) const;
112112   float user_gain(int inputnum) const;
trunk/src/emu/ui/devopt.c
r245649r245650
3939
4040void ui_menu_device_config::populate()
4141{
42   astring string;
42   astring str;
4343   device_t *dev;
4444
45   string.printf("[This option is%s currently mounted in the running system]\n\n", m_mounted ? "" : " NOT");
46   string.catprintf("Option: %s\n", m_option->name());
45   str.printf("[This option is%s currently mounted in the running system]\n\n", m_mounted ? "" : " NOT");
46   str.catprintf("Option: %s\n", m_option->name());
4747
4848   dev = const_cast<machine_config &>(machine().config()).device_add(&machine().config().root_device(), m_option->name(), m_option->devtype(), 0);
4949
50   string.catprintf("Device: %s\n", dev->name());
50   str.catprintf("Device: %s\n", dev->name());
5151   if (!m_mounted)
52      string.cat("\nIf you select this option, the following items will be enabled:\n");
52      str.cat("\nIf you select this option, the following items will be enabled:\n");
5353   else
54      string.cat("\nThe selected option enables the following items:\n");
54      str.cat("\nThe selected option enables the following items:\n");
5555
5656   // loop over all CPUs
5757   execute_interface_iterator execiter(*dev);
5858   if (execiter.count() > 0)
5959   {
60      string.cat("* CPU:\n");
60      str.cat("* CPU:\n");
6161      tagmap_t<UINT8> exectags;
6262      for (device_execute_interface *exec = execiter.first(); exec != NULL; exec = execiter.next())
6363      {
r245649r245650
8080
8181         // if more than one, prepend a #x in front of the CPU name
8282         if (count > 1)
83            string.catprintf("  %d" UTF8_MULTIPLY, count);
83            str.catprintf("  %d" UTF8_MULTIPLY, count);
8484         else
85            string.cat("  ");
86         string.cat(name);
85            str.cat("  ");
86         str.cat(name);
8787
8888         // display clock in kHz or MHz
8989         if (clock >= 1000000)
90            string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
90            str.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
9191         else
92            string.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
92            str.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
9393      }
9494   }
9595
r245649r245650
9797   screen_device_iterator scriter(*dev);
9898   if (scriter.count() > 0)
9999   {
100      string.cat("* Video:\n");
100      str.cat("* Video:\n");
101101      for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next())
102102      {
103         string.catprintf("  Screen '%s': ", screen->tag());
103         str.catprintf("  Screen '%s': ", screen->tag());
104104
105105         if (screen->screen_type() == SCREEN_TYPE_VECTOR)
106            string.cat("Vector\n");
106            str.cat("Vector\n");
107107         else
108108         {
109109            const rectangle &visarea = screen->visible_area();
110110
111            string.catprintf("%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz\n",
111            str.catprintf("%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz\n",
112112                           visarea.width(), visarea.height(),
113113                           (machine().system().flags & ORIENTATION_SWAP_XY) ? "V" : "H",
114114                           ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds));
r245649r245650
120120   sound_interface_iterator snditer(*dev);
121121   if (snditer.count() > 0)
122122   {
123      string.cat("* Sound:\n");
123      str.cat("* Sound:\n");
124124      tagmap_t<UINT8> soundtags;
125125      for (device_sound_interface *sound = snditer.first(); sound != NULL; sound = snditer.next())
126126      {
r245649r245650
138138         }
139139         // if more than one, prepend a #x in front of the CPU name
140140         if (count > 1)
141            string.catprintf("  %d" UTF8_MULTIPLY, count);
141            str.catprintf("  %d" UTF8_MULTIPLY, count);
142142         else
143            string.cat("  ");
144         string.cat(sound->device().name());
143            str.cat("  ");
144         str.cat(sound->device().name());
145145
146146         // display clock in kHz or MHz
147147         int clock = sound->device().clock();
148148         if (clock >= 1000000)
149            string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
149            str.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
150150         else if (clock != 0)
151            string.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
151            str.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
152152         else
153            string.cat("\n");
153            str.cat("\n");
154154      }
155155   }
156156
r245649r245650
176176      }
177177
178178      if (bios)
179         string.catprintf("* BIOS settings:\n  %d options    [default: %s]\n", bios, bios_str.c_str());
179         str.catprintf("* BIOS settings:\n  %d options    [default: %s]\n", bios, bios_str.c_str());
180180   }
181181
182182   int input = 0, input_mj = 0, input_hana = 0, input_gamble = 0, input_analog = 0, input_adjust = 0;
r245649r245650
236236      }
237237
238238   if (dips)
239      string.cat("* Dispwitch settings:\n").cat(dips_opt);
239      str.cat("* Dispwitch settings:\n").cat(dips_opt);
240240   if (confs)
241      string.cat("* Configuration settings:\n").cat(confs_opt);
241      str.cat("* Configuration settings:\n").cat(confs_opt);
242242   if (input + input_mj + input_hana + input_gamble + input_analog + input_adjust + input_keypad + input_keyboard)
243      string.cat("* Input device(s):\n");
243      str.cat("* Input device(s):\n");
244244   if (input)
245      string.catprintf("  User inputs    [%d inputs]\n", input);
245      str.catprintf("  User inputs    [%d inputs]\n", input);
246246   if (input_mj)
247      string.catprintf("  Mahjong inputs    [%d inputs]\n", input_mj);
247      str.catprintf("  Mahjong inputs    [%d inputs]\n", input_mj);
248248   if (input_hana)
249      string.catprintf("  Hanafuda inputs    [%d inputs]\n", input_hana);
249      str.catprintf("  Hanafuda inputs    [%d inputs]\n", input_hana);
250250   if (input_gamble)
251      string.catprintf("  Gambling inputs    [%d inputs]\n", input_gamble);
251      str.catprintf("  Gambling inputs    [%d inputs]\n", input_gamble);
252252   if (input_analog)
253      string.catprintf("  Analog inputs    [%d inputs]\n", input_analog);
253      str.catprintf("  Analog inputs    [%d inputs]\n", input_analog);
254254   if (input_adjust)
255      string.catprintf("  Adjuster inputs    [%d inputs]\n", input_adjust);
255      str.catprintf("  Adjuster inputs    [%d inputs]\n", input_adjust);
256256   if (input_keypad)
257      string.catprintf("  Keypad inputs    [%d inputs]\n", input_keypad);
257      str.catprintf("  Keypad inputs    [%d inputs]\n", input_keypad);
258258   if (input_keyboard)
259      string.catprintf("  Keyboard inputs    [%d inputs]\n", input_keyboard);
259      str.catprintf("  Keyboard inputs    [%d inputs]\n", input_keyboard);
260260
261261   image_interface_iterator imgiter(*dev);
262262   if (imgiter.count() > 0)
263263   {
264      string.cat("* Media Options:\n");
264      str.cat("* Media Options:\n");
265265      for (const device_image_interface *imagedev = imgiter.first(); imagedev != NULL; imagedev = imgiter.next())
266         string.catprintf("  %s    [tag: %s]\n", imagedev->image_type_name(), imagedev->device().tag());
266         str.catprintf("  %s    [tag: %s]\n", imagedev->image_type_name(), imagedev->device().tag());
267267   }
268268
269269   slot_interface_iterator slotiter(*dev);
270270   if (slotiter.count() > 0)
271271   {
272      string.cat("* Slot Options:\n");
272      str.cat("* Slot Options:\n");
273273      for (const device_slot_interface *slot = slotiter.first(); slot != NULL; slot = slotiter.next())
274         string.catprintf("  %s    [default: %s]\n", slot->device().tag(), slot->default_option() ? slot->default_option() : "----");
274         str.catprintf("  %s    [default: %s]\n", slot->device().tag(), slot->default_option() ? slot->default_option() : "----");
275275   }
276276
277277   if ((execiter.count() + scriter.count() + snditer.count() + imgiter.count() + slotiter.count() + bios + dips + confs
278278         + input + input_mj + input_hana + input_gamble + input_analog + input_adjust + input_keypad + input_keyboard) == 0)
279      string.cat("[None]\n");
279         str.cat("[None]\n");
280280
281281   const_cast<machine_config &>(machine().config()).device_remove(&machine().config().root_device(), m_option->name());
282   item_append(string.c_str(), NULL, MENU_FLAG_MULTILINE, NULL);
282   item_append(str.c_str(), NULL, MENU_FLAG_MULTILINE, NULL);
283283}
284284
285285void ui_menu_device_config::handle()
trunk/src/emu/ui/info.c
r245649r245650
8585      // if image has been loaded through softlist, let's add some more info
8686      if (image->software_entry())
8787      {
88         astring string;
88         astring str;
8989
9090         // display long filename
9191         item_append(image->longname(), "", MENU_FLAG_DISABLE, NULL);
9292
9393         // display manufacturer and year
94         string.catprintf("%s, %s", image->manufacturer(), image->year());
95         item_append(string.c_str(), "", MENU_FLAG_DISABLE, NULL);
94         str.catprintf("%s, %s", image->manufacturer(), image->year());
95         item_append(str.c_str(), "", MENU_FLAG_DISABLE, NULL);
9696
9797         // display supported information, if available
9898         switch (image->supported())
trunk/src/emu/ui/ui.c
r245649r245650
989989//  text to the given buffer
990990//-------------------------------------------------
991991
992astring &ui_manager::disclaimer_string(astring &string)
992astring &ui_manager::disclaimer_string(astring &str)
993993{
994   string.cpy("Usage of emulators in conjunction with ROMs you don't own is forbidden by copyright law.\n\n");
995   string.catprintf("IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%s\" ON THIS EMULATOR, PRESS ESC.\n\n", machine().system().description);
996   string.cat("Otherwise, type OK or move the joystick left then right to continue");
997   return string;
994   str.cpy("Usage of emulators in conjunction with ROMs you don't own is forbidden by copyright law.\n\n");
995   str.catprintf("IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%s\" ON THIS EMULATOR, PRESS ESC.\n\n", machine().system().description);
996   str.cat("Otherwise, type OK or move the joystick left then right to continue");
997   return str;
998998}
999999
10001000
r245649r245650
10031003//  text to the given buffer
10041004//-------------------------------------------------
10051005
1006astring &ui_manager::warnings_string(astring &string)
1006astring &ui_manager::warnings_string(astring &str)
10071007{
10081008#define WARNING_FLAGS ( GAME_NOT_WORKING | \
10091009                  GAME_UNEMULATED_PROTECTION | \
r245649r245650
10171017                  GAME_IMPERFECT_KEYBOARD | \
10181018                  GAME_NO_COCKTAIL)
10191019
1020   string.reset();
1020   str.reset();
10211021
10221022   // if no warnings, nothing to return
10231023   if (rom_load_warnings(machine()) == 0 && rom_load_knownbad(machine()) == 0 && !(machine().system().flags & WARNING_FLAGS) && software_load_warnings_message(machine()).len()==0)
1024      return string;
1024      return str;
10251025
10261026   // add a warning if any ROMs were loaded with warnings
10271027   if (rom_load_warnings(machine()) > 0)
10281028   {
1029      string.cat("One or more ROMs/CHDs for this game are incorrect. The ");
1030      string.cat(emulator_info::get_gamenoun());
1031      string.cat(" may not run correctly.\n");
1029      str.cat("One or more ROMs/CHDs for this game are incorrect. The ");
1030      str.cat(emulator_info::get_gamenoun());
1031      str.cat(" may not run correctly.\n");
10321032      if (machine().system().flags & WARNING_FLAGS)
1033         string.cat("\n");
1033         str.cat("\n");
10341034   }
10351035
10361036   if (software_load_warnings_message(machine()).len()>0) {
1037      string.cat(software_load_warnings_message(machine()));
1037      str.cat(software_load_warnings_message(machine()));
10381038      if (machine().system().flags & WARNING_FLAGS)
1039         string.cat("\n");
1039         str.cat("\n");
10401040   }
10411041   // if we have at least one warning flag, print the general header
10421042   if ((machine().system().flags & WARNING_FLAGS) || rom_load_knownbad(machine()) > 0)
10431043   {
1044      string.cat("There are known problems with this ");
1045      string.cat(emulator_info::get_gamenoun());
1046      string.cat("\n\n");
1044      str.cat("There are known problems with this ");
1045      str.cat(emulator_info::get_gamenoun());
1046      str.cat("\n\n");
10471047
10481048      // add a warning if any ROMs are flagged BAD_DUMP/NO_DUMP
10491049      if (rom_load_knownbad(machine()) > 0) {
1050         string.cat("One or more ROMs/CHDs for this ");
1051         string.cat(emulator_info::get_gamenoun());
1052         string.cat(" have not been correctly dumped.\n");
1050         str.cat("One or more ROMs/CHDs for this ");
1051         str.cat(emulator_info::get_gamenoun());
1052         str.cat(" have not been correctly dumped.\n");
10531053      }
10541054      // add one line per warning flag
10551055      if (machine().system().flags & GAME_IMPERFECT_KEYBOARD)
1056         string.cat("The keyboard emulation may not be 100% accurate.\n");
1056         str.cat("The keyboard emulation may not be 100% accurate.\n");
10571057      if (machine().system().flags & GAME_IMPERFECT_COLORS)
1058         string.cat("The colors aren't 100% accurate.\n");
1058         str.cat("The colors aren't 100% accurate.\n");
10591059      if (machine().system().flags & GAME_WRONG_COLORS)
1060         string.cat("The colors are completely wrong.\n");
1060         str.cat("The colors are completely wrong.\n");
10611061      if (machine().system().flags & GAME_IMPERFECT_GRAPHICS)
1062         string.cat("The video emulation isn't 100% accurate.\n");
1062         str.cat("The video emulation isn't 100% accurate.\n");
10631063      if (machine().system().flags & GAME_IMPERFECT_SOUND)
1064         string.cat("The sound emulation isn't 100% accurate.\n");
1064         str.cat("The sound emulation isn't 100% accurate.\n");
10651065      if (machine().system().flags & GAME_NO_SOUND)
1066         string.cat("The game lacks sound.\n");
1066         str.cat("The game lacks sound.\n");
10671067      if (machine().system().flags & GAME_NO_COCKTAIL)
1068         string.cat("Screen flipping in cocktail mode is not supported.\n");
1068         str.cat("Screen flipping in cocktail mode is not supported.\n");
10691069
10701070      // check if external artwork is present before displaying this warning?
10711071      if (machine().system().flags & GAME_REQUIRES_ARTWORK)
1072         string.cat("The game requires external artwork files\n");
1072         str.cat("The game requires external artwork files\n");
10731073
10741074      // if there's a NOT WORKING, UNEMULATED PROTECTION or GAME MECHANICAL warning, make it stronger
10751075      if (machine().system().flags & (GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION | GAME_MECHANICAL))
10761076      {
10771077         // add the strings for these warnings
10781078         if (machine().system().flags & GAME_UNEMULATED_PROTECTION)
1079            string.cat("The game has protection which isn't fully emulated.\n");
1079            str.cat("The game has protection which isn't fully emulated.\n");
10801080         if (machine().system().flags & GAME_NOT_WORKING) {
1081            string.cat("\nTHIS ");
1082            string.cat(emulator_info::get_capgamenoun());
1083            string.cat(" DOESN'T WORK. The emulation for this game is not yet complete. "
1081            str.cat("\nTHIS ");
1082            str.cat(emulator_info::get_capgamenoun());
1083            str.cat(" DOESN'T WORK. The emulation for this game is not yet complete. "
10841084                  "There is nothing you can do to fix this problem except wait for the developers to improve the emulation.\n");
10851085         }
10861086         if (machine().system().flags & GAME_MECHANICAL) {
1087            string.cat("\nCertain elements of this ");
1088            string.cat(emulator_info::get_gamenoun());
1089            string.cat(" cannot be emulated as it requires actual physical interaction or consists of mechanical devices. "
1087            str.cat("\nCertain elements of this ");
1088            str.cat(emulator_info::get_gamenoun());
1089            str.cat(" cannot be emulated as it requires actual physical interaction or consists of mechanical devices. "
10901090                  "It is not possible to fully play this ");
1091            string.cat(emulator_info::get_gamenoun());
1092            string.cat(".\n");
1091            str.cat(emulator_info::get_gamenoun());
1092            str.cat(".\n");
10931093         }
10941094
10951095         // find the parent of this driver
r245649r245650
11071107               {
11081108                  // this one works, add a header and display the name of the clone
11091109                  if (!foundworking)
1110                     string.cat("\n\nThere are working clones of this game: ");
1110                     str.cat("\n\nThere are working clones of this game: ");
11111111                  else
1112                     string.cat(", ");
1113                  string.cat(drivlist.driver().name);
1112                     str.cat(", ");
1113                  str.cat(drivlist.driver().name);
11141114                  foundworking = true;
11151115               }
11161116
11171117         if (foundworking)
1118            string.cat("\n");
1118            str.cat("\n");
11191119      }
11201120   }
11211121
11221122   // add the 'press OK' string
1123   string.cat("\n\nType OK or move the joystick left then right to continue");
1124   return string;
1123   str.cat("\n\nType OK or move the joystick left then right to continue");
1124   return str;
11251125}
11261126
11271127
r245649r245650
11301130//  string with the game info text
11311131//-------------------------------------------------
11321132
1133astring &ui_manager::game_info_astring(astring &string)
1133astring &ui_manager::game_info_astring(astring &str)
11341134{
11351135   // print description, manufacturer, and CPU:
11361136   astring tempstr;
1137   string.printf("%s\n%s %s\nDriver: %s\n\nCPU:\n", machine().system().description, machine().system().year, machine().system().manufacturer, core_filename_extract_base(tempstr, machine().system().source_file).c_str());
1137   str.printf("%s\n%s %s\nDriver: %s\n\nCPU:\n", machine().system().description, machine().system().year, machine().system().manufacturer, core_filename_extract_base(tempstr, machine().system().source_file).c_str());
11381138
11391139   // loop over all CPUs
11401140   execute_interface_iterator execiter(machine().root_device());
r245649r245650
11591159
11601160      // if more than one, prepend a #x in front of the CPU name
11611161      if (count > 1)
1162         string.catprintf("%d" UTF8_MULTIPLY, count);
1163      string.cat(name);
1162         str.catprintf("%d" UTF8_MULTIPLY, count);
1163      str.cat(name);
11641164
11651165      // display clock in kHz or MHz
11661166      if (clock >= 1000000)
1167         string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
1167         str.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
11681168      else
1169         string.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
1169         str.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
11701170   }
11711171
11721172   // loop over all sound chips
r245649r245650
11801180
11811181      // append the Sound: string
11821182      if (!found_sound)
1183         string.cat("\nSound:\n");
1183         str.cat("\nSound:\n");
11841184      found_sound = true;
11851185
11861186      // count how many identical sound chips we have
r245649r245650
11941194      }
11951195      // if more than one, prepend a #x in front of the CPU name
11961196      if (count > 1)
1197         string.catprintf("%d" UTF8_MULTIPLY, count);
1198      string.cat(sound->device().name());
1197         str.catprintf("%d" UTF8_MULTIPLY, count);
1198      str.cat(sound->device().name());
11991199
12001200      // display clock in kHz or MHz
12011201      int clock = sound->device().clock();
12021202      if (clock >= 1000000)
1203         string.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
1203         str.catprintf(" %d.%06d" UTF8_NBSP "MHz\n", clock / 1000000, clock % 1000000);
12041204      else if (clock != 0)
1205         string.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
1205         str.catprintf(" %d.%03d" UTF8_NBSP "kHz\n", clock / 1000, clock % 1000);
12061206      else
1207         string.cat("\n");
1207         str.cat("\n");
12081208   }
12091209
12101210   // display screen information
1211   string.cat("\nVideo:\n");
1211   str.cat("\nVideo:\n");
12121212   screen_device_iterator scriter(machine().root_device());
12131213   int scrcount = scriter.count();
12141214   if (scrcount == 0)
1215      string.cat("None\n");
1215      str.cat("None\n");
12161216   else
12171217   {
12181218      for (screen_device *screen = scriter.first(); screen != NULL; screen = scriter.next())
12191219      {
12201220         if (scrcount > 1)
12211221         {
1222            string.cat(slider_get_screen_desc(*screen));
1223            string.cat(": ");
1222            str.cat(slider_get_screen_desc(*screen));
1223            str.cat(": ");
12241224         }
12251225
12261226         if (screen->screen_type() == SCREEN_TYPE_VECTOR)
1227            string.cat("Vector\n");
1227            str.cat("Vector\n");
12281228         else
12291229         {
12301230            const rectangle &visarea = screen->visible_area();
12311231
1232            string.catprintf("%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz\n",
1232            str.catprintf("%d " UTF8_MULTIPLY " %d (%s) %f" UTF8_NBSP "Hz\n",
12331233                  visarea.width(), visarea.height(),
12341234                  (machine().system().flags & ORIENTATION_SWAP_XY) ? "V" : "H",
12351235                  ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds));
r245649r245650
12371237      }
12381238   }
12391239
1240   return string;
1240   return str;
12411241}
12421242
12431243
r245649r245650
18281828   ioport_port *port;
18291829   slider_state *listhead = NULL;
18301830   slider_state **tailptr = &listhead;
1831   astring string;
1831   astring str;
18321832   int item;
18331833
18341834   // add overall volume
r245649r245650
18421842      INT32 maxval = 2000;
18431843      INT32 defval = 1000;
18441844
1845      info.stream->input_name(info.inputnum, string);
1846      string.cat(" Volume");
1847      *tailptr = slider_alloc(machine, string.c_str(), 0, defval, maxval, 20, slider_mixervol, (void *)(FPTR)item);
1845      info.stream->input_name(info.inputnum, str);
1846      str.cat(" Volume");
1847      *tailptr = slider_alloc(machine, str.c_str(), 0, defval, maxval, 20, slider_mixervol, (void *)(FPTR)item);
18481848      tailptr = &(*tailptr)->next;
18491849   }
18501850
r245649r245650
18651865      for (device_execute_interface *exec = iter.first(); exec != NULL; exec = iter.next())
18661866      {
18671867         void *param = (void *)&exec->device();
1868         string.printf("Overclock CPU %s", exec->device().tag());
1869         *tailptr = slider_alloc(machine, string.c_str(), 10, 1000, 2000, 1, slider_overclock, param);
1868         str.printf("Overclock CPU %s", exec->device().tag());
1869         *tailptr = slider_alloc(machine, str.c_str(), 10, 1000, 2000, 1, slider_overclock, param);
18701870         tailptr = &(*tailptr)->next;
18711871      }
18721872   }
r245649r245650
18841884      // add refresh rate tweaker
18851885      if (machine.options().cheat())
18861886      {
1887         string.printf("%s Refresh Rate", slider_get_screen_desc(*screen));
1888         *tailptr = slider_alloc(machine, string.c_str(), -10000, 0, 10000, 1000, slider_refresh, param);
1887         str.printf("%s Refresh Rate", slider_get_screen_desc(*screen));
1888         *tailptr = slider_alloc(machine, str.c_str(), -10000, 0, 10000, 1000, slider_refresh, param);
18891889         tailptr = &(*tailptr)->next;
18901890      }
18911891
18921892      // add standard brightness/contrast/gamma controls per-screen
1893      string.printf("%s Brightness", slider_get_screen_desc(*screen));
1894      *tailptr = slider_alloc(machine, string.c_str(), 100, 1000, 2000, 10, slider_brightness, param);
1893      str.printf("%s Brightness", slider_get_screen_desc(*screen));
1894      *tailptr = slider_alloc(machine, str.c_str(), 100, 1000, 2000, 10, slider_brightness, param);
18951895      tailptr = &(*tailptr)->next;
1896      string.printf("%s Contrast", slider_get_screen_desc(*screen));
1897      *tailptr = slider_alloc(machine, string.c_str(), 100, 1000, 2000, 50, slider_contrast, param);
1896      str.printf("%s Contrast", slider_get_screen_desc(*screen));
1897      *tailptr = slider_alloc(machine, str.c_str(), 100, 1000, 2000, 50, slider_contrast, param);
18981898      tailptr = &(*tailptr)->next;
1899      string.printf("%s Gamma", slider_get_screen_desc(*screen));
1900      *tailptr = slider_alloc(machine, string.c_str(), 100, 1000, 3000, 50, slider_gamma, param);
1899      str.printf("%s Gamma", slider_get_screen_desc(*screen));
1900      *tailptr = slider_alloc(machine, str.c_str(), 100, 1000, 3000, 50, slider_gamma, param);
19011901      tailptr = &(*tailptr)->next;
19021902
19031903      // add scale and offset controls per-screen
1904      string.printf("%s Horiz Stretch", slider_get_screen_desc(*screen));
1905      *tailptr = slider_alloc(machine, string.c_str(), 500, defxscale, 1500, 2, slider_xscale, param);
1904      str.printf("%s Horiz Stretch", slider_get_screen_desc(*screen));
1905      *tailptr = slider_alloc(machine, str.c_str(), 500, defxscale, 1500, 2, slider_xscale, param);
19061906      tailptr = &(*tailptr)->next;
1907      string.printf("%s Horiz Position", slider_get_screen_desc(*screen));
1908      *tailptr = slider_alloc(machine, string.c_str(), -500, defxoffset, 500, 2, slider_xoffset, param);
1907      str.printf("%s Horiz Position", slider_get_screen_desc(*screen));
1908      *tailptr = slider_alloc(machine, str.c_str(), -500, defxoffset, 500, 2, slider_xoffset, param);
19091909      tailptr = &(*tailptr)->next;
1910      string.printf("%s Vert Stretch", slider_get_screen_desc(*screen));
1911      *tailptr = slider_alloc(machine, string.c_str(), 500, defyscale, 1500, 2, slider_yscale, param);
1910      str.printf("%s Vert Stretch", slider_get_screen_desc(*screen));
1911      *tailptr = slider_alloc(machine, str.c_str(), 500, defyscale, 1500, 2, slider_yscale, param);
19121912      tailptr = &(*tailptr)->next;
1913      string.printf("%s Vert Position", slider_get_screen_desc(*screen));
1914      *tailptr = slider_alloc(machine, string.c_str(), -500, defyoffset, 500, 2, slider_yoffset, param);
1913      str.printf("%s Vert Position", slider_get_screen_desc(*screen));
1914      *tailptr = slider_alloc(machine, str.c_str(), -500, defyoffset, 500, 2, slider_yoffset, param);
19151915      tailptr = &(*tailptr)->next;
19161916   }
19171917
r245649r245650
19281928         void *param = (void *)laserdisc;
19291929
19301930         // add scale and offset controls per-overlay
1931         string.printf("Laserdisc '%s' Horiz Stretch", laserdisc->tag());
1932         *tailptr = slider_alloc(machine, string.c_str(), 500, (defxscale == 0) ? 1000 : defxscale, 1500, 2, slider_overxscale, param);
1931         str.printf("Laserdisc '%s' Horiz Stretch", laserdisc->tag());
1932         *tailptr = slider_alloc(machine, str.c_str(), 500, (defxscale == 0) ? 1000 : defxscale, 1500, 2, slider_overxscale, param);
19331933         tailptr = &(*tailptr)->next;
1934         string.printf("Laserdisc '%s' Horiz Position", laserdisc->tag());
1935         *tailptr = slider_alloc(machine, string.c_str(), -500, defxoffset, 500, 2, slider_overxoffset, param);
1934         str.printf("Laserdisc '%s' Horiz Position", laserdisc->tag());
1935         *tailptr = slider_alloc(machine, str.c_str(), -500, defxoffset, 500, 2, slider_overxoffset, param);
19361936         tailptr = &(*tailptr)->next;
1937         string.printf("Laserdisc '%s' Vert Stretch", laserdisc->tag());
1938         *tailptr = slider_alloc(machine, string.c_str(), 500, (defyscale == 0) ? 1000 : defyscale, 1500, 2, slider_overyscale, param);
1937         str.printf("Laserdisc '%s' Vert Stretch", laserdisc->tag());
1938         *tailptr = slider_alloc(machine, str.c_str(), 500, (defyscale == 0) ? 1000 : defyscale, 1500, 2, slider_overyscale, param);
19391939         tailptr = &(*tailptr)->next;
1940         string.printf("Laserdisc '%s' Vert Position", laserdisc->tag());
1941         *tailptr = slider_alloc(machine, string.c_str(), -500, defyoffset, 500, 2, slider_overyoffset, param);
1940         str.printf("Laserdisc '%s' Vert Position", laserdisc->tag());
1941         *tailptr = slider_alloc(machine, str.c_str(), -500, defyoffset, 500, 2, slider_overyoffset, param);
19421942         tailptr = &(*tailptr)->next;
19431943      }
19441944
r245649r245650
19601960         if (field->crosshair_axis() != CROSSHAIR_AXIS_NONE && field->player() == 0)
19611961         {
19621962            void *param = (void *)field;
1963            string.printf("Crosshair Scale %s", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y");
1964            *tailptr = slider_alloc(machine, string.c_str(), -3000, 1000, 3000, 100, slider_crossscale, param);
1963            str.printf("Crosshair Scale %s", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y");
1964            *tailptr = slider_alloc(machine, str.c_str(), -3000, 1000, 3000, 100, slider_crossscale, param);
19651965            tailptr = &(*tailptr)->next;
1966            string.printf("Crosshair Offset %s", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y");
1967            *tailptr = slider_alloc(machine, string.c_str(), -3000, 0, 3000, 100, slider_crossoffset, param);
1966            str.printf("Crosshair Offset %s", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y");
1967            *tailptr = slider_alloc(machine, str.c_str(), -3000, 0, 3000, 100, slider_crossoffset, param);
19681968            tailptr = &(*tailptr)->next;
19691969         }
19701970#endif
trunk/src/emu/ui/ui.h
r245649r245650
160160   void request_quit();
161161
162162   // print the game info string into a buffer
163   astring &game_info_astring(astring &string);
163   astring &game_info_astring(astring &str);
164164
165165   // slider controls
166166   const slider_state *get_slider_list(void);
trunk/src/emu/validity.c
r245649r245650
10361036//  and device
10371037//-------------------------------------------------
10381038
1039void validity_checker::build_output_prefix(astring &string)
1039void validity_checker::build_output_prefix(astring &str)
10401040{
10411041   // start empty
1042   string.reset();
1042   str.reset();
10431043
10441044   // if we have a current device, indicate that
10451045   if (m_current_device != NULL)
1046      string.cat(m_current_device->name()).cat(" device '").cat(m_current_device->tag()).cat("': ");
1046      str.cat(m_current_device->name()).cat(" device '").cat(m_current_device->tag()).cat("': ");
10471047
10481048   // if we have a current port, indicate that as well
10491049   if (m_current_ioport != NULL)
1050      string.cat("ioport '").cat(m_current_ioport).cat("': ");
1050      str.cat("ioport '").cat(m_current_ioport).cat("': ");
10511051}
10521052
10531053
trunk/src/emu/validity.h
r245649r245650
7979   void validate_devices();
8080
8181   // output helpers
82   void build_output_prefix(astring &string);
82   void build_output_prefix(astring &str);
8383   void output_via_delegate(osd_output_channel channel, const char *format, ...) ATTR_PRINTF(3,4);
8484
8585   // internal driver list
trunk/src/emu/video.c
r245649r245650
257257//  into a string buffer
258258//-------------------------------------------------
259259
260astring &video_manager::speed_text(astring &string)
260astring &video_manager::speed_text(astring &str)
261261{
262   string.reset();
262   str.reset();
263263
264264   // if we're paused, just display Paused
265265   bool paused = machine().paused();
266266   if (paused)
267      string.cat("paused");
267      str.cat("paused");
268268
269269   // if we're fast forwarding, just display Fast-forward
270270   else if (m_fastforward)
271      string.cat("fast ");
271      str.cat("fast ");
272272
273273   // if we're auto frameskipping, display that plus the level
274274   else if (effective_autoframeskip())
275      string.catprintf("auto%2d/%d", effective_frameskip(), MAX_FRAMESKIP);
275      str.catprintf("auto%2d/%d", effective_frameskip(), MAX_FRAMESKIP);
276276
277277   // otherwise, just display the frameskip plus the level
278278   else
279      string.catprintf("skip %d/%d", effective_frameskip(), MAX_FRAMESKIP);
279      str.catprintf("skip %d/%d", effective_frameskip(), MAX_FRAMESKIP);
280280
281281   // append the speed for all cases except paused
282282   if (!paused)
283      string.catprintf("%4d%%", (int)(100 * m_speed_percent + 0.5));
283      str.catprintf("%4d%%", (int)(100 * m_speed_percent + 0.5));
284284
285285   // display the number of partial updates as well
286286   int partials = 0;
r245649r245650
288288   for (screen_device *screen = iter.first(); screen != NULL; screen = iter.next())
289289      partials += screen->partial_updates();
290290   if (partials > 1)
291      string.catprintf("\n%d partial updates", partials);
291      str.catprintf("\n%d partial updates", partials);
292292
293   return string;
293   return str;
294294}
295295
296296
trunk/src/emu/video.h
r245649r245650
8181   void frame_update(bool debug = false);
8282
8383   // current speed helpers
84   astring &speed_text(astring &string);
84   astring &speed_text(astring &str);
8585   double speed_percent() const { return m_speed_percent; }
8686
8787   // snapshots
trunk/src/mame/etc/template_cpu.c
r245649r245650
107107}
108108
109109
110void xxx_cpu_device::state_string_export(const device_state_entry &entry, astring &string)
110void xxx_cpu_device::state_string_export(const device_state_entry &entry, astring &str)
111111{
112112   switch (entry.index())
113113   {
114114      case STATE_GENFLAGS:
115         string.printf("%c%c%c%c",
115         str.printf("%c%c%c%c",
116116            m_flags & 0x80 ? 'S':'.',
117117            m_flags & 0x40 ? 'Z':'.',
118118            m_flags & 0x20 ? 'V':'.',
trunk/src/mame/etc/template_cpu.h
r245649r245650
4242   virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ); }
4343
4444   // device_state_interface overrides
45   void state_string_export(const device_state_entry &entry, astring &string);
45   void state_string_export(const device_state_entry &entry, astring &str);
4646
4747   // device_disasm_interface overrides
4848   virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
trunk/src/tools/chdman.c
r245649r245650
822822//  big_int_string - create a 64-bit string
823823//-------------------------------------------------
824824
825const char *big_int_string(astring &string, UINT64 intvalue)
825const char *big_int_string(astring &str, UINT64 intvalue)
826826{
827827   // 0 is a special case
828828   if (intvalue == 0)
829      return string.cpy("0").c_str();
829      return str.cpy("0").c_str();
830830
831831   // loop until all chunks are done
832   string.reset();
832   str.reset();
833833   bool first = true;
834834   while (intvalue != 0)
835835   {
r245649r245650
840840      insert.format((intvalue != 0) ? "%03d" : "%d", chunk);
841841
842842      if (!first)
843         string.ins(0, ",").c_str();
843         str.ins(0, ",").c_str();
844844      first = false;
845      string.ins(0, insert);
845      str.ins(0, insert);
846846   }
847   return string.c_str();
847   return str.c_str();
848848}
849849
850850
r245649r245650
853853//  number of frames in M:S:F format
854854//-------------------------------------------------
855855
856const char *msf_string_from_frames(astring &string, UINT32 frames)
856const char *msf_string_from_frames(astring &str, UINT32 frames)
857857{
858   return string.format("%02d:%02d:%02d", frames / (75 * 60), (frames / 75) % 60, frames % 75).c_str();
858   return str.format("%02d:%02d:%02d", frames / (75 * 60), (frames / 75) % 60, frames % 75).c_str();
859859}
860860
861861
r245649r245650
11241124//  describing a set of compressors
11251125//-------------------------------------------------
11261126
1127static const char *compression_string(astring &string, chd_codec_type compression[4])
1127static const char *compression_string(astring &str, chd_codec_type compression[4])
11281128{
11291129   // output compression types
1130   string.reset();
1130   str.reset();
11311131   if (compression[0] == CHD_CODEC_NONE)
1132      return string.cpy("none").c_str();
1132      return str.cpy("none").c_str();
11331133
11341134   // iterate over types
11351135   for (int index = 0; index < 4; index++)
r245649r245650
11381138      if (type == CHD_CODEC_NONE)
11391139         break;
11401140      if (index != 0)
1141         string.cat(", ");
1142      string.cat((type >> 24) & 0xff).cat((type >> 16) & 0xff).cat((type >> 8) & 0xff).cat(type & 0xff);
1143      string.cat(" (").cat(chd_codec_list::codec_name(type)).cat(")");
1141         str.cat(", ");
1142      str.cat((type >> 24) & 0xff).cat((type >> 16) & 0xff).cat((type >> 8) & 0xff).cat(type & 0xff);
1143      str.cat(" (").cat(chd_codec_list::codec_name(type)).cat(")");
11441144   }
1145   return string.c_str();
1145   return str.c_str();
11461146}
11471147
11481148


Previous 199869 Revisions Next


© 1997-2024 The MAME Team