Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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]

Browse Source
This commit is contained in:
smf- 2016-09-27 14:24:33 +01:00
parent 3957d89e44
commit 1a186c8a3a
139 changed files with 214 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/devices/cpu/8x300/8x300.cpp
View File

@ -140,7 +140,8 @@ 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, "curpc", m_genPC).noshow();
state_add(STATE_GENPC, "GENPC", m_genPC).noshow();
state_add(STATE_GENPCBASE, "CURPC", m_genPC).noshow();
m_icountptr = &m_icount;
}

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

@ -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, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENPCBASE, "CURPC", m_ppc).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_astat).mask(0xff).noshow().formatstr("%8s");
state_add(ADSP2100_AX0, "AX0", m_core.ax0.u);

6
src/devices/cpu/adsp2100/adsp2100.h
View File

@ -170,11 +170,7 @@ enum
ADSP2100_SE_SEC,
ADSP2100_SB_SEC,
ADSP2100_SR0_SEC,
ADSP2100_SR1_SEC,
ADSP2100_GENPC = STATE_GENPC,
ADSP2100_GENSP = STATE_GENSP,
ADSP2100_GENPCBASE = STATE_GENPCBASE
ADSP2100_SR1_SEC
};

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

@ -989,7 +989,8 @@ 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, "curpc", m_mpc).formatstr("%03X").noshow();
state_add(STATE_GENPC, "GENPC", m_mpc).formatstr("%03X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_mpc).formatstr("%03X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_aluc0).formatstr("%5s").noshow();
m_icountptr = &m_icount;

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

@ -397,7 +397,8 @@ 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, "curpc", m_pc).formatstr("%08X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%08X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%08X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_alu).formatstr("%13s").noshow();
m_icountptr = &m_icount;

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

@ -170,7 +170,8 @@ 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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_f).formatstr("%6s").noshow();
m_icountptr = &m_icount;

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

@ -65,6 +65,7 @@ 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;
}
@ -78,6 +79,7 @@ void arc_device::state_export(const device_state_entry &entry)
break;
case STATE_GENPC:
case STATE_GENPCBASE:
m_debugger_temp = m_pc << 2;
break;
}

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

@ -95,6 +95,7 @@ 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++)
{
@ -111,6 +112,8 @@ 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;
@ -125,10 +128,6 @@ 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))
{

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

@ -545,7 +545,8 @@ 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, "curpc", m_sArmRegister[15]).mask(ADDRESS_MASK).callimport().callexport().formatstr("%8s").noshow();
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_GENFLAGS, "GENFLAGS", m_sArmRegister[15]).formatstr("%11s").noshow();
m_icountptr = &m_icount;

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

@ -506,6 +506,7 @@ 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");
@ -558,6 +559,7 @@ 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;
}

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

@ -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, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -752,6 +752,7 @@ 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);

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

@ -133,7 +133,8 @@ 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, "curpc", m_PC).noshow();
state_add(STATE_GENPC, "GENPC", m_PC).noshow();
state_add(STATE_GENPCBASE, "CURPC", m_PC).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%6s").noshow();
m_icountptr = &m_icount;

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

@ -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, "GENPCBASE", m_prevpc).mask(0xfff).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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");

5
src/devices/cpu/cop400/cop400.h
View File

@ -72,10 +72,7 @@ enum
COP400_EN,
COP400_SIO,
COP400_SKL,
COP400_T,
COP400_GENPC = STATE_GENPC,
COP400_GENPCBASE = STATE_GENPCBASE,
COP400_GENSP = STATE_GENSP
COP400_T
};
/* input lines */

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

@ -342,6 +342,7 @@ 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);
@ -433,6 +434,7 @@ void cosmac_device::state_import(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
case STATE_GENPCBASE:
R[P] = m_pc;
break;
@ -453,6 +455,7 @@ void cosmac_device::state_export(const device_state_entry &entry)
switch (entry.index())
{
case STATE_GENPC:
case STATE_GENPCBASE:
m_pc = R[P];
break;

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

@ -3359,7 +3359,8 @@ 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, "curpc", m_r[7] ).noshow();
state_add( STATE_GENPC, "GENPC", m_r[7] ).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_r[7]).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).noshow();
m_icountptr = &m_icount;

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

