summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2016-09-27 18:05:19 -0400
committer Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2016-09-27 18:05:19 -0400
commite8d2853334d6779213352b2e7aa442d1ace45516 (patch)
treec7ede65dd03a891b33644fe2c3549aa6863cb02b
parent7f1bb873d19bc81907e800b2ab6ed00e82a79f28 (diff)
Revert "Make sure all cpu's export STATE_GENPCBASE and use safe_pcbase() for everything in the debugger, which allows interruptible cpu's to work properly. [smf]"
This reverts commit 1a186c8a3a16a7ce99d7df2dd217a7552b696c92.
-rw-r--r--src/devices/cpu/8x300/8x300.cpp3
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp2
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.h6
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp3
-rw-r--r--src/devices/cpu/am29000/am29000.cpp3
-rw-r--r--src/devices/cpu/amis2000/amis2000.cpp3
-rw-r--r--src/devices/cpu/arc/arc.cpp2
-rw-r--r--src/devices/cpu/arcompact/arcompact.cpp7
-rw-r--r--src/devices/cpu/arm/arm.cpp3
-rw-r--r--src/devices/cpu/arm7/arm7.cpp2
-rw-r--r--src/devices/cpu/asap/asap.cpp2
-rw-r--r--src/devices/cpu/avr8/avr8.cpp1
-rw-r--r--src/devices/cpu/ccpu/ccpu.cpp3
-rw-r--r--src/devices/cpu/cop400/cop400.cpp2
-rw-r--r--src/devices/cpu/cop400/cop400.h5
-rw-r--r--src/devices/cpu/cosmac/cosmac.cpp3
-rw-r--r--src/devices/cpu/cp1610/cp1610.cpp3
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.cpp9
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp2
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp2
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.cpp3
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp1
-rw-r--r--src/devices/cpu/es5510/es5510.cpp1
-rw-r--r--src/devices/cpu/esrip/esrip.cpp1
-rw-r--r--src/devices/cpu/f8/f8.cpp3
-rw-r--r--src/devices/cpu/g65816/g65816.cpp3
-rw-r--r--src/devices/cpu/h6280/h6280.cpp1
-rw-r--r--src/devices/cpu/h8/h8.cpp2
-rw-r--r--src/devices/cpu/hcd62121/hcd62121.cpp4
-rw-r--r--src/devices/cpu/hd61700/hd61700.cpp4
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp3
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp1
-rw-r--r--src/devices/cpu/i386/i386.cpp1
-rw-r--r--src/devices/cpu/i4004/i4004.cpp1
-rw-r--r--src/devices/cpu/i4004/i4004.h5
-rw-r--r--src/devices/cpu/i8008/i8008.cpp1
-rw-r--r--src/devices/cpu/i8008/i8008.h6
-rw-r--r--src/devices/cpu/i8085/i8085.cpp1
-rw-r--r--src/devices/cpu/i8085/i8085.h6
-rw-r--r--src/devices/cpu/i8089/i8089.cpp1
-rw-r--r--src/devices/cpu/i86/i186.cpp3
-rw-r--r--src/devices/cpu/i86/i286.cpp4
-rw-r--r--src/devices/cpu/i86/i86.cpp4
-rw-r--r--src/devices/cpu/i860/i860.cpp3
-rw-r--r--src/devices/cpu/i960/i960.cpp1
-rw-r--r--src/devices/cpu/ie15/ie15.cpp1
-rw-r--r--src/devices/cpu/ie15/ie15.h5
-rw-r--r--src/devices/cpu/jaguar/jaguar.cpp2
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp5
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp1
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp3
-rw-r--r--src/devices/cpu/m37710/m37710.cpp3
-rw-r--r--src/devices/cpu/m6502/m6502.cpp2
-rw-r--r--src/devices/cpu/m6502/m6509.cpp2
-rw-r--r--src/devices/cpu/m6800/m6800.cpp1
-rw-r--r--src/devices/cpu/m68000/m68000.h6
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp2
-rw-r--r--src/devices/cpu/m6805/m6805.cpp1
-rw-r--r--src/devices/cpu/m6809/m6809.cpp2
-rw-r--r--src/devices/cpu/mb86233/mb86233.cpp1
-rw-r--r--src/devices/cpu/mb86235/mb86235.cpp3
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.cpp3
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp1
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp2
-rw-r--r--src/devices/cpu/mcs48/mcs48.h6
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp1
-rw-r--r--src/devices/cpu/mcs96/mcs96.cpp2
-rw-r--r--src/devices/cpu/melps4/melps4.cpp3
-rw-r--r--src/devices/cpu/minx/minx.cpp3
-rw-r--r--src/devices/cpu/mips/r3000.cpp2
-rw-r--r--src/devices/cpu/mn10200/mn10200.cpp1
-rw-r--r--src/devices/cpu/nec/nec.cpp4
-rw-r--r--src/devices/cpu/nec/v25.cpp4
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.cpp1
-rw-r--r--src/devices/cpu/pdp1/pdp1.cpp1
-rw-r--r--src/devices/cpu/pdp1/tx0.cpp1
-rw-r--r--src/devices/cpu/pdp8/pdp8.cpp1
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp1
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.cpp1
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp1
-rw-r--r--src/devices/cpu/pps4/pps4.cpp1
-rw-r--r--src/devices/cpu/pps4/pps4.h3
-rw-r--r--src/devices/cpu/psx/psx.cpp1
-rw-r--r--src/devices/cpu/rsp/rsp.cpp2
-rw-r--r--src/devices/cpu/s2650/s2650.cpp1
-rw-r--r--src/devices/cpu/saturn/saturn.cpp1
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp2
-rw-r--r--src/devices/cpu/scmp/scmp.cpp1
-rw-r--r--src/devices/cpu/scmp/scmp.h5
-rw-r--r--src/devices/cpu/score/score.cpp4
-rw-r--r--src/devices/cpu/scudsp/scudsp.cpp3
-rw-r--r--src/devices/cpu/se3208/se3208.cpp4
-rw-r--r--src/devices/cpu/sh2/sh2.cpp2
-rw-r--r--src/devices/cpu/sh4/sh4.cpp2
-rw-r--r--src/devices/cpu/sharc/sharc.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.cpp3
-rw-r--r--src/devices/cpu/sm8500/sm8500.cpp3
-rw-r--r--src/devices/cpu/sparc/mb86901.cpp1
-rw-r--r--src/devices/cpu/spc700/spc700.cpp4
-rw-r--r--src/devices/cpu/ssem/ssem.cpp1
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.cpp2
-rw-r--r--src/devices/cpu/superfx/superfx.cpp3
-rw-r--r--src/devices/cpu/t11/t11.cpp4
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp2
-rw-r--r--src/devices/cpu/tlcs900/tlcs900.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.cpp4
-rw-r--r--src/devices/cpu/tms32010/tms32010.cpp2
-rw-r--r--src/devices/cpu/tms32025/tms32025.cpp2
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp1
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp1
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp6
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp2
-rw-r--r--src/devices/cpu/tms34010/tms34010.h6
-rw-r--r--src/devices/cpu/tms57002/tms57002.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp1
-rw-r--r--src/devices/cpu/tms9900/ti990_10.cpp3
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp3
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp3
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp3
-rw-r--r--src/devices/cpu/unsp/unsp.cpp7
-rw-r--r--src/devices/cpu/upd7725/upd7725.cpp1
-rw-r--r--src/devices/cpu/upd7810/upd7810.cpp4
-rw-r--r--src/devices/cpu/v30mz/v30mz.cpp4
-rw-r--r--src/devices/cpu/v60/v60.cpp2
-rw-r--r--src/devices/cpu/v810/v810.cpp2
-rw-r--r--src/devices/cpu/z180/z180.cpp2
-rw-r--r--src/devices/cpu/z180/z180.h6
-rw-r--r--src/devices/cpu/z8/z8.cpp5
-rw-r--r--src/devices/cpu/z8/z8.h5
-rw-r--r--src/devices/cpu/z80/z80.cpp2
-rw-r--r--src/devices/cpu/z80/z80.h6
-rw-r--r--src/devices/cpu/z8000/z8000.cpp2
-rw-r--r--src/devices/machine/netlist.cpp3
-rw-r--r--src/emu/debug/debugcmd.cpp2
-rw-r--r--src/emu/debug/debugcpu.cpp6
-rw-r--r--src/emu/debug/dvdisasm.cpp2
-rw-r--r--src/mame/drivers/vgmplay.cpp2
-rw-r--r--src/mame/etc/template_cpu.cpp3
139 files changed, 158 insertions, 214 deletions
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index 3999332d6ee..7096448f90f 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -140,8 +140,7 @@ void n8x300_cpu_device::device_start()
state_add( _8X300_OVF, "OVF", m_OVF).mask(0x01).formatstr("%01X");
state_add( _8X300_IVL, "IVL", m_IVL).mask(0xff).formatstr("%02X");
state_add( _8X300_IVR, "IVR", m_IVR).mask(0xff).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_genPC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_genPC).noshow();
+ state_add(STATE_GENPC, "curpc", m_genPC).noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp
index a83614b04c3..dd9bdb4209d 100644
--- a/src/devices/cpu/adsp2100/adsp2100.cpp
+++ b/src/devices/cpu/adsp2100/adsp2100.cpp
@@ -499,7 +499,7 @@ void adsp21xx_device::device_start()
// register state with the debugger
state_add(ADSP2100_PC, "PC", m_pc);
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_astat).mask(0xff).noshow().formatstr("%8s");
state_add(ADSP2100_AX0, "AX0", m_core.ax0.u);
diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h
index 71fe14eae8c..282a340e040 100644
--- a/src/devices/cpu/adsp2100/adsp2100.h
+++ b/src/devices/cpu/adsp2100/adsp2100.h
@@ -170,7 +170,11 @@ enum
ADSP2100_SE_SEC,
ADSP2100_SB_SEC,
ADSP2100_SR0_SEC,
- ADSP2100_SR1_SEC
+ ADSP2100_SR1_SEC,
+
+ ADSP2100_GENPC = STATE_GENPC,
+ ADSP2100_GENSP = STATE_GENSP,
+ ADSP2100_GENPCBASE = STATE_GENPCBASE
};
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index 74d0b07d8f8..6ff87fd785b 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -989,8 +989,7 @@ void alto2_cpu_device::device_start()
state_add( A2_OKTORUN, "OKTORUN", m_dsk.ok_to_run).formatstr("%1u");
state_add( A2_READY, "READY", m_dsk.kstat).formatstr("%1u");
- state_add(STATE_GENPC, "GENPC", m_mpc).formatstr("%03X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_mpc).formatstr("%03X").noshow();
+ state_add(STATE_GENPC, "curpc", m_mpc).formatstr("%03X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_aluc0).formatstr("%5s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp
index 524cb8b28d8..bfeefebbcbf 100644
--- a/src/devices/cpu/am29000/am29000.cpp
+++ b/src/devices/cpu/am29000/am29000.cpp
@@ -397,8 +397,7 @@ void am29000_cpu_device::device_start()
state_add( AM29000_R254, "R254", m_r[254] ).formatstr("%08X");
state_add( AM29000_R255, "R255", m_r[255] ).formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%08X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%08X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%08X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_alu).formatstr("%13s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp
index 1deb6967864..326437b5baa 100644
--- a/src/devices/cpu/amis2000/amis2000.cpp
+++ b/src/devices/cpu/amis2000/amis2000.cpp
@@ -170,8 +170,7 @@ void amis2000_base_device::device_start()
state_add(S2000_E, "E", m_e ).formatstr("%01X");
state_add(S2000_CY, "CY", m_carry ).formatstr("%01X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_f).formatstr("%6s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/arc/arc.cpp b/src/devices/cpu/arc/arc.cpp
index b0672f03bfe..e38d853f9be 100644
--- a/src/devices/cpu/arc/arc.cpp
+++ b/src/devices/cpu/arc/arc.cpp
@@ -65,7 +65,6 @@ void arc_device::device_start()
state_add( 0, "PC", m_debugger_temp).callimport().callexport().formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
m_icountptr = &m_icount;
}
@@ -79,7 +78,6 @@ void arc_device::state_export(const device_state_entry &entry)
break;
case STATE_GENPC:
- case STATE_GENPCBASE:
m_debugger_temp = m_pc << 2;
break;
}
diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp
index 7c290e1adad..7c56a774601 100644
--- a/src/devices/cpu/arcompact/arcompact.cpp
+++ b/src/devices/cpu/arcompact/arcompact.cpp
@@ -95,7 +95,6 @@ void arcompact_device::device_start()
state_add( 0x12, "LP_END", m_debugger_temp).callimport().callexport().formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
for (int i = 0x100; i < 0x140; i++)
{
@@ -112,8 +111,6 @@ void arcompact_device::state_export(const device_state_entry &entry)
switch (index)
{
- case STATE_GENPC:
- case STATE_GENPCBASE:
case 0:
m_debugger_temp = m_pc;
break;
@@ -128,6 +125,10 @@ void arcompact_device::state_export(const device_state_entry &entry)
m_debugger_temp = m_LP_END;
break;
+ case STATE_GENPC:
+ m_debugger_temp = m_pc;
+ break;
+
default:
if ((index >= 0x100) && (index < 0x140))
{
diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp
index 31bcfa527dd..d94534cf515 100644
--- a/src/devices/cpu/arm/arm.cpp
+++ b/src/devices/cpu/arm/arm.cpp
@@ -545,8 +545,7 @@ void arm_cpu_device::device_start()
state_add( ARM32_SR13, "SR13", m_sArmRegister[eR13_SVC] ).formatstr("%08X");
state_add( ARM32_SR14, "SR14", m_sArmRegister[eR14_SVC] ).formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_sArmRegister[15]).mask(ADDRESS_MASK).formatstr("%8s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_sArmRegister[15]).mask(ADDRESS_MASK).formatstr("%8s").noshow();
+ state_add(STATE_GENPC, "curpc", m_sArmRegister[15]).mask(ADDRESS_MASK).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_sArmRegister[15]).formatstr("%11s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
index 7f7f75b279c..50388580e5a 100644
--- a/src/devices/cpu/arm7/arm7.cpp
+++ b/src/devices/cpu/arm7/arm7.cpp
@@ -506,7 +506,6 @@ void arm7_cpu_device::device_start()
state_add( ARM7_PC, "PC", m_pc).callexport().formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_pc).callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).callexport().noshow();
/* registers shared by all operating modes */
state_add( ARM7_R0, "R0", m_r[ 0]).formatstr("%08X");
state_add( ARM7_R1, "R1", m_r[ 1]).formatstr("%08X");
@@ -559,7 +558,6 @@ void arm7_cpu_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
m_pc = GET_PC;
break;
}
diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp
index bfad7b0a4cf..5cf5c35512a 100644
--- a/src/devices/cpu/asap/asap.cpp
+++ b/src/devices/cpu/asap/asap.cpp
@@ -187,7 +187,7 @@ void asap_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENSP, "GENSP", m_src2val[REGBASE + 31]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flagsio).callimport().callexport().formatstr("%6s").noshow();
state_add(ASAP_PC, "PC", m_pc);
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index 44009a8c6fd..5500f9060ad 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -752,7 +752,6 @@ void avr8_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_shifted_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_shifted_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_r[AVR8_REGIDX_SREG]).callimport().callexport().formatstr("%8s").noshow();
state_add(AVR8_SREG, "STATUS", m_r[AVR8_REGIDX_SREG]).mask(0xff);
state_add(AVR8_PC, "PC", m_shifted_pc).mask(m_addr_mask);
diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp
index 9758faff4f0..f7731312241 100644
--- a/src/devices/cpu/ccpu/ccpu.cpp
+++ b/src/devices/cpu/ccpu/ccpu.cpp
@@ -133,8 +133,7 @@ void ccpu_cpu_device::device_start()
state_add( CCPU_X, "X", m_X).mask(0xfff).formatstr("%03X");
state_add( CCPU_Y, "Y", m_Y).mask(0xfff).formatstr("%03X");
state_add( CCPU_T, "T", m_T).mask(0xfff).formatstr("%03X");
- state_add(STATE_GENPC, "GENPC", m_PC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC).noshow();
+ state_add(STATE_GENPC, "curpc", m_PC).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%6s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index 885f00d34cf..41d2974fb65 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -963,7 +963,7 @@ void cop400_cpu_device::device_start()
save_item(NAME(m_idle));
state_add(STATE_GENPC, "GENPC", m_pc).mask(0xfff).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_prevpc).mask(0xfff).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_prevpc).mask(0xfff).noshow();
state_add(STATE_GENSP, "GENSP", m_n).mask(0x3).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0x3).callimport().callexport().noshow().formatstr("%3s");
diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h
index d5ccef3a4a4..8b44c34cd06 100644
--- a/src/devices/cpu/cop400/cop400.h
+++ b/src/devices/cpu/cop400/cop400.h
@@ -72,7 +72,10 @@ enum
COP400_EN,
COP400_SIO,
COP400_SKL,
- COP400_T
+ COP400_T,
+ COP400_GENPC = STATE_GENPC,
+ COP400_GENPCBASE = STATE_GENPCBASE,
+ COP400_GENSP = STATE_GENSP
};
/* input lines */
diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp
index f46f6de4dfc..b47ba545a5e 100644
--- a/src/devices/cpu/cosmac/cosmac.cpp
+++ b/src/devices/cpu/cosmac/cosmac.cpp
@@ -342,7 +342,6 @@ void cosmac_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).callimport().callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).callimport().callexport().noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flagsio).mask(0x7).callimport().callexport().noshow().formatstr("%3s");
state_add(COSMAC_P, "P", m_p).mask(0xf);
@@ -434,7 +433,6 @@ void cosmac_device::state_import(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
R[P] = m_pc;
break;
@@ -455,7 +453,6 @@ void cosmac_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
m_pc = R[P];
break;
diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp
index fa3ef8a1d4b..f882d4a73ac 100644
--- a/src/devices/cpu/cp1610/cp1610.cpp
+++ b/src/devices/cpu/cp1610/cp1610.cpp
@@ -3359,8 +3359,7 @@ void cp1610_cpu_device::device_start()
state_add( CP1610_R5, "R5", m_r[5] ).formatstr("%04X");
state_add( CP1610_R6, "R6", m_r[6] ).formatstr("%04X");
state_add( CP1610_R7, "R7", m_r[7] ).formatstr("%04X");
- state_add( STATE_GENPC, "GENPC", m_r[7] ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_r[7]).noshow();
+ state_add( STATE_GENPC, "curpc", m_r[7] ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
index ec286c10570..b042b8de8b5 100644
--- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
+++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
@@ -229,8 +229,7 @@ void cquestsnd_cpu_device::device_start()
state_add( CQUESTSND_RAME, "RAM[E]", m_ram[0xe]).formatstr("%04X");
state_add( CQUESTSND_RAMF, "RAM[F]", m_ram[0xf]).formatstr("%04X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%02X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%02X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%02X").noshow();
m_icountptr = &m_icount;
}
@@ -332,8 +331,7 @@ void cquestrot_cpu_device::device_start()
state_add( CQUESTROT_LDADDR, "LDADDR", m_lineaddr).formatstr("%04X");
state_add( CQUESTROT_LDDATA, "LDDATA", m_linedata).formatstr("%04X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%02X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%02X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%3s").noshow();
m_icountptr = &m_icount;
@@ -459,8 +457,7 @@ void cquestlin_cpu_device::device_start()
state_add( CQUESTLIN_CLATCH, "CLATCH", m_clatch).formatstr("%04X");
state_add( CQUESTLIN_ZLATCH, "ZLATCH", m_zlatch).formatstr("%04X");
- state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%02X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_curpc).formatstr("%02X").noshow();
+ state_add(STATE_GENPC, "curpc", m_curpc).callimport().callexport().formatstr("%02X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%6s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index 0c41933bf32..70155100bfe 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -90,7 +90,7 @@ void dsp16_device::device_start()
{
// register state with the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ //state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_psw).callimport().callexport().formatstr("%10s").noshow();
state_add(DSP16_PC, "PC", m_pc);
state_add(DSP16_I, "I", m_i);
diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp
index 454be6c1aa7..dd6c2b17184 100644
--- a/src/devices/cpu/dsp32/dsp32.cpp
+++ b/src/devices/cpu/dsp32/dsp32.cpp
@@ -195,7 +195,7 @@ void dsp32c_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_r[15]).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENSP, "GENSP", m_r[21]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_iotemp).callimport().callexport().formatstr("%6s").noshow();
state_add(DSP32_PC, "PC", m_r[15]).mask(0xffffff);
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index 91f3528e86b..39a19d73bd9 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -332,8 +332,8 @@ void dsp56k_device::device_start()
state_add(DSP56K_ST15, "ST15", m_dsp56k_core.PCU.ss[15].d).formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_dsp56k_core.PCU.pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_dsp56k_core.ppc).noshow();
state_add(STATE_GENSP, "GENSP", m_dsp56k_core.PCU.sp).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_dsp56k_core.ppc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_dsp56k_core.PCU.sr).formatstr("%14s").noshow();
m_icountptr = &m_dsp56k_core.icount;
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp
index e2bb9390586..940a5893ce8 100644
--- a/src/devices/cpu/e0c6200/e0c6200.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200.cpp
@@ -119,8 +119,7 @@ void e0c6200_cpu_device::device_start()
state_add(E0C6200_YL, "YL", m_yl).formatstr("%01X");
state_add(E0C6200_SP, "SP", m_sp).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_f).formatstr("%4s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index 7d01744147d..e0889a24474 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -1563,7 +1563,6 @@ void hyperstone_device::init(int scale_mask)
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_global_regs[0]).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_global_regs[0]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_global_regs[1]).callimport().callexport().formatstr("%40s").noshow();
state_add(E132XS_PC, "PC", m_global_regs[0]).mask(0xffffffff);
state_add(E132XS_SR, "SR", m_global_regs[1]).mask(0xffffffff);
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index fa4bd97a598..721f3b222db 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -552,7 +552,6 @@ void es5510_device::ser_w(int offset, INT16 data)
void es5510_device::device_start() {
m_icountptr = &icount;
state_add(STATE_GENPC,"GENPC", pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", pc).noshow();
}
void es5510_device::device_reset() {
diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp
index def6fbc6a05..43c6590a05f 100644
--- a/src/devices/cpu/esrip/esrip.cpp
+++ b/src/devices/cpu/esrip/esrip.cpp
@@ -194,7 +194,6 @@ void esrip_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_rip_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_rip_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_status).callimport().callexport().formatstr("%8s").noshow();
state_add(ESRIP_PC, "PC:", m_rip_pc).mask(0xffff);
state_add(ESRIP_ACC, "ACC:", m_acc).mask(0xffff);
diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp
index 7d711bf8b03..d19274ed202 100644
--- a/src/devices/cpu/f8/f8.cpp
+++ b/src/devices/cpu/f8/f8.cpp
@@ -2038,8 +2038,7 @@ void f8_cpu_device::device_start()
state_add( F8_R62, "R62", m_r[62]).formatstr("%02X");
state_add( F8_R63, "R63", m_r[63]).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_w).formatstr("%5s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp
index 169a8208e52..a98a822849d 100644
--- a/src/devices/cpu/g65816/g65816.cpp
+++ b/src/devices/cpu/g65816/g65816.cpp
@@ -868,7 +868,6 @@ void g65816_device::device_start()
state_add( G65816_IRQ_STATE, "IRQ", m_line_irq).mask(0x01).callimport().formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_debugger_temp).callimport().callexport().formatstr("%06X").noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callimport().callexport().formatstr("%06X").noshow();
state_add( STATE_GENSP, "GENSP", m_debugger_temp).callimport().callexport().formatstr("%06X").noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%8s").noshow();
@@ -880,7 +879,6 @@ void g65816_device::state_import(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
g65816_set_pc(m_debugger_temp);
break;
case STATE_GENSP:
@@ -926,7 +924,6 @@ void g65816_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
case G65816_PC:
m_debugger_temp = g65816_get_pc();
break;
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index 5ca1397bb64..d8d16f6946c 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -209,7 +209,6 @@ void h6280_device::device_start()
{
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_p).callimport().callexport().formatstr("%8s").noshow();
state_add(H6280_PC, "PC", m_pc.d).mask(0xffff);
state_add(H6280_S, "S", m_sp.b.l).mask(0xff);
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp
index 4a413853b95..62b0829eff1 100644
--- a/src/devices/cpu/h8/h8.cpp
+++ b/src/devices/cpu/h8/h8.cpp
@@ -35,7 +35,7 @@ void h8_device::device_start()
io = &space(AS_IO);
state_add(STATE_GENPC, "GENPC", NPC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", PPC).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
if(has_exr)
state_add(STATE_GENFLAGS, "GENFLAGS", CCR).formatstr("%11s").noshow();
else
diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp
index 4cc98ab13fe..0711868a55b 100644
--- a/src/devices/cpu/hcd62121/hcd62121.cpp
+++ b/src/devices/cpu/hcd62121/hcd62121.cpp
@@ -314,8 +314,7 @@ void hcd62121_cpu_device::device_start()
save_item( NAME(m_temp2) );
// Register state for debugger
- state_add( STATE_GENPC, "GENPC", m_ip ).callexport().formatstr("%8s");
- state_add( STATE_GENPCBASE,"CURPC", m_ip ).callexport().formatstr("%8s");
+ state_add( STATE_GENPC, "curpc", m_ip ).callimport().callexport().formatstr("%8s");
state_add( STATE_GENFLAGS, "GENFLAGS", m_f ).callimport().callexport().formatstr("%12s").noshow();
state_add( HCD62121_IP, "IP", m_ip ).callimport().callexport().formatstr("%04X");
@@ -369,7 +368,6 @@ void hcd62121_cpu_device::state_string_export(const device_state_entry &entry, s
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
str = string_format("%06X", (m_cseg << 16) | m_ip);
break;
diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp
index ce96d03c699..55cdaefcd6e 100644
--- a/src/devices/cpu/hd61700/hd61700.cpp
+++ b/src/devices/cpu/hd61700/hd61700.cpp
@@ -186,8 +186,8 @@ void hd61700_cpu_device::device_start()
state_add(HD61700_MAINREG + ireg, string_format("R%d", ireg).c_str(), m_regmain[ireg]).callimport().callexport().formatstr("%02X");
}
- state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%8s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).formatstr("%8s").noshow();
+ state_add(STATE_GENPC, "curpc", m_curpc).callimport().callexport().formatstr("%8s").noshow();
+ state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0xff).formatstr("%8s").noshow();
// set our instruction counter
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index c8d2148b861..cd35106a37b 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -267,8 +267,7 @@ void hmcs40_cpu_device::device_start()
state_add(HMCS40_Y, "Y", m_y).formatstr("%01X");
state_add(HMCS40_SPY, "SPY", m_spy).formatstr("%01X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_s).formatstr("%2s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index 7e5a575a163..aa7421e5d15 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -180,7 +180,6 @@ void hp_hybrid_cpu_device::device_start()
state_add(HPHYBRID_D, "D", m_reg_D);
state_add(HPHYBRID_P, "P", m_reg_P);
state_add(STATE_GENPC, "GENPC", m_genpc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_genpc).noshow();
state_add(HPHYBRID_R, "R", m_reg_R);
state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
state_add(HPHYBRID_IV, "IV", m_reg_IV);
diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp
index 5c26b195bfe..b46feb0f813 100644
--- a/src/devices/cpu/i386/i386.cpp
+++ b/src/devices/cpu/i386/i386.cpp
@@ -3413,7 +3413,6 @@ void i386_device::register_state_i386()
state_add( I386_CPL, "CPL", m_CPL).formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_pc).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%8s").noshow();
state_add( STATE_GENSP, "GENSP", REG32(ESP)).noshow();
}
diff --git a/src/devices/cpu/i4004/i4004.cpp b/src/devices/cpu/i4004/i4004.cpp
index ce67670a007..e7a63564c59 100644
--- a/src/devices/cpu/i4004/i4004.cpp
+++ b/src/devices/cpu/i4004/i4004.cpp
@@ -418,7 +418,6 @@ void i4004_cpu_device::device_start()
{
state_add(I4004_PC, "PC", m_PC.w.l).mask(0x0fff);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).mask(0x0fff).noshow();
- state_add(STATE_GENPCBASE,"CURPC", m_PC.w.l).mask(0x0fff).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0x0f).callimport().callexport().noshow().formatstr("%4s");
state_add(I4004_A, "A", m_A).mask(0x0f);
diff --git a/src/devices/cpu/i4004/i4004.h b/src/devices/cpu/i4004/i4004.h
index c2e887c6e0d..fd60a9a5d10 100644
--- a/src/devices/cpu/i4004/i4004.h
+++ b/src/devices/cpu/i4004/i4004.h
@@ -14,7 +14,10 @@ enum
I4004_PC,
I4004_A,
I4004_R01, I4004_R23, I4004_R45, I4004_R67, I4004_R89, I4004_RAB, I4004_RCD, I4004_REF,
- I4004_ADDR1,I4004_ADDR2,I4004_ADDR3,I4004_ADDR4,I4004_RAM
+ I4004_ADDR1,I4004_ADDR2,I4004_ADDR3,I4004_ADDR4,I4004_RAM,
+ I4004_GENPC = STATE_GENPC,
+ I4004_GENSP = STATE_GENSP,
+ I4004_GENPCBASE = STATE_GENPCBASE
};
/***************************************************************************
diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp
index c8e1f74195b..c0af31b82a5 100644
--- a/src/devices/cpu/i8008/i8008.cpp
+++ b/src/devices/cpu/i8008/i8008.cpp
@@ -83,7 +83,6 @@ void i8008_device::device_start()
// register our state for the debugger
state_add(I8008_PC, "PC", m_PC.w.l).mask(0x3fff);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).mask(0x3fff).noshow();
- state_add(STATE_GENPCBASE,"CURPC", m_PC.w.l).mask(0x3fff).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0x0f).callimport().callexport().noshow().formatstr("%4s");
state_add(I8008_A, "A", m_A);
state_add(I8008_B, "B", m_B);
diff --git a/src/devices/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h
index 14fcf28d0dc..74c727290eb 100644
--- a/src/devices/cpu/i8008/i8008.h
+++ b/src/devices/cpu/i8008/i8008.h
@@ -11,7 +11,11 @@ enum
{
I8008_PC,
I8008_A,I8008_B,I8008_C,I8008_D,I8008_E,I8008_H,I8008_L,
- I8008_ADDR1,I8008_ADDR2,I8008_ADDR3,I8008_ADDR4,I8008_ADDR5,I8008_ADDR6,I8008_ADDR7,I8008_ADDR8
+ I8008_ADDR1,I8008_ADDR2,I8008_ADDR3,I8008_ADDR4,I8008_ADDR5,I8008_ADDR6,I8008_ADDR7,I8008_ADDR8,
+
+ I8008_GENPC = STATE_GENPC,
+ I8008_GENSP = STATE_GENSP,
+ I8008_GENPCBASE = STATE_GENPCBASE
};
//**************************************************************************
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index 5fc63d50987..f8ea5275984 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -924,7 +924,6 @@ void i8085a_cpu_device::device_start()
{
state_add(I8085_PC, "PC", m_PC.w.l);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC.w.l).noshow();
state_add(I8085_SP, "SP", m_SP.w.l);
state_add(STATE_GENSP, "GENSP", m_SP.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_AF.b.l).noshow().formatstr("%8s");
diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h
index dfd1b8a9e02..9a866577ca6 100644
--- a/src/devices/cpu/i8085/i8085.h
+++ b/src/devices/cpu/i8085/i8085.h
@@ -14,7 +14,11 @@ enum
I8085_PC, I8085_SP, I8085_AF, I8085_BC, I8085_DE, I8085_HL,
I8085_A, I8085_B, I8085_C, I8085_D, I8085_E, I8085_F, I8085_H, I8085_L,
I8085_STATUS, I8085_SOD, I8085_SID, I8085_INTE,
- I8085_HALT, I8085_IM
+ I8085_HALT, I8085_IM,
+
+ I8085_GENPC = STATE_GENPC,
+ I8085_GENSP = STATE_GENSP,
+ I8085_GENPCBASE = STATE_GENPCBASE
};
#define I8085_INTR_LINE 0
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index b817e5d109d..9394206e179 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -91,7 +91,6 @@ void i8089_device::device_start()
state_add(CH2_PP, "CH2 PP", m_ch2->m_r[i8089_channel::PP].w).mask(0xfffff);
state_add(CH2_PSW, "CH2 PSW", m_ch2->m_r[i8089_channel::PSW].w).callimport().callexport().formatstr("%12s");
state_add(STATE_GENPC, "GENPC", m_current_tp).mask(0xfffff).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_current_tp).mask(0xfffff).noshow();
// register for save states
save_item(NAME(m_sysbus));
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 428b1214052..f79505f0353 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -555,8 +555,7 @@ void i80186_cpu_device::device_start()
state_add( I8086_DS, "DS", m_sregs[DS] ).callimport().callexport().formatstr("%04X");
state_add( I8086_VECTOR, "V", m_int_vector).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%05X");
- state_add(STATE_GENPC, "CURPC", m_pc).formatstr("%05X");
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%05X");
// register for savestates
save_item(NAME(m_timer[0].control));
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index d7743897d35..05fb35362df 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -273,8 +273,7 @@ void i80286_cpu_device::device_start()
state_add( I286_MSW, "MSW", m_msw ).callimport().callexport().formatstr("%04X");
state_add( I286_VECTOR, "V", m_int_vector).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).callexport().formatstr("%06X");
- state_add(STATE_GENPCBASE, "CURPC", m_pc).callexport().formatstr("%06X");
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%06X");
m_out_shutdown_func.resolve_safe();
}
@@ -283,7 +282,6 @@ void i80286_cpu_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
str = string_format("%08X", m_base[CS] + m_ip);
break;
diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp
index ae68d66b66e..0c37e3b9c03 100644
--- a/src/devices/cpu/i86/i86.cpp
+++ b/src/devices/cpu/i86/i86.cpp
@@ -273,8 +273,7 @@ void i8086_cpu_device::device_start()
state_add( I8086_DS, "DS", m_sregs[DS] ).callimport().callexport().formatstr("%04X");
state_add( I8086_VECTOR, "V", m_int_vector).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).callexport().formatstr("%05X");
- state_add(STATE_GENPCBASE, "CURPC", m_pc).callexport().formatstr("%05X");
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%05X");
}
i8086_common_cpu_device::i8086_common_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
@@ -324,7 +323,6 @@ void i8086_common_cpu_device::state_string_export(const device_state_entry &entr
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
str = string_format("%08X", (m_sregs[CS] << 4) + m_ip);
break;
diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp
index 96ad4e967c9..d37079f31e2 100644
--- a/src/devices/cpu/i860/i860.cpp
+++ b/src/devices/cpu/i860/i860.cpp
@@ -127,8 +127,7 @@ void i860_cpu_device::device_start()
state_add( I860_F30, "F30", m_freg[30]).callimport().callexport().formatstr("%08X");
state_add( I860_F31, "F31", m_freg[31]).callimport().callexport().formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp
index 3e74c2e676a..282aec610f6 100644
--- a/src/devices/cpu/i960/i960.cpp
+++ b/src/devices/cpu/i960/i960.cpp
@@ -2070,7 +2070,6 @@ void i960_cpu_device::device_start()
state_add( I960_G15, "fp", m_r[31]).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", m_IP).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_IP).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_AC).noshow().formatstr("%2s");
m_immediate_vector = 0;
diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp
index 7d4d3a9a32a..e48b836586d 100644
--- a/src/devices/cpu/ie15/ie15.cpp
+++ b/src/devices/cpu/ie15/ie15.cpp
@@ -61,7 +61,6 @@ void ie15_device::device_start()
// register our state for the debugger
state_add(IE15_PC, "PC", m_PC.w.l).mask(0x0fff);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).mask(0x0fff).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC.w.l).mask(0x0fff).noshow();
state_add(STATE_GENFLAGS,"GENFLAGS", m_flags).mask(0x0f).callimport().callexport().noshow().formatstr("%4s");
state_add(IE15_A, "A", m_A);
diff --git a/src/devices/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h
index 5f5d4786ba9..ce5cb46bf81 100644
--- a/src/devices/cpu/ie15/ie15.h
+++ b/src/devices/cpu/ie15/ie15.h
@@ -14,7 +14,10 @@ enum
IE15_R0, IE15_R1, IE15_R2, IE15_R3, IE15_R4, IE15_R5, IE15_R6, IE15_R7,
IE15_R8, IE15_R9, IE15_R10, IE15_R11, IE15_R12, IE15_R13, IE15_R14, IE15_R15,
IE15_R16, IE15_R17, IE15_R18, IE15_R19, IE15_R20, IE15_R21, IE15_R22, IE15_R23,
- IE15_R24, IE15_R25, IE15_R26, IE15_R27, IE15_R28, IE15_R29, IE15_R30, IE15_R31
+ IE15_R24, IE15_R25, IE15_R26, IE15_R27, IE15_R28, IE15_R29, IE15_R30, IE15_R31,
+
+ IE15_GENPC = STATE_GENPC,
+ IE15_GENPCBASE = STATE_GENPCBASE
};
//**************************************************************************
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index d6d7524dcc7..48b1031bd5f 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -393,7 +393,7 @@ void jaguar_cpu_device::device_start()
state_add( JAGUAR_R31, "R31", m_r[31]).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", PC).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", FLAGS).formatstr("%11s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp
index 026cb1c8756..fe50a7182c8 100644
--- a/src/devices/cpu/lc8670/lc8670.cpp
+++ b/src/devices/cpu/lc8670/lc8670.cpp
@@ -260,8 +260,8 @@ void lc8670_cpu_device::device_start()
state_add(LC8670_SFR + 0x65, "VRMAD2", REG_VRMAD2).callimport().callexport().formatstr("%02X");
state_add(LC8670_SFR + 0x7f, "BTCR" , REG_BTCR ).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).callimport().formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).callimport().formatstr("%4X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%04X").noshow();
+ state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%4X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", REG_PSW).mask(0xff).formatstr("%7s").noshow();
// save state
@@ -358,7 +358,6 @@ void lc8670_cpu_device::state_import(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
set_pc(m_pc);
break;
}
diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp
index 072dbf932a5..efdb959080d 100644
--- a/src/devices/cpu/lh5801/lh5801.cpp
+++ b/src/devices/cpu/lh5801/lh5801.cpp
@@ -137,7 +137,6 @@ void lh5801_cpu_device::device_start()
state_add( LH5801_DP, "DP", m_dp ).formatstr("%04X");
state_add(STATE_GENPC, "GENPC", m_p.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_p.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_t).noshow().formatstr("%8s");
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp
index 3c9080ce3c8..a3c281a1766 100644
--- a/src/devices/cpu/lr35902/lr35902.cpp
+++ b/src/devices/cpu/lr35902/lr35902.cpp
@@ -173,8 +173,7 @@ void lr35902_cpu_device::device_start()
state_add( LR35902_IE, "IE", m_IE ).callimport().callexport().formatstr("%02X");
state_add( LR35902_IF, "IF", m_IF ).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%8s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC).formatstr("%8s").noshow();
+ state_add(STATE_GENPC, "curpc", m_PC).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_F).mask(0xf0).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp
index ffaa7f46f05..449af4c45e8 100644
--- a/src/devices/cpu/m37710/m37710.cpp
+++ b/src/devices/cpu/m37710/m37710.cpp
@@ -1066,7 +1066,6 @@ void m37710_cpu_device::device_start()
state_add( M37710_IRQ_STATE, "IRQ", m_line_irq).formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_debugger_pc ).callimport().callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_pc ).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_p ).formatstr("%8s").noshow();
m_icountptr = &m_ICount;
@@ -1099,7 +1098,6 @@ void m37710_cpu_device::state_import(const device_state_entry &entry)
break;
case STATE_GENPC:
- case STATE_GENPCBASE:
REG_PB = m_debugger_pc & 0xff0000;
m37710_set_pc(m_debugger_pc & 0xffff);
break;
@@ -1132,7 +1130,6 @@ void m37710_cpu_device::state_export(const device_state_entry &entry)
break;
case STATE_GENPC:
- case STATE_GENPCBASE:
m_debugger_pc = (REG_PB | REG_PC);
break;
}
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index 6fa76704731..e4f9d7220c6 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -55,7 +55,7 @@ void m6502_device::init()
sync_w.resolve_safe();
state_add(STATE_GENPC, "GENPC", NPC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", PPC).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
state_add(STATE_GENSP, "GENSP", SP).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", P).callimport().formatstr("%6s").noshow();
state_add(M6502_PC, "PC", NPC).callimport();
diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp
index 6d955a7edec..d5a82a11fde 100644
--- a/src/devices/cpu/m6502/m6509.cpp
+++ b/src/devices/cpu/m6502/m6509.cpp
@@ -32,7 +32,6 @@ void m6509_device::device_start()
init();
state_add(STATE_GENPC, "GENPC", XPC).callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", XPC).callexport().noshow();
state_add(M6509_BI, "BI", bank_i);
state_add(M6509_BY, "BY", bank_y);
}
@@ -48,7 +47,6 @@ void m6509_device::state_export(const device_state_entry &entry)
{
switch(entry.index()) {
case STATE_GENPC:
- case STATE_GENPCBASE:
XPC = adr_in_bank_i(NPC);
break;
}
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index c874a6c177a..acb84ede603 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -1135,7 +1135,6 @@ void m6800_cpu_device::device_start()
state_add( M6800_WAI_STATE, "WAI", m_wai_state).formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_pc.w.l).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc.w.l).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_cc).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index 1ef00e16e14..6ccad0a03bd 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -106,7 +106,11 @@ enum
M68K_D0, M68K_D1, M68K_D2, M68K_D3, M68K_D4, M68K_D5, M68K_D6, M68K_D7,
M68K_A0, M68K_A1, M68K_A2, M68K_A3, M68K_A4, M68K_A5, M68K_A6, M68K_A7,
M68K_FP0, M68K_FP1, M68K_FP2, M68K_FP3, M68K_FP4, M68K_FP5, M68K_FP6, M68K_FP7,
- M68K_FPSR, M68K_FPCR
+ M68K_FPSR, M68K_FPCR,
+
+ M68K_GENPC = STATE_GENPC,
+ M68K_GENSP = STATE_GENSP,
+ M68K_GENPCBASE = STATE_GENPCBASE
};
unsigned int m68k_disassemble_raw(char* str_buff, unsigned int pc, const unsigned char* opdata, const unsigned char* argdata, unsigned int cpu_type);
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 053ab3d6976..18de1a02e04 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -1689,7 +1689,7 @@ void m68000_base_device::define_state(void)
state_add(M68K_PC, "PC", pc).mask(addrmask);
state_add(STATE_GENPC, "GENPC", pc).mask(addrmask).noshow();
- state_add(STATE_GENPCBASE, "CURPC", ppc).mask(addrmask).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", ppc).mask(addrmask).noshow();
state_add(M68K_SP, "SP", dar[15]);
state_add(STATE_GENSP, "GENSP", dar[15]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", iotemp).noshow().callimport().callexport().formatstr("%16s");
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp
index c95f45d32df..65d7fd86a55 100644
--- a/src/devices/cpu/m6805/m6805.cpp
+++ b/src/devices/cpu/m6805/m6805.cpp
@@ -425,7 +425,6 @@ void m6805_base_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_cc).callimport().callexport().formatstr("%8s").noshow();
state_add(M6805_A, "A", m_a).mask(0xff);
state_add(M6805_PC, "PC", m_pc.w.l).mask(0xffff);
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index 148015c3af4..c02450c1ea2 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -140,7 +140,7 @@ void m6809_base_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc.w).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc.w).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_cc).callimport().callexport().formatstr("%8s").noshow();
state_add(M6809_PC, "PC", m_pc.w).mask(0xffff);
state_add(M6809_S, "S", m_s.w).mask(0xffff);
diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp
index cf4d0ff7da9..fed57fc9ddc 100644
--- a/src/devices/cpu/mb86233/mb86233.cpp
+++ b/src/devices/cpu/mb86233/mb86233.cpp
@@ -155,7 +155,6 @@ void mb86233_cpu_device::device_start()
state_add( MB86233_R15, "R15", m_gpr[15]).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", m_pc).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_sr).formatstr("%2s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp
index 9ab306bb96f..2cd268f83ad 100644
--- a/src/devices/cpu/mb86235/mb86235.cpp
+++ b/src/devices/cpu/mb86235/mb86235.cpp
@@ -68,8 +68,7 @@ void mb86235_cpu_device::device_start()
// Register state for debugger
//state_add( CP1610_R0, "PC", m_pc ).formatstr("%02X");
- state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
+ state_add( STATE_GENPC, "curpc", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp
index 1f1a84217bf..ce915c6d63b 100644
--- a/src/devices/cpu/mb88xx/mb88xx.cpp
+++ b/src/devices/cpu/mb88xx/mb88xx.cpp
@@ -222,7 +222,6 @@ void mb88_cpu_device::device_start()
state_add( MB88_SB, "SB", m_SB).formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_debugger_pc ).callimport().callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_pc ).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_flags ).callimport().callexport().formatstr("%6s").noshow();
m_icountptr = &m_icount;
}
@@ -242,7 +241,6 @@ void mb88_cpu_device::state_import(const device_state_entry &entry)
break;
case STATE_GENPC:
- case STATE_GENPCBASE:
m_PC = m_debugger_pc & 0x3f;
m_PA = ( m_debugger_pc >> 6 ) & 0x1f;
break;
@@ -265,7 +263,6 @@ void mb88_cpu_device::state_export(const device_state_entry &entry)
break;
case STATE_GENPC:
- case STATE_GENPCBASE:
m_debugger_pc = GETPC();
break;
}
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp
index 4a3c3970be8..0bace4613d3 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.cpp
+++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp
@@ -442,7 +442,6 @@ void mc68hc11_cpu_device::device_start()
state_add( HC11_IY, "IY", m_iy).formatstr("%04X");
state_add( STATE_GENPC, "GENPC", m_pc).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_ccr).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp
index b21cae01394..26963fe2fc1 100644
--- a/src/devices/cpu/mcs48/mcs48.cpp
+++ b/src/devices/cpu/mcs48/mcs48.cpp
@@ -968,7 +968,7 @@ void mcs48_cpu_device::device_start()
{
state_add(MCS48_PC, "PC", m_pc).mask(0xfff);
state_add(STATE_GENPC, "GENPC", m_pc).mask(0xfff).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_prevpc).mask(0xfff).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_prevpc).mask(0xfff).noshow();
state_add(STATE_GENSP, "GENSP", m_psw).mask(0x7).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_psw).noshow().formatstr("%10s");
state_add(MCS48_A, "A", m_a);
diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h
index 83f4d4bd4e0..bb049961104 100644
--- a/src/devices/cpu/mcs48/mcs48.h
+++ b/src/devices/cpu/mcs48/mcs48.h
@@ -43,7 +43,11 @@ enum
MCS48_EA,
MCS48_STS, /* UPI-41 systems only */
MCS48_DBBO, /* UPI-41 systems only */
- MCS48_DBBI /* UPI-41 systems only */
+ MCS48_DBBI, /* UPI-41 systems only */
+
+ MCS48_GENPC = STATE_GENPC,
+ MCS48_GENSP = STATE_GENSP,
+ MCS48_GENPCBASE = STATE_GENPCBASE
};
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index d90623369a3..48674fdb6b8 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -2148,7 +2148,6 @@ void mcs51_cpu_device::device_start()
state_add( MCS51_RB, "RB", m_rtemp).mask(0x03).callimport().callexport().formatstr("%02X");
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_rtemp).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp
index 4e30df62c07..4dd8c882870 100644
--- a/src/devices/cpu/mcs96/mcs96.cpp
+++ b/src/devices/cpu/mcs96/mcs96.cpp
@@ -26,7 +26,7 @@ void mcs96_device::device_start()
m_icountptr = &icount;
state_add(STATE_GENPC, "GENPC", PC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", PPC).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
state_add(STATE_GENSP, "GENSP", R[0]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", PSW).formatstr("%16s").noshow();
state_add(MCS96_PC, "PC", PC);
diff --git a/src/devices/cpu/melps4/melps4.cpp b/src/devices/cpu/melps4/melps4.cpp
index a3f204e3ada..2602c6d0194 100644
--- a/src/devices/cpu/melps4/melps4.cpp
+++ b/src/devices/cpu/melps4/melps4.cpp
@@ -187,8 +187,7 @@ void melps4_cpu_device::device_start()
save_item(NAME(m_w));
// register state for debugger
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_cy).formatstr("%9s").noshow();
state_add(MELPS4_PC, "PC", m_pc).formatstr("%04X");
diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp
index f5bcc222d1d..8e812dffcde 100644
--- a/src/devices/cpu/minx/minx.cpp
+++ b/src/devices/cpu/minx/minx.cpp
@@ -114,8 +114,7 @@ void minx_cpu_device::device_start()
state_add( MINX_XI, "XI", m_XI ).formatstr("%02X");
state_add( MINX_YI, "YI", m_YI ).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%06X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_curpc).formatstr("%06X").noshow();
+ state_add(STATE_GENPC, "curpc", m_curpc).formatstr("%06X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%14s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp
index 9eec18d9de2..dce91379357 100644
--- a/src/devices/cpu/mips/r3000.cpp
+++ b/src/devices/cpu/mips/r3000.cpp
@@ -305,7 +305,7 @@ void r3000_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENSP, "GENSP", m_r[31]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", SR).callimport().callexport().formatstr("%6s").noshow();
state_add(R3000_PC, "PC", m_pc);
diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp
index 604b73c0cbf..9293353c825 100644
--- a/src/devices/cpu/mn10200/mn10200.cpp
+++ b/src/devices/cpu/mn10200/mn10200.cpp
@@ -230,7 +230,6 @@ void mn10200_device::device_start()
state_add( MN10200_IAGR, "IAGR", m_iagr).formatstr("%02X");
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_psw).formatstr("%26s").noshow();
m_icountptr = &m_cycles;
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp
index 6738a89f467..b368d666ffe 100644
--- a/src/devices/cpu/nec/nec.cpp
+++ b/src/devices/cpu/nec/nec.cpp
@@ -430,8 +430,7 @@ void nec_common_device::device_start()
state_add( NEC_SS, "SS", Sreg(SS)).formatstr("%04X");
state_add( NEC_DS, "DS0", Sreg(DS0)).formatstr("%04X");
- state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
+ state_add( STATE_GENPC, "GENPC", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENSP, "GENSP", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%16s").noshow();
@@ -494,7 +493,6 @@ void nec_common_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
case NEC_PC:
m_debugger_temp = (Sreg(PS)<<4) + m_ip;
break;
diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp
index f67897dd3d2..b3ea4249882 100644
--- a/src/devices/cpu/nec/v25.cpp
+++ b/src/devices/cpu/nec/v25.cpp
@@ -533,8 +533,7 @@ void v25_common_device::device_start()
state_add( V25_SS, "SS", m_debugger_temp).callimport().callexport().formatstr("%04X");
state_add( V25_DS, "DS0", m_debugger_temp).callimport().callexport().formatstr("%04X");
- state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
+ state_add( STATE_GENPC, "GENPC", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENSP, "GENSP", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%16s").noshow();
@@ -644,7 +643,6 @@ void v25_common_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
case V25_PC:
m_debugger_temp = (Sreg(PS)<<4) + m_ip;
break;
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp
index d0d45db77ee..a040d243916 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp
@@ -117,7 +117,6 @@ void patinho_feio_cpu_device::device_start()
state_add( PATINHO_FEIO_EXT, "EXT", m_ext ).mask(0xFF);
state_add( PATINHO_FEIO_IDX, "IDX", m_idx ).mask(0xFF);
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("0%06O").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("0%06O").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%8s");
if (m_rc_read_cb.isnull()){
diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp
index ded99a2d80d..7489d974911 100644
--- a/src/devices/cpu/pdp1/pdp1.cpp
+++ b/src/devices/cpu/pdp1/pdp1.cpp
@@ -640,7 +640,6 @@ void pdp1_device::device_start()
state_add( PDP1_IOS, "IOS", m_ios).mask(1).formatstr("%1X");
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_pf ).formatstr("%13s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp
index 1f6ee61e6cd..7a966a04e9d 100644
--- a/src/devices/cpu/pdp1/tx0.cpp
+++ b/src/devices/cpu/pdp1/tx0.cpp
@@ -209,7 +209,6 @@ void tx0_device::device_start()
state_add( TX0_IOS, "IOS", m_ios ).mask(1) .formatstr("%1X");
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("0%06O").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("0%06O").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_ir).noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp
index d65f4dc7cfe..84685e54636 100644
--- a/src/devices/cpu/pdp8/pdp8.cpp
+++ b/src/devices/cpu/pdp8/pdp8.cpp
@@ -73,7 +73,6 @@ void pdp8_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_CURPC, "CURPC", m_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_l).callimport().callexport().formatstr("%1s").noshow();
state_add(PDP8_PC, "PC", m_pc).mask(0xfff);
state_add(PDP8_AC, "AC", m_ac).mask(0xfff);
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index 2844fc04a58..89d37d6f5ac 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -863,7 +863,6 @@ void pic16c5x_device::device_start()
state_add( PIC16C5x_PSCL, "PSCL", m_debugger_temp).callimport().formatstr("%3s");
state_add( STATE_GENPC, "GENPC", m_PC).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_PC).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_OPTION).formatstr("%13s").noshow();
state_add( STATE_GENPCBASE, "PREVPC", m_PREVPC).noshow();
diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp
index 1d990c23794..024769d66a6 100644
--- a/src/devices/cpu/pic16c62x/pic16c62x.cpp
+++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp
@@ -937,7 +937,6 @@ void pic16c62x_device::device_start()
state_add( PIC16C62x_PSCL, "PSCL", m_debugger_temp).callimport().formatstr("%3s");
state_add( STATE_GENPC, "GENPC", m_PC).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_PC).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_OPTION).formatstr("%13s").noshow();
state_add( STATE_GENPCBASE, "PREVPC", m_PREVPC).noshow();
diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp
index 42ba5708713..081aa5d0838 100644
--- a/src/devices/cpu/powerpc/ppccom.cpp
+++ b/src/devices/cpu/powerpc/ppccom.cpp
@@ -877,7 +877,6 @@ void ppc_device::device_start()
state_add(PPC_FPSCR, "FPSCR", m_core->fpscr).formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_core->pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_core->pc).noshow();
state_add(STATE_GENSP, "GENSP", m_core->r[31]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).noshow().formatstr("%1s");
diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp
index 7581097f2fa..b2a6cc8129f 100644
--- a/src/devices/cpu/pps4/pps4.cpp
+++ b/src/devices/cpu/pps4/pps4.cpp
@@ -1547,7 +1547,6 @@ void pps4_device::device_start()
state_add( PPS4_I2, "I2", m_I2 ).formatstr("%02X").noshow();
state_add( PPS4_Ip, "Ip", m_Ip ).formatstr("%02X").noshow();
state_add( STATE_GENPC, "GENPC", m_P ).noshow();
- state_add( STATE_GENPCBASE,"CURPC", m_P ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_C).formatstr("%3s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h
index 4fee82b9328..a2797668751 100644
--- a/src/devices/cpu/pps4/pps4.h
+++ b/src/devices/cpu/pps4/pps4.h
@@ -20,6 +20,9 @@ enum
PPS4_I1,
PPS4_I2,
PPS4_Ip,
+ PPS4_GENPC = STATE_GENPC,
+ PPS4_GENSP = STATE_GENSP,
+ PPS4_GENPCBASE = STATE_GENPCBASE,
PPS4_PORT_A = 256,
PPS4_PORT_B = 257
};
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index 9d4ff93c7f3..e0a1394fd07 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -1820,7 +1820,6 @@ void psxcpu_device::device_start()
save_item( NAME( m_multiplier_operand2 ) );
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( PSXCPU_PC, "pc", m_pc );
state_add( PSXCPU_DELAYR, "delayr", m_delayr ).formatstr("%8s");
state_add( PSXCPU_DELAYV, "delayv", m_delayv );
diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp
index b3ddbda9686..d7e85e7525e 100644
--- a/src/devices/cpu/rsp/rsp.cpp
+++ b/src/devices/cpu/rsp/rsp.cpp
@@ -493,9 +493,9 @@ void rsp_device::device_start()
state_add( RSP_V31, "V31", m_debugger_temp).formatstr("%39s");
state_add( STATE_GENPC, "GENPC", m_debugger_temp).callimport().callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%1s").noshow();
state_add( STATE_GENSP, "GENSP", m_rsp_state->r[31]).noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_debugger_temp).callimport().callexport().noshow();
m_icountptr = &m_rsp_state->icount;
}
diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp
index 1071d896350..69accfea7c7 100644
--- a/src/devices/cpu/s2650/s2650.cpp
+++ b/src/devices/cpu/s2650/s2650.cpp
@@ -822,7 +822,6 @@ void s2650_device::device_start()
state_add( S2650_FO, "FO", m_debugger_temp).mask(0x01).callimport().callexport().formatstr("%01X");
state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%16s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp
index 159d2ecd037..9993e118919 100644
--- a/src/devices/cpu/saturn/saturn.cpp
+++ b/src/devices/cpu/saturn/saturn.cpp
@@ -164,7 +164,6 @@ void saturn_device::device_start()
state_add( SATURN_SLEEPING, "sleep", m_sleeping).formatstr("%1X");
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%2s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp
index 7491412d74d..4051d451561 100644
--- a/src/devices/cpu/sc61860/sc61860.cpp
+++ b/src/devices/cpu/sc61860/sc61860.cpp
@@ -163,9 +163,9 @@ void sc61860_device::device_start()
state_add( SC61860_ZERO, "Zero" , m_zero ).mask(1).formatstr("%1u");
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_oldpc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%2s").noshow();
state_add(STATE_GENSP, "GENSP", m_r).mask(0x7f).formatstr("%02X").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_oldpc).formatstr("%04X").noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp
index 2671dc9cf5a..62717f0035e 100644
--- a/src/devices/cpu/scmp/scmp.cpp
+++ b/src/devices/cpu/scmp/scmp.cpp
@@ -493,7 +493,6 @@ void scmp_device::device_start()
{
state_add(SCMP_PC, "PC", m_PC.w.l);
state_add(STATE_GENPC, "GENPC", m_PC.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_SR).noshow().formatstr("%8s");
state_add(SCMP_P1, "P1", m_P1.w.l);
state_add(SCMP_P2, "P2", m_P2.w.l);
diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h
index 11aec711060..03f284589eb 100644
--- a/src/devices/cpu/scmp/scmp.h
+++ b/src/devices/cpu/scmp/scmp.h
@@ -10,7 +10,10 @@
enum
{
- SCMP_PC, SCMP_P1, SCMP_P2, SCMP_P3, SCMP_AC, SCMP_ER, SCMP_SR
+ SCMP_PC, SCMP_P1, SCMP_P2, SCMP_P3, SCMP_AC, SCMP_ER, SCMP_SR,
+ SCMP_GENPC = STATE_GENPC,
+ SCMP_GENSP = STATE_GENSP,
+ SCMP_GENPCBASE = STATE_GENPCBASE
};
diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp
index bb5f9cd5255..e20726b0337 100644
--- a/src/devices/cpu/score/score.cpp
+++ b/src/devices/cpu/score/score.cpp
@@ -92,8 +92,8 @@ void score7_cpu_device::device_start()
state_add(SCORE_CEH, "ceh", REG_CEH).callimport().callexport().formatstr("%08X");
state_add(SCORE_CEL, "cel", REG_CEL).callimport().callexport().formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%08X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).formatstr("%8X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%08X").noshow();
+ state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%8X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_ppc).formatstr("%5s").noshow();
// save state
diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp
index d4e393c8ac3..d4b28d87408 100644
--- a/src/devices/cpu/scudsp/scudsp.cpp
+++ b/src/devices/cpu/scudsp/scudsp.cpp
@@ -975,8 +975,7 @@ void scudsp_cpu_device::device_start()
state_add( SCUDSP_CT1, "CT1", m_ct1 ).formatstr("%02X");
state_add( SCUDSP_CT2, "CT2", m_ct2 ).formatstr("%02X");
state_add( SCUDSP_CT3, "CT3", m_ct3 ).formatstr("%02X");
- state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
+ state_add( STATE_GENPC, "curpc", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).formatstr("%17s").noshow();
m_out_irq_cb.resolve_safe();
diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp
index ec8ddaf0649..65c109f8ff4 100644
--- a/src/devices/cpu/se3208/se3208.cpp
+++ b/src/devices/cpu/se3208/se3208.cpp
@@ -1801,9 +1801,9 @@ void se3208_device::device_start()
state_add( SE3208_PPC, "PPC", m_PPC).formatstr("%08X");
state_add(STATE_GENPC, "GENPC", m_PC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PPC).noshow();
state_add(STATE_GENSP, "GENSP", m_SP).noshow();
- state_add(STATE_GENFLAGS, "GENFLAGS", m_SR).formatstr("%10s").noshow();
+ state_add(STATE_GENFLAGS, "GENFLAGS", m_SR).formatstr("%10s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_PPC).noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp
index 3b419193dcf..0201e8d8a44 100644
--- a/src/devices/cpu/sh2/sh2.cpp
+++ b/src/devices/cpu/sh2/sh2.cpp
@@ -2459,8 +2459,8 @@ void sh2_device::device_start()
state_add( SH2_EA, "EA", m_sh2_state->ea).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", m_sh2_state->pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_sh2_state->ppc ).noshow();
state_add( STATE_GENSP, "GENSP", m_sh2_state->r[15] ).noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_sh2_state->ppc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_sh2_state->sr ).formatstr("%6s").noshow();
m_icountptr = &m_sh2_state->icount;
diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp
index e18e1646314..3a9a24e1525 100644
--- a/src/devices/cpu/sh4/sh4.cpp
+++ b/src/devices/cpu/sh4/sh4.cpp
@@ -4278,8 +4278,8 @@ void sh34_base_device::device_start()
state_add(SH4_XF15, "XF15", m_debugger_temp).callimport().formatstr("%25s");
state_add(STATE_GENPC, "GENPC", m_debugger_temp).callimport().callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
state_add(STATE_GENSP, "GENSP", m_r[15]).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_sr).formatstr("%20s").noshow();
m_icountptr = &m_sh4_icount;
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index ef6eed4f614..f479d336c46 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -760,7 +760,6 @@ void adsp21062_device::device_start()
state_add( SHARC_B15, "B15", m_core->dag2.b[7]).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", m_core->pc).noshow();
- state_add( STATE_GENPC, "CURPC", m_core->pc).noshow();
m_icountptr = &m_core->icount;
}
diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp
index 7242ef93b55..b5eb56ab24f 100644
--- a/src/devices/cpu/sm510/sm510.cpp
+++ b/src/devices/cpu/sm510/sm510.cpp
@@ -104,8 +104,7 @@ void sm510_base_device::device_start()
state_add(SM510_C, "C", m_c).formatstr("%01X");
state_add(SM510_W, "W", m_w).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_c).formatstr("%1s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp
index 071c7ee56cf..dff83dbd9f4 100644
--- a/src/devices/cpu/sm8500/sm8500.cpp
+++ b/src/devices/cpu/sm8500/sm8500.cpp
@@ -134,8 +134,7 @@ void sm8500_cpu_device::device_start()
state_add(SM8500_RR10, "RR10", m_PC ).callimport().callexport().formatstr("%04s");
state_add(SM8500_RR12, "RR12", m_PC ).callimport().callexport().formatstr("%04s");
state_add(SM8500_RR14, "RR14", m_PC ).callimport().callexport().formatstr("%04s");
- state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%8s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PC).formatstr("%8s").noshow();
+ state_add(STATE_GENPC, "curpc", m_PC).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_PS1).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp
index 17eff33b8d1..be7edbe6284 100644
--- a/src/devices/cpu/sparc/mb86901.cpp
+++ b/src/devices/cpu/sparc/mb86901.cpp
@@ -247,7 +247,6 @@ void mb86901_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_psr).callimport().callexport().formatstr("%6s").noshow();
state_add(SPARC_PC, "PC", m_pc).formatstr("%08X");
state_add(SPARC_NPC, "nPC", m_npc).formatstr("%08X");
diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp
index c84e5d56a3c..abd0b7bf44e 100644
--- a/src/devices/cpu/spc700/spc700.cpp
+++ b/src/devices/cpu/spc700/spc700.cpp
@@ -1235,10 +1235,10 @@ void spc700_device::device_start()
state_add( SPC700_X, "X", m_x ).formatstr("%02X");
state_add( SPC700_Y, "Y", m_y ).formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENSP, "GENSP", m_debugger_temp).mask(0x1ff).callexport().formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%8s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).formatstr("%04X").noshow();
m_icountptr = &m_ICount;
}
diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp
index 1ea2584c33e..3f67e18de5f 100644
--- a/src/devices/cpu/ssem/ssem.cpp
+++ b/src/devices/cpu/ssem/ssem.cpp
@@ -101,7 +101,6 @@ void ssem_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_halt).callimport().callexport().formatstr("%1s").noshow();
state_add(SSEM_PC, "PC", m_shifted_pc).mask(0xffff);
state_add(SSEM_A, "A", m_a).mask(0xffffffff);
diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp
index e37939f34f4..e583ac0bfb3 100644
--- a/src/devices/cpu/ssp1601/ssp1601.cpp
+++ b/src/devices/cpu/ssp1601/ssp1601.cpp
@@ -540,8 +540,8 @@ void ssp1601_device::device_start()
state_add( SSP_PR7, "R7", m_r[7]).formatstr("%02X");
state_add(STATE_GENPC, "GENPC", rPC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", PPC).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", rST).formatstr("%4s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
m_icountptr = &m_g_cycles;
}
diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp
index 1c7715c4d04..f0b7f79101c 100644
--- a/src/devices/cpu/superfx/superfx.cpp
+++ b/src/devices/cpu/superfx/superfx.cpp
@@ -694,8 +694,6 @@ void superfx_device::device_start()
state_add( SUPERFX_RAMAR, "RAMAR", m_ramar).formatstr("%04X");
state_add( SUPERFX_RAMDR, "RAMDR", m_ramdr).formatstr("%02X");
state_add( SUPERFX_RAMADDR, "RAMADDR", m_ramaddr).formatstr("%04X");
- state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().formatstr("%06X");
- state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().formatstr("%06X");
m_icountptr = &m_icount;
}
@@ -717,7 +715,6 @@ void superfx_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
case SUPERFX_PC:
m_debugger_temp = ( (m_pbr << 16) | m_r[15] ) - 1;
break;
diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp
index d53bebf13cb..262c69cb17a 100644
--- a/src/devices/cpu/t11/t11.cpp
+++ b/src/devices/cpu/t11/t11.cpp
@@ -287,9 +287,9 @@ void t11_device::device_start()
state_add( T11_R4, "R4", m_reg[4].w.l).formatstr("%04X");
state_add( T11_R5, "R5", m_reg[5].w.l).formatstr("%04X");
- state_add(STATE_GENPC, "GENPC", m_reg[7].w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc.w.l).noshow();
+ state_add(STATE_GENPC, "curpc", m_reg[7].w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_psw.b.l).formatstr("%8s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w.l).noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index a347d93a632..8cf66a14ccb 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -2764,9 +2764,9 @@ void tlcs90_device::device_start()
state_add( T90_IY, "IY", m_iy.w.l).formatstr("%04X");
state_add(STATE_GENPC, "GENPC", m_pc.w.l).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_prvpc.w.l).formatstr("%04X").noshow();
state_add(STATE_GENSP, "GENSP", m_sp.w.l).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", F ).formatstr("%8s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_prvpc.w.l).formatstr("%04X").noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp
index 5521954bc03..fa36695b095 100644
--- a/src/devices/cpu/tlcs900/tlcs900.cpp
+++ b/src/devices/cpu/tlcs900/tlcs900.cpp
@@ -378,7 +378,6 @@ void tlcs900h_device::device_start()
state_add( TLCS900_DMAM3, "DMAM3", m_dmam[3].b.l ).formatstr("%02X");
state_add( STATE_GENPC, "GENPC", m_pc.d ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_pc.d ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_sr.w.l ).formatstr("%12s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/tms1000/tms1k_base.cpp b/src/devices/cpu/tms1000/tms1k_base.cpp
index ef5f41f0546..019557efab5 100644
--- a/src/devices/cpu/tms1000/tms1k_base.cpp
+++ b/src/devices/cpu/tms1000/tms1k_base.cpp
@@ -74,7 +74,6 @@ void tms1k_base_device::state_string_export(const device_state_entry &entry, std
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
str = string_format("%03X", m_rom_address << ((m_byte_bits > 8) ? 1 : 0));
break;
}
@@ -195,8 +194,7 @@ void tms1k_base_device::device_start()
state_add(TMS1XXX_Y, "Y", m_y ).formatstr("%01X");
state_add(TMS1XXX_STATUS, "STATUS", m_status).formatstr("%01X");
- state_add(STATE_GENPC, "GENPC", m_rom_address).formatstr("%03X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_rom_address).formatstr("%03X").noshow();
+ state_add(STATE_GENPC, "curpc", m_rom_address).formatstr("%03X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_sr).formatstr("%8s").noshow();
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp
index 146d95ab113..7625ff96646 100644
--- a/src/devices/cpu/tms32010/tms32010.cpp
+++ b/src/devices/cpu/tms32010/tms32010.cpp
@@ -863,10 +863,10 @@ void tms32010_device::device_start()
state_add( TMS32010_STK3, "STK3", m_STACK[3]).formatstr("%04X");
state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PREVPC).formatstr("%04X").noshow();
/* This is actually not a stack pointer, but the stack contents */
state_add(STATE_GENSP, "GENSP", m_STACK[3]).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_STR).formatstr("%16s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_PREVPC).formatstr("%04X").noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp
index 5ce29bf10ab..a73ec8f21da 100644
--- a/src/devices/cpu/tms32025/tms32025.cpp
+++ b/src/devices/cpu/tms32025/tms32025.cpp
@@ -1747,10 +1747,10 @@ void tms32025_device::device_start()
state_add( TMS32025_GREG, "GREG", m_debugger_temp).callimport().callexport().formatstr("%04X");
state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PREVPC).formatstr("%04X").noshow();
/* This is actually not a stack pointer, but the stack contents */
state_add(STATE_GENSP, "GENSP", m_STACK[7]).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_STR0).formatstr("%33s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_PREVPC).formatstr("%04X").noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index 22593bc9e15..6a90630b5a1 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -399,7 +399,6 @@ void tms3203x_device::device_start()
// register our state for the debugger
state_add(TMS3203X_PC, "PC", m_pc);
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_r[TMR_ST].i32[0]).mask(0xff).noshow().formatstr("%8s");
state_add(TMS3203X_R0, "R0", m_r[TMR_R0].i32[0]);
state_add(TMS3203X_R1, "R1", m_r[TMR_R1].i32[0]);
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index e5efade625f..9bbde38dae0 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -244,7 +244,6 @@ void tms32051_device::device_start()
state_add( TMS32051_PSC, "PSC", m_timer.psc).formatstr("%04X");
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp
index 3d788a19aa2..baf444dd064 100644
--- a/src/devices/cpu/tms32082/tms32082.cpp
+++ b/src/devices/cpu/tms32082/tms32082.cpp
@@ -206,8 +206,7 @@ void tms32082_mp_device::device_start()
state_add(MP_TCOUNT, "tcount", m_tcount).formatstr("%08X");
state_add(MP_TSCALE, "tscale", m_tscale).formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).noshow();
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
@@ -504,8 +503,7 @@ void tms32082_pp_device::device_start()
// Register state for debugger
state_add(PP_PC, "pc", m_pc).formatstr("%08X");
- state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).noshow();
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index dd45a91a848..e7098319d08 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -586,7 +586,7 @@ void tms340x0_device::device_start()
{
state_add(TMS34010_PC, "PC", m_pc);
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc).noshow();
state_add(TMS34010_SP, "SP", m_regs[15].reg);
state_add(STATE_GENSP, "GENSP", m_regs[15].reg).noshow();
state_add(TMS34010_ST, "ST", m_st);
diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h
index 83d96832f38..f87a3df37b1 100644
--- a/src/devices/cpu/tms34010/tms34010.h
+++ b/src/devices/cpu/tms34010/tms34010.h
@@ -50,7 +50,11 @@ enum
TMS34010_B11,
TMS34010_B12,
TMS34010_B13,
- TMS34010_B14
+ TMS34010_B14,
+
+ TMS34010_GENPC = STATE_GENPC,
+ TMS34010_GENSP = STATE_GENSP,
+ TMS34010_GENPCBASE = STATE_GENPCBASE
};
diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp
index fbc7b208673..2424642e8d4 100644
--- a/src/devices/cpu/tms57002/tms57002.cpp
+++ b/src/devices/cpu/tms57002/tms57002.cpp
@@ -815,7 +815,6 @@ void tms57002_device::device_start()
data = &space(AS_DATA);
state_add(STATE_GENPC, "GENPC", pc).noshow();
- state_add(STATE_GENPCBASE,"CURPC", pc).noshow();
state_add(TMS57002_PC, "PC", pc);
state_add(TMS57002_ST0, "ST0", st0);
state_add(TMS57002_ST1, "ST1", st1);
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index bb3d24bf338..b29f8f20ee4 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -241,7 +241,6 @@ void tms7000_device::device_start()
state_add(TMS7000_ST, "ST", m_sr).formatstr("%02X");
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%02X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENSP, "GENSP", m_sp).formatstr("%02X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_sr).formatstr("%8s").noshow();
}
diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp
index 01c2c57a87d..97510d1f610 100644
--- a/src/devices/cpu/tms9900/ti990_10.cpp
+++ b/src/devices/cpu/tms9900/ti990_10.cpp
@@ -62,8 +62,7 @@ void ti990_10_device::device_start()
// set our instruction counter
m_icountptr = &m_icount;
- state_add(STATE_GENPC, "GENPC", PC).formatstr("%4s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", PC).formatstr("%4s").noshow();
+ state_add(STATE_GENPC, "curpc", PC).formatstr("%4s").noshow();
state_add(STATE_GENFLAGS, "status", m_state_any).callimport().callexport().formatstr("%16s").noshow();
}
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index 1962cc897f5..eab6ffc8007 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -233,8 +233,7 @@ void tms99xx_device::device_start()
// callexport = need to use the state_export method to read the state variable
state_add(i, s_statename[i], m_state_any).callimport().callexport().formatstr("%04X");
}
- state_add(STATE_GENPC, "GENPC", PC).formatstr("%4s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", PC).formatstr("%4s").noshow();
+ state_add(STATE_GENPC, "curpc", PC).formatstr("%4s").noshow();
state_add(STATE_GENFLAGS, "status", m_state_any).callimport().callexport().formatstr("%16s").noshow();
build_command_lookup_table();
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index d8ffcda2337..52e482efaa5 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -264,8 +264,7 @@ void tms9995_device::device_start()
// callexport = need to use the state_export method to read the state variable
state_add(i, s_statename[i], m_state_any).callimport().callexport().formatstr("%04X");
}
- state_add(STATE_GENPC, "GENPC", PC_debug).formatstr("%4s").noshow();
- state_add(STATE_GENPCBASE, "CURPC", PC_debug).formatstr("%4s").noshow();
+ state_add(STATE_GENPC, "curpc", PC_debug).formatstr("%4s").noshow();
state_add(STATE_GENFLAGS, "status", m_state_any).callimport().callexport().formatstr("%16s").noshow();
// Set up the lookup table for command decoding
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index 71f1bd2ce9b..fd0263ac8fb 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -180,8 +180,7 @@ void ucom4_cpu_device::device_start()
state_add(UCOM4_DPH, "DPH", m_dph).formatstr("%01X");
state_add(UCOM4_ACC, "ACC", m_acc).formatstr("%01X");
- state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
+ state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_carry_f).formatstr("%5s").noshow(); // dummy
m_icountptr = &m_icount;
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp
index 12bdc67078c..a6215b98fcf 100644
--- a/src/devices/cpu/unsp/unsp.cpp
+++ b/src/devices/cpu/unsp/unsp.cpp
@@ -145,7 +145,6 @@ void unsp_device::device_start()
state_add( UNSP_SB, "SB", m_sb).formatstr("%1u");
state_add(STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
m_icountptr = &m_icount;
}
@@ -154,11 +153,13 @@ void unsp_device::state_export(const device_state_entry &entry)
{
switch (entry.index())
{
- case STATE_GENPC:
- case STATE_GENPCBASE:
case UNSP_PC:
m_debugger_temp = UNSP_LPC;
break;
+
+ case STATE_GENPC:
+ m_debugger_temp = UNSP_LPC;
+ break;
}
}
diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp
index 9564d380bc9..5641743ffb7 100644
--- a/src/devices/cpu/upd7725/upd7725.cpp
+++ b/src/devices/cpu/upd7725/upd7725.cpp
@@ -70,7 +70,6 @@ void necdsp_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", regs.pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", regs.pc).noshow();
state_add(UPD7725_PC, "PC", regs.pc);
state_add(UPD7725_RP, "RP", regs.rp);
state_add(UPD7725_DP, "DP", regs.dp);
diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp
index 9722ba360b3..7ab58fc46c1 100644
--- a/src/devices/cpu/upd7810/upd7810.cpp
+++ b/src/devices/cpu/upd7810/upd7810.cpp
@@ -1659,7 +1659,7 @@ void upd7810_device::device_start()
state_add( UPD7810_CO1, "CO1", m_co1).formatstr("%3u");
state_add( STATE_GENPC, "GENPC", m_pc.w.l ).formatstr("%04X").noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_ppc.w.l ).formatstr("%04X").noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_ppc.w.l ).formatstr("%04X").noshow();
state_add( STATE_GENSP, "GENSP", m_sp.w.l ).formatstr("%04X").noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_psw ).formatstr("%17s").noshow();
}
@@ -1690,7 +1690,7 @@ void upd78c05_device::device_start()
state_add( UPD7810_MKL, "MKL", m_mkl).formatstr("%02X");
state_add( STATE_GENPC, "GENPC", m_pc.w.l ).formatstr("%04X").noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_ppc.w.l ).formatstr("%04X").noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_ppc.w.l ).formatstr("%04X").noshow();
state_add( STATE_GENSP, "GENSP", m_sp.w.l ).formatstr("%04X").noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_psw ).formatstr("%17s").noshow();
diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp
index 1436b72d757..52845538b47 100644
--- a/src/devices/cpu/v30mz/v30mz.cpp
+++ b/src/devices/cpu/v30mz/v30mz.cpp
@@ -178,8 +178,7 @@ void v30mz_cpu_device::device_start()
state_add( NEC_DS, "DS", m_sregs[DS] ).callimport().callexport().formatstr("%04X");
state_add( NEC_VECTOR, "V", m_int_vector).callimport().callexport().formatstr("%02X");
- state_add(STATE_GENPC, "GENPC", m_pc).callexport().formatstr("%05X");
- state_add(STATE_GENPCBASE, "CURPC", m_pc).callexport().formatstr("%05X");
+ state_add(STATE_GENPC, "curpc", m_pc).callimport().callexport().formatstr("%05X");
state_add(STATE_GENFLAGS, "GENFLAGS", m_TF).callimport().callexport().formatstr("%16s").noshow();
m_icountptr = &m_icount;
@@ -191,7 +190,6 @@ void v30mz_cpu_device::state_string_export(const device_state_entry &entry, std:
switch (entry.index())
{
case STATE_GENPC:
- case STATE_GENPCBASE:
str = string_format("%08X", ( m_sregs[CS] << 4 ) + m_ip);
break;
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 009a7cf66a7..ec33e3e6eab 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -498,7 +498,7 @@ void v60_device::device_start()
state_add( V60_ADTMR1, "ADTMR1", ADTMR1).formatstr("%08X");
state_add( STATE_GENPC, "GENPC", PC).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_PPC ).noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_PPC ).noshow();
state_add( STATE_GENSP, "GENSP", SP ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).noshow();
diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp
index 4e03c000747..d9509d77b6b 100644
--- a/src/devices/cpu/v810/v810.cpp
+++ b/src/devices/cpu/v810/v810.cpp
@@ -1307,9 +1307,9 @@ void v810_device::device_start()
state_add( V810_ADTRE, "ADTRE", ADTRE).formatstr("%08X");
state_add(STATE_GENPC, "GENPC", PC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PPC).noshow();
state_add(STATE_GENSP, "GENSP", SP).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", PSW).formatstr("%8s").noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_PPC).noshow();
m_icountptr = &m_icount;
}
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index c904ea33eec..8cff26069c0 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -1973,7 +1973,7 @@ void z180_device::device_start()
{
state_add(Z180_PC, "PC", m_PC.w.l);
state_add(STATE_GENPC, "GENPC", _PCD).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_PREPC.w.l).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_PREPC.w.l).noshow();
state_add(Z180_SP, "SP", _SPD);
state_add(STATE_GENSP, "GENSP", m_SP.w.l).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_AF.b.l).noshow().formatstr("%8s");
diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h
index 36b260e7a6f..87980e29f4e 100644
--- a/src/devices/cpu/z180/z180.h
+++ b/src/devices/cpu/z180/z180.h
@@ -103,7 +103,11 @@ enum
Z180_IO3D, /* 3d reserved */
Z180_OMCR, /* 3e operation mode control register */
Z180_IOCR, /* 3f I/O control register */
- Z180_IOLINES /* read/write I/O lines */
+ Z180_IOLINES, /* read/write I/O lines */
+
+ Z180_GENPC = STATE_GENPC,
+ Z180_GENSP = STATE_GENSP,
+ Z180_GENPCBASE = STATE_GENPCBASE
};
enum
diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index 7e21e5d2e5b..53aecb48b1b 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -670,7 +670,6 @@ void z8_device::device_start()
{
state_add(Z8_PC, "PC", m_pc);
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
state_add(Z8_SP, "SP", m_fake_sp).callimport().callexport();
state_add(STATE_GENSP, "GENSP", m_fake_sp).callimport().callexport().noshow();
state_add(Z8_RP, "RP", m_r[Z8_REGISTER_RP]);
@@ -774,7 +773,7 @@ void z8_device::state_import(const device_state_entry &entry)
switch (entry.index())
{
case Z8_SP:
- case STATE_GENSP:
+ case Z8_GENSP:
m_r[Z8_REGISTER_SPH] = m_fake_sp >> 8;
m_r[Z8_REGISTER_SPL] = m_fake_sp & 0xff;
break;
@@ -793,7 +792,7 @@ void z8_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case Z8_SP:
- case STATE_GENSP:
+ case Z8_GENSP:
m_fake_sp = (m_r[Z8_REGISTER_SPH] << 8) | m_r[Z8_REGISTER_SPL];
break;
diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h
index 758ae7c5366..6ef667c74cc 100644
--- a/src/devices/cpu/z8/z8.h
+++ b/src/devices/cpu/z8/z8.h
@@ -16,7 +16,10 @@ enum
{
Z8_PC, Z8_SP, Z8_RP, Z8_T0, Z8_T1,
- Z8_R0, Z8_R1, Z8_R2, Z8_R3, Z8_R4, Z8_R5, Z8_R6, Z8_R7, Z8_R8, Z8_R9, Z8_R10, Z8_R11, Z8_R12, Z8_R13, Z8_R14, Z8_R15
+ Z8_R0, Z8_R1, Z8_R2, Z8_R3, Z8_R4, Z8_R5, Z8_R6, Z8_R7, Z8_R8, Z8_R9, Z8_R10, Z8_R11, Z8_R12, Z8_R13, Z8_R14, Z8_R15,
+
+ Z8_GENPC = STATE_GENPC,
+ Z8_GENSP = STATE_GENSP
};
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index e0a3bbb8863..b32dce2faf9 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -3426,7 +3426,7 @@ void z80_device::device_start()
/* set up the state table */
state_add(Z80_PC, "PC", m_pc.w.l);
state_add(STATE_GENPC, "GENPC", m_pc.w.l).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_prvpc.w.l).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_prvpc.w.l).noshow();
state_add(Z80_SP, "SP", SP);
state_add(STATE_GENSP, "GENSP", SP).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", F).noshow().formatstr("%8s");
diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
index a3100fd1674..e3733807770 100644
--- a/src/devices/cpu/z80/z80.h
+++ b/src/devices/cpu/z80/z80.h
@@ -30,7 +30,11 @@ enum
Z80_AF, Z80_BC, Z80_DE, Z80_HL,
Z80_IX, Z80_IY, Z80_AF2, Z80_BC2, Z80_DE2, Z80_HL2,
Z80_R, Z80_I, Z80_IM, Z80_IFF1, Z80_IFF2, Z80_HALT,
- Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_WZ
+ Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_WZ,
+
+ Z80_GENPC = STATE_GENPC,
+ Z80_GENSP = STATE_GENSP,
+ Z80_GENPCBASE = STATE_GENPCBASE
};
class z80_device : public cpu_device, public z80_daisy_chain_interface
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index 114faab7441..bdfbc436275 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -612,7 +612,7 @@ void z8002_device::register_debug_state()
state_add( Z8000_R15, "R15", RW(15) ).formatstr("%04X");
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_ppc ).noshow();
+ state_add( STATE_GENPCBASE, "GENPCBASE", m_ppc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_fcw ).formatstr("%16s").noshow();
state_add( STATE_GENSP, "GENSP", m_nspoff ).noshow();
}
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index e04d0f31a60..c99b5ac9f18 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -499,8 +499,7 @@ void netlist_mame_cpu_device_t::device_start()
// State support
- state_add(STATE_GENPC, "GENPC", m_genPC).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_genPC).noshow();
+ state_add(STATE_GENPC, "curpc", m_genPC).noshow();
for (int i=0; i < netlist().m_nets.size(); i++)
{
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 9fd4d1a860b..99cdefb3b36 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -2628,7 +2628,7 @@ void debugger_commands::execute_trackpc(int ref, int params, const char *param[]
// Insert current pc
if (m_cpu.get_visible_cpu() == cpu)
{
- const offs_t pc = cpu->safe_pcbase();
+ const offs_t pc = cpu->safe_pc();
cpu->debug()->set_track_pc_visited(pc);
}
m_console.printf("PC tracking enabled\n");
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index 5e6535a9fb4..7fbcb29b3ea 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -1939,7 +1939,7 @@ void device_debug::instruction_hook(offs_t curpc)
// handle step out/over on the instruction we are about to execute
if ((m_flags & (DEBUG_FLAG_STEPPING_OVER | DEBUG_FLAG_STEPPING_OUT)) != 0 && m_stepaddr == ~0)
- prepare_for_step_overout(m_device.safe_pcbase());
+ prepare_for_step_overout(m_device.safe_pc());
// no longer in debugger code
debugcpu.set_within_instruction(false);
@@ -2955,7 +2955,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre
{
"0bytes", "byte", "word", "3bytes", "dword", "5bytes", "6bytes", "7bytes", "qword"
};
- offs_t pc = space.device().safe_pcbase();
+ offs_t pc = space.device().safe_pc();
std::string buffer;
if (type & WATCHPOINT_WRITE)
@@ -2985,7 +2985,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre
void device_debug::hotspot_check(address_space &space, offs_t address)
{
- offs_t curpc = m_device.safe_pcbase();
+ offs_t curpc = m_device.safe_pc();
// see if we have a match in our list
unsigned int hotindex;
diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp
index b793a7a553e..bc7ca2a2300 100644
--- a/src/emu/debug/dvdisasm.cpp
+++ b/src/emu/debug/dvdisasm.cpp
@@ -167,7 +167,7 @@ void debug_view_disasm::view_char(int chval)
case DCH_HOME: // set the active column to the PC
{
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
- offs_t pc = source.m_space.address_to_byte(source.device()->safe_pcbase()) & source.m_space.logbytemask();
+ offs_t pc = source.m_space.address_to_byte(source.device()->safe_pc()) & source.m_space.logbytemask();
// figure out which row the pc is on
for (unsigned int curline = 0; curline < m_byteaddress.size(); curline++)
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index a5f40be8e8e..0751b961b14 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -196,7 +196,7 @@ void vgmplay_device::device_start()
save_item(NAME(m_pc));
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
- state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_pc).noshow();
}
void vgmplay_device::device_reset()
diff --git a/src/mame/etc/template_cpu.cpp b/src/mame/etc/template_cpu.cpp
index 3ef47437be8..b6900258a43 100644
--- a/src/mame/etc/template_cpu.cpp
+++ b/src/mame/etc/template_cpu.cpp
@@ -70,8 +70,7 @@ void xxx_cpu_device::device_start()
// Register state for debugger
state_add( CP1610_R0, "PC", m_pc ).formatstr("%02X");
- state_add( STATE_GENPC, "GENPC", m_r[7] ).noshow();
- state_add( STATE_GENPCBASE, "CURPC", m_r[7] ).noshow();
+ state_add( STATE_GENPC, "curpc", m_r[7] ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).noshow();
m_icountptr = &m_icount;