@ -229,7 +229,8 @@ 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, "curpc", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%02X").noshow();
m_icountptr = &m_icount;
}
@ -331,7 +332,8 @@ 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, "curpc", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%02X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%3s").noshow();
m_icountptr = &m_icount;
@ -457,7 +459,8 @@ 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, "curpc", m_curpc).callimport().callexport().formatstr("%02X").noshow();
state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%02X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_curpc).formatstr("%02X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%6s").noshow();
m_icountptr = &m_icount;

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

@ -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, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -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, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -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;

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

@ -119,7 +119,8 @@ 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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_f).formatstr("%4s").noshow();
m_icountptr = &m_icount;

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

@ -1563,6 +1563,7 @@ 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);

1
src/devices/cpu/es5510/es5510.cpp
View File

@ -552,6 +552,7 @@ 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() {

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

@ -194,6 +194,7 @@ 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);

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

@ -2038,7 +2038,8 @@ 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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_w).formatstr("%5s").noshow();
m_icountptr = &m_icount;

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

@ -868,6 +868,7 @@ 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();
@ -879,6 +880,7 @@ 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:
@ -924,6 +926,7 @@ 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;

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

@ -209,6 +209,7 @@ 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);

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

@ -35,7 +35,7 @@ void h8_device::device_start()
io = &space(AS_IO);
state_add(STATE_GENPC, "GENPC", NPC).noshow();
state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
state_add(STATE_GENPCBASE, "CURPC", PPC).noshow();
if(has_exr)
state_add(STATE_GENFLAGS, "GENFLAGS", CCR).formatstr("%11s").noshow();
else

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

@ -314,7 +314,8 @@ void hcd62121_cpu_device::device_start()
save_item( NAME(m_temp2) );
// Register state for debugger
state_add( STATE_GENPC, "curpc", m_ip ).callimport().callexport().formatstr("%8s");
state_add( STATE_GENPC, "GENPC", m_ip ).callexport().formatstr("%8s");
state_add( STATE_GENPCBASE,"CURPC", m_ip ).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");
@ -368,6 +369,7 @@ 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;

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

@ -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, "curpc", m_curpc).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%8s").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_ppc).formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).mask(0xff).formatstr("%8s").noshow();
// set our instruction counter

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

@ -267,7 +267,8 @@ 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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_s).formatstr("%2s").noshow();
m_icountptr = &m_icount;

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

@ -180,6 +180,7 @@ 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);

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

@ -3413,6 +3413,7 @@ 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();
}

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

@ -418,6 +418,7 @@ 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);

5
src/devices/cpu/i4004/i4004.h
View File

@ -14,10 +14,7 @@ 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_GENPC = STATE_GENPC,
I4004_GENSP = STATE_GENSP,
I4004_GENPCBASE = STATE_GENPCBASE
I4004_ADDR1,I4004_ADDR2,I4004_ADDR3,I4004_ADDR4,I4004_RAM
};
/***************************************************************************

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

@ -83,6 +83,7 @@ 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);

6
src/devices/cpu/i8008/i8008.h
View File

@ -11,11 +11,7 @@ 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_GENPC = STATE_GENPC,
I8008_GENSP = STATE_GENSP,
I8008_GENPCBASE = STATE_GENPCBASE
I8008_ADDR1,I8008_ADDR2,I8008_ADDR3,I8008_ADDR4,I8008_ADDR5,I8008_ADDR6,I8008_ADDR7,I8008_ADDR8
};
//**************************************************************************

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

@ -924,6 +924,7 @@ 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");

6
src/devices/cpu/i8085/i8085.h
View File

@ -14,11 +14,7 @@ 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_GENPC = STATE_GENPC,
I8085_GENSP = STATE_GENSP,
I8085_GENPCBASE = STATE_GENPCBASE
I8085_HALT, I8085_IM
};
#define I8085_INTR_LINE 0

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

@ -91,6 +91,7 @@ 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));

3
src/devices/cpu/i86/i186.cpp
View File

@ -555,7 +555,8 @@ 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, "curpc", m_pc).callimport().callexport().formatstr("%05X");
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%05X");
state_add(STATE_GENPC, "CURPC", m_pc).formatstr("%05X");
// register for savestates
save_item(NAME(m_timer[0].control));

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

@ -273,7 +273,8 @@ 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, "curpc", m_pc).callimport().callexport().formatstr("%06X");
state_add(STATE_GENPC, "GENPC", m_pc).callexport().formatstr("%06X");
state_add(STATE_GENPCBASE, "CURPC", m_pc).callexport().formatstr("%06X");
m_out_shutdown_func.resolve_safe();
}
@ -282,6 +283,7 @@ 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;

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

@ -273,7 +273,8 @@ 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, "curpc", m_pc).callimport().callexport().formatstr("%05X");
state_add(STATE_GENPC, "GENPC", m_pc).callexport().formatstr("%05X");
state_add(STATE_GENPCBASE, "CURPC", m_pc).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)
@ -323,6 +324,7 @@ 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;

3
src/devices/cpu/i860/i860.cpp
View File

@ -127,7 +127,8 @@ 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, "curpc", m_pc).noshow();
state_add(STATE_GENPC, "GENPC", m_pc).noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).noshow();
m_icountptr = &m_icount;
}

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

@ -2070,6 +2070,7 @@ 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;

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

@ -61,6 +61,7 @@ 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);

5
src/devices/cpu/ie15/ie15.h
View File

@ -14,10 +14,7 @@ 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_GENPC = STATE_GENPC,
IE15_GENPCBASE = STATE_GENPCBASE
IE15_R24, IE15_R25, IE15_R26, IE15_R27, IE15_R28, IE15_R29, IE15_R30, IE15_R31
};
//**************************************************************************

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

@ -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, "GENPCBASE", m_ppc).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_ppc).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", FLAGS).formatstr("%11s").noshow();
m_icountptr = &m_icount;

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

@ -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, "curpc", m_pc).callimport().callexport().formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%4X").noshow();
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_GENFLAGS, "GENFLAGS", REG_PSW).mask(0xff).formatstr("%7s").noshow();
// save state
@ -358,6 +358,7 @@ 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;
}

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

@ -137,6 +137,7 @@ 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;

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

@ -173,7 +173,8 @@ 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, "curpc", m_PC).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%8s").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_PC).formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_F).mask(0xf0).formatstr("%8s").noshow();
m_icountptr = &m_icount;

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

@ -1066,6 +1066,7 @@ 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;
@ -1098,6 +1099,7 @@ 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;
@ -1130,6 +1132,7 @@ 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;
}

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

@ -55,7 +55,7 @@ void m6502_device::init()
sync_w.resolve_safe();
state_add(STATE_GENPC, "GENPC", NPC).noshow();
state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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();

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

@ -32,6 +32,7 @@ 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);
}
@ -47,6 +48,7 @@ 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;
}

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

@ -1135,6 +1135,7 @@ 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;

6
src/devices/cpu/m68000/m68000.h
View File

@ -106,11 +106,7 @@ 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_GENPC = STATE_GENPC,
M68K_GENSP = STATE_GENSP,
M68K_GENPCBASE = STATE_GENPCBASE
M68K_FPSR, M68K_FPCR
};
unsigned int m68k_disassemble_raw(char* str_buff, unsigned int pc, const unsigned char* opdata, const unsigned char* argdata, unsigned int cpu_type);

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

@ -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, "GENPCBASE", ppc).mask(addrmask).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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");

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

@ -425,6 +425,7 @@ 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);

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

@ -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, "GENPCBASE", m_ppc.w).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -155,6 +155,7 @@ 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;

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

@ -68,7 +68,8 @@ void mb86235_cpu_device::device_start()
// Register state for debugger
//state_add( CP1610_R0, "PC", m_pc ).formatstr("%02X");
state_add( STATE_GENPC, "curpc", m_pc ).noshow();
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).noshow();
m_icountptr = &m_icount;

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

@ -222,6 +222,7 @@ 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;
}
@ -241,6 +242,7 @@ 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;
@ -263,6 +265,7 @@ void mb88_cpu_device::state_export(const device_state_entry &entry)
break;
case STATE_GENPC:
case STATE_GENPCBASE:
m_debugger_pc = GETPC();
break;
}

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

@ -442,6 +442,7 @@ 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;

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

@ -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, "GENPCBASE", m_prevpc).mask(0xfff).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

6
src/devices/cpu/mcs48/mcs48.h
View File

@ -43,11 +43,7 @@ enum
MCS48_EA,
MCS48_STS, /* UPI-41 systems only */
MCS48_DBBO, /* UPI-41 systems only */
MCS48_DBBI, /* UPI-41 systems only */
MCS48_GENPC = STATE_GENPC,
MCS48_GENSP = STATE_GENSP,
MCS48_GENPCBASE = STATE_GENPCBASE
MCS48_DBBI /* UPI-41 systems only */
};

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

@ -2148,6 +2148,7 @@ 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;

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

@ -26,7 +26,7 @@ void mcs96_device::device_start()
m_icountptr = &icount;
state_add(STATE_GENPC, "GENPC", PC).noshow();
state_add(STATE_GENPCBASE, "GENPCBASE", PPC).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -187,7 +187,8 @@ void melps4_cpu_device::device_start()
save_item(NAME(m_w));
// register state for debugger
state_add(STATE_GENPC, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "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");

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

@ -114,7 +114,8 @@ 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, "curpc", m_curpc).formatstr("%06X").noshow();
state_add(STATE_GENPC, "GENPC", m_curpc).formatstr("%06X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_curpc).formatstr("%06X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).formatstr("%14s").noshow();
m_icountptr = &m_icount;

2
src/devices/cpu/mips/r3000.cpp
View File

@ -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, "GENPCBASE", m_ppc).noshow();
state_add(STATE_GENPCBASE, "CURPC", 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);

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

@ -230,6 +230,7 @@ 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;

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

@ -430,7 +430,8 @@ 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).callimport().callexport().noshow();
state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
state_add( STATE_GENSP, "GENSP", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%16s").noshow();
@ -493,6 +494,7 @@ 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;

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

@ -533,7 +533,8 @@ 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).callimport().callexport().noshow();
state_add( STATE_GENPC, "GENPC", m_debugger_temp).callexport().noshow();
state_add( STATE_GENPCBASE, "CURPC", m_debugger_temp).callexport().noshow();
state_add( STATE_GENSP, "GENSP", m_debugger_temp).callimport().callexport().noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_debugger_temp).formatstr("%16s").noshow();
@ -643,6 +644,7 @@ 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;

1
src/devices/cpu/patinhofeio/patinho_feio.cpp
View File

@ -117,6 +117,7 @@ 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()){

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

@ -640,6 +640,7 @@ 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;

1
src/devices/cpu/pdp1/tx0.cpp
View File

@ -209,6 +209,7 @@ 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;

1
src/devices/cpu/pdp8/pdp8.cpp
View File

@ -73,6 +73,7 @@ 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);

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

@ -863,6 +863,7 @@ 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();

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

@ -937,6 +937,7 @@ 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();

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

@ -877,6 +877,7 @@ 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");

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

@ -1547,6 +1547,7 @@ 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;

3
src/devices/cpu/pps4/pps4.h
View File

@ -20,9 +20,6 @@ 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
};

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

@ -1820,6 +1820,7 @@ 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 );

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

@ -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;
}

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

@ -822,6 +822,7 @@ 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;

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

@ -164,6 +164,7 @@ 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;

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

@ -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;
}

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

@ -493,6 +493,7 @@ 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);

5
src/devices/cpu/scmp/scmp.h
View File

@ -10,10 +10,7 @@
enum
{
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
SCMP_PC, SCMP_P1, SCMP_P2, SCMP_P3, SCMP_AC, SCMP_ER, SCMP_SR
};

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

@ -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, "curpc", m_pc).callimport().callexport().formatstr("%08X").noshow();
state_add(STATE_GENPCBASE, "curpcbase", m_ppc).callimport().callexport().formatstr("%8X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%08X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_ppc).formatstr("%8X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_ppc).formatstr("%5s").noshow();
// save state

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

@ -975,7 +975,8 @@ 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, "curpc", m_pc ).noshow();
state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
state_add( STATE_GENFLAGS, "GENFLAGS", m_flags ).formatstr("%17s").noshow();
m_out_irq_cb.resolve_safe();

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

@ -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_GENPCBASE, "GENPCBASE", m_PPC).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_SR).formatstr("%10s").noshow();
m_icountptr = &m_icount;
}

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

@ -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;

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

@ -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;

1
src/devices/cpu/sharc/sharc.cpp
View File

@ -760,6 +760,7 @@ 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;
}

3
src/devices/cpu/sm510/sm510.cpp
View File

@ -104,7 +104,8 @@ 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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_c).formatstr("%1s").noshow();
m_icountptr = &m_icount;

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

@ -134,7 +134,8 @@ 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, "curpc", m_PC).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENPC, "GENPC", m_PC).formatstr("%8s").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_PC).formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_PS1).formatstr("%8s").noshow();
m_icountptr = &m_icount;

1
src/devices/cpu/sparc/mb86901.cpp
View File

@ -247,6 +247,7 @@ 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");

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

@ -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, "curpc", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPC, "GENPC", m_pc).formatstr("%04X").noshow();
state_add(STATE_GENPCBASE, "CURPC", m_ppc).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;
}

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