diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-02-09 05:51:04 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-02-09 05:51:04 +0000 |
commit | a38c67f27bf9f10b4bafa7db0344df68b8560ff5 (patch) | |
tree | f86e6cbf34509658916e9a13c038bcc00c0e1f4e | |
parent | 9f05843690e050662decef270d3a5faa05bf4376 (diff) |
Get rid of state_save_register_device_* macros in favor of direct
calls on the device object.
Regex used:
state_save_register_device_item( *)\(( *)([^,]+), *([^,]+),( *)([^ )]+)( *)\)
\3->save_item\1\(\2NAME\(\6\),\5\4\7\)
state_save_register_device_item_array( *)\(( *)([^,]+), *([^,]+),( *)([^ )]+)( *)\)
\3->save_item\1\(\2NAME\(\6\),\5\4\7\)
state_save_register_device_item_2d_array( *)\(( *)([^,]+), *([^,]+),( *)([^ )]+)( *)\)
\3->save_item\1\(\2NAME\(\6\),\5\4\7\)
state_save_register_device_item_bitmap( *)\(( *)([^,]+), *([^,]+),( *)([^ )]+)( *)\)
\3->save_item\1\(\2NAME\(\*\6\),\5\4\7\)
state_save_register_device_item_pointer( *)\(( *)([^,]+), *([^,]+),( *)([^,]+), *([^ )]+)( *)\)
\3->save_pointer\1\(\2NAME\(\6\),\5\7,\5\4\8\)
this->save_
save_
(save_item[^;]+), *0( *)\);
\1\2\);
(save_pointer[^;]+), *0( *)\);
\1\2\);
241 files changed, 4424 insertions, 4443 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c index d1f83e127fa..1b33655cdee 100644 --- a/src/emu/cpu/adsp2100/adsp2100.c +++ b/src/emu/cpu/adsp2100/adsp2100.c @@ -612,86 +612,86 @@ void adsp21xx_device::device_start() m_io = space(AS_IO); // "core" - state_save_register_device_item(this, 0, m_core.ax0.u); - state_save_register_device_item(this, 0, m_core.ax1.u); - state_save_register_device_item(this, 0, m_core.ay0.u); - state_save_register_device_item(this, 0, m_core.ay1.u); - state_save_register_device_item(this, 0, m_core.ar.u); - state_save_register_device_item(this, 0, m_core.af.u); - state_save_register_device_item(this, 0, m_core.mx0.u); - state_save_register_device_item(this, 0, m_core.mx1.u); - state_save_register_device_item(this, 0, m_core.my0.u); - state_save_register_device_item(this, 0, m_core.my1.u); - state_save_register_device_item(this, 0, m_core.mr.mr); - state_save_register_device_item(this, 0, m_core.mf.u); - state_save_register_device_item(this, 0, m_core.si.u); - state_save_register_device_item(this, 0, m_core.se.u); - state_save_register_device_item(this, 0, m_core.sb.u); - state_save_register_device_item(this, 0, m_core.sr.sr); - state_save_register_device_item(this, 0, m_core.zero.u); + save_item(NAME(m_core.ax0.u)); + save_item(NAME(m_core.ax1.u)); + save_item(NAME(m_core.ay0.u)); + save_item(NAME(m_core.ay1.u)); + save_item(NAME(m_core.ar.u)); + save_item(NAME(m_core.af.u)); + save_item(NAME(m_core.mx0.u)); + save_item(NAME(m_core.mx1.u)); + save_item(NAME(m_core.my0.u)); + save_item(NAME(m_core.my1.u)); + save_item(NAME(m_core.mr.mr)); + save_item(NAME(m_core.mf.u)); + save_item(NAME(m_core.si.u)); + save_item(NAME(m_core.se.u)); + save_item(NAME(m_core.sb.u)); + save_item(NAME(m_core.sr.sr)); + save_item(NAME(m_core.zero.u)); // "alt" - state_save_register_device_item(this, 0, m_alt.ax0.u); - state_save_register_device_item(this, 0, m_alt.ax1.u); - state_save_register_device_item(this, 0, m_alt.ay0.u); - state_save_register_device_item(this, 0, m_alt.ay1.u); - state_save_register_device_item(this, 0, m_alt.ar.u); - state_save_register_device_item(this, 0, m_alt.af.u); - state_save_register_device_item(this, 0, m_alt.mx0.u); - state_save_register_device_item(this, 0, m_alt.mx1.u); - state_save_register_device_item(this, 0, m_alt.my0.u); - state_save_register_device_item(this, 0, m_alt.my1.u); - state_save_register_device_item(this, 0, m_alt.mr.mr); - state_save_register_device_item(this, 0, m_alt.mf.u); - state_save_register_device_item(this, 0, m_alt.si.u); - state_save_register_device_item(this, 0, m_alt.se.u); - state_save_register_device_item(this, 0, m_alt.sb.u); - state_save_register_device_item(this, 0, m_alt.sr.sr); - state_save_register_device_item(this, 0, m_alt.zero.u); - - state_save_register_device_item_array(this, 0, m_i); - state_save_register_device_item_array(this, 0, m_m); - state_save_register_device_item_array(this, 0, m_l); - state_save_register_device_item_array(this, 0, m_lmask); - state_save_register_device_item_array(this, 0, m_base); - state_save_register_device_item(this, 0, m_px); - - state_save_register_device_item(this, 0, m_pc); - state_save_register_device_item(this, 0, m_ppc); - state_save_register_device_item(this, 0, m_loop); - state_save_register_device_item(this, 0, m_loop_condition); - state_save_register_device_item(this, 0, m_cntr); - state_save_register_device_item(this, 0, m_astat); - state_save_register_device_item(this, 0, m_sstat); - state_save_register_device_item(this, 0, m_mstat); - state_save_register_device_item(this, 0, m_mstat_prev); - state_save_register_device_item(this, 0, m_astat_clear); - state_save_register_device_item(this, 0, m_idle); - - state_save_register_device_item_array(this, 0, m_loop_stack); - state_save_register_device_item_array(this, 0, m_cntr_stack); - state_save_register_device_item_array(this, 0, m_pc_stack); - state_save_register_device_item_2d_array(this, 0, m_stat_stack); - - state_save_register_device_item(this, 0, m_pc_sp); - state_save_register_device_item(this, 0, m_cntr_sp); - state_save_register_device_item(this, 0, m_stat_sp); - state_save_register_device_item(this, 0, m_loop_sp); - - state_save_register_device_item(this, 0, m_flagout); - state_save_register_device_item(this, 0, m_flagin); - state_save_register_device_item(this, 0, m_fl0); - state_save_register_device_item(this, 0, m_fl1); - state_save_register_device_item(this, 0, m_fl2); - state_save_register_device_item(this, 0, m_idma_addr); - state_save_register_device_item(this, 0, m_idma_cache); - state_save_register_device_item(this, 0, m_idma_offs); - - state_save_register_device_item(this, 0, m_imask); - state_save_register_device_item(this, 0, m_icntl); - state_save_register_device_item(this, 0, m_ifc); - state_save_register_device_item_array(this, 0, m_irq_state); - state_save_register_device_item_array(this, 0, m_irq_latch); + save_item(NAME(m_alt.ax0.u)); + save_item(NAME(m_alt.ax1.u)); + save_item(NAME(m_alt.ay0.u)); + save_item(NAME(m_alt.ay1.u)); + save_item(NAME(m_alt.ar.u)); + save_item(NAME(m_alt.af.u)); + save_item(NAME(m_alt.mx0.u)); + save_item(NAME(m_alt.mx1.u)); + save_item(NAME(m_alt.my0.u)); + save_item(NAME(m_alt.my1.u)); + save_item(NAME(m_alt.mr.mr)); + save_item(NAME(m_alt.mf.u)); + save_item(NAME(m_alt.si.u)); + save_item(NAME(m_alt.se.u)); + save_item(NAME(m_alt.sb.u)); + save_item(NAME(m_alt.sr.sr)); + save_item(NAME(m_alt.zero.u)); + + save_item(NAME(m_i)); + save_item(NAME(m_m)); + save_item(NAME(m_l)); + save_item(NAME(m_lmask)); + save_item(NAME(m_base)); + save_item(NAME(m_px)); + + save_item(NAME(m_pc)); + save_item(NAME(m_ppc)); + save_item(NAME(m_loop)); + save_item(NAME(m_loop_condition)); + save_item(NAME(m_cntr)); + save_item(NAME(m_astat)); + save_item(NAME(m_sstat)); + save_item(NAME(m_mstat)); + save_item(NAME(m_mstat_prev)); + save_item(NAME(m_astat_clear)); + save_item(NAME(m_idle)); + + save_item(NAME(m_loop_stack)); + save_item(NAME(m_cntr_stack)); + save_item(NAME(m_pc_stack)); + save_item(NAME(m_stat_stack)); + + save_item(NAME(m_pc_sp)); + save_item(NAME(m_cntr_sp)); + save_item(NAME(m_stat_sp)); + save_item(NAME(m_loop_sp)); + + save_item(NAME(m_flagout)); + save_item(NAME(m_flagin)); + save_item(NAME(m_fl0)); + save_item(NAME(m_fl1)); + save_item(NAME(m_fl2)); + save_item(NAME(m_idma_addr)); + save_item(NAME(m_idma_cache)); + save_item(NAME(m_idma_offs)); + + save_item(NAME(m_imask)); + save_item(NAME(m_icntl)); + save_item(NAME(m_ifc)); + save_item(NAME(m_irq_state)); + save_item(NAME(m_irq_latch)); // register state with the debugger state_add(ADSP2100_PC, "PC", m_pc); diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c index d9f61810ccd..a21c5d9d85b 100644 --- a/src/emu/cpu/alph8201/alph8201.c +++ b/src/emu/cpu/alph8201/alph8201.c @@ -672,27 +672,27 @@ static CPU_INIT( alpha8201 ) cpustate->program = device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - state_save_register_device_item_array(device, 0, cpustate->RAM); - state_save_register_device_item(device, 0, cpustate->PREVPC); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->regPtr); - state_save_register_device_item(device, 0, cpustate->zf); - state_save_register_device_item(device, 0, cpustate->cf); - state_save_register_device_item(device, 0, cpustate->mb); + device->save_item(NAME(cpustate->RAM)); + device->save_item(NAME(cpustate->PREVPC)); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->regPtr)); + device->save_item(NAME(cpustate->zf)); + device->save_item(NAME(cpustate->cf)); + device->save_item(NAME(cpustate->mb)); #if HANDLE_HALT_LINE - state_save_register_device_item(device, 0, cpustate->halt); + device->save_item(NAME(cpustate->halt)); #endif - state_save_register_device_item(device, 0, cpustate->IX0); - state_save_register_device_item(device, 0, cpustate->IX1); - state_save_register_device_item(device, 0, cpustate->IX2); - state_save_register_device_item(device, 0, cpustate->LP0); - state_save_register_device_item(device, 0, cpustate->LP1); - state_save_register_device_item(device, 0, cpustate->LP2); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->B); - state_save_register_device_item(device, 0, cpustate->retptr); - state_save_register_device_item(device, 0, cpustate->savec); - state_save_register_device_item(device, 0, cpustate->savez); + device->save_item(NAME(cpustate->IX0)); + device->save_item(NAME(cpustate->IX1)); + device->save_item(NAME(cpustate->IX2)); + device->save_item(NAME(cpustate->LP0)); + device->save_item(NAME(cpustate->LP1)); + device->save_item(NAME(cpustate->LP2)); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->B)); + device->save_item(NAME(cpustate->retptr)); + device->save_item(NAME(cpustate->savec)); + device->save_item(NAME(cpustate->savez)); } /**************************************************************************** * Reset registers to their initial values diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c index d6aeba286e4..4f0de4d0372 100644 --- a/src/emu/cpu/am29000/am29000.c +++ b/src/emu/cpu/am29000/am29000.c @@ -162,52 +162,52 @@ static CPU_INIT( am29000 ) am29000->cfg = (PRL_AM29000 | PRL_REV_D) << CFG_PRL_SHIFT; /* Register state for saving */ - state_save_register_device_item(device, 0, am29000->icount); - state_save_register_device_item(device, 0, am29000->pc); - state_save_register_device_item_array(device, 0, am29000->r); - state_save_register_device_item_array(device, 0, am29000->tlb); - - state_save_register_device_item(device, 0, am29000->vab); - state_save_register_device_item(device, 0, am29000->ops); - state_save_register_device_item(device, 0, am29000->cps); - state_save_register_device_item(device, 0, am29000->cfg); - state_save_register_device_item(device, 0, am29000->cha); - state_save_register_device_item(device, 0, am29000->chd); - state_save_register_device_item(device, 0, am29000->chc); - state_save_register_device_item(device, 0, am29000->rbp); - state_save_register_device_item(device, 0, am29000->tmc); - state_save_register_device_item(device, 0, am29000->tmr); - state_save_register_device_item(device, 0, am29000->pc0); - state_save_register_device_item(device, 0, am29000->pc1); - state_save_register_device_item(device, 0, am29000->pc2); - state_save_register_device_item(device, 0, am29000->mmu); - state_save_register_device_item(device, 0, am29000->lru); - - state_save_register_device_item(device, 0, am29000->ipc); - state_save_register_device_item(device, 0, am29000->ipa); - state_save_register_device_item(device, 0, am29000->ipb); - state_save_register_device_item(device, 0, am29000->q); - - state_save_register_device_item(device, 0, am29000->alu); - state_save_register_device_item(device, 0, am29000->fpe); - state_save_register_device_item(device, 0, am29000->inte); - state_save_register_device_item(device, 0, am29000->fps); - - state_save_register_device_item(device, 0, am29000->exceptions); - state_save_register_device_item_array(device, 0, am29000->exception_queue); - - state_save_register_device_item(device, 0, am29000->irq_active); - state_save_register_device_item(device, 0, am29000->irq_lines); - - state_save_register_device_item(device, 0, am29000->exec_ir); - state_save_register_device_item(device, 0, am29000->next_ir); - - state_save_register_device_item(device, 0, am29000->pl_flags); - state_save_register_device_item(device, 0, am29000->next_pl_flags); - - state_save_register_device_item(device, 0, am29000->iret_pc); - state_save_register_device_item(device, 0, am29000->exec_pc); - state_save_register_device_item(device, 0, am29000->next_pc); + device->save_item(NAME(am29000->icount)); + device->save_item(NAME(am29000->pc)); + device->save_item(NAME(am29000->r)); + device->save_item(NAME(am29000->tlb)); + + device->save_item(NAME(am29000->vab)); + device->save_item(NAME(am29000->ops)); + device->save_item(NAME(am29000->cps)); + device->save_item(NAME(am29000->cfg)); + device->save_item(NAME(am29000->cha)); + device->save_item(NAME(am29000->chd)); + device->save_item(NAME(am29000->chc)); + device->save_item(NAME(am29000->rbp)); + device->save_item(NAME(am29000->tmc)); + device->save_item(NAME(am29000->tmr)); + device->save_item(NAME(am29000->pc0)); + device->save_item(NAME(am29000->pc1)); + device->save_item(NAME(am29000->pc2)); + device->save_item(NAME(am29000->mmu)); + device->save_item(NAME(am29000->lru)); + + device->save_item(NAME(am29000->ipc)); + device->save_item(NAME(am29000->ipa)); + device->save_item(NAME(am29000->ipb)); + device->save_item(NAME(am29000->q)); + + device->save_item(NAME(am29000->alu)); + device->save_item(NAME(am29000->fpe)); + device->save_item(NAME(am29000->inte)); + device->save_item(NAME(am29000->fps)); + + device->save_item(NAME(am29000->exceptions)); + device->save_item(NAME(am29000->exception_queue)); + + device->save_item(NAME(am29000->irq_active)); + device->save_item(NAME(am29000->irq_lines)); + + device->save_item(NAME(am29000->exec_ir)); + device->save_item(NAME(am29000->next_ir)); + + device->save_item(NAME(am29000->pl_flags)); + device->save_item(NAME(am29000->next_pl_flags)); + + device->save_item(NAME(am29000->iret_pc)); + device->save_item(NAME(am29000->exec_pc)); + device->save_item(NAME(am29000->next_pc)); } static CPU_RESET( am29000 ) diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c index 2da00fba36c..db140f7fec4 100644 --- a/src/emu/cpu/apexc/apexc.c +++ b/src/emu/cpu/apexc/apexc.c @@ -804,14 +804,14 @@ static CPU_INIT( apexc ) cpustate->program = device->space(AS_PROGRAM); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->r); - state_save_register_device_item(device, 0, cpustate->cr); - state_save_register_device_item(device, 0, cpustate->ml); - state_save_register_device_item(device, 0, cpustate->working_store); - state_save_register_device_item(device, 0, cpustate->current_word); - state_save_register_device_item(device, 0, cpustate->running); - state_save_register_device_item(device, 0, cpustate->pc); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->r)); + device->save_item(NAME(cpustate->cr)); + device->save_item(NAME(cpustate->ml)); + device->save_item(NAME(cpustate->working_store)); + device->save_item(NAME(cpustate->current_word)); + device->save_item(NAME(cpustate->running)); + device->save_item(NAME(cpustate->pc)); } static CPU_RESET( apexc ) diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index 28f420e98f9..4ba2fabbc92 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -531,10 +531,10 @@ static CPU_INIT( arm ) cpustate->program = device->space(AS_PROGRAM); cpustate->endian = ENDIANNESS_LITTLE; - state_save_register_device_item_array(device, 0, cpustate->sArmRegister); - state_save_register_device_item_array(device, 0, cpustate->coproRegister); - state_save_register_device_item(device, 0, cpustate->pendingIrq); - state_save_register_device_item(device, 0, cpustate->pendingFiq); + device->save_item(NAME(cpustate->sArmRegister)); + device->save_item(NAME(cpustate->coproRegister)); + device->save_item(NAME(cpustate->pendingIrq)); + device->save_item(NAME(cpustate->pendingFiq)); } @@ -547,10 +547,10 @@ static CPU_INIT( arm_be ) cpustate->program = device->space(AS_PROGRAM); cpustate->endian = ENDIANNESS_BIG; - state_save_register_device_item_array(device, 0, cpustate->sArmRegister); - state_save_register_device_item_array(device, 0, cpustate->coproRegister); - state_save_register_device_item(device, 0, cpustate->pendingIrq); - state_save_register_device_item(device, 0, cpustate->pendingFiq); + device->save_item(NAME(cpustate->sArmRegister)); + device->save_item(NAME(cpustate->coproRegister)); + device->save_item(NAME(cpustate->pendingIrq)); + device->save_item(NAME(cpustate->pendingFiq)); } diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index 77f9f33b5e4..b07de65ce33 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -571,13 +571,13 @@ static void arm7_core_init(device_t *device, const char *cpuname) { arm_state *cpustate = get_safe_token(device); - state_save_register_device_item_array(device, 0, cpustate->sArmRegister); - state_save_register_device_item(device, 0, cpustate->pendingIrq); - state_save_register_device_item(device, 0, cpustate->pendingFiq); - state_save_register_device_item(device, 0, cpustate->pendingAbtD); - state_save_register_device_item(device, 0, cpustate->pendingAbtP); - state_save_register_device_item(device, 0, cpustate->pendingUnd); - state_save_register_device_item(device, 0, cpustate->pendingSwi); + device->save_item(NAME(cpustate->sArmRegister)); + device->save_item(NAME(cpustate->pendingIrq)); + device->save_item(NAME(cpustate->pendingFiq)); + device->save_item(NAME(cpustate->pendingAbtD)); + device->save_item(NAME(cpustate->pendingAbtP)); + device->save_item(NAME(cpustate->pendingUnd)); + device->save_item(NAME(cpustate->pendingSwi)); } // CPU RESET diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c index cc4d1aa2792..d7f19a6dc94 100644 --- a/src/emu/cpu/asap/asap.c +++ b/src/emu/cpu/asap/asap.c @@ -334,16 +334,16 @@ void asap_device::device_start() state_add(ASAP_R0 + regnum, tempstr.format("R%d", regnum), m_src2val[REGBASE + regnum]); // register our state for saving - state_save_register_device_item(this, 0, m_pc); - state_save_register_device_item(this, 0, m_pflag); - state_save_register_device_item(this, 0, m_iflag); - state_save_register_device_item(this, 0, m_cflag); - state_save_register_device_item(this, 0, m_vflag); - state_save_register_device_item(this, 0, m_znflag); - state_save_register_device_item(this, 0, m_op); - state_save_register_device_item(this, 0, m_ppc); - state_save_register_device_item(this, 0, m_nextpc); - state_save_register_device_item(this, 0, m_irq_state); + save_item(NAME(m_pc)); + save_item(NAME(m_pflag)); + save_item(NAME(m_iflag)); + save_item(NAME(m_cflag)); + save_item(NAME(m_vflag)); + save_item(NAME(m_znflag)); + save_item(NAME(m_op)); + save_item(NAME(m_ppc)); + save_item(NAME(m_nextpc)); + save_item(NAME(m_irq_state)); // set our instruction counter m_icountptr = &m_icount; diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c index bca90fde00d..acd769b6a82 100644 --- a/src/emu/cpu/avr8/avr8.c +++ b/src/emu/cpu/avr8/avr8.c @@ -193,7 +193,7 @@ static CPU_INIT( avr8 ) WRITE_IO_8(cpustate, AVR8_IO_SREG, 0); - state_save_register_device_item(device, 0, cpustate->pc); + device->save_item(NAME(cpustate->pc)); } static CPU_EXIT( avr8 ) diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index 939e44acc9d..0574b47aed0 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -136,25 +136,25 @@ static CPU_INIT( ccpu ) cpustate->data = device->space(AS_DATA); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->B); - state_save_register_device_item(device, 0, cpustate->I); - state_save_register_device_item(device, 0, cpustate->J); - state_save_register_device_item(device, 0, cpustate->P); - state_save_register_device_item(device, 0, cpustate->X); - state_save_register_device_item(device, 0, cpustate->Y); - state_save_register_device_item(device, 0, cpustate->T); - state_save_register_device_item(device, 0, cpustate->a0flag); - state_save_register_device_item(device, 0, cpustate->ncflag); - state_save_register_device_item(device, 0, cpustate->cmpacc); - state_save_register_device_item(device, 0, cpustate->cmpval); - state_save_register_device_item(device, 0, cpustate->miflag); - state_save_register_device_item(device, 0, cpustate->nextmiflag); - state_save_register_device_item(device, 0, cpustate->nextnextmiflag); - state_save_register_device_item(device, 0, cpustate->drflag); - state_save_register_device_item(device, 0, cpustate->waiting); - state_save_register_device_item(device, 0, cpustate->watchdog); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->B)); + device->save_item(NAME(cpustate->I)); + device->save_item(NAME(cpustate->J)); + device->save_item(NAME(cpustate->P)); + device->save_item(NAME(cpustate->X)); + device->save_item(NAME(cpustate->Y)); + device->save_item(NAME(cpustate->T)); + device->save_item(NAME(cpustate->a0flag)); + device->save_item(NAME(cpustate->ncflag)); + device->save_item(NAME(cpustate->cmpacc)); + device->save_item(NAME(cpustate->cmpval)); + device->save_item(NAME(cpustate->miflag)); + device->save_item(NAME(cpustate->nextmiflag)); + device->save_item(NAME(cpustate->nextnextmiflag)); + device->save_item(NAME(cpustate->drflag)); + device->save_item(NAME(cpustate->waiting)); + device->save_item(NAME(cpustate->watchdog)); } diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c index bcd9ff6532f..febba94ef49 100644 --- a/src/emu/cpu/cop400/cop400.c +++ b/src/emu/cpu/cop400/cop400.c @@ -915,32 +915,32 @@ static void cop400_init(legacy_cpu_device *device, UINT8 g_mask, UINT8 d_mask, U /* register for state saving */ - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->prevpc); - state_save_register_device_item(device, 0, cpustate->n); - state_save_register_device_item(device, 0, cpustate->sa); - state_save_register_device_item(device, 0, cpustate->sb); - state_save_register_device_item(device, 0, cpustate->sc); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->b); - state_save_register_device_item(device, 0, cpustate->c); - state_save_register_device_item(device, 0, cpustate->g); - state_save_register_device_item(device, 0, cpustate->h); - state_save_register_device_item(device, 0, cpustate->q); - state_save_register_device_item(device, 0, cpustate->r); - state_save_register_device_item(device, 0, cpustate->en); - state_save_register_device_item(device, 0, cpustate->sio); - state_save_register_device_item(device, 0, cpustate->skl); - state_save_register_device_item(device, 0, cpustate->t); - state_save_register_device_item(device, 0, cpustate->skip); - state_save_register_device_item(device, 0, cpustate->skip_lbi); - state_save_register_device_item(device, 0, cpustate->skt_latch); - state_save_register_device_item(device, 0, cpustate->si); - state_save_register_device_item(device, 0, cpustate->last_skip); - state_save_register_device_item_array(device, 0, cpustate->in); - state_save_register_device_item(device, 0, cpustate->microbus_int); - state_save_register_device_item(device, 0, cpustate->halt); - state_save_register_device_item(device, 0, cpustate->idle); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->prevpc)); + device->save_item(NAME(cpustate->n)); + device->save_item(NAME(cpustate->sa)); + device->save_item(NAME(cpustate->sb)); + device->save_item(NAME(cpustate->sc)); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->b)); + device->save_item(NAME(cpustate->c)); + device->save_item(NAME(cpustate->g)); + device->save_item(NAME(cpustate->h)); + device->save_item(NAME(cpustate->q)); + device->save_item(NAME(cpustate->r)); + device->save_item(NAME(cpustate->en)); + device->save_item(NAME(cpustate->sio)); + device->save_item(NAME(cpustate->skl)); + device->save_item(NAME(cpustate->t)); + device->save_item(NAME(cpustate->skip)); + device->save_item(NAME(cpustate->skip_lbi)); + device->save_item(NAME(cpustate->skt_latch)); + device->save_item(NAME(cpustate->si)); + device->save_item(NAME(cpustate->last_skip)); + device->save_item(NAME(cpustate->in)); + device->save_item(NAME(cpustate->microbus_int)); + device->save_item(NAME(cpustate->halt)); + device->save_item(NAME(cpustate->idle)); } static void cop410_init_opcodes(device_t *device) diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c index afd5b535119..8207d0480cb 100644 --- a/src/emu/cpu/cosmac/cosmac.c +++ b/src/emu/cpu/cosmac/cosmac.c @@ -393,27 +393,27 @@ void cosmac_device::device_start() devcb_resolve_write_line(&m_out_tpb_func, &m_config.m_out_tpb_func, this); // register our state for saving - state_save_register_device_item(this, 0, m_op); - state_save_register_device_item(this, 0, m_flagsio); - state_save_register_device_item(this, 0, m_state); - state_save_register_device_item(this, 0, m_mode); - state_save_register_device_item(this, 0, m_pmode); - state_save_register_device_item(this, 0, m_irq); - state_save_register_device_item(this, 0, m_dmain); - state_save_register_device_item(this, 0, m_dmaout); - state_save_register_device_item_array(this, 0, m_ef); - state_save_register_device_item(this, 0, m_d); - state_save_register_device_item(this, 0, m_b); - state_save_register_device_item_array(this, 0, m_r); - state_save_register_device_item(this, 0, m_p); - state_save_register_device_item(this, 0, m_x); - state_save_register_device_item(this, 0, m_n); - state_save_register_device_item(this, 0, m_i); - state_save_register_device_item(this, 0, m_t); - state_save_register_device_item(this, 0, m_df); - state_save_register_device_item(this, 0, m_ie); - state_save_register_device_item(this, 0, m_q); - state_save_register_device_item(this, 0, m_icount); + save_item(NAME(m_op)); + save_item(NAME(m_flagsio)); + save_item(NAME(m_state)); + save_item(NAME(m_mode)); + save_item(NAME(m_pmode)); + save_item(NAME(m_irq)); + save_item(NAME(m_dmain)); + save_item(NAME(m_dmaout)); + save_item(NAME(m_ef)); + save_item(NAME(m_d)); + save_item(NAME(m_b)); + save_item(NAME(m_r)); + save_item(NAME(m_p)); + save_item(NAME(m_x)); + save_item(NAME(m_n)); + save_item(NAME(m_i)); + save_item(NAME(m_t)); + save_item(NAME(m_df)); + save_item(NAME(m_ie)); + save_item(NAME(m_q)); + save_item(NAME(m_icount)); // set our instruction counter m_icountptr = &m_icount; diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c index 5e8e5d48aec..d1f1d27bee3 100644 --- a/src/emu/cpu/cp1610/cp1610.c +++ b/src/emu/cpu/cp1610/cp1610.c @@ -3391,17 +3391,17 @@ static CPU_INIT( cp1610 ) cpustate->device = device; cpustate->program = device->space(AS_PROGRAM); - state_save_register_device_item_array(device, 0, cpustate->r); - state_save_register_device_item(device, 0, cpustate->flags); - state_save_register_device_item(device, 0, cpustate->intr_enabled); - state_save_register_device_item(device, 0, cpustate->intr_vector); - state_save_register_device_item(device, 0, cpustate->reset_state); - state_save_register_device_item(device, 0, cpustate->intr_state); - state_save_register_device_item(device, 0, cpustate->intrm_state); - state_save_register_device_item(device, 0, cpustate->reset_pending); - state_save_register_device_item(device, 0, cpustate->intr_pending); - state_save_register_device_item(device, 0, cpustate->intrm_pending); - state_save_register_device_item(device, 0, cpustate->mask_interrupts); + device->save_item(NAME(cpustate->r)); + device->save_item(NAME(cpustate->flags)); + device->save_item(NAME(cpustate->intr_enabled)); + device->save_item(NAME(cpustate->intr_vector)); + device->save_item(NAME(cpustate->reset_state)); + device->save_item(NAME(cpustate->intr_state)); + device->save_item(NAME(cpustate->intrm_state)); + device->save_item(NAME(cpustate->reset_pending)); + device->save_item(NAME(cpustate->intr_pending)); + device->save_item(NAME(cpustate->intrm_pending)); + device->save_item(NAME(cpustate->mask_interrupts)); } static void cp1610_set_irq_line(cp1610_state *cpustate, UINT32 irqline, int state) diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index 7b45fd6fb5e..7c6ef0dcfa0 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -258,22 +258,22 @@ static STATE_POSTLOAD( cquestsnd_postload ) static void cquestsnd_state_register(device_t *device) { cquestsnd_state *cpustate = get_safe_token_snd(device); - state_save_register_device_item_array(device, 0, cpustate->ram); - state_save_register_device_item(device, 0, cpustate->q); - state_save_register_device_item(device, 0, cpustate->f); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->cflag); - state_save_register_device_item(device, 0, cpustate->vflag); - - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->platch); - state_save_register_device_item(device, 0, cpustate->rtnlatch); - state_save_register_device_item(device, 0, cpustate->adrcntr); - state_save_register_device_item(device, 0, cpustate->adrlatch); - state_save_register_device_item(device, 0, cpustate->dinlatch); - state_save_register_device_item(device, 0, cpustate->ramwlatch); - state_save_register_device_item(device, 0, cpustate->prev_ipram); - state_save_register_device_item(device, 0, cpustate->prev_ipwrt); + device->save_item(NAME(cpustate->ram)); + device->save_item(NAME(cpustate->q)); + device->save_item(NAME(cpustate->f)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->cflag)); + device->save_item(NAME(cpustate->vflag)); + + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->platch)); + device->save_item(NAME(cpustate->rtnlatch)); + device->save_item(NAME(cpustate->adrcntr)); + device->save_item(NAME(cpustate->adrlatch)); + device->save_item(NAME(cpustate->dinlatch)); + device->save_item(NAME(cpustate->ramwlatch)); + device->save_item(NAME(cpustate->prev_ipram)); + device->save_item(NAME(cpustate->prev_ipwrt)); device->machine->state().register_postload(cquestsnd_postload, (void *)device); } @@ -323,31 +323,31 @@ static STATE_POSTLOAD( cquestrot_postload ) static void cquestrot_state_register(device_t *device) { cquestrot_state *cpustate = get_safe_token_rot(device); - state_save_register_device_item_array(device, 0, cpustate->ram); - state_save_register_device_item(device, 0, cpustate->q); - state_save_register_device_item(device, 0, cpustate->f); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->cflag); - state_save_register_device_item(device, 0, cpustate->vflag); - - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->seqcnt); - state_save_register_device_item(device, 0, cpustate->dsrclatch); - state_save_register_device_item(device, 0, cpustate->rsrclatch); - state_save_register_device_item(device, 0, cpustate->dynaddr); - state_save_register_device_item(device, 0, cpustate->dyndata); - state_save_register_device_item(device, 0, cpustate->yrlatch); - state_save_register_device_item(device, 0, cpustate->ydlatch); - state_save_register_device_item(device, 0, cpustate->dinlatch); - state_save_register_device_item(device, 0, cpustate->divreg); - state_save_register_device_item(device, 0, cpustate->linedata); - state_save_register_device_item(device, 0, cpustate->lineaddr); - state_save_register_device_item(device, 0, cpustate->prev_dred); - state_save_register_device_item(device, 0, cpustate->prev_dwrt); - state_save_register_device_item(device, 0, cpustate->wc); - - state_save_register_device_item_pointer(device, 0, cpustate->dram, 16384); - state_save_register_device_item_pointer(device, 0, cpustate->sram, 2048); + device->save_item(NAME(cpustate->ram)); + device->save_item(NAME(cpustate->q)); + device->save_item(NAME(cpustate->f)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->cflag)); + device->save_item(NAME(cpustate->vflag)); + + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->seqcnt)); + device->save_item(NAME(cpustate->dsrclatch)); + device->save_item(NAME(cpustate->rsrclatch)); + device->save_item(NAME(cpustate->dynaddr)); + device->save_item(NAME(cpustate->dyndata)); + device->save_item(NAME(cpustate->yrlatch)); + device->save_item(NAME(cpustate->ydlatch)); + device->save_item(NAME(cpustate->dinlatch)); + device->save_item(NAME(cpustate->divreg)); + device->save_item(NAME(cpustate->linedata)); + device->save_item(NAME(cpustate->lineaddr)); + device->save_item(NAME(cpustate->prev_dred)); + device->save_item(NAME(cpustate->prev_dwrt)); + device->save_item(NAME(cpustate->wc)); + + device->save_pointer(NAME(cpustate->dram), 16384); + device->save_pointer(NAME(cpustate->sram), 2048); device->machine->state().register_postload(cquestrot_postload, (void *)device); } @@ -403,35 +403,35 @@ static void cquestlin_state_register(device_t *device) { cquestlin_state *cpustate = get_safe_token_lin(device); - state_save_register_device_item_array(device, 0, cpustate->ram); - state_save_register_device_item(device, 0, cpustate->q); - state_save_register_device_item(device, 0, cpustate->f); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->cflag); - state_save_register_device_item(device, 0, cpustate->vflag); - - state_save_register_device_item(device, 0, cpustate->pc[0]); - state_save_register_device_item(device, 0, cpustate->pc[1]); - state_save_register_device_item(device, 0, cpustate->seqcnt); - state_save_register_device_item(device, 0, cpustate->clatch); - state_save_register_device_item(device, 0, cpustate->zlatch); - state_save_register_device_item(device, 0, cpustate->xcnt); - state_save_register_device_item(device, 0, cpustate->ycnt); - state_save_register_device_item(device, 0, cpustate->sreg); - state_save_register_device_item(device, 0, cpustate->fadlatch); - state_save_register_device_item(device, 0, cpustate->badlatch); - state_save_register_device_item(device, 0, cpustate->sramdlatch); - state_save_register_device_item(device, 0, cpustate->fglatch); - state_save_register_device_item(device, 0, cpustate->bglatch); - state_save_register_device_item(device, 0, cpustate->gt0reg); - state_save_register_device_item(device, 0, cpustate->fdxreg); - state_save_register_device_item(device, 0, cpustate->field); - state_save_register_device_item(device, 0, cpustate->clkcnt); - - state_save_register_device_item_pointer(device, 0, cpustate->sram, 4096); - state_save_register_device_item_pointer(device, 0, cpustate->ptr_ram, 1024); - state_save_register_device_item_pointer(device, 0, cpustate->e_stack, 32768); - state_save_register_device_item_pointer(device, 0, cpustate->o_stack, 32768); + device->save_item(NAME(cpustate->ram)); + device->save_item(NAME(cpustate->q)); + device->save_item(NAME(cpustate->f)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->cflag)); + device->save_item(NAME(cpustate->vflag)); + + device->save_item(NAME(cpustate->pc[0])); + device->save_item(NAME(cpustate->pc[1])); + device->save_item(NAME(cpustate->seqcnt)); + device->save_item(NAME(cpustate->clatch)); + device->save_item(NAME(cpustate->zlatch)); + device->save_item(NAME(cpustate->xcnt)); + device->save_item(NAME(cpustate->ycnt)); + device->save_item(NAME(cpustate->sreg)); + device->save_item(NAME(cpustate->fadlatch)); + device->save_item(NAME(cpustate->badlatch)); + device->save_item(NAME(cpustate->sramdlatch)); + device->save_item(NAME(cpustate->fglatch)); + device->save_item(NAME(cpustate->bglatch)); + device->save_item(NAME(cpustate->gt0reg)); + device->save_item(NAME(cpustate->fdxreg)); + device->save_item(NAME(cpustate->field)); + device->save_item(NAME(cpustate->clkcnt)); + + device->save_pointer(NAME(cpustate->sram), 4096); + device->save_pointer(NAME(cpustate->ptr_ram), 1024); + device->save_pointer(NAME(cpustate->e_stack), 32768); + device->save_pointer(NAME(cpustate->o_stack), 32768); device->machine->state().register_postload(cquestlin_postload, (void *)device); } diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c index 3d48a6d855a..b5d3ad3bf8c 100644 --- a/src/emu/cpu/dsp16/dsp16.c +++ b/src/emu/cpu/dsp16/dsp16.c @@ -146,7 +146,7 @@ void dsp16_device::device_start() m_program = space(AS_PROGRAM); m_direct = &m_program->direct(); - state_save_register_device_item(this, 0, m_pc); + save_item(NAME(m_pc)); // register state with the debugger state_add(DSP16_PC, "PC", m_pc); diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index d31b737e9cb..df0984002d5 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -383,39 +383,39 @@ void dsp32c_device::device_start() state_add(DSP32_IOC, "IOC", m_r[27]).mask(0xfffff); // register our state for saving - state_save_register_device_item_array(this, 0, m_r); - state_save_register_device_item(this, 0, m_pin); - state_save_register_device_item(this, 0, m_pout); - state_save_register_device_item(this, 0, m_ivtp); - state_save_register_device_item(this, 0, m_nzcflags); - state_save_register_device_item(this, 0, m_vflags); - state_save_register_device_item_array(this, 0, m_a); - state_save_register_device_item(this, 0, m_NZflags); - state_save_register_device_item(this, 0, m_VUflags); - state_save_register_device_item_array(this, 0, m_abuf); - state_save_register_device_item_array(this, 0, m_abufreg); - state_save_register_device_item_array(this, 0, m_abufVUflags); - state_save_register_device_item_array(this, 0, m_abufNZflags); - state_save_register_device_item_array(this, 0, m_abufcycle); - state_save_register_device_item(this, 0, m_abuf_index); - state_save_register_device_item_array(this, 0, m_mbufaddr); - state_save_register_device_item_array(this, 0, m_mbufdata); - state_save_register_device_item(this, 0, m_par); - state_save_register_device_item(this, 0, m_pare); - state_save_register_device_item(this, 0, m_pdr); - state_save_register_device_item(this, 0, m_pdr2); - state_save_register_device_item(this, 0, m_pir); - state_save_register_device_item(this, 0, m_pcr); - state_save_register_device_item(this, 0, m_emr); - state_save_register_device_item(this, 0, m_esr); - state_save_register_device_item(this, 0, m_pcw); - state_save_register_device_item(this, 0, m_piop); - state_save_register_device_item(this, 0, m_ibuf); - state_save_register_device_item(this, 0, m_isr); - state_save_register_device_item(this, 0, m_obuf); - state_save_register_device_item(this, 0, m_osr); - state_save_register_device_item(this, 0, m_lastpins); - state_save_register_device_item(this, 0, m_ppc); + save_item(NAME(m_r)); + save_item(NAME(m_pin)); + save_item(NAME(m_pout)); + save_item(NAME(m_ivtp)); + save_item(NAME(m_nzcflags)); + save_item(NAME(m_vflags)); + save_item(NAME(m_a)); + save_item(NAME(m_NZflags)); + save_item(NAME(m_VUflags)); + save_item(NAME(m_abuf)); + save_item(NAME(m_abufreg)); + save_item(NAME(m_abufVUflags)); + save_item(NAME(m_abufNZflags)); + save_item(NAME(m_abufcycle)); + save_item(NAME(m_abuf_index)); + save_item(NAME(m_mbufaddr)); + save_item(NAME(m_mbufdata)); + save_item(NAME(m_par)); + save_item(NAME(m_pare)); + save_item(NAME(m_pdr)); + save_item(NAME(m_pdr2)); + save_item(NAME(m_pir)); + save_item(NAME(m_pcr)); + save_item(NAME(m_emr)); + save_item(NAME(m_esr)); + save_item(NAME(m_pcw)); + save_item(NAME(m_piop)); + save_item(NAME(m_ibuf)); + save_item(NAME(m_isr)); + save_item(NAME(m_obuf)); + save_item(NAME(m_osr)); + save_item(NAME(m_lastpins)); + save_item(NAME(m_ppc)); } diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index b7b2cbd16d8..4c0d4bbf5d6 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -165,28 +165,28 @@ static void set_irq_line(dsp56k_core* cpustate, int irqline, int state) static void agu_init(dsp56k_core* cpustate, device_t *device) { /* save states - dsp56k_agu members */ - state_save_register_device_item(device, 0, cpustate->AGU.r0); - state_save_register_device_item(device, 0, cpustate->AGU.r1); - state_save_register_device_item(device, 0, cpustate->AGU.r2); - state_save_register_device_item(device, 0, cpustate->AGU.r3); - state_save_register_device_item(device, 0, cpustate->AGU.n0); - state_save_register_device_item(device, 0, cpustate->AGU.n1); - state_save_register_device_item(device, 0, cpustate->AGU.n2); - state_save_register_device_item(device, 0, cpustate->AGU.n3); - state_save_register_device_item(device, 0, cpustate->AGU.m0); - state_save_register_device_item(device, 0, cpustate->AGU.m1); - state_save_register_device_item(device, 0, cpustate->AGU.m2); - state_save_register_device_item(device, 0, cpustate->AGU.m3); - state_save_register_device_item(device, 0, cpustate->AGU.temp); + device->save_item(NAME(cpustate->AGU.r0)); + device->save_item(NAME(cpustate->AGU.r1)); + device->save_item(NAME(cpustate->AGU.r2)); + device->save_item(NAME(cpustate->AGU.r3)); + device->save_item(NAME(cpustate->AGU.n0)); + device->save_item(NAME(cpustate->AGU.n1)); + device->save_item(NAME(cpustate->AGU.n2)); + device->save_item(NAME(cpustate->AGU.n3)); + device->save_item(NAME(cpustate->AGU.m0)); + device->save_item(NAME(cpustate->AGU.m1)); + device->save_item(NAME(cpustate->AGU.m2)); + device->save_item(NAME(cpustate->AGU.m3)); + device->save_item(NAME(cpustate->AGU.temp)); } static void alu_init(dsp56k_core* cpustate, device_t *device) { /* save states - dsp56k_alu members */ - state_save_register_device_item(device, 0, cpustate->ALU.x); - state_save_register_device_item(device, 0, cpustate->ALU.y); - state_save_register_device_item(device, 0, cpustate->ALU.a); - state_save_register_device_item(device, 0, cpustate->ALU.b); + device->save_item(NAME(cpustate->ALU.x)); + device->save_item(NAME(cpustate->ALU.y)); + device->save_item(NAME(cpustate->ALU.a)); + device->save_item(NAME(cpustate->ALU.b)); } static CPU_INIT( dsp56k ) @@ -208,26 +208,26 @@ static CPU_INIT( dsp56k ) cpustate->reset_state = FALSE; /* save states - dsp56k_core members */ - state_save_register_device_item(device, 0, cpustate->modA_state); - state_save_register_device_item(device, 0, cpustate->modB_state); - state_save_register_device_item(device, 0, cpustate->modC_state); - state_save_register_device_item(device, 0, cpustate->reset_state); - state_save_register_device_item(device, 0, cpustate->bootstrap_mode); - state_save_register_device_item(device, 0, cpustate->repFlag); - state_save_register_device_item(device, 0, cpustate->repAddr); - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->ppc); - state_save_register_device_item(device, 0, cpustate->op); - state_save_register_device_item(device, 0, cpustate->interrupt_cycles); + device->save_item(NAME(cpustate->modA_state)); + device->save_item(NAME(cpustate->modB_state)); + device->save_item(NAME(cpustate->modC_state)); + device->save_item(NAME(cpustate->reset_state)); + device->save_item(NAME(cpustate->bootstrap_mode)); + device->save_item(NAME(cpustate->repFlag)); + device->save_item(NAME(cpustate->repAddr)); + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->ppc)); + device->save_item(NAME(cpustate->op)); + device->save_item(NAME(cpustate->interrupt_cycles)); /* save states - dsp56k_host_interface members */ - state_save_register_device_item(device, 0, cpustate->HI.icr); - state_save_register_device_item(device, 0, cpustate->HI.cvr); - state_save_register_device_item(device, 0, cpustate->HI.isr); - state_save_register_device_item(device, 0, cpustate->HI.ivr); - state_save_register_device_item(device, 0, cpustate->HI.trxh); - state_save_register_device_item(device, 0, cpustate->HI.trxl); - state_save_register_device_item(device, 0, cpustate->HI.bootstrap_offset); + device->save_item(NAME(cpustate->HI.icr)); + device->save_item(NAME(cpustate->HI.cvr)); + device->save_item(NAME(cpustate->HI.isr)); + device->save_item(NAME(cpustate->HI.ivr)); + device->save_item(NAME(cpustate->HI.trxh)); + device->save_item(NAME(cpustate->HI.trxl)); + device->save_item(NAME(cpustate->HI.bootstrap_offset)); //cpustate->config = device->baseconfig().static_config(); //cpustate->irq_callback = irqcallback; diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c index 52876ebf9db..2460beb056c 100644 --- a/src/emu/cpu/dsp56k/dsp56pcu.c +++ b/src/emu/cpu/dsp56k/dsp56pcu.c @@ -102,15 +102,15 @@ void pcu_init(dsp56k_core* cpustate, device_t *device) dsp56k_irq_table_init(); /* save states - dsp56k_pcu members */ - state_save_register_device_item(device, 0, cpustate->PCU.pc); - state_save_register_device_item(device, 0, cpustate->PCU.la); - state_save_register_device_item(device, 0, cpustate->PCU.lc); - state_save_register_device_item(device, 0, cpustate->PCU.sr); - state_save_register_device_item(device, 0, cpustate->PCU.omr); - state_save_register_device_item(device, 0, cpustate->PCU.sp); - state_save_register_device_item_array(device, 0, cpustate->PCU.ss); - state_save_register_device_item_array(device, 0, cpustate->PCU.pending_interrupts); - state_save_register_device_item(device, 0, cpustate->PCU.reset_vector); + device->save_item(NAME(cpustate->PCU.pc)); + device->save_item(NAME(cpustate->PCU.la)); + device->save_item(NAME(cpustate->PCU.lc)); + device->save_item(NAME(cpustate->PCU.sr)); + device->save_item(NAME(cpustate->PCU.omr)); + device->save_item(NAME(cpustate->PCU.sp)); + device->save_item(NAME(cpustate->PCU.ss)); + device->save_item(NAME(cpustate->PCU.pending_interrupts)); + device->save_item(NAME(cpustate->PCU.reset_vector)); } void pcu_reset(dsp56k_core* cpustate) diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index c8ee775de0e..93c0b15c77b 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -1531,15 +1531,15 @@ static void hyperstone_init(legacy_cpu_device *device, device_irq_callback irqca { hyperstone_state *cpustate = get_safe_token(device); - state_save_register_device_item_array(device, 0, cpustate->global_regs); - state_save_register_device_item_array(device, 0, cpustate->local_regs); - state_save_register_device_item(device, 0, cpustate->ppc); - state_save_register_device_item(device, 0, cpustate->trap_entry); - state_save_register_device_item(device, 0, cpustate->delay.delay_pc); - state_save_register_device_item(device, 0, cpustate->instruction_length); - state_save_register_device_item(device, 0, cpustate->intblock); - state_save_register_device_item(device, 0, cpustate->delay.delay_cmd); - state_save_register_device_item(device, 0, cpustate->tr_clocks_per_tick); + device->save_item(NAME(cpustate->global_regs)); + device->save_item(NAME(cpustate->local_regs)); + device->save_item(NAME(cpustate->ppc)); + device->save_item(NAME(cpustate->trap_entry)); + device->save_item(NAME(cpustate->delay.delay_pc)); + device->save_item(NAME(cpustate->instruction_length)); + device->save_item(NAME(cpustate->intblock)); + device->save_item(NAME(cpustate->delay.delay_cmd)); + device->save_item(NAME(cpustate->tr_clocks_per_tick)); cpustate->irq_callback = irqcallback; cpustate->device = device; diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 9ea8e4314bc..a394de44eb7 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -272,48 +272,48 @@ static CPU_INIT( esrip ) make_ops(cpustate); /* Register stuff for state saving */ - state_save_register_device_item(device, 0, cpustate->acc); - state_save_register_device_item_array(device, 0, cpustate->ram); - state_save_register_device_item(device, 0, cpustate->d_latch); - state_save_register_device_item(device, 0, cpustate->i_latch); - state_save_register_device_item(device, 0, cpustate->result); - state_save_register_device_item(device, 0, cpustate->new_status); - state_save_register_device_item(device, 0, cpustate->status); - state_save_register_device_item(device, 0, cpustate->inst); - state_save_register_device_item(device, 0, cpustate->immflag); - state_save_register_device_item(device, 0, cpustate->ct); - state_save_register_device_item(device, 0, cpustate->t); - state_save_register_device_item(device, 0, cpustate->l1); - state_save_register_device_item(device, 0, cpustate->l2); - state_save_register_device_item(device, 0, cpustate->l3); - state_save_register_device_item(device, 0, cpustate->l4); - state_save_register_device_item(device, 0, cpustate->l5); - state_save_register_device_item(device, 0, cpustate->l6); - state_save_register_device_item(device, 0, cpustate->l7); - state_save_register_device_item(device, 0, cpustate->pl1); - state_save_register_device_item(device, 0, cpustate->pl2); - state_save_register_device_item(device, 0, cpustate->pl3); - state_save_register_device_item(device, 0, cpustate->pl4); - state_save_register_device_item(device, 0, cpustate->pl5); - state_save_register_device_item(device, 0, cpustate->pl6); - state_save_register_device_item(device, 0, cpustate->pl7); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->status_out); - state_save_register_device_item(device, 0, cpustate->x_scale); - state_save_register_device_item(device, 0, cpustate->y_scale); - state_save_register_device_item(device, 0, cpustate->img_bank); - state_save_register_device_item(device, 0, cpustate->line_latch); - state_save_register_device_item(device, 0, cpustate->fig_latch); - state_save_register_device_item(device, 0, cpustate->attr_latch); - state_save_register_device_item(device, 0, cpustate->adl_latch); - state_save_register_device_item(device, 0, cpustate->adr_latch); - state_save_register_device_item(device, 0, cpustate->iaddr_latch); - state_save_register_device_item(device, 0, cpustate->c_latch); - state_save_register_device_item(device, 0, cpustate->fdt_cnt); - state_save_register_device_item(device, 0, cpustate->ipt_cnt); - state_save_register_device_item(device, 0, cpustate->fig); - state_save_register_device_item(device, 0, cpustate->fig_cycles); - state_save_register_device_item_pointer(device, 0, cpustate->ipt_ram, IPT_RAM_SIZE / sizeof(UINT16)); + device->save_item(NAME(cpustate->acc)); + device->save_item(NAME(cpustate->ram)); + device->save_item(NAME(cpustate->d_latch)); + device->save_item(NAME(cpustate->i_latch)); + device->save_item(NAME(cpustate->result)); + device->save_item(NAME(cpustate->new_status)); + device->save_item(NAME(cpustate->status)); + device->save_item(NAME(cpustate->inst)); + device->save_item(NAME(cpustate->immflag)); + device->save_item(NAME(cpustate->ct)); + device->save_item(NAME(cpustate->t)); + device->save_item(NAME(cpustate->l1)); + device->save_item(NAME(cpustate->l2)); + device->save_item(NAME(cpustate->l3)); + device->save_item(NAME(cpustate->l4)); + device->save_item(NAME(cpustate->l5)); + device->save_item(NAME(cpustate->l6)); + device->save_item(NAME(cpustate->l7)); + device->save_item(NAME(cpustate->pl1)); + device->save_item(NAME(cpustate->pl2)); + device->save_item(NAME(cpustate->pl3)); + device->save_item(NAME(cpustate->pl4)); + device->save_item(NAME(cpustate->pl5)); + device->save_item(NAME(cpustate->pl6)); + device->save_item(NAME(cpustate->pl7)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->status_out)); + device->save_item(NAME(cpustate->x_scale)); + device->save_item(NAME(cpustate->y_scale)); + device->save_item(NAME(cpustate->img_bank)); + device->save_item(NAME(cpustate->line_latch)); + device->save_item(NAME(cpustate->fig_latch)); + device->save_item(NAME(cpustate->attr_latch)); + device->save_item(NAME(cpustate->adl_latch)); + device->save_item(NAME(cpustate->adr_latch)); + device->save_item(NAME(cpustate->iaddr_latch)); + device->save_item(NAME(cpustate->c_latch)); + device->save_item(NAME(cpustate->fdt_cnt)); + device->save_item(NAME(cpustate->ipt_cnt)); + device->save_item(NAME(cpustate->fig)); + device->save_item(NAME(cpustate->fig_cycles)); + device->save_pointer(NAME(cpustate->ipt_ram), IPT_RAM_SIZE / sizeof(UINT16)); } diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c index 8ca3de9bac1..1ca981204e4 100644 --- a/src/emu/cpu/f8/f8.c +++ b/src/emu/cpu/f8/f8.c @@ -1903,18 +1903,18 @@ static CPU_INIT( f8 ) cpustate->direct = &cpustate->program->direct(); cpustate->iospace = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->pc0); - state_save_register_device_item(device, 0, cpustate->pc1); - state_save_register_device_item(device, 0, cpustate->dc0); - state_save_register_device_item(device, 0, cpustate->dc1); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->w); - state_save_register_device_item(device, 0, cpustate->is); - state_save_register_device_item(device, 0, cpustate->dbus); - state_save_register_device_item(device, 0, cpustate->io); - state_save_register_device_item(device, 0, cpustate->irq_vector); - state_save_register_device_item(device, 0, cpustate->irq_request); - state_save_register_device_item_array(device, 0, cpustate->r); + device->save_item(NAME(cpustate->pc0)); + device->save_item(NAME(cpustate->pc1)); + device->save_item(NAME(cpustate->dc0)); + device->save_item(NAME(cpustate->dc1)); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->w)); + device->save_item(NAME(cpustate->is)); + device->save_item(NAME(cpustate->dbus)); + device->save_item(NAME(cpustate->io)); + device->save_item(NAME(cpustate->irq_vector)); + device->save_item(NAME(cpustate->irq_request)); + device->save_item(NAME(cpustate->r)); } static CPU_SET_INFO( f8 ) diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 1ad3e64aec5..c57d6912b7d 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -340,30 +340,30 @@ static CPU_INIT( g65816 ) cpustate->program = device->space(AS_PROGRAM); cpustate->cpu_type = CPU_TYPE_G65816; - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->b); - state_save_register_device_item(device, 0, cpustate->x); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->s); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->ppc); - state_save_register_device_item(device, 0, cpustate->pb); - state_save_register_device_item(device, 0, cpustate->db); - state_save_register_device_item(device, 0, cpustate->d); - state_save_register_device_item(device, 0, cpustate->flag_e); - state_save_register_device_item(device, 0, cpustate->flag_m); - state_save_register_device_item(device, 0, cpustate->flag_x); - state_save_register_device_item(device, 0, cpustate->flag_n); - state_save_register_device_item(device, 0, cpustate->flag_v); - state_save_register_device_item(device, 0, cpustate->flag_d); - state_save_register_device_item(device, 0, cpustate->flag_i); - state_save_register_device_item(device, 0, cpustate->flag_z); - state_save_register_device_item(device, 0, cpustate->flag_c); - state_save_register_device_item(device, 0, cpustate->line_irq); - state_save_register_device_item(device, 0, cpustate->line_nmi); - state_save_register_device_item(device, 0, cpustate->ir); - state_save_register_device_item(device, 0, cpustate->irq_delay); - state_save_register_device_item(device, 0, cpustate->stopped); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->b)); + device->save_item(NAME(cpustate->x)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->s)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->ppc)); + device->save_item(NAME(cpustate->pb)); + device->save_item(NAME(cpustate->db)); + device->save_item(NAME(cpustate->d)); + device->save_item(NAME(cpustate->flag_e)); + device->save_item(NAME(cpustate->flag_m)); + device->save_item(NAME(cpustate->flag_x)); + device->save_item(NAME(cpustate->flag_n)); + device->save_item(NAME(cpustate->flag_v)); + device->save_item(NAME(cpustate->flag_d)); + device->save_item(NAME(cpustate->flag_i)); + device->save_item(NAME(cpustate->flag_z)); + device->save_item(NAME(cpustate->flag_c)); + device->save_item(NAME(cpustate->line_irq)); + device->save_item(NAME(cpustate->line_nmi)); + device->save_item(NAME(cpustate->ir)); + device->save_item(NAME(cpustate->irq_delay)); + device->save_item(NAME(cpustate->stopped)); device->machine->state().register_postload(g65816_restore_state, cpustate); } diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c index f30e49381f7..dd529534ed4 100644 --- a/src/emu/cpu/h6280/h6280.c +++ b/src/emu/cpu/h6280/h6280.c @@ -132,32 +132,32 @@ static CPU_INIT( h6280 ) { h6280_Regs* cpustate = get_safe_token(device); - state_save_register_device_item(device, 0, cpustate->ppc.w.l); - state_save_register_device_item(device, 0, cpustate->pc.w.l); - state_save_register_device_item(device, 0, cpustate->sp.w.l); - state_save_register_device_item(device, 0, cpustate->zp.w.l); - state_save_register_device_item(device, 0, cpustate->ea.w.l); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->x); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->p); - state_save_register_device_item_array(device, 0, cpustate->mmr); - state_save_register_device_item(device, 0, cpustate->irq_mask); - state_save_register_device_item(device, 0, cpustate->timer_status); - state_save_register_device_item(device, 0, cpustate->timer_ack); - state_save_register_device_item(device, 0, cpustate->clocks_per_cycle); - state_save_register_device_item(device, 0, cpustate->timer_value); - state_save_register_device_item(device, 0, cpustate->timer_load); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->irq_state[0]); - state_save_register_device_item(device, 0, cpustate->irq_state[1]); - state_save_register_device_item(device, 0, cpustate->irq_state[2]); - state_save_register_device_item(device, 0, cpustate->irq_pending); + device->save_item(NAME(cpustate->ppc.w.l)); + device->save_item(NAME(cpustate->pc.w.l)); + device->save_item(NAME(cpustate->sp.w.l)); + device->save_item(NAME(cpustate->zp.w.l)); + device->save_item(NAME(cpustate->ea.w.l)); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->x)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->p)); + device->save_item(NAME(cpustate->mmr)); + device->save_item(NAME(cpustate->irq_mask)); + device->save_item(NAME(cpustate->timer_status)); + device->save_item(NAME(cpustate->timer_ack)); + device->save_item(NAME(cpustate->clocks_per_cycle)); + device->save_item(NAME(cpustate->timer_value)); + device->save_item(NAME(cpustate->timer_load)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state[0])); + device->save_item(NAME(cpustate->irq_state[1])); + device->save_item(NAME(cpustate->irq_state[2])); + device->save_item(NAME(cpustate->irq_pending)); #if LAZY_FLAGS - state_save_register_device_item(device, 0, cpustate->NZ); + device->save_item(NAME(cpustate->NZ)); #endif - state_save_register_device_item(device, 0, cpustate->io_buffer); + device->save_item(NAME(cpustate->io_buffer)); cpustate->irq_callback = irqcallback; cpustate->device = device; diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c index cea2931af24..814c4be9a2b 100644 --- a/src/emu/cpu/h83002/h8_16.c +++ b/src/emu/cpu/h83002/h8_16.c @@ -224,18 +224,18 @@ static CPU_INIT(h8) h8->direct = &h8->program->direct(); h8->io = device->space(AS_IO); - state_save_register_device_item(device, 0, h8->h8err); - state_save_register_device_item_array(device, 0, h8->regs); - state_save_register_device_item(device, 0, h8->pc); - state_save_register_device_item(device, 0, h8->ppc); - state_save_register_device_item(device, 0, h8->h8_IRQrequestH); - state_save_register_device_item(device, 0, h8->h8_IRQrequestL); - state_save_register_device_item(device, 0, h8->ccr); - state_save_register_device_item(device, 0, h8->mode_8bit); - - state_save_register_device_item_array(device, 0, h8->per_regs); - state_save_register_device_item(device, 0, h8->h8TSTR); - state_save_register_device_item_array(device, 0, h8->h8TCNT); + device->save_item(NAME(h8->h8err)); + device->save_item(NAME(h8->regs)); + device->save_item(NAME(h8->pc)); + device->save_item(NAME(h8->ppc)); + device->save_item(NAME(h8->h8_IRQrequestH)); + device->save_item(NAME(h8->h8_IRQrequestL)); + device->save_item(NAME(h8->ccr)); + device->save_item(NAME(h8->mode_8bit)); + + device->save_item(NAME(h8->per_regs)); + device->save_item(NAME(h8->h8TSTR)); + device->save_item(NAME(h8->h8TCNT)); device->machine->state().register_postload(h8_onstateload, h8); diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c index f7d98ae8bcd..3528fc8e6e2 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -246,18 +246,18 @@ static CPU_INIT(h8bit) h8->timer[2] = h8->device->machine->scheduler().timer_alloc(FUNC(h8_timer_2_cb), h8); h8->timer[3] = h8->device->machine->scheduler().timer_alloc(FUNC(h8_timer_3_cb), h8); - state_save_register_device_item(device, 0, h8->h8err); - state_save_register_device_item_array(device, 0, h8->regs); - state_save_register_device_item(device, 0, h8->pc); - state_save_register_device_item(device, 0, h8->ppc); - state_save_register_device_item(device, 0, h8->h8_IRQrequestH); - state_save_register_device_item(device, 0, h8->h8_IRQrequestL); - state_save_register_device_item(device, 0, h8->ccr); - state_save_register_device_item(device, 0, h8->mode_8bit); - - state_save_register_device_item_array(device, 0, h8->per_regs); - state_save_register_device_item(device, 0, h8->h8TSTR); - state_save_register_device_item_array(device, 0, h8->h8TCNT); + device->save_item(NAME(h8->h8err)); + device->save_item(NAME(h8->regs)); + device->save_item(NAME(h8->pc)); + device->save_item(NAME(h8->ppc)); + device->save_item(NAME(h8->h8_IRQrequestH)); + device->save_item(NAME(h8->h8_IRQrequestL)); + device->save_item(NAME(h8->ccr)); + device->save_item(NAME(h8->mode_8bit)); + + device->save_item(NAME(h8->per_regs)); + device->save_item(NAME(h8->h8TSTR)); + device->save_item(NAME(h8->h8TCNT)); h8->device->machine->state().register_postload(h8_onstateload, h8); } diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/emu/cpu/hd61700/hd61700.c index db22dbc54f0..bebddfe52e2 100644 --- a/src/emu/cpu/hd61700/hd61700.c +++ b/src/emu/cpu/hd61700/hd61700.c @@ -172,20 +172,20 @@ void hd61700_cpu_device::device_start() m_sec_timer->adjust(attotime::from_seconds(1), 0, attotime::from_seconds(1)); // save state - state_save_register_device_item(this, 0, m_ppc); - state_save_register_device_item(this, 0, m_curpc); - state_save_register_device_item(this, 0, m_pc); - state_save_register_device_item(this, 0, m_flags); - state_save_register_device_item(this, 0, m_fetch_addr); - state_save_register_device_item(this, 0, m_irq_status); - state_save_register_device_item(this, 0, m_state); - state_save_register_device_item(this, 0, prev_ua); - state_save_register_device_item(this, 0, m_icount); - state_save_register_device_item_array(this, 0, m_regsir); - state_save_register_device_item_array(this, 0, m_reg8bit); - state_save_register_device_item_array(this, 0, m_reg16bit); - state_save_register_device_item_array(this, 0, m_regmain); - state_save_register_device_item_array(this, 0, m_lines_status); + save_item(NAME(m_ppc)); + save_item(NAME(m_curpc)); + save_item(NAME(m_pc)); + save_item(NAME(m_flags)); + save_item(NAME(m_fetch_addr)); + save_item(NAME(m_irq_status)); + save_item(NAME(m_state)); + save_item(NAME(prev_ua)); + save_item(NAME(m_icount)); + save_item(NAME(m_regsir)); + save_item(NAME(m_reg8bit)); + save_item(NAME(m_reg16bit)); + save_item(NAME(m_regmain)); + save_item(NAME(m_lines_status)); // register state for debugger state_add(HD61700_PC, "pc", m_pc).callimport().callexport().formatstr("%04X"); diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c index 8adeb17f8e0..c1a3023b117 100644 --- a/src/emu/cpu/hd6309/hd6309.c +++ b/src/emu/cpu/hd6309/hd6309.c @@ -532,20 +532,20 @@ static CPU_INIT( hd6309 ) m68_state->regTable[2] = &(B); m68_state->regTable[3] = &m68_state->dummy_byte; - state_save_register_device_item(device, 0, PC); - state_save_register_device_item(device, 0, U); - state_save_register_device_item(device, 0, S); - state_save_register_device_item(device, 0, X); - state_save_register_device_item(device, 0, Y); - state_save_register_device_item(device, 0, V); - state_save_register_device_item(device, 0, DP); - state_save_register_device_item(device, 0, CC); - state_save_register_device_item(device, 0, MD); + device->save_item(NAME(PC)); + device->save_item(NAME(U)); + device->save_item(NAME(S)); + device->save_item(NAME(X)); + device->save_item(NAME(Y)); + device->save_item(NAME(V)); + device->save_item(NAME(DP)); + device->save_item(NAME(CC)); + device->save_item(NAME(MD)); device->machine->state().register_postload(hd6309_postload, (void *) device); - state_save_register_device_item(device, 0, m68_state->int_state); - state_save_register_device_item(device, 0, m68_state->nmi_state); - state_save_register_device_item(device, 0, m68_state->irq_state[0]); - state_save_register_device_item(device, 0, m68_state->irq_state[1]); + device->save_item(NAME(m68_state->int_state)); + device->save_item(NAME(m68_state->nmi_state)); + device->save_item(NAME(m68_state->irq_state[0])); + device->save_item(NAME(m68_state->irq_state[1])); } /****************************************************************************/ diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index d3999ab8685..44c44fee538 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -552,59 +552,59 @@ static CPU_INIT( i386 ) cpustate->direct = &cpustate->program->direct(); cpustate->io = device->space(AS_IO); - state_save_register_device_item_array(device, 0, cpustate->reg.d); - state_save_register_device_item(device, 0, cpustate->sreg[ES].selector); - state_save_register_device_item(device, 0, cpustate->sreg[ES].base); - state_save_register_device_item(device, 0, cpustate->sreg[ES].limit); - state_save_register_device_item(device, 0, cpustate->sreg[ES].flags); - state_save_register_device_item(device, 0, cpustate->sreg[CS].selector); - state_save_register_device_item(device, 0, cpustate->sreg[CS].base); - state_save_register_device_item(device, 0, cpustate->sreg[CS].limit); - state_save_register_device_item(device, 0, cpustate->sreg[CS].flags); - state_save_register_device_item(device, 0, cpustate->sreg[SS].selector); - state_save_register_device_item(device, 0, cpustate->sreg[SS].base); - state_save_register_device_item(device, 0, cpustate->sreg[SS].limit); - state_save_register_device_item(device, 0, cpustate->sreg[SS].flags); - state_save_register_device_item(device, 0, cpustate->sreg[DS].selector); - state_save_register_device_item(device, 0, cpustate->sreg[DS].base); - state_save_register_device_item(device, 0, cpustate->sreg[DS].limit); - state_save_register_device_item(device, 0, cpustate->sreg[DS].flags); - state_save_register_device_item(device, 0, cpustate->sreg[FS].selector); - state_save_register_device_item(device, 0, cpustate->sreg[FS].base); - state_save_register_device_item(device, 0, cpustate->sreg[FS].limit); - state_save_register_device_item(device, 0, cpustate->sreg[FS].flags); - state_save_register_device_item(device, 0, cpustate->sreg[GS].selector); - state_save_register_device_item(device, 0, cpustate->sreg[GS].base); - state_save_register_device_item(device, 0, cpustate->sreg[GS].limit); - state_save_register_device_item(device, 0, cpustate->sreg[GS].flags); - state_save_register_device_item(device, 0, cpustate->eip); - state_save_register_device_item(device, 0, cpustate->prev_eip); - state_save_register_device_item(device, 0, cpustate->CF); - state_save_register_device_item(device, 0, cpustate->DF); - state_save_register_device_item(device, 0, cpustate->SF); - state_save_register_device_item(device, 0, cpustate->OF); - state_save_register_device_item(device, 0, cpustate->ZF); - state_save_register_device_item(device, 0, cpustate->PF); - state_save_register_device_item(device, 0, cpustate->AF); - state_save_register_device_item(device, 0, cpustate->IF); - state_save_register_device_item(device, 0, cpustate->TF); - state_save_register_device_item_array(device, 0, cpustate->cr); - state_save_register_device_item_array(device, 0, cpustate->dr); - state_save_register_device_item_array(device, 0, cpustate->tr); - state_save_register_device_item(device, 0, cpustate->idtr.base); - state_save_register_device_item(device, 0, cpustate->idtr.limit); - state_save_register_device_item(device, 0, cpustate->gdtr.base); - state_save_register_device_item(device, 0, cpustate->gdtr.limit); - state_save_register_device_item(device, 0, cpustate->task.base); - state_save_register_device_item(device, 0, cpustate->task.segment); - state_save_register_device_item(device, 0, cpustate->task.limit); - state_save_register_device_item(device, 0, cpustate->task.flags); - state_save_register_device_item(device, 0, cpustate->ldtr.base); - state_save_register_device_item(device, 0, cpustate->ldtr.segment); - state_save_register_device_item(device, 0, cpustate->ldtr.limit); - state_save_register_device_item(device, 0, cpustate->ldtr.flags); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->performed_intersegment_jump); + device->save_item(NAME( cpustate->reg.d)); + device->save_item(NAME(cpustate->sreg[ES].selector)); + device->save_item(NAME(cpustate->sreg[ES].base)); + device->save_item(NAME(cpustate->sreg[ES].limit)); + device->save_item(NAME(cpustate->sreg[ES].flags)); + device->save_item(NAME(cpustate->sreg[CS].selector)); + device->save_item(NAME(cpustate->sreg[CS].base)); + device->save_item(NAME(cpustate->sreg[CS].limit)); + device->save_item(NAME(cpustate->sreg[CS].flags)); + device->save_item(NAME(cpustate->sreg[SS].selector)); + device->save_item(NAME(cpustate->sreg[SS].base)); + device->save_item(NAME(cpustate->sreg[SS].limit)); + device->save_item(NAME(cpustate->sreg[SS].flags)); + device->save_item(NAME(cpustate->sreg[DS].selector)); + device->save_item(NAME(cpustate->sreg[DS].base)); + device->save_item(NAME(cpustate->sreg[DS].limit)); + device->save_item(NAME(cpustate->sreg[DS].flags)); + device->save_item(NAME(cpustate->sreg[FS].selector)); + device->save_item(NAME(cpustate->sreg[FS].base)); + device->save_item(NAME(cpustate->sreg[FS].limit)); + device->save_item(NAME(cpustate->sreg[FS].flags)); + device->save_item(NAME(cpustate->sreg[GS].selector)); + device->save_item(NAME(cpustate->sreg[GS].base)); + device->save_item(NAME(cpustate->sreg[GS].limit)); + device->save_item(NAME(cpustate->sreg[GS].flags)); + device->save_item(NAME(cpustate->eip)); + device->save_item(NAME(cpustate->prev_eip)); + device->save_item(NAME(cpustate->CF)); + device->save_item(NAME(cpustate->DF)); + device->save_item(NAME(cpustate->SF)); + device->save_item(NAME(cpustate->OF)); + device->save_item(NAME(cpustate->ZF)); + device->save_item(NAME(cpustate->PF)); + device->save_item(NAME(cpustate->AF)); + device->save_item(NAME(cpustate->IF)); + device->save_item(NAME(cpustate->TF)); + device->save_item(NAME( cpustate->cr)); + device->save_item(NAME( cpustate->dr)); + device->save_item(NAME( cpustate->tr)); + device->save_item(NAME(cpustate->idtr.base)); + device->save_item(NAME(cpustate->idtr.limit)); + device->save_item(NAME(cpustate->gdtr.base)); + device->save_item(NAME(cpustate->gdtr.limit)); + device->save_item(NAME(cpustate->task.base)); + device->save_item(NAME(cpustate->task.segment)); + device->save_item(NAME(cpustate->task.limit)); + device->save_item(NAME(cpustate->task.flags)); + device->save_item(NAME(cpustate->ldtr.base)); + device->save_item(NAME(cpustate->ldtr.segment)); + device->save_item(NAME(cpustate->ldtr.limit)); + device->save_item(NAME(cpustate->ldtr.flags)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->performed_intersegment_jump)); device->machine->state().register_postload(i386_postload, (void *)device); } diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c index 3e886a5d667..87306d5479b 100644 --- a/src/emu/cpu/i4004/i4004.c +++ b/src/emu/cpu/i4004/i4004.c @@ -468,24 +468,24 @@ static CPU_INIT( i4004 ) cpustate->data = device->space(AS_DATA); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->C); - state_save_register_device_item(device, 0, cpustate->TEST); - state_save_register_device_item(device, 0, cpustate->pc_pos); - state_save_register_device_item(device, 0, cpustate->ADDR[0]); - state_save_register_device_item(device, 0, cpustate->ADDR[1]); - state_save_register_device_item(device, 0, cpustate->ADDR[2]); - state_save_register_device_item(device, 0, cpustate->ADDR[3]); - state_save_register_device_item(device, 0, cpustate->R[0]); - state_save_register_device_item(device, 0, cpustate->R[1]); - state_save_register_device_item(device, 0, cpustate->R[2]); - state_save_register_device_item(device, 0, cpustate->R[3]); - state_save_register_device_item(device, 0, cpustate->R[4]); - state_save_register_device_item(device, 0, cpustate->R[5]); - state_save_register_device_item(device, 0, cpustate->R[6]); - state_save_register_device_item(device, 0, cpustate->R[7]); - state_save_register_device_item(device, 0, cpustate->RAM); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->C)); + device->save_item(NAME(cpustate->TEST)); + device->save_item(NAME(cpustate->pc_pos)); + device->save_item(NAME(cpustate->ADDR[0])); + device->save_item(NAME(cpustate->ADDR[1])); + device->save_item(NAME(cpustate->ADDR[2])); + device->save_item(NAME(cpustate->ADDR[3])); + device->save_item(NAME(cpustate->R[0])); + device->save_item(NAME(cpustate->R[1])); + device->save_item(NAME(cpustate->R[2])); + device->save_item(NAME(cpustate->R[3])); + device->save_item(NAME(cpustate->R[4])); + device->save_item(NAME(cpustate->R[5])); + device->save_item(NAME(cpustate->R[6])); + device->save_item(NAME(cpustate->R[7])); + device->save_item(NAME(cpustate->RAM)); } diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c index c59f5471dc9..e60fb027be3 100644 --- a/src/emu/cpu/i8008/i8008.c +++ b/src/emu/cpu/i8008/i8008.c @@ -551,29 +551,29 @@ static CPU_INIT( i8008 ) init_tables(); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->B); - state_save_register_device_item(device, 0, cpustate->C); - state_save_register_device_item(device, 0, cpustate->D); - state_save_register_device_item(device, 0, cpustate->E); - state_save_register_device_item(device, 0, cpustate->H); - state_save_register_device_item(device, 0, cpustate->L); - state_save_register_device_item(device, 0, cpustate->CF); - state_save_register_device_item(device, 0, cpustate->SF); - state_save_register_device_item(device, 0, cpustate->ZF); - state_save_register_device_item(device, 0, cpustate->PF); - state_save_register_device_item(device, 0, cpustate->pc_pos); - state_save_register_device_item(device, 0, cpustate->ADDR[0]); - state_save_register_device_item(device, 0, cpustate->ADDR[1]); - state_save_register_device_item(device, 0, cpustate->ADDR[2]); - state_save_register_device_item(device, 0, cpustate->ADDR[3]); - state_save_register_device_item(device, 0, cpustate->ADDR[4]); - state_save_register_device_item(device, 0, cpustate->ADDR[5]); - state_save_register_device_item(device, 0, cpustate->ADDR[6]); - state_save_register_device_item(device, 0, cpustate->ADDR[7]); - state_save_register_device_item(device, 0, cpustate->HALT); - state_save_register_device_item(device, 0, cpustate->irq_state); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->B)); + device->save_item(NAME(cpustate->C)); + device->save_item(NAME(cpustate->D)); + device->save_item(NAME(cpustate->E)); + device->save_item(NAME(cpustate->H)); + device->save_item(NAME(cpustate->L)); + device->save_item(NAME(cpustate->CF)); + device->save_item(NAME(cpustate->SF)); + device->save_item(NAME(cpustate->ZF)); + device->save_item(NAME(cpustate->PF)); + device->save_item(NAME(cpustate->pc_pos)); + device->save_item(NAME(cpustate->ADDR[0])); + device->save_item(NAME(cpustate->ADDR[1])); + device->save_item(NAME(cpustate->ADDR[2])); + device->save_item(NAME(cpustate->ADDR[3])); + device->save_item(NAME(cpustate->ADDR[4])); + device->save_item(NAME(cpustate->ADDR[5])); + device->save_item(NAME(cpustate->ADDR[6])); + device->save_item(NAME(cpustate->ADDR[7])); + device->save_item(NAME(cpustate->HALT)); + device->save_item(NAME(cpustate->irq_state)); } diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 27c4c1dc999..6848c2118ba 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -1017,21 +1017,21 @@ static void init_808x_common(legacy_cpu_device *device, device_irq_callback irqc devcb_resolve_write_line(&cpustate->out_sod_func, &cpustate->config.out_sod_func, device); /* register for state saving */ - state_save_register_device_item(device, 0, cpustate->PC.w.l); - state_save_register_device_item(device, 0, cpustate->SP.w.l); - state_save_register_device_item(device, 0, cpustate->AF.w.l); - state_save_register_device_item(device, 0, cpustate->BC.w.l); - state_save_register_device_item(device, 0, cpustate->DE.w.l); - state_save_register_device_item(device, 0, cpustate->HL.w.l); - state_save_register_device_item(device, 0, cpustate->HALT); - state_save_register_device_item(device, 0, cpustate->IM); - state_save_register_device_item(device, 0, cpustate->STATUS); - state_save_register_device_item(device, 0, cpustate->after_ei); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item_array(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->trap_pending); - state_save_register_device_item(device, 0, cpustate->trap_im_copy); - state_save_register_device_item(device, 0, cpustate->sod_state); + device->save_item(NAME(cpustate->PC.w.l)); + device->save_item(NAME(cpustate->SP.w.l)); + device->save_item(NAME(cpustate->AF.w.l)); + device->save_item(NAME(cpustate->BC.w.l)); + device->save_item(NAME(cpustate->DE.w.l)); + device->save_item(NAME(cpustate->HL.w.l)); + device->save_item(NAME(cpustate->HALT)); + device->save_item(NAME(cpustate->IM)); + device->save_item(NAME(cpustate->STATUS)); + device->save_item(NAME(cpustate->after_ei)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->trap_pending)); + device->save_item(NAME(cpustate->trap_im_copy)); + device->save_item(NAME(cpustate->sod_state)); } static CPU_INIT( i8080 ) diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 2f3fefd1601..8710541095e 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -253,41 +253,41 @@ static CPU_INIT( i80286 ) { i80286_state *cpustate = get_safe_token(device); - state_save_register_device_item_array(device, 0, cpustate->regs.w); - state_save_register_device_item(device, 0, cpustate->amask); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->prevpc); - state_save_register_device_item(device, 0, cpustate->msw); - state_save_register_device_item_array(device, 0, cpustate->base); - state_save_register_device_item_array(device, 0, cpustate->sregs); - state_save_register_device_item_array(device, 0, cpustate->limit); - state_save_register_device_item_array(device, 0, cpustate->rights); - state_save_register_device_item(device, 0, cpustate->gdtr.base); - state_save_register_device_item(device, 0, cpustate->gdtr.limit); - state_save_register_device_item(device, 0, cpustate->idtr.base); - state_save_register_device_item(device, 0, cpustate->idtr.limit); - state_save_register_device_item(device, 0, cpustate->ldtr.sel); - state_save_register_device_item(device, 0, cpustate->ldtr.base); - state_save_register_device_item(device, 0, cpustate->ldtr.limit); - state_save_register_device_item(device, 0, cpustate->ldtr.rights); - state_save_register_device_item(device, 0, cpustate->tr.sel); - state_save_register_device_item(device, 0, cpustate->tr.base); - state_save_register_device_item(device, 0, cpustate->tr.limit); - state_save_register_device_item(device, 0, cpustate->tr.rights); - state_save_register_device_item(device, 0, cpustate->AuxVal); - state_save_register_device_item(device, 0, cpustate->OverVal); - state_save_register_device_item(device, 0, cpustate->SignVal); - state_save_register_device_item(device, 0, cpustate->ZeroVal); - state_save_register_device_item(device, 0, cpustate->CarryVal); - state_save_register_device_item(device, 0, cpustate->DirVal); - state_save_register_device_item(device, 0, cpustate->ParityVal); - state_save_register_device_item(device, 0, cpustate->TF); - state_save_register_device_item(device, 0, cpustate->IF); - state_save_register_device_item(device, 0, cpustate->int_vector); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->extra_cycles); - state_save_register_device_item(device, 0, cpustate->rep_in_progress); + device->save_item(NAME(cpustate->regs.w)); + device->save_item(NAME(cpustate->amask)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->prevpc)); + device->save_item(NAME(cpustate->msw)); + device->save_item(NAME(cpustate->base)); + device->save_item(NAME(cpustate->sregs)); + device->save_item(NAME(cpustate->limit)); + device->save_item(NAME(cpustate->rights)); + device->save_item(NAME(cpustate->gdtr.base)); + device->save_item(NAME(cpustate->gdtr.limit)); + device->save_item(NAME(cpustate->idtr.base)); + device->save_item(NAME(cpustate->idtr.limit)); + device->save_item(NAME(cpustate->ldtr.sel)); + device->save_item(NAME(cpustate->ldtr.base)); + device->save_item(NAME(cpustate->ldtr.limit)); + device->save_item(NAME(cpustate->ldtr.rights)); + device->save_item(NAME(cpustate->tr.sel)); + device->save_item(NAME(cpustate->tr.base)); + device->save_item(NAME(cpustate->tr.limit)); + device->save_item(NAME(cpustate->tr.rights)); + device->save_item(NAME(cpustate->AuxVal)); + device->save_item(NAME(cpustate->OverVal)); + device->save_item(NAME(cpustate->SignVal)); + device->save_item(NAME(cpustate->ZeroVal)); + device->save_item(NAME(cpustate->CarryVal)); + device->save_item(NAME(cpustate->DirVal)); + device->save_item(NAME(cpustate->ParityVal)); + device->save_item(NAME(cpustate->TF)); + device->save_item(NAME(cpustate->IF)); + device->save_item(NAME(cpustate->int_vector)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->extra_cycles)); + device->save_item(NAME(cpustate->rep_in_progress)); cpustate->irq_callback = irqcallback; cpustate->device = device; diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 14b20478267..0ab1177d0c9 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -114,29 +114,29 @@ static UINT8 parity_table[256]; static void i8086_state_register(device_t *device) { i8086_state *cpustate = get_safe_token(device); - state_save_register_device_item_array(device, 0, cpustate->regs.w); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->prevpc); - state_save_register_device_item_array(device, 0, cpustate->base); - state_save_register_device_item_array(device, 0, cpustate->sregs); - state_save_register_device_item(device, 0, cpustate->flags); - state_save_register_device_item(device, 0, cpustate->AuxVal); - state_save_register_device_item(device, 0, cpustate->OverVal); - state_save_register_device_item(device, 0, cpustate->SignVal); - state_save_register_device_item(device, 0, cpustate->ZeroVal); - state_save_register_device_item(device, 0, cpustate->CarryVal); - state_save_register_device_item(device, 0, cpustate->DirVal); - state_save_register_device_item(device, 0, cpustate->ParityVal); - state_save_register_device_item(device, 0, cpustate->TF); - state_save_register_device_item(device, 0, cpustate->IF); - state_save_register_device_item(device, 0, cpustate->MF); - state_save_register_device_item(device, 0, cpustate->int_vector); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->extra_cycles); - state_save_register_device_item(device, 0, cpustate->halted); - state_save_register_device_item(device, 0, cpustate->test_state); /* PJB 03/05 */ - state_save_register_device_item(device, 0, cpustate->rep_in_progress); /* PJB 03/05 */ + device->save_item(NAME(cpustate->regs.w)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->prevpc)); + device->save_item(NAME(cpustate->base)); + device->save_item(NAME(cpustate->sregs)); + device->save_item(NAME(cpustate->flags)); + device->save_item(NAME(cpustate->AuxVal)); + device->save_item(NAME(cpustate->OverVal)); + device->save_item(NAME(cpustate->SignVal)); + device->save_item(NAME(cpustate->ZeroVal)); + device->save_item(NAME(cpustate->CarryVal)); + device->save_item(NAME(cpustate->DirVal)); + device->save_item(NAME(cpustate->ParityVal)); + device->save_item(NAME(cpustate->TF)); + device->save_item(NAME(cpustate->IF)); + device->save_item(NAME(cpustate->MF)); + device->save_item(NAME(cpustate->int_vector)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->extra_cycles)); + device->save_item(NAME(cpustate->halted)); + device->save_item(NAME(cpustate->test_state)); /* PJB 03/05 */ + device->save_item(NAME(cpustate->rep_in_progress)); /* PJB 03/05 */ } static CPU_INIT( i8086 ) diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c index 2c10a36216d..9d8b122ba36 100644 --- a/src/emu/cpu/i860/i860.c +++ b/src/emu/cpu/i860/i860.c @@ -36,10 +36,10 @@ static CPU_INIT( i860 ) i860_set_pin(device, DEC_PIN_RESET, 0); cpustate->single_stepping = 0; - state_save_register_device_item_array(device, 0, cpustate->iregs); - state_save_register_device_item_array(device, 0, cpustate->cregs); - state_save_register_device_item_array(device, 0, cpustate->frg); - state_save_register_device_item(device, 0, cpustate->pc); + device->save_item(NAME(cpustate->iregs)); + device->save_item(NAME(cpustate->cregs)); + device->save_item(NAME(cpustate->frg)); + device->save_item(NAME(cpustate->pc)); } static CPU_RESET( i860 ) diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c index 1d35004dcc5..eeb903298c0 100644 --- a/src/emu/cpu/i960/i960.c +++ b/src/emu/cpu/i960/i960.c @@ -2071,16 +2071,16 @@ static CPU_INIT( i960 ) i960->program = device->space(AS_PROGRAM); i960->direct = &i960->program->direct(); - state_save_register_device_item(device, 0, i960->PIP); - state_save_register_device_item(device, 0, i960->SAT); - state_save_register_device_item(device, 0, i960->PRCB); - state_save_register_device_item(device, 0, i960->PC); - state_save_register_device_item(device, 0, i960->AC); - state_save_register_device_item(device, 0, i960->ICR); - state_save_register_device_item_array(device, 0, i960->r); - state_save_register_device_item_array(device, 0, i960->fp); - state_save_register_device_item_2d_array(device, 0, i960->rcache); - state_save_register_device_item_array(device, 0, i960->rcache_frame_addr); + device->save_item(NAME(i960->PIP)); + device->save_item(NAME(i960->SAT)); + device->save_item(NAME(i960->PRCB)); + device->save_item(NAME(i960->PC)); + device->save_item(NAME(i960->AC)); + device->save_item(NAME(i960->ICR)); + device->save_item(NAME(i960->r)); + device->save_item(NAME(i960->fp)); + device->save_item(NAME(i960->rcache)); + device->save_item(NAME(i960->rcache_frame_addr)); } static CPU_RESET( i960 ) diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c index 0ece28b5d3c..33b5acd5aea 100644 --- a/src/emu/cpu/jaguar/jaguar.c +++ b/src/emu/cpu/jaguar/jaguar.c @@ -426,10 +426,10 @@ static void init_common(int isdsp, legacy_cpu_device *device, device_irq_callbac if (configdata != NULL) jaguar->cpu_interrupt = configdata->cpu_int_callback; - state_save_register_device_item_array(device, 0, jaguar->r); - state_save_register_device_item_array(device, 0, jaguar->a); - state_save_register_device_item_array(device, 0, jaguar->ctrl); - state_save_register_device_item(device, 0, jaguar->ppc); + device->save_item(NAME(jaguar->r)); + device->save_item(NAME(jaguar->a)); + device->save_item(NAME(jaguar->ctrl)); + device->save_item(NAME(jaguar->ppc)); device->machine->state().register_postload(jaguar_postload, (void *)device); } diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index 2d70057d391..4575450cbf6 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -407,19 +407,19 @@ static CPU_INIT( konami ) cpustate->program = device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - state_save_register_device_item(device, 0, PC); - state_save_register_device_item(device, 0, U); - state_save_register_device_item(device, 0, S); - state_save_register_device_item(device, 0, X); - state_save_register_device_item(device, 0, Y); - state_save_register_device_item(device, 0, D); - state_save_register_device_item(device, 0, DP); - state_save_register_device_item(device, 0, CC); - state_save_register_device_item(device, 0, cpustate->int_state); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->nmi_pending); - state_save_register_device_item(device, 0, cpustate->irq_state[0]); - state_save_register_device_item(device, 0, cpustate->irq_state[1]); + device->save_item(NAME(PC)); + device->save_item(NAME(U)); + device->save_item(NAME(S)); + device->save_item(NAME(X)); + device->save_item(NAME(Y)); + device->save_item(NAME(D)); + device->save_item(NAME(DP)); + device->save_item(NAME(CC)); + device->save_item(NAME(cpustate->int_state)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->nmi_pending)); + device->save_item(NAME(cpustate->irq_state[0])); + device->save_item(NAME(cpustate->irq_state[1])); } static CPU_RESET( konami ) diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c index bd17e16ec04..f973e716d5a 100644 --- a/src/emu/cpu/m37710/m37710.c +++ b/src/emu/cpu/m37710/m37710.c @@ -908,46 +908,46 @@ static CPU_INIT( m37710 ) for (i = 0; i < 8; i++) cpustate->timers[i] = device->machine->scheduler().timer_alloc(FUNC(m37710_timer_cb), cpustate); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->b); - state_save_register_device_item(device, 0, cpustate->ba); - state_save_register_device_item(device, 0, cpustate->bb); - state_save_register_device_item(device, 0, cpustate->x); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->s); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->ppc); - state_save_register_device_item(device, 0, cpustate->pb); - state_save_register_device_item(device, 0, cpustate->db); - state_save_register_device_item(device, 0, cpustate->d); - state_save_register_device_item(device, 0, cpustate->flag_e); - state_save_register_device_item(device, 0, cpustate->flag_m); - state_save_register_device_item(device, 0, cpustate->flag_x); - state_save_register_device_item(device, 0, cpustate->flag_n); - state_save_register_device_item(device, 0, cpustate->flag_v); - state_save_register_device_item(device, 0, cpustate->flag_d); - state_save_register_device_item(device, 0, cpustate->flag_i); - state_save_register_device_item(device, 0, cpustate->flag_z); - state_save_register_device_item(device, 0, cpustate->flag_c); - state_save_register_device_item(device, 0, cpustate->line_irq); - state_save_register_device_item(device, 0, cpustate->ipl); - state_save_register_device_item(device, 0, cpustate->ir); - state_save_register_device_item(device, 0, cpustate->im); - state_save_register_device_item(device, 0, cpustate->im2); - state_save_register_device_item(device, 0, cpustate->im3); - state_save_register_device_item(device, 0, cpustate->im4); - state_save_register_device_item(device, 0, cpustate->irq_delay); - state_save_register_device_item(device, 0, cpustate->irq_level); - state_save_register_device_item(device, 0, cpustate->stopped); - state_save_register_device_item_array(device, 0, cpustate->m37710_regs); - state_save_register_device_item(device, 0, cpustate->reload[0]); - state_save_register_device_item(device, 0, cpustate->reload[1]); - state_save_register_device_item(device, 0, cpustate->reload[2]); - state_save_register_device_item(device, 0, cpustate->reload[3]); - state_save_register_device_item(device, 0, cpustate->reload[4]); - state_save_register_device_item(device, 0, cpustate->reload[5]); - state_save_register_device_item(device, 0, cpustate->reload[6]); - state_save_register_device_item(device, 0, cpustate->reload[7]); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->b)); + device->save_item(NAME(cpustate->ba)); + device->save_item(NAME(cpustate->bb)); + device->save_item(NAME(cpustate->x)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->s)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->ppc)); + device->save_item(NAME(cpustate->pb)); + device->save_item(NAME(cpustate->db)); + device->save_item(NAME(cpustate->d)); + device->save_item(NAME(cpustate->flag_e)); + device->save_item(NAME(cpustate->flag_m)); + device->save_item(NAME(cpustate->flag_x)); + device->save_item(NAME(cpustate->flag_n)); + device->save_item(NAME(cpustate->flag_v)); + device->save_item(NAME(cpustate->flag_d)); + device->save_item(NAME(cpustate->flag_i)); + device->save_item(NAME(cpustate->flag_z)); + device->save_item(NAME(cpustate->flag_c)); + device->save_item(NAME(cpustate->line_irq)); + device->save_item(NAME(cpustate->ipl)); + device->save_item(NAME(cpustate->ir)); + device->save_item(NAME(cpustate->im)); + device->save_item(NAME(cpustate->im2)); + device->save_item(NAME(cpustate->im3)); + device->save_item(NAME(cpustate->im4)); + device->save_item(NAME(cpustate->irq_delay)); + device->save_item(NAME(cpustate->irq_level)); + device->save_item(NAME(cpustate->stopped)); + device->save_item(NAME(cpustate->m37710_regs)); + device->save_item(NAME(cpustate->reload[0])); + device->save_item(NAME(cpustate->reload[1])); + device->save_item(NAME(cpustate->reload[2])); + device->save_item(NAME(cpustate->reload[3])); + device->save_item(NAME(cpustate->reload[4])); + device->save_item(NAME(cpustate->reload[5])); + device->save_item(NAME(cpustate->reload[6])); + device->save_item(NAME(cpustate->reload[7])); device->machine->state().register_postload(m37710_restore_state, cpustate); } diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 731bab93bca..4992013825c 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -159,22 +159,22 @@ static void m6502_common_init(legacy_cpu_device *device, device_irq_callback irq cpustate->port_write = intf->port_write_func; } - state_save_register_device_item(device, 0, cpustate->pc.w.l); - state_save_register_device_item(device, 0, cpustate->sp.w.l); - state_save_register_device_item(device, 0, cpustate->p); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->x); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->pending_irq); - state_save_register_device_item(device, 0, cpustate->after_cli); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->so_state); + device->save_item(NAME(cpustate->pc.w.l)); + device->save_item(NAME(cpustate->sp.w.l)); + device->save_item(NAME(cpustate->p)); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->x)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->pending_irq)); + device->save_item(NAME(cpustate->after_cli)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->so_state)); if (subtype == SUBTYPE_6510) { - state_save_register_device_item(device, 0, cpustate->port); - state_save_register_device_item(device, 0, cpustate->ddr); + device->save_item(NAME(cpustate->port)); + device->save_item(NAME(cpustate->ddr)); } } diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index c0ece25cf8a..ff98b3d7a4a 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -987,54 +987,54 @@ static TIMER_CALLBACK( sci_tick ) ****************************************************************************/ static void state_register(m6800_state *cpustate, const char *type) { - state_save_register_device_item(cpustate->device, 0, cpustate->ppc.w.l); - state_save_register_device_item(cpustate->device, 0, cpustate->pc.w.l); - state_save_register_device_item(cpustate->device, 0, cpustate->s.w.l); - state_save_register_device_item(cpustate->device, 0, cpustate->x.w.l); - state_save_register_device_item(cpustate->device, 0, cpustate->d.w.l); - state_save_register_device_item(cpustate->device, 0, cpustate->cc); - state_save_register_device_item(cpustate->device, 0, cpustate->wai_state); - state_save_register_device_item(cpustate->device, 0, cpustate->nmi_state); - state_save_register_device_item(cpustate->device, 0, cpustate->nmi_pending); - state_save_register_device_item_array(cpustate->device, 0, cpustate->irq_state); - state_save_register_device_item(cpustate->device, 0, cpustate->ic_eddge); - - state_save_register_device_item(cpustate->device, 0, cpustate->port1_ddr); - state_save_register_device_item(cpustate->device, 0, cpustate->port2_ddr); - state_save_register_device_item(cpustate->device, 0, cpustate->port3_ddr); - state_save_register_device_item(cpustate->device, 0, cpustate->port4_ddr); - state_save_register_device_item(cpustate->device, 0, cpustate->port1_data); - state_save_register_device_item(cpustate->device, 0, cpustate->port2_data); - state_save_register_device_item(cpustate->device, 0, cpustate->port3_data); - state_save_register_device_item(cpustate->device, 0, cpustate->port4_data); - state_save_register_device_item(cpustate->device, 0, cpustate->port2_written); - state_save_register_device_item(cpustate->device, 0, cpustate->port3_latched); - state_save_register_device_item(cpustate->device, 0, cpustate->p3csr); - state_save_register_device_item(cpustate->device, 0, cpustate->p3csr_is3_flag_read); - state_save_register_device_item(cpustate->device, 0, cpustate->tcsr); - state_save_register_device_item(cpustate->device, 0, cpustate->pending_tcsr); - state_save_register_device_item(cpustate->device, 0, cpustate->irq2); - state_save_register_device_item(cpustate->device, 0, cpustate->ram_ctrl); - - state_save_register_device_item(cpustate->device, 0, cpustate->counter.d); - state_save_register_device_item(cpustate->device, 0, cpustate->output_compare.d); - state_save_register_device_item(cpustate->device, 0, cpustate->input_capture); - state_save_register_device_item(cpustate->device, 0, cpustate->timer_over.d); - - state_save_register_device_item(cpustate->device, 0, cpustate->clock); - state_save_register_device_item(cpustate->device, 0, cpustate->trcsr); - state_save_register_device_item(cpustate->device, 0, cpustate->rmcr); - state_save_register_device_item(cpustate->device, 0, cpustate->rdr); - state_save_register_device_item(cpustate->device, 0, cpustate->tdr); - state_save_register_device_item(cpustate->device, 0, cpustate->rsr); - state_save_register_device_item(cpustate->device, 0, cpustate->tsr); - state_save_register_device_item(cpustate->device, 0, cpustate->rxbits); - state_save_register_device_item(cpustate->device, 0, cpustate->txbits); - state_save_register_device_item(cpustate->device, 0, cpustate->txstate); - state_save_register_device_item(cpustate->device, 0, cpustate->trcsr_read_tdre); - state_save_register_device_item(cpustate->device, 0, cpustate->trcsr_read_orfe); - state_save_register_device_item(cpustate->device, 0, cpustate->trcsr_read_rdrf); - state_save_register_device_item(cpustate->device, 0, cpustate->tx); + cpustate->device->save_item(NAME(cpustate->ppc.w.l)); + cpustate->device->save_item(NAME(cpustate->pc.w.l)); + cpustate->device->save_item(NAME(cpustate->s.w.l)); + cpustate->device->save_item(NAME(cpustate->x.w.l)); + cpustate->device->save_item(NAME(cpustate->d.w.l)); + cpustate->device->save_item(NAME(cpustate->cc)); + cpustate->device->save_item(NAME(cpustate->wai_state)); + cpustate->device->save_item(NAME(cpustate->nmi_state)); + cpustate->device->save_item(NAME(cpustate->nmi_pending)); + cpustate->device->save_item(NAME(cpustate->irq_state)); + cpustate->device->save_item(NAME(cpustate->ic_eddge)); + + cpustate->device->save_item(NAME(cpustate->port1_ddr)); + cpustate->device->save_item(NAME(cpustate->port2_ddr)); + cpustate->device->save_item(NAME(cpustate->port3_ddr)); + cpustate->device->save_item(NAME(cpustate->port4_ddr)); + cpustate->device->save_item(NAME(cpustate->port1_data)); + cpustate->device->save_item(NAME(cpustate->port2_data)); + cpustate->device->save_item(NAME(cpustate->port3_data)); + cpustate->device->save_item(NAME(cpustate->port4_data)); + cpustate->device->save_item(NAME(cpustate->port2_written)); + cpustate->device->save_item(NAME(cpustate->port3_latched)); + cpustate->device->save_item(NAME(cpustate->p3csr)); + cpustate->device->save_item(NAME(cpustate->p3csr_is3_flag_read)); + cpustate->device->save_item(NAME(cpustate->tcsr)); + cpustate->device->save_item(NAME(cpustate->pending_tcsr)); + cpustate->device->save_item(NAME(cpustate->irq2)); + cpustate->device->save_item(NAME(cpustate->ram_ctrl)); + + cpustate->device->save_item(NAME(cpustate->counter.d)); + cpustate->device->save_item(NAME(cpustate->output_compare.d)); + cpustate->device->save_item(NAME(cpustate->input_capture)); + cpustate->device->save_item(NAME(cpustate->timer_over.d)); + + cpustate->device->save_item(NAME(cpustate->clock)); + cpustate->device->save_item(NAME(cpustate->trcsr)); + cpustate->device->save_item(NAME(cpustate->rmcr)); + cpustate->device->save_item(NAME(cpustate->rdr)); + cpustate->device->save_item(NAME(cpustate->tdr)); + cpustate->device->save_item(NAME(cpustate->rsr)); + cpustate->device->save_item(NAME(cpustate->tsr)); + cpustate->device->save_item(NAME(cpustate->rxbits)); + cpustate->device->save_item(NAME(cpustate->txbits)); + cpustate->device->save_item(NAME(cpustate->txstate)); + cpustate->device->save_item(NAME(cpustate->trcsr_read_tdre)); + cpustate->device->save_item(NAME(cpustate->trcsr_read_orfe)); + cpustate->device->save_item(NAME(cpustate->trcsr_read_rdrf)); + cpustate->device->save_item(NAME(cpustate->tx)); } static CPU_INIT( m6800 ) diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 2dbbc94fbc1..563f5e213f7 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -752,23 +752,23 @@ static CPU_INIT( m68k ) } /* Note, D covers A because the dar array is common, REG_A=REG_D+8 */ - state_save_register_device_item_array(device, 0, REG_D); - state_save_register_device_item(device, 0, REG_PPC); - state_save_register_device_item(device, 0, REG_PC); - state_save_register_device_item(device, 0, REG_USP); - state_save_register_device_item(device, 0, REG_ISP); - state_save_register_device_item(device, 0, REG_MSP); - state_save_register_device_item(device, 0, m68k->vbr); - state_save_register_device_item(device, 0, m68k->sfc); - state_save_register_device_item(device, 0, m68k->dfc); - state_save_register_device_item(device, 0, m68k->cacr); - state_save_register_device_item(device, 0, m68k->caar); - state_save_register_device_item(device, 0, m68k->save_sr); - state_save_register_device_item(device, 0, m68k->int_level); - state_save_register_device_item(device, 0, m68k->save_stopped); - state_save_register_device_item(device, 0, m68k->save_halted); - state_save_register_device_item(device, 0, m68k->pref_addr); - state_save_register_device_item(device, 0, m68k->pref_data); + device->save_item(NAME(REG_D)); + device->save_item(NAME(REG_PPC)); + device->save_item(NAME(REG_PC)); + device->save_item(NAME(REG_USP)); + device->save_item(NAME(REG_ISP)); + device->save_item(NAME(REG_MSP)); + device->save_item(NAME(m68k->vbr)); + device->save_item(NAME(m68k->sfc)); + device->save_item(NAME(m68k->dfc)); + device->save_item(NAME(m68k->cacr)); + device->save_item(NAME(m68k->caar)); + device->save_item(NAME(m68k->save_sr)); + device->save_item(NAME(m68k->int_level)); + device->save_item(NAME(m68k->save_stopped)); + device->save_item(NAME(m68k->save_halted)); + device->save_item(NAME(m68k->pref_addr)); + device->save_item(NAME(m68k->pref_data)); device->machine->state().register_presave(m68k_presave, m68k); device->machine->state().register_postload(m68k_postload, m68k); } diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index c1e9bd9f306..30ae0cbfdd2 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -462,13 +462,13 @@ static void Interrupt( m6805_Regs *cpustate ) static void state_register(m6805_Regs *cpustate, const char *type, legacy_cpu_device *device) { - state_save_register_device_item(device, 0, A); - state_save_register_device_item(device, 0, PC); - state_save_register_device_item(device, 0, S); - state_save_register_device_item(device, 0, X); - state_save_register_device_item(device, 0, CC); - state_save_register_device_item(device, 0, cpustate->pending_interrupts); - state_save_register_device_item_array(device, 0, cpustate->irq_state); + device->save_item(NAME(A)); + device->save_item(NAME(PC)); + device->save_item(NAME(S)); + device->save_item(NAME(X)); + device->save_item(NAME(CC)); + device->save_item(NAME(cpustate->pending_interrupts)); + device->save_item(NAME(cpustate->irq_state)); } static CPU_INIT( m6805 ) diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index f9a95fb186d..362c2831572 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -383,18 +383,18 @@ static CPU_INIT( m6809 ) /* setup regtable */ - state_save_register_device_item(device, 0, PC); - state_save_register_device_item(device, 0, PPC); - state_save_register_device_item(device, 0, D); - state_save_register_device_item(device, 0, DP); - state_save_register_device_item(device, 0, U); - state_save_register_device_item(device, 0, S); - state_save_register_device_item(device, 0, X); - state_save_register_device_item(device, 0, Y); - state_save_register_device_item(device, 0, CC); - state_save_register_device_item_array(device, 0, m68_state->irq_state); - state_save_register_device_item(device, 0, m68_state->int_state); - state_save_register_device_item(device, 0, m68_state->nmi_state); + device->save_item(NAME(PC)); + device->save_item(NAME(PPC)); + device->save_item(NAME(D)); + device->save_item(NAME(DP)); + device->save_item(NAME(U)); + device->save_item(NAME(S)); + device->save_item(NAME(X)); + device->save_item(NAME(Y)); + device->save_item(NAME(CC)); + device->save_item(NAME(m68_state->irq_state)); + device->save_item(NAME(m68_state->int_state)); + device->save_item(NAME(m68_state->nmi_state)); } diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c index 54175c4c078..6ba06ca866f 100644 --- a/src/emu/cpu/mb88xx/mb88xx.c +++ b/src/emu/cpu/mb88xx/mb88xx.c @@ -151,30 +151,30 @@ static CPU_INIT( mb88 ) cpustate->serial = device->machine->scheduler().timer_alloc(FUNC(serial_timer), (void *)device); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->PA); - state_save_register_device_item(device, 0, cpustate->SP[0]); - state_save_register_device_item(device, 0, cpustate->SP[1]); - state_save_register_device_item(device, 0, cpustate->SP[2]); - state_save_register_device_item(device, 0, cpustate->SP[3]); - state_save_register_device_item(device, 0, cpustate->SI); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->X); - state_save_register_device_item(device, 0, cpustate->Y); - state_save_register_device_item(device, 0, cpustate->st); - state_save_register_device_item(device, 0, cpustate->zf); - state_save_register_device_item(device, 0, cpustate->cf); - state_save_register_device_item(device, 0, cpustate->vf); - state_save_register_device_item(device, 0, cpustate->sf); - state_save_register_device_item(device, 0, cpustate->nf); - state_save_register_device_item(device, 0, cpustate->pio); - state_save_register_device_item(device, 0, cpustate->TH); - state_save_register_device_item(device, 0, cpustate->TL); - state_save_register_device_item(device, 0, cpustate->TP); - state_save_register_device_item(device, 0, cpustate->ctr); - state_save_register_device_item(device, 0, cpustate->SB); - state_save_register_device_item(device, 0, cpustate->SBcount); - state_save_register_device_item(device, 0, cpustate->pending_interrupt); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->PA)); + device->save_item(NAME(cpustate->SP[0])); + device->save_item(NAME(cpustate->SP[1])); + device->save_item(NAME(cpustate->SP[2])); + device->save_item(NAME(cpustate->SP[3])); + device->save_item(NAME(cpustate->SI)); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->X)); + device->save_item(NAME(cpustate->Y)); + device->save_item(NAME(cpustate->st)); + device->save_item(NAME(cpustate->zf)); + device->save_item(NAME(cpustate->cf)); + device->save_item(NAME(cpustate->vf)); + device->save_item(NAME(cpustate->sf)); + device->save_item(NAME(cpustate->nf)); + device->save_item(NAME(cpustate->pio)); + device->save_item(NAME(cpustate->TH)); + device->save_item(NAME(cpustate->TL)); + device->save_item(NAME(cpustate->TP)); + device->save_item(NAME(cpustate->ctr)); + device->save_item(NAME(cpustate->SB)); + device->save_item(NAME(cpustate->SBcount)); + device->save_item(NAME(cpustate->pending_interrupt)); } static CPU_RESET( mb88 ) diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index 581e9bd2456..946a3aa0998 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -897,32 +897,32 @@ static void mcs48_init(legacy_cpu_device *device, device_irq_callback irqcallbac /* ensure that regptr is valid before get_info gets called */ update_regptr(cpustate); - state_save_register_device_item(device, 0, cpustate->prevpc); - state_save_register_device_item(device, 0, cpustate->pc); - - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->psw); - state_save_register_device_item(device, 0, cpustate->p1); - state_save_register_device_item(device, 0, cpustate->p2); - state_save_register_device_item(device, 0, cpustate->ea); - state_save_register_device_item(device, 0, cpustate->timer); - state_save_register_device_item(device, 0, cpustate->prescaler); - state_save_register_device_item(device, 0, cpustate->t1_history); - state_save_register_device_item(device, 0, cpustate->sts); - state_save_register_device_item(device, 0, cpustate->dbbi); - state_save_register_device_item(device, 0, cpustate->dbbo); - - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->irq_in_progress); - state_save_register_device_item(device, 0, cpustate->timer_overflow); - state_save_register_device_item(device, 0, cpustate->timer_flag); - state_save_register_device_item(device, 0, cpustate->tirq_enabled); - state_save_register_device_item(device, 0, cpustate->xirq_enabled); - state_save_register_device_item(device, 0, cpustate->timecount_enabled); - state_save_register_device_item(device, 0, cpustate->flags_enabled); - state_save_register_device_item(device, 0, cpustate->dma_enabled); - - state_save_register_device_item(device, 0, cpustate->a11); + device->save_item(NAME(cpustate->prevpc)); + device->save_item(NAME(cpustate->pc)); + + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->psw)); + device->save_item(NAME(cpustate->p1)); + device->save_item(NAME(cpustate->p2)); + device->save_item(NAME(cpustate->ea)); + device->save_item(NAME(cpustate->timer)); + device->save_item(NAME(cpustate->prescaler)); + device->save_item(NAME(cpustate->t1_history)); + device->save_item(NAME(cpustate->sts)); + device->save_item(NAME(cpustate->dbbi)); + device->save_item(NAME(cpustate->dbbo)); + + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->irq_in_progress)); + device->save_item(NAME(cpustate->timer_overflow)); + device->save_item(NAME(cpustate->timer_flag)); + device->save_item(NAME(cpustate->tirq_enabled)); + device->save_item(NAME(cpustate->xirq_enabled)); + device->save_item(NAME(cpustate->timecount_enabled)); + device->save_item(NAME(cpustate->flags_enabled)); + device->save_item(NAME(cpustate->dma_enabled)); + + device->save_item(NAME(cpustate->a11)); } diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c index 840bc24522e..f1db04cb474 100644 --- a/src/emu/cpu/mcs51/mcs51.c +++ b/src/emu/cpu/mcs51/mcs51.c @@ -2091,18 +2091,18 @@ static CPU_INIT( mcs51 ) /* Save states */ - state_save_register_device_item(device, 0, mcs51_state->ppc); - state_save_register_device_item(device, 0, mcs51_state->pc); - state_save_register_device_item(device, 0, mcs51_state->rwm ); - state_save_register_device_item(device, 0, mcs51_state->cur_irq_prio ); - state_save_register_device_item(device, 0, mcs51_state->last_line_state ); - state_save_register_device_item(device, 0, mcs51_state->t0_cnt ); - state_save_register_device_item(device, 0, mcs51_state->t1_cnt ); - state_save_register_device_item(device, 0, mcs51_state->t2_cnt ); - state_save_register_device_item(device, 0, mcs51_state->t2ex_cnt ); - state_save_register_device_item(device, 0, mcs51_state->recalc_parity ); - state_save_register_device_item_array(device, 0, mcs51_state->irq_prio ); - state_save_register_device_item(device, 0, mcs51_state->irq_active ); + device->save_item(NAME(mcs51_state->ppc)); + device->save_item(NAME(mcs51_state->pc)); + device->save_item(NAME(mcs51_state->rwm) ); + device->save_item(NAME(mcs51_state->cur_irq_prio) ); + device->save_item(NAME(mcs51_state->last_line_state) ); + device->save_item(NAME(mcs51_state->t0_cnt) ); + device->save_item(NAME(mcs51_state->t1_cnt) ); + device->save_item(NAME(mcs51_state->t2_cnt) ); + device->save_item(NAME(mcs51_state->t2ex_cnt) ); + device->save_item(NAME(mcs51_state->recalc_parity) ); + device->save_item(NAME(mcs51_state->irq_prio) ); + device->save_item(NAME(mcs51_state->irq_active) ); } static CPU_INIT( i80c51 ) @@ -2395,9 +2395,9 @@ static CPU_INIT( ds5002fp ) mcs51_state->sfr_read = ds5002fp_sfr_read; mcs51_state->sfr_write = ds5002fp_sfr_write; - state_save_register_device_item(device, 0, mcs51_state->ds5002fp.previous_ta ); - state_save_register_device_item(device, 0, mcs51_state->ds5002fp.ta_window ); - state_save_register_device_item(device, 0, mcs51_state->ds5002fp.range ); + device->save_item(NAME(mcs51_state->ds5002fp.previous_ta) ); + device->save_item(NAME(mcs51_state->ds5002fp.ta_window) ); + device->save_item(NAME(mcs51_state->ds5002fp.range) ); } diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c index 1053014df59..2c940ce60d1 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -111,17 +111,17 @@ void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, legacy mips3com_reset(mips); /* register for save states */ - state_save_register_device_item(device, 0, mips->pc); - state_save_register_device_item_array(device, 0, mips->r); - state_save_register_device_item_2d_array(device, 0, mips->cpr); - state_save_register_device_item_2d_array(device, 0, mips->ccr); - state_save_register_device_item(device, 0, mips->llbit); - state_save_register_device_item(device, 0, mips->count_zero_time); + device->save_item(NAME(mips->pc)); + device->save_item(NAME(mips->r)); + device->save_item(NAME(mips->cpr)); + device->save_item(NAME(mips->ccr)); + device->save_item(NAME(mips->llbit)); + device->save_item(NAME(mips->count_zero_time)); for (tlbindex = 0; tlbindex < mips->tlbentries; tlbindex++) { - state_save_register_device_item(device, tlbindex, mips->tlb[tlbindex].page_mask); - state_save_register_device_item(device, tlbindex, mips->tlb[tlbindex].entry_hi); - state_save_register_device_item_array(device, tlbindex, mips->tlb[tlbindex].entry_lo); + device->save_item(NAME(mips->tlb[tlbindex].page_mask), tlbindex); + device->save_item(NAME(mips->tlb[tlbindex].entry_hi), tlbindex); + device->save_item(NAME(mips->tlb[tlbindex].entry_lo), tlbindex); } } diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c index 7a7d6bdec9e..99c126d571f 100644 --- a/src/emu/cpu/mips/psx.c +++ b/src/emu/cpu/mips/psx.c @@ -1610,23 +1610,23 @@ static void mips_state_register( const char *type, legacy_cpu_device *device ) { psxcpu_state *psxcpu = get_safe_token(device); - state_save_register_device_item( device, 0, psxcpu->op ); - state_save_register_device_item( device, 0, psxcpu->pc ); - state_save_register_device_item( device, 0, psxcpu->delayv ); - state_save_register_device_item( device, 0, psxcpu->delayr ); - state_save_register_device_item( device, 0, psxcpu->hi ); - state_save_register_device_item( device, 0, psxcpu->lo ); - state_save_register_device_item( device, 0, psxcpu->biu ); - state_save_register_device_item_array( device, 0, psxcpu->r ); - state_save_register_device_item_array( device, 0, psxcpu->cp0r ); - state_save_register_device_item_array( device, 0, psxcpu->cp2cr ); - state_save_register_device_item_array( device, 0, psxcpu->cp2dr ); - state_save_register_device_item_array( device, 0, psxcpu->icacheTag ); - state_save_register_device_item_array( device, 0, psxcpu->icache ); - state_save_register_device_item_array( device, 0, psxcpu->dcache ); - state_save_register_device_item( device, 0, psxcpu->multiplier_operation ); - state_save_register_device_item( device, 0, psxcpu->multiplier_operand1 ); - state_save_register_device_item( device, 0, psxcpu->multiplier_operand2 ); + device->save_item( NAME(psxcpu->op) ); + device->save_item( NAME(psxcpu->pc) ); + device->save_item( NAME(psxcpu->delayv) ); + device->save_item( NAME(psxcpu->delayr) ); + device->save_item( NAME(psxcpu->hi) ); + device->save_item( NAME(psxcpu->lo) ); + device->save_item( NAME(psxcpu->biu) ); + device->save_item( NAME(psxcpu->r) ); + device->save_item( NAME(psxcpu->cp0r) ); + device->save_item( NAME(psxcpu->cp2cr) ); + device->save_item( NAME(psxcpu->cp2dr) ); + device->save_item( NAME(psxcpu->icacheTag) ); + device->save_item( NAME(psxcpu->icache) ); + device->save_item( NAME(psxcpu->dcache) ); + device->save_item( NAME(psxcpu->multiplier_operation) ); + device->save_item( NAME(psxcpu->multiplier_operand1) ); + device->save_item( NAME(psxcpu->multiplier_operand2) ); device->machine->state().register_postload( mips_postload, psxcpu ); } diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index 1b7b9123a71..a52d1254aa1 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -278,20 +278,20 @@ static CPU_INIT(mn10200) cpustate->program = device->space(AS_PROGRAM); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item_array(device, 0, cpustate->d); - state_save_register_device_item_array(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->nmicr); - state_save_register_device_item(device, 0, cpustate->iagr); - state_save_register_device_item_array(device, 0, cpustate->icrl); - state_save_register_device_item_array(device, 0, cpustate->icrh); - state_save_register_device_item(device, 0, cpustate->psw); - state_save_register_device_item(device, 0, cpustate->mdr); -// state_save_register_device_item_array(device, 0, cpustate->simple_timer); -// state_save_register_device_item_array(device, 0, cpustate->prescaler); -// state_save_register_device_item_array(device, 0, cpustate->dma); -// state_save_register_device_item_array(device, 0, cpustate->serial); - state_save_register_device_item_array(device, 0, cpustate->ddr); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->d)); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->nmicr)); + device->save_item(NAME(cpustate->iagr)); + device->save_item(NAME(cpustate->icrl)); + device->save_item(NAME(cpustate->icrh)); + device->save_item(NAME(cpustate->psw)); + device->save_item(NAME(cpustate->mdr)); +// device->save_item(NAME(cpustate->simple_timer)); +// device->save_item(NAME(cpustate->prescaler)); +// device->save_item(NAME(cpustate->dma)); +// device->save_item(NAME(cpustate->serial)); + device->save_item(NAME(cpustate->ddr)); for (tmr = 0; tmr < NUM_TIMERS_8BIT; tmr++) { diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index 52130d2c90f..35f76d2fbf3 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -338,24 +338,24 @@ static void nec_init(legacy_cpu_device *device, device_irq_callback irqcallback, memset(nec_state, 0, sizeof(nec_state)); - state_save_register_device_item_array(device, 0, nec_state->regs.w); - state_save_register_device_item_array(device, 0, nec_state->sregs); - - state_save_register_device_item(device, 0, nec_state->ip); - state_save_register_device_item(device, 0, nec_state->TF); - state_save_register_device_item(device, 0, nec_state->IF); - state_save_register_device_item(device, 0, nec_state->DF); - state_save_register_device_item(device, 0, nec_state->MF); - state_save_register_device_item(device, 0, nec_state->SignVal); - state_save_register_device_item(device, 0, nec_state->AuxVal); - state_save_register_device_item(device, 0, nec_state->OverVal); - state_save_register_device_item(device, 0, nec_state->ZeroVal); - state_save_register_device_item(device, 0, nec_state->CarryVal); - state_save_register_device_item(device, 0, nec_state->ParityVal); - state_save_register_device_item(device, 0, nec_state->pending_irq); - state_save_register_device_item(device, 0, nec_state->nmi_state); - state_save_register_device_item(device, 0, nec_state->irq_state); - state_save_register_device_item(device, 0, nec_state->poll_state); + device->save_item(NAME(nec_state->regs.w)); + device->save_item(NAME(nec_state->sregs)); + + device->save_item(NAME(nec_state->ip)); + device->save_item(NAME(nec_state->TF)); + device->save_item(NAME(nec_state->IF)); + device->save_item(NAME(nec_state->DF)); + device->save_item(NAME(nec_state->MF)); + device->save_item(NAME(nec_state->SignVal)); + device->save_item(NAME(nec_state->AuxVal)); + device->save_item(NAME(nec_state->OverVal)); + device->save_item(NAME(nec_state->ZeroVal)); + device->save_item(NAME(nec_state->CarryVal)); + device->save_item(NAME(nec_state->ParityVal)); + device->save_item(NAME(nec_state->pending_irq)); + device->save_item(NAME(nec_state->nmi_state)); + device->save_item(NAME(nec_state->irq_state)); + device->save_item(NAME(nec_state->poll_state)); nec_state->irq_callback = irqcallback; nec_state->device = device; diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c index c485ba55376..e4adc5cabb8 100644 --- a/src/emu/cpu/nec/v25.c +++ b/src/emu/cpu/nec/v25.c @@ -432,49 +432,49 @@ static void v25_init(legacy_cpu_device *device, device_irq_callback irqcallback, for (int i = 0; i < 4; i++) nec_state->timers[i] = device->machine->scheduler().timer_alloc(FUNC(v25_timer_callback), nec_state); - state_save_register_device_item_array(device, 0, nec_state->ram.w); - state_save_register_device_item_array(device, 0, nec_state->intp_state); - - state_save_register_device_item(device, 0, nec_state->ip); - state_save_register_device_item(device, 0, nec_state->IBRK); - state_save_register_device_item(device, 0, nec_state->F0); - state_save_register_device_item(device, 0, nec_state->F1); - state_save_register_device_item(device, 0, nec_state->TF); - state_save_register_device_item(device, 0, nec_state->IF); - state_save_register_device_item(device, 0, nec_state->DF); - state_save_register_device_item(device, 0, nec_state->MF); - state_save_register_device_item(device, 0, nec_state->RBW); - state_save_register_device_item(device, 0, nec_state->RBB); - state_save_register_device_item(device, 0, nec_state->SignVal); - state_save_register_device_item(device, 0, nec_state->AuxVal); - state_save_register_device_item(device, 0, nec_state->OverVal); - state_save_register_device_item(device, 0, nec_state->ZeroVal); - state_save_register_device_item(device, 0, nec_state->CarryVal); - state_save_register_device_item(device, 0, nec_state->ParityVal); - state_save_register_device_item(device, 0, nec_state->pending_irq); - state_save_register_device_item(device, 0, nec_state->unmasked_irq); - state_save_register_device_item(device, 0, nec_state->bankswitch_irq); - state_save_register_device_item(device, 0, nec_state->priority_inttu); - state_save_register_device_item(device, 0, nec_state->priority_intd); - state_save_register_device_item(device, 0, nec_state->priority_intp); - state_save_register_device_item(device, 0, nec_state->priority_ints0); - state_save_register_device_item(device, 0, nec_state->priority_ints1); - state_save_register_device_item(device, 0, nec_state->IRQS); - state_save_register_device_item(device, 0, nec_state->ISPR); - state_save_register_device_item(device, 0, nec_state->nmi_state); - state_save_register_device_item(device, 0, nec_state->irq_state); - state_save_register_device_item(device, 0, nec_state->poll_state); - state_save_register_device_item(device, 0, nec_state->mode_state); - state_save_register_device_item(device, 0, nec_state->TM0); - state_save_register_device_item(device, 0, nec_state->MD0); - state_save_register_device_item(device, 0, nec_state->TM1); - state_save_register_device_item(device, 0, nec_state->MD1); - state_save_register_device_item(device, 0, nec_state->TMC0); - state_save_register_device_item(device, 0, nec_state->TMC1); - state_save_register_device_item(device, 0, nec_state->RAMEN); - state_save_register_device_item(device, 0, nec_state->TB); - state_save_register_device_item(device, 0, nec_state->PCK); - state_save_register_device_item(device, 0, nec_state->IDB); + device->save_item(NAME(nec_state->ram.w)); + device->save_item(NAME(nec_state->intp_state)); + + device->save_item(NAME(nec_state->ip)); + device->save_item(NAME(nec_state->IBRK)); + device->save_item(NAME(nec_state->F0)); + device->save_item(NAME(nec_state->F1)); + device->save_item(NAME(nec_state->TF)); + device->save_item(NAME(nec_state->IF)); + device->save_item(NAME(nec_state->DF)); + device->save_item(NAME(nec_state->MF)); + device->save_item(NAME(nec_state->RBW)); + device->save_item(NAME(nec_state->RBB)); + device->save_item(NAME(nec_state->SignVal)); + device->save_item(NAME(nec_state->AuxVal)); + device->save_item(NAME(nec_state->OverVal)); + device->save_item(NAME(nec_state->ZeroVal)); + device->save_item(NAME(nec_state->CarryVal)); + device->save_item(NAME(nec_state->ParityVal)); + device->save_item(NAME(nec_state->pending_irq)); + device->save_item(NAME(nec_state->unmasked_irq)); + device->save_item(NAME(nec_state->bankswitch_irq)); + device->save_item(NAME(nec_state->priority_inttu)); + device->save_item(NAME(nec_state->priority_intd)); + device->save_item(NAME(nec_state->priority_intp)); + device->save_item(NAME(nec_state->priority_ints0)); + device->save_item(NAME(nec_state->priority_ints1)); + device->save_item(NAME(nec_state->IRQS)); + device->save_item(NAME(nec_state->ISPR)); + device->save_item(NAME(nec_state->nmi_state)); + device->save_item(NAME(nec_state->irq_state)); + device->save_item(NAME(nec_state->poll_state)); + device->save_item(NAME(nec_state->mode_state)); + device->save_item(NAME(nec_state->TM0)); + device->save_item(NAME(nec_state->MD0)); + device->save_item(NAME(nec_state->TM1)); + device->save_item(NAME(nec_state->MD1)); + device->save_item(NAME(nec_state->TMC0)); + device->save_item(NAME(nec_state->TMC1)); + device->save_item(NAME(nec_state->RAMEN)); + device->save_item(NAME(nec_state->TB)); + device->save_item(NAME(nec_state->PCK)); + device->save_item(NAME(nec_state->IDB)); nec_state->irq_callback = irqcallback; nec_state->device = device; diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c index 46b295db334..b08d01496ff 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.c +++ b/src/emu/cpu/pic16c5x/pic16c5x.c @@ -737,37 +737,37 @@ static CPU_INIT( pic16c5x ) /* ensure the internal ram pointers are set before get_info is called */ update_internalram_ptr(cpustate); - state_save_register_device_item(device, 0, cpustate->W); - state_save_register_device_item(device, 0, cpustate->ALU); - state_save_register_device_item(device, 0, cpustate->OPTION); - state_save_register_device_item(device, 0, cpustate->TMR0); - state_save_register_device_item(device, 0, cpustate->PCL); - state_save_register_device_item(device, 0, cpustate->STATUS); - state_save_register_device_item(device, 0, cpustate->FSR); - state_save_register_device_item(device, 0, cpustate->PORTA); - state_save_register_device_item(device, 0, cpustate->PORTB); - state_save_register_device_item(device, 0, cpustate->PORTC); - state_save_register_device_item(device, 0, cpustate->TRISA); - state_save_register_device_item(device, 0, cpustate->TRISB); - state_save_register_device_item(device, 0, cpustate->TRISC); - state_save_register_device_item(device, 0, cpustate->old_T0); - state_save_register_device_item(device, 0, cpustate->old_data); - state_save_register_device_item(device, 0, cpustate->picRAMmask); - state_save_register_device_item(device, 0, cpustate->WDT); - state_save_register_device_item(device, 0, cpustate->prescaler); - state_save_register_device_item(device, 0, cpustate->STACK[0]); - state_save_register_device_item(device, 0, cpustate->STACK[1]); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->PREVPC); - state_save_register_device_item(device, 0, cpustate->CONFIG); - state_save_register_device_item(device, 0, cpustate->opcode.d); - state_save_register_device_item(device, 0, cpustate->delay_timer); - state_save_register_device_item(device, 0, cpustate->picmodel); - state_save_register_device_item(device, 0, cpustate->reset_vector); - - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->temp_config); - state_save_register_device_item(device, 0, cpustate->inst_cycles); + device->save_item(NAME(cpustate->W)); + device->save_item(NAME(cpustate->ALU)); + device->save_item(NAME(cpustate->OPTION)); + device->save_item(NAME(cpustate->TMR0)); + device->save_item(NAME(cpustate->PCL)); + device->save_item(NAME(cpustate->STATUS)); + device->save_item(NAME(cpustate->FSR)); + device->save_item(NAME(cpustate->PORTA)); + device->save_item(NAME(cpustate->PORTB)); + device->save_item(NAME(cpustate->PORTC)); + device->save_item(NAME(cpustate->TRISA)); + device->save_item(NAME(cpustate->TRISB)); + device->save_item(NAME(cpustate->TRISC)); + device->save_item(NAME(cpustate->old_T0)); + device->save_item(NAME(cpustate->old_data)); + device->save_item(NAME(cpustate->picRAMmask)); + device->save_item(NAME(cpustate->WDT)); + device->save_item(NAME(cpustate->prescaler)); + device->save_item(NAME(cpustate->STACK[0])); + device->save_item(NAME(cpustate->STACK[1])); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->PREVPC)); + device->save_item(NAME(cpustate->CONFIG)); + device->save_item(NAME(cpustate->opcode.d)); + device->save_item(NAME(cpustate->delay_timer)); + device->save_item(NAME(cpustate->picmodel)); + device->save_item(NAME(cpustate->reset_vector)); + + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->temp_config)); + device->save_item(NAME(cpustate->inst_cycles)); } diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c index c30f7066210..7b1255026bb 100644 --- a/src/emu/cpu/pic16c62x/pic16c62x.c +++ b/src/emu/cpu/pic16c62x/pic16c62x.c @@ -849,42 +849,42 @@ static CPU_INIT( pic16c62x ) build_opcode_table(); - state_save_register_device_item(device, 0, cpustate->W); - state_save_register_device_item(device, 0, cpustate->ALU); - state_save_register_device_item(device, 0, cpustate->OPTION); - state_save_register_device_item(device, 0, cpustate->PCLATH); - state_save_register_device_item(device, 0, cpustate->TMR0); - state_save_register_device_item(device, 0, cpustate->PCL); - state_save_register_device_item(device, 0, cpustate->STATUS); - state_save_register_device_item(device, 0, cpustate->FSR); - state_save_register_device_item(device, 0, cpustate->PORTA); - state_save_register_device_item(device, 0, cpustate->PORTB); - state_save_register_device_item(device, 0, cpustate->TRISA); - state_save_register_device_item(device, 0, cpustate->TRISB); - state_save_register_device_item(device, 0, cpustate->old_T0); - state_save_register_device_item(device, 0, cpustate->old_data); - state_save_register_device_item(device, 0, cpustate->picRAMmask); - state_save_register_device_item(device, 0, cpustate->WDT); - state_save_register_device_item(device, 0, cpustate->prescaler); - state_save_register_device_item(device, 0, cpustate->STACK[0]); - state_save_register_device_item(device, 0, cpustate->STACK[1]); - state_save_register_device_item(device, 0, cpustate->STACK[2]); - state_save_register_device_item(device, 0, cpustate->STACK[3]); - state_save_register_device_item(device, 0, cpustate->STACK[4]); - state_save_register_device_item(device, 0, cpustate->STACK[5]); - state_save_register_device_item(device, 0, cpustate->STACK[6]); - state_save_register_device_item(device, 0, cpustate->STACK[7]); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->PREVPC); - state_save_register_device_item(device, 0, cpustate->CONFIG); - state_save_register_device_item(device, 0, cpustate->opcode.d); - state_save_register_device_item(device, 0, cpustate->delay_timer); - state_save_register_device_item(device, 0, cpustate->picmodel); - state_save_register_device_item(device, 0, cpustate->reset_vector); - - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->temp_config); - state_save_register_device_item(device, 0, cpustate->inst_cycles); + device->save_item(NAME(cpustate->W)); + device->save_item(NAME(cpustate->ALU)); + device->save_item(NAME(cpustate->OPTION)); + device->save_item(NAME(cpustate->PCLATH)); + device->save_item(NAME(cpustate->TMR0)); + device->save_item(NAME(cpustate->PCL)); + device->save_item(NAME(cpustate->STATUS)); + device->save_item(NAME(cpustate->FSR)); + device->save_item(NAME(cpustate->PORTA)); + device->save_item(NAME(cpustate->PORTB)); + device->save_item(NAME(cpustate->TRISA)); + device->save_item(NAME(cpustate->TRISB)); + device->save_item(NAME(cpustate->old_T0)); + device->save_item(NAME(cpustate->old_data)); + device->save_item(NAME(cpustate->picRAMmask)); + device->save_item(NAME(cpustate->WDT)); + device->save_item(NAME(cpustate->prescaler)); + device->save_item(NAME(cpustate->STACK[0])); + device->save_item(NAME(cpustate->STACK[1])); + device->save_item(NAME(cpustate->STACK[2])); + device->save_item(NAME(cpustate->STACK[3])); + device->save_item(NAME(cpustate->STACK[4])); + device->save_item(NAME(cpustate->STACK[5])); + device->save_item(NAME(cpustate->STACK[6])); + device->save_item(NAME(cpustate->STACK[7])); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->PREVPC)); + device->save_item(NAME(cpustate->CONFIG)); + device->save_item(NAME(cpustate->opcode.d)); + device->save_item(NAME(cpustate->delay_timer)); + device->save_item(NAME(cpustate->picmodel)); + device->save_item(NAME(cpustate->reset_vector)); + + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->temp_config)); + device->save_item(NAME(cpustate->inst_cycles)); } diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c index 2e94aca74e8..9b1ec9f368f 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -339,36 +339,36 @@ void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_di } /* register for save states */ - state_save_register_device_item(device, 0, ppc->pc); - state_save_register_device_item_array(device, 0, ppc->r); - state_save_register_device_item_array(device, 0, ppc->f); - state_save_register_device_item_array(device, 0, ppc->cr); - state_save_register_device_item(device, 0, ppc->xerso); - state_save_register_device_item(device, 0, ppc->fpscr); - state_save_register_device_item(device, 0, ppc->msr); - state_save_register_device_item_array(device, 0, ppc->sr); - state_save_register_device_item_array(device, 0, ppc->spr); - state_save_register_device_item_array(device, 0, ppc->dcr); + device->save_item(NAME(ppc->pc)); + device->save_item(NAME(ppc->r)); + device->save_item(NAME(ppc->f)); + device->save_item(NAME(ppc->cr)); + device->save_item(NAME(ppc->xerso)); + device->save_item(NAME(ppc->fpscr)); + device->save_item(NAME(ppc->msr)); + device->save_item(NAME(ppc->sr)); + device->save_item(NAME(ppc->spr)); + device->save_item(NAME(ppc->dcr)); if (cap & PPCCAP_4XX) { - state_save_register_device_item_array(device, 0, ppc->spu.regs); - state_save_register_device_item(device, 0, ppc->spu.txbuf); - state_save_register_device_item(device, 0, ppc->spu.rxbuf); - state_save_register_device_item_array(device, 0, ppc->spu.rxbuffer); - state_save_register_device_item(device, 0, ppc->spu.rxin); - state_save_register_device_item(device, 0, ppc->spu.rxout); - state_save_register_device_item(device, 0, ppc->pit_reload); - state_save_register_device_item(device, 0, ppc->irqstate); + device->save_item(NAME(ppc->spu.regs)); + device->save_item(NAME(ppc->spu.txbuf)); + device->save_item(NAME(ppc->spu.rxbuf)); + device->save_item(NAME(ppc->spu.rxbuffer)); + device->save_item(NAME(ppc->spu.rxin)); + device->save_item(NAME(ppc->spu.rxout)); + device->save_item(NAME(ppc->pit_reload)); + device->save_item(NAME(ppc->irqstate)); } if (cap & PPCCAP_603_MMU) { - state_save_register_device_item(device, 0, ppc->mmu603_cmp); - state_save_register_device_item_array(device, 0, ppc->mmu603_hash); - state_save_register_device_item_array(device, 0, ppc->mmu603_r); + device->save_item(NAME(ppc->mmu603_cmp)); + device->save_item(NAME(ppc->mmu603_hash)); + device->save_item(NAME(ppc->mmu603_r)); } - state_save_register_device_item(device, 0, ppc->irq_pending); - state_save_register_device_item(device, 0, ppc->tb_zero_cycles); - state_save_register_device_item(device, 0, ppc->dec_zero_cycles); + device->save_item(NAME(ppc->irq_pending)); + device->save_item(NAME(ppc->tb_zero_cycles)); + device->save_item(NAME(ppc->dec_zero_cycles)); } diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c index 6791eb0c7f7..93b0bba0e72 100644 --- a/src/emu/cpu/pps4/pps4.c +++ b/src/emu/cpu/pps4/pps4.c @@ -343,15 +343,15 @@ static CPU_INIT( pps4 ) cpustate->data = device->space(AS_DATA); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->A); - state_save_register_device_item(device, 0, cpustate->X); - state_save_register_device_item(device, 0, cpustate->P); - state_save_register_device_item(device, 0, cpustate->SA); - state_save_register_device_item(device, 0, cpustate->SB); - state_save_register_device_item(device, 0, cpustate->B); - state_save_register_device_item(device, 0, cpustate->C); - state_save_register_device_item(device, 0, cpustate->FF1); - state_save_register_device_item(device, 0, cpustate->FF2); + device->save_item(NAME(cpustate->A)); + device->save_item(NAME(cpustate->X)); + device->save_item(NAME(cpustate->P)); + device->save_item(NAME(cpustate->SA)); + device->save_item(NAME(cpustate->SB)); + device->save_item(NAME(cpustate->B)); + device->save_item(NAME(cpustate->C)); + device->save_item(NAME(cpustate->FF1)); + device->save_item(NAME(cpustate->FF2)); } /*************************************************************************** diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index 23acfd5b012..7f6d1d8ed3e 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -800,18 +800,18 @@ static CPU_INIT( s2650 ) s2650c->direct = &s2650c->program->direct(); s2650c->io = device->space(AS_IO); - state_save_register_device_item(device, 0, s2650c->ppc); - state_save_register_device_item(device, 0, s2650c->page); - state_save_register_device_item(device, 0, s2650c->iar); - state_save_register_device_item(device, 0, s2650c->ea); - state_save_register_device_item(device, 0, s2650c->psl); - state_save_register_device_item(device, 0, s2650c->psu); - state_save_register_device_item(device, 0, s2650c->r); - state_save_register_device_item_array(device, 0, s2650c->reg); - state_save_register_device_item(device, 0, s2650c->halt); - state_save_register_device_item(device, 0, s2650c->ir); - state_save_register_device_item_array(device, 0, s2650c->ras); - state_save_register_device_item(device, 0, s2650c->irq_state); + device->save_item(NAME(s2650c->ppc)); + device->save_item(NAME(s2650c->page)); + device->save_item(NAME(s2650c->iar)); + device->save_item(NAME(s2650c->ea)); + device->save_item(NAME(s2650c->psl)); + device->save_item(NAME(s2650c->psu)); + device->save_item(NAME(s2650c->r)); + device->save_item(NAME(s2650c->reg)); + device->save_item(NAME(s2650c->halt)); + device->save_item(NAME(s2650c->ir)); + device->save_item(NAME(s2650c->ras)); + device->save_item(NAME(s2650c->irq_state)); } static CPU_RESET( s2650 ) diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 8b3156c6456..53bf61b9021 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -118,29 +118,29 @@ static CPU_INIT( saturn ) cpustate->program = device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - state_save_register_device_item_array(device, 0,cpustate->reg[R0]); - state_save_register_device_item_array(device, 0,cpustate->reg[R1]); - state_save_register_device_item_array(device, 0,cpustate->reg[R2]); - state_save_register_device_item_array(device, 0,cpustate->reg[R3]); - state_save_register_device_item_array(device, 0,cpustate->reg[R4]); - state_save_register_device_item_array(device, 0,cpustate->reg[A]); - state_save_register_device_item_array(device, 0,cpustate->reg[B]); - state_save_register_device_item_array(device, 0,cpustate->reg[C]); - state_save_register_device_item_array(device, 0,cpustate->reg[D]); - state_save_register_device_item_array(device, 0,cpustate->d); - state_save_register_device_item(device, 0,cpustate->pc); - state_save_register_device_item(device, 0,cpustate->oldpc); - state_save_register_device_item_array(device, 0,cpustate->rstk); - state_save_register_device_item(device, 0,cpustate->out); - state_save_register_device_item(device, 0,cpustate->carry); - state_save_register_device_item(device, 0,cpustate->st); - state_save_register_device_item(device, 0,cpustate->hst); - state_save_register_device_item(device, 0,cpustate->nmi_state); - state_save_register_device_item(device, 0,cpustate->irq_state); - state_save_register_device_item(device, 0,cpustate->irq_enable); - state_save_register_device_item(device, 0,cpustate->in_irq); - state_save_register_device_item(device, 0,cpustate->pending_irq); - state_save_register_device_item(device, 0,cpustate->sleeping); + device->save_item(NAME(cpustate->reg[R0])); + device->save_item(NAME(cpustate->reg[R1])); + device->save_item(NAME(cpustate->reg[R2])); + device->save_item(NAME(cpustate->reg[R3])); + device->save_item(NAME(cpustate->reg[R4])); + device->save_item(NAME(cpustate->reg[A])); + device->save_item(NAME(cpustate->reg[B])); + device->save_item(NAME(cpustate->reg[C])); + device->save_item(NAME(cpustate->reg[D])); + device->save_item(NAME(cpustate->d)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->oldpc)); + device->save_item(NAME(cpustate->rstk)); + device->save_item(NAME(cpustate->out)); + device->save_item(NAME(cpustate->carry)); + device->save_item(NAME(cpustate->st)); + device->save_item(NAME(cpustate->hst)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->irq_enable)); + device->save_item(NAME(cpustate->in_irq)); + device->save_item(NAME(cpustate->pending_irq)); + device->save_item(NAME(cpustate->sleeping)); } static CPU_RESET( saturn ) diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c index 6ba324da679..8b578771a2f 100644 --- a/src/emu/cpu/scmp/scmp.c +++ b/src/emu/cpu/scmp/scmp.c @@ -525,13 +525,13 @@ static CPU_INIT( scmp ) devcb_resolve_read_line(&cpustate->senseb_func, &cpustate->config.senseb_func, device); devcb_resolve_write_line(&cpustate->halt_func, &cpustate->config.halt_func, device); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->P1); - state_save_register_device_item(device, 0, cpustate->P2); - state_save_register_device_item(device, 0, cpustate->P3); - state_save_register_device_item(device, 0, cpustate->AC); - state_save_register_device_item(device, 0, cpustate->ER); - state_save_register_device_item(device, 0, cpustate->SR); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->P1)); + device->save_item(NAME(cpustate->P2)); + device->save_item(NAME(cpustate->P3)); + device->save_item(NAME(cpustate->AC)); + device->save_item(NAME(cpustate->ER)); + device->save_item(NAME(cpustate->SR)); } diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c index f2cbdd06752..69c2ea6f5aa 100644 --- a/src/emu/cpu/sh2/sh2comn.c +++ b/src/emu/cpu/sh2/sh2comn.c @@ -954,47 +954,47 @@ void sh2_common_init(sh2_state *sh2, legacy_cpu_device *device, device_irq_callb sh2->direct = &sh2->program->direct(); sh2->internal = device->space(AS_PROGRAM); - state_save_register_device_item(device, 0, sh2->pc); - state_save_register_device_item(device, 0, sh2->sr); - state_save_register_device_item(device, 0, sh2->pr); - state_save_register_device_item(device, 0, sh2->gbr); - state_save_register_device_item(device, 0, sh2->vbr); - state_save_register_device_item(device, 0, sh2->mach); - state_save_register_device_item(device, 0, sh2->macl); - state_save_register_device_item_array(device, 0, sh2->r); - state_save_register_device_item(device, 0, sh2->ea); - state_save_register_device_item(device, 0, sh2->delay); - state_save_register_device_item(device, 0, sh2->cpu_off); - state_save_register_device_item(device, 0, sh2->dvsr); - state_save_register_device_item(device, 0, sh2->dvdnth); - state_save_register_device_item(device, 0, sh2->dvdntl); - state_save_register_device_item(device, 0, sh2->dvcr); - state_save_register_device_item(device, 0, sh2->pending_irq); - state_save_register_device_item(device, 0, sh2->test_irq); - state_save_register_device_item(device, 0, sh2->pending_nmi); - state_save_register_device_item(device, 0, sh2->irqline); - state_save_register_device_item(device, 0, sh2->evec); - state_save_register_device_item(device, 0, sh2->irqsr); - state_save_register_device_item(device, 0, sh2->target); + device->save_item(NAME(sh2->pc)); + device->save_item(NAME(sh2->sr)); + device->save_item(NAME(sh2->pr)); + device->save_item(NAME(sh2->gbr)); + device->save_item(NAME(sh2->vbr)); + device->save_item(NAME(sh2->mach)); + device->save_item(NAME(sh2->macl)); + device->save_item(NAME(sh2->r)); + device->save_item(NAME(sh2->ea)); + device->save_item(NAME(sh2->delay)); + device->save_item(NAME(sh2->cpu_off)); + device->save_item(NAME(sh2->dvsr)); + device->save_item(NAME(sh2->dvdnth)); + device->save_item(NAME(sh2->dvdntl)); + device->save_item(NAME(sh2->dvcr)); + device->save_item(NAME(sh2->pending_irq)); + device->save_item(NAME(sh2->test_irq)); + device->save_item(NAME(sh2->pending_nmi)); + device->save_item(NAME(sh2->irqline)); + device->save_item(NAME(sh2->evec)); + device->save_item(NAME(sh2->irqsr)); + device->save_item(NAME(sh2->target)); for (i = 0; i < 16; ++i) { - state_save_register_device_item(device, i, sh2->irq_queue[i].irq_vector); - state_save_register_device_item(device, i, sh2->irq_queue[i].irq_priority); + device->save_item(NAME(sh2->irq_queue[i].irq_vector), i); + device->save_item(NAME(sh2->irq_queue[i].irq_priority), i); } - state_save_register_device_item(device, 0, sh2->pcfsel); - state_save_register_device_item(device, 0, sh2->maxpcfsel); - state_save_register_device_item_array(device, 0, sh2->pcflushes); - state_save_register_device_item_array(device, 0, sh2->irq_line_state); - state_save_register_device_item_pointer(device, 0, sh2->m, 0x200/4); - state_save_register_device_item(device, 0, sh2->nmi_line_state); - state_save_register_device_item(device, 0, sh2->frc); - state_save_register_device_item(device, 0, sh2->ocra); - state_save_register_device_item(device, 0, sh2->ocrb); - state_save_register_device_item(device, 0, sh2->icr); - state_save_register_device_item(device, 0, sh2->frc_base); - state_save_register_device_item(device, 0, sh2->frt_input); - state_save_register_device_item(device, 0, sh2->internal_irq_level); - state_save_register_device_item(device, 0, sh2->internal_irq_vector); - state_save_register_device_item_array(device, 0, sh2->dma_timer_active); + device->save_item(NAME(sh2->pcfsel)); + device->save_item(NAME(sh2->maxpcfsel)); + device->save_item(NAME(sh2->pcflushes)); + device->save_item(NAME(sh2->irq_line_state)); + device->save_pointer(NAME(sh2->m), 0x200/4); + device->save_item(NAME(sh2->nmi_line_state)); + device->save_item(NAME(sh2->frc)); + device->save_item(NAME(sh2->ocra)); + device->save_item(NAME(sh2->ocrb)); + device->save_item(NAME(sh2->icr)); + device->save_item(NAME(sh2->frc_base)); + device->save_item(NAME(sh2->frt_input)); + device->save_item(NAME(sh2->internal_irq_level)); + device->save_item(NAME(sh2->internal_irq_vector)); + device->save_item(NAME(sh2->dma_timer_active)); } diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index b4c1a3582dd..5c37404d059 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3393,70 +3393,70 @@ static CPU_INIT( sh4 ) sh4->irln = 15; sh4->test_irq = 0; - state_save_register_device_item(device, 0, sh4->pc); - state_save_register_device_item(device, 0, sh4->r[15]); - state_save_register_device_item(device, 0, sh4->sr); - state_save_register_device_item(device, 0, sh4->pr); - state_save_register_device_item(device, 0, sh4->gbr); - state_save_register_device_item(device, 0, sh4->vbr); - state_save_register_device_item(device, 0, sh4->mach); - state_save_register_device_item(device, 0, sh4->macl); - state_save_register_device_item(device, 0, sh4->spc); - state_save_register_device_item(device, 0, sh4->ssr); - state_save_register_device_item(device, 0, sh4->sgr); - state_save_register_device_item(device, 0, sh4->fpscr); - state_save_register_device_item(device, 0, sh4->r[ 0]); - state_save_register_device_item(device, 0, sh4->r[ 1]); - state_save_register_device_item(device, 0, sh4->r[ 2]); - state_save_register_device_item(device, 0, sh4->r[ 3]); - state_save_register_device_item(device, 0, sh4->r[ 4]); - state_save_register_device_item(device, 0, sh4->r[ 5]); - state_save_register_device_item(device, 0, sh4->r[ 6]); - state_save_register_device_item(device, 0, sh4->r[ 7]); - state_save_register_device_item(device, 0, sh4->r[ 8]); - state_save_register_device_item(device, 0, sh4->r[ 9]); - state_save_register_device_item(device, 0, sh4->r[10]); - state_save_register_device_item(device, 0, sh4->r[11]); - state_save_register_device_item(device, 0, sh4->r[12]); - state_save_register_device_item(device, 0, sh4->r[13]); - state_save_register_device_item(device, 0, sh4->r[14]); - state_save_register_device_item(device, 0, sh4->fr[ 0]); - state_save_register_device_item(device, 0, sh4->fr[ 1]); - state_save_register_device_item(device, 0, sh4->fr[ 2]); - state_save_register_device_item(device, 0, sh4->fr[ 3]); - state_save_register_device_item(device, 0, sh4->fr[ 4]); - state_save_register_device_item(device, 0, sh4->fr[ 5]); - state_save_register_device_item(device, 0, sh4->fr[ 6]); - state_save_register_device_item(device, 0, sh4->fr[ 7]); - state_save_register_device_item(device, 0, sh4->fr[ 8]); - state_save_register_device_item(device, 0, sh4->fr[ 9]); - state_save_register_device_item(device, 0, sh4->fr[10]); - state_save_register_device_item(device, 0, sh4->fr[11]); - state_save_register_device_item(device, 0, sh4->fr[12]); - state_save_register_device_item(device, 0, sh4->fr[13]); - state_save_register_device_item(device, 0, sh4->fr[14]); - state_save_register_device_item(device, 0, sh4->fr[15]); - state_save_register_device_item(device, 0, sh4->xf[ 0]); - state_save_register_device_item(device, 0, sh4->xf[ 1]); - state_save_register_device_item(device, 0, sh4->xf[ 2]); - state_save_register_device_item(device, 0, sh4->xf[ 3]); - state_save_register_device_item(device, 0, sh4->xf[ 4]); - state_save_register_device_item(device, 0, sh4->xf[ 5]); - state_save_register_device_item(device, 0, sh4->xf[ 6]); - state_save_register_device_item(device, 0, sh4->xf[ 7]); - state_save_register_device_item(device, 0, sh4->xf[ 8]); - state_save_register_device_item(device, 0, sh4->xf[ 9]); - state_save_register_device_item(device, 0, sh4->xf[10]); - state_save_register_device_item(device, 0, sh4->xf[11]); - state_save_register_device_item(device, 0, sh4->xf[12]); - state_save_register_device_item(device, 0, sh4->xf[13]); - state_save_register_device_item(device, 0, sh4->xf[14]); - state_save_register_device_item(device, 0, sh4->xf[15]); - state_save_register_device_item(device, 0, sh4->ea); - state_save_register_device_item(device, 0, sh4->fpul); - state_save_register_device_item(device, 0, sh4->dbr); - state_save_register_device_item_array(device, 0, sh4->exception_priority); - state_save_register_device_item_array(device, 0, sh4->exception_requesting); + device->save_item(NAME(sh4->pc)); + device->save_item(NAME(sh4->r[15])); + device->save_item(NAME(sh4->sr)); + device->save_item(NAME(sh4->pr)); + device->save_item(NAME(sh4->gbr)); + device->save_item(NAME(sh4->vbr)); + device->save_item(NAME(sh4->mach)); + device->save_item(NAME(sh4->macl)); + device->save_item(NAME(sh4->spc)); + device->save_item(NAME(sh4->ssr)); + device->save_item(NAME(sh4->sgr)); + device->save_item(NAME(sh4->fpscr)); + device->save_item(NAME(sh4->r[ 0])); + device->save_item(NAME(sh4->r[ 1])); + device->save_item(NAME(sh4->r[ 2])); + device->save_item(NAME(sh4->r[ 3])); + device->save_item(NAME(sh4->r[ 4])); + device->save_item(NAME(sh4->r[ 5])); + device->save_item(NAME(sh4->r[ 6])); + device->save_item(NAME(sh4->r[ 7])); + device->save_item(NAME(sh4->r[ 8])); + device->save_item(NAME(sh4->r[ 9])); + device->save_item(NAME(sh4->r[10])); + device->save_item(NAME(sh4->r[11])); + device->save_item(NAME(sh4->r[12])); + device->save_item(NAME(sh4->r[13])); + device->save_item(NAME(sh4->r[14])); + device->save_item(NAME(sh4->fr[ 0])); + device->save_item(NAME(sh4->fr[ 1])); + device->save_item(NAME(sh4->fr[ 2])); + device->save_item(NAME(sh4->fr[ 3])); + device->save_item(NAME(sh4->fr[ 4])); + device->save_item(NAME(sh4->fr[ 5])); + device->save_item(NAME(sh4->fr[ 6])); + device->save_item(NAME(sh4->fr[ 7])); + device->save_item(NAME(sh4->fr[ 8])); + device->save_item(NAME(sh4->fr[ 9])); + device->save_item(NAME(sh4->fr[10])); + device->save_item(NAME(sh4->fr[11])); + device->save_item(NAME(sh4->fr[12])); + device->save_item(NAME(sh4->fr[13])); + device->save_item(NAME(sh4->fr[14])); + device->save_item(NAME(sh4->fr[15])); + device->save_item(NAME(sh4->xf[ 0])); + device->save_item(NAME(sh4->xf[ 1])); + device->save_item(NAME(sh4->xf[ 2])); + device->save_item(NAME(sh4->xf[ 3])); + device->save_item(NAME(sh4->xf[ 4])); + device->save_item(NAME(sh4->xf[ 5])); + device->save_item(NAME(sh4->xf[ 6])); + device->save_item(NAME(sh4->xf[ 7])); + device->save_item(NAME(sh4->xf[ 8])); + device->save_item(NAME(sh4->xf[ 9])); + device->save_item(NAME(sh4->xf[10])); + device->save_item(NAME(sh4->xf[11])); + device->save_item(NAME(sh4->xf[12])); + device->save_item(NAME(sh4->xf[13])); + device->save_item(NAME(sh4->xf[14])); + device->save_item(NAME(sh4->xf[15])); + device->save_item(NAME(sh4->ea)); + device->save_item(NAME(sh4->fpul)); + device->save_item(NAME(sh4->dbr)); + device->save_item(NAME(sh4->exception_priority)); + device->save_item(NAME(sh4->exception_requesting)); } diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 757b1206ac1..6a73387e9cf 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -434,120 +434,120 @@ static CPU_INIT( sharc ) cpustate->internal_ram_block0 = &cpustate->internal_ram[0]; cpustate->internal_ram_block1 = &cpustate->internal_ram[0x20000/2]; - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item_pointer(device, 0, (&cpustate->r[0].r), ARRAY_LENGTH(cpustate->r)); - state_save_register_device_item_pointer(device, 0, (&cpustate->reg_alt[0].r), ARRAY_LENGTH(cpustate->reg_alt)); - state_save_register_device_item(device, 0, cpustate->mrf); - state_save_register_device_item(device, 0, cpustate->mrb); - - state_save_register_device_item_array(device, 0, cpustate->pcstack); - state_save_register_device_item_array(device, 0, cpustate->lcstack); - state_save_register_device_item_array(device, 0, cpustate->lastack); - state_save_register_device_item(device, 0, cpustate->lstkp); - - state_save_register_device_item(device, 0, cpustate->faddr); - state_save_register_device_item(device, 0, cpustate->daddr); - state_save_register_device_item(device, 0, cpustate->pcstk); - state_save_register_device_item(device, 0, cpustate->pcstkp); - state_save_register_device_item(device, 0, cpustate->laddr); - state_save_register_device_item(device, 0, cpustate->curlcntr); - state_save_register_device_item(device, 0, cpustate->lcntr); - - state_save_register_device_item_array(device, 0, cpustate->dag1.i); - state_save_register_device_item_array(device, 0, cpustate->dag1.m); - state_save_register_device_item_array(device, 0, cpustate->dag1.b); - state_save_register_device_item_array(device, 0, cpustate->dag1.l); - state_save_register_device_item_array(device, 0, cpustate->dag2.i); - state_save_register_device_item_array(device, 0, cpustate->dag2.m); - state_save_register_device_item_array(device, 0, cpustate->dag2.b); - state_save_register_device_item_array(device, 0, cpustate->dag2.l); - state_save_register_device_item_array(device, 0, cpustate->dag1_alt.i); - state_save_register_device_item_array(device, 0, cpustate->dag1_alt.m); - state_save_register_device_item_array(device, 0, cpustate->dag1_alt.b); - state_save_register_device_item_array(device, 0, cpustate->dag1_alt.l); - state_save_register_device_item_array(device, 0, cpustate->dag2_alt.i); - state_save_register_device_item_array(device, 0, cpustate->dag2_alt.m); - state_save_register_device_item_array(device, 0, cpustate->dag2_alt.b); - state_save_register_device_item_array(device, 0, cpustate->dag2_alt.l); + device->save_item(NAME(cpustate->pc)); + device->save_pointer(NAME(&cpustate->r[0].r), ARRAY_LENGTH(cpustate->r)); + device->save_pointer(NAME(&cpustate->reg_alt[0].r), ARRAY_LENGTH(cpustate->reg_alt)); + device->save_item(NAME(cpustate->mrf)); + device->save_item(NAME(cpustate->mrb)); + + device->save_item(NAME(cpustate->pcstack)); + device->save_item(NAME(cpustate->lcstack)); + device->save_item(NAME(cpustate->lastack)); + device->save_item(NAME(cpustate->lstkp)); + + device->save_item(NAME(cpustate->faddr)); + device->save_item(NAME(cpustate->daddr)); + device->save_item(NAME(cpustate->pcstk)); + device->save_item(NAME(cpustate->pcstkp)); + device->save_item(NAME(cpustate->laddr)); + device->save_item(NAME(cpustate->curlcntr)); + device->save_item(NAME(cpustate->lcntr)); + + device->save_item(NAME(cpustate->dag1.i)); + device->save_item(NAME(cpustate->dag1.m)); + device->save_item(NAME(cpustate->dag1.b)); + device->save_item(NAME(cpustate->dag1.l)); + device->save_item(NAME(cpustate->dag2.i)); + device->save_item(NAME(cpustate->dag2.m)); + device->save_item(NAME(cpustate->dag2.b)); + device->save_item(NAME(cpustate->dag2.l)); + device->save_item(NAME(cpustate->dag1_alt.i)); + device->save_item(NAME(cpustate->dag1_alt.m)); + device->save_item(NAME(cpustate->dag1_alt.b)); + device->save_item(NAME(cpustate->dag1_alt.l)); + device->save_item(NAME(cpustate->dag2_alt.i)); + device->save_item(NAME(cpustate->dag2_alt.m)); + device->save_item(NAME(cpustate->dag2_alt.b)); + device->save_item(NAME(cpustate->dag2_alt.l)); for (saveindex = 0; saveindex < ARRAY_LENGTH(cpustate->dma); saveindex++) { - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].control); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].int_index); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].int_modifier); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].int_count); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].chain_ptr); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].gen_purpose); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].ext_index); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].ext_modifier); - state_save_register_device_item(device, saveindex, cpustate->dma[saveindex].ext_count); + device->save_item(NAME(cpustate->dma[saveindex].control), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].int_index), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].int_modifier), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].int_count), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].chain_ptr), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].gen_purpose), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].ext_index), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].ext_modifier), saveindex); + device->save_item(NAME(cpustate->dma[saveindex].ext_count), saveindex); } - state_save_register_device_item(device, 0, cpustate->mode1); - state_save_register_device_item(device, 0, cpustate->mode2); - state_save_register_device_item(device, 0, cpustate->astat); - state_save_register_device_item(device, 0, cpustate->stky); - state_save_register_device_item(device, 0, cpustate->irptl); - state_save_register_device_item(device, 0, cpustate->imask); - state_save_register_device_item(device, 0, cpustate->imaskp); - state_save_register_device_item(device, 0, cpustate->ustat1); - state_save_register_device_item(device, 0, cpustate->ustat2); + device->save_item(NAME(cpustate->mode1)); + device->save_item(NAME(cpustate->mode2)); + device->save_item(NAME(cpustate->astat)); + device->save_item(NAME(cpustate->stky)); + device->save_item(NAME(cpustate->irptl)); + device->save_item(NAME(cpustate->imask)); + device->save_item(NAME(cpustate->imaskp)); + device->save_item(NAME(cpustate->ustat1)); + device->save_item(NAME(cpustate->ustat2)); - state_save_register_device_item_array(device, 0, cpustate->flag); + device->save_item(NAME(cpustate->flag)); - state_save_register_device_item(device, 0, cpustate->syscon); - state_save_register_device_item(device, 0, cpustate->sysstat); + device->save_item(NAME(cpustate->syscon)); + device->save_item(NAME(cpustate->sysstat)); for (saveindex = 0; saveindex < ARRAY_LENGTH(cpustate->status_stack); saveindex++) { - state_save_register_device_item(device, saveindex, cpustate->status_stack[saveindex].mode1); - state_save_register_device_item(device, saveindex, cpustate->status_stack[saveindex].astat); + device->save_item(NAME(cpustate->status_stack[saveindex].mode1), saveindex); + device->save_item(NAME(cpustate->status_stack[saveindex].astat), saveindex); } - state_save_register_device_item(device, 0, cpustate->status_stkp); + device->save_item(NAME(cpustate->status_stkp)); - state_save_register_device_item(device, 0, cpustate->px); + device->save_item(NAME(cpustate->px)); - state_save_register_device_item_pointer(device, 0, cpustate->internal_ram, 2 * 0x10000); + device->save_pointer(NAME(cpustate->internal_ram), 2 * 0x10000); - state_save_register_device_item(device, 0, cpustate->opcode); - state_save_register_device_item(device, 0, cpustate->fetch_opcode); - state_save_register_device_item(device, 0, cpustate->decode_opcode); + device->save_item(NAME(cpustate->opcode)); + device->save_item(NAME(cpustate->fetch_opcode)); + device->save_item(NAME(cpustate->decode_opcode)); - state_save_register_device_item(device, 0, cpustate->nfaddr); + device->save_item(NAME(cpustate->nfaddr)); - state_save_register_device_item(device, 0, cpustate->idle); - state_save_register_device_item(device, 0, cpustate->irq_active); - state_save_register_device_item(device, 0, cpustate->active_irq_num); + device->save_item(NAME(cpustate->idle)); + device->save_item(NAME(cpustate->irq_active)); + device->save_item(NAME(cpustate->active_irq_num)); - state_save_register_device_item(device, 0, cpustate->dmaop_src); - state_save_register_device_item(device, 0, cpustate->dmaop_dst); - state_save_register_device_item(device, 0, cpustate->dmaop_chain_ptr); - state_save_register_device_item(device, 0, cpustate->dmaop_src_modifier); - state_save_register_device_item(device, 0, cpustate->dmaop_dst_modifier); - state_save_register_device_item(device, 0, cpustate->dmaop_src_count); - state_save_register_device_item(device, 0, cpustate->dmaop_dst_count); - state_save_register_device_item(device, 0, cpustate->dmaop_pmode); - state_save_register_device_item(device, 0, cpustate->dmaop_cycles); - state_save_register_device_item(device, 0, cpustate->dmaop_channel); - state_save_register_device_item(device, 0, cpustate->dmaop_chained_direction); + device->save_item(NAME(cpustate->dmaop_src)); + device->save_item(NAME(cpustate->dmaop_dst)); + device->save_item(NAME(cpustate->dmaop_chain_ptr)); + device->save_item(NAME(cpustate->dmaop_src_modifier)); + device->save_item(NAME(cpustate->dmaop_dst_modifier)); + device->save_item(NAME(cpustate->dmaop_src_count)); + device->save_item(NAME(cpustate->dmaop_dst_count)); + device->save_item(NAME(cpustate->dmaop_pmode)); + device->save_item(NAME(cpustate->dmaop_cycles)); + device->save_item(NAME(cpustate->dmaop_channel)); + device->save_item(NAME(cpustate->dmaop_chained_direction)); - state_save_register_device_item(device, 0, cpustate->interrupt_active); + device->save_item(NAME(cpustate->interrupt_active)); - state_save_register_device_item(device, 0, cpustate->iop_latency_cycles); - state_save_register_device_item(device, 0, cpustate->iop_latency_reg); - state_save_register_device_item(device, 0, cpustate->iop_latency_data); + device->save_item(NAME(cpustate->iop_latency_cycles)); + device->save_item(NAME(cpustate->iop_latency_reg)); + device->save_item(NAME(cpustate->iop_latency_data)); - state_save_register_device_item(device, 0, cpustate->delay_slot1); - state_save_register_device_item(device, 0, cpustate->delay_slot2); + device->save_item(NAME(cpustate->delay_slot1)); + device->save_item(NAME(cpustate->delay_slot2)); - state_save_register_device_item(device, 0, cpustate->systemreg_latency_cycles); - state_save_register_device_item(device, 0, cpustate->systemreg_latency_reg); - state_save_register_device_item(device, 0, cpustate->systemreg_latency_data); - state_save_register_device_item(device, 0, cpustate->systemreg_previous_data); + device->save_item(NAME(cpustate->systemreg_latency_cycles)); + device->save_item(NAME(cpustate->systemreg_latency_reg)); + device->save_item(NAME(cpustate->systemreg_latency_data)); + device->save_item(NAME(cpustate->systemreg_previous_data)); - state_save_register_device_item(device, 0, cpustate->astat_old); - state_save_register_device_item(device, 0, cpustate->astat_old_old); - state_save_register_device_item(device, 0, cpustate->astat_old_old_old); + device->save_item(NAME(cpustate->astat_old)); + device->save_item(NAME(cpustate->astat_old_old)); + device->save_item(NAME(cpustate->astat_old_old_old)); } static CPU_RESET( sharc ) diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index 9bb5e595473..6855bda9dee 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -1249,33 +1249,33 @@ static void state_register( legacy_cpu_device *device ) { spc700i_cpu *cpustate = get_safe_token(device); - state_save_register_device_item(device, 0, cpustate->a); - state_save_register_device_item(device, 0, cpustate->x); - state_save_register_device_item(device, 0, cpustate->y); - state_save_register_device_item(device, 0, cpustate->s); - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item(device, 0, cpustate->ppc); - state_save_register_device_item(device, 0, cpustate->flag_n); - state_save_register_device_item(device, 0, cpustate->flag_z); - state_save_register_device_item(device, 0, cpustate->flag_v); - state_save_register_device_item(device, 0, cpustate->flag_p); - state_save_register_device_item(device, 0, cpustate->flag_b); - state_save_register_device_item(device, 0, cpustate->flag_h); - state_save_register_device_item(device, 0, cpustate->flag_i); - state_save_register_device_item(device, 0, cpustate->flag_c); - state_save_register_device_item(device, 0, cpustate->line_irq); - state_save_register_device_item(device, 0, cpustate->line_nmi); - state_save_register_device_item(device, 0, cpustate->line_rst); - state_save_register_device_item(device, 0, cpustate->ir); - state_save_register_device_item(device, 0, cpustate->stopped); - state_save_register_device_item(device, 0, cpustate->ICount); - state_save_register_device_item(device, 0, cpustate->source); - state_save_register_device_item(device, 0, cpustate->destination); - state_save_register_device_item(device, 0, cpustate->temp1); - state_save_register_device_item(device, 0, cpustate->temp2); - state_save_register_device_item(device, 0, cpustate->temp3); - state_save_register_device_item(device, 0, cpustate->spc_int16); - state_save_register_device_item(device, 0, cpustate->spc_int32); + device->save_item(NAME(cpustate->a)); + device->save_item(NAME(cpustate->x)); + device->save_item(NAME(cpustate->y)); + device->save_item(NAME(cpustate->s)); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->ppc)); + device->save_item(NAME(cpustate->flag_n)); + device->save_item(NAME(cpustate->flag_z)); + device->save_item(NAME(cpustate->flag_v)); + device->save_item(NAME(cpustate->flag_p)); + device->save_item(NAME(cpustate->flag_b)); + device->save_item(NAME(cpustate->flag_h)); + device->save_item(NAME(cpustate->flag_i)); + device->save_item(NAME(cpustate->flag_c)); + device->save_item(NAME(cpustate->line_irq)); + device->save_item(NAME(cpustate->line_nmi)); + device->save_item(NAME(cpustate->line_rst)); + device->save_item(NAME(cpustate->ir)); + device->save_item(NAME(cpustate->stopped)); + device->save_item(NAME(cpustate->ICount)); + device->save_item(NAME(cpustate->source)); + device->save_item(NAME(cpustate->destination)); + device->save_item(NAME(cpustate->temp1)); + device->save_item(NAME(cpustate->temp2)); + device->save_item(NAME(cpustate->temp3)); + device->save_item(NAME(cpustate->spc_int16)); + device->save_item(NAME(cpustate->spc_int32)); } static CPU_INIT( spc700 ) diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index b739033f388..2d11783f92d 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -513,17 +513,17 @@ static CPU_INIT( ssp1601 ) { ssp1601_state_t *ssp1601_state = get_safe_token(device); - state_save_register_device_item(device, 0, rX); - state_save_register_device_item(device, 0, rY); - state_save_register_device_item(device, 0, rA32); - state_save_register_device_item(device, 0, rST); - state_save_register_device_item(device, 0, rSTACK); - state_save_register_device_item(device, 0, rPC); - state_save_register_device_item(device, 0, rP.d); - state_save_register_device_item(device, 0, PPC); - state_save_register_device_item_array(device, 0, ssp1601_state->stack); - state_save_register_device_item_array(device, 0, ssp1601_state->r); - state_save_register_device_item_array(device, 0, ssp1601_state->RAM); + device->save_item(NAME(rX)); + device->save_item(NAME(rY)); + device->save_item(NAME(rA32)); + device->save_item(NAME(rST)); + device->save_item(NAME(rSTACK)); + device->save_item(NAME(rPC)); + device->save_item(NAME(rP.d)); + device->save_item(NAME(PPC)); + device->save_item(NAME(ssp1601_state->stack)); + device->save_item(NAME(ssp1601_state->r)); + device->save_item(NAME(ssp1601_state->RAM)); /* clear the state */ memset(ssp1601_state, 0, sizeof(ssp1601_state_t)); diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c index 7c822dfe606..ba187583612 100644 --- a/src/emu/cpu/superfx/superfx.c +++ b/src/emu/cpu/superfx/superfx.c @@ -673,51 +673,51 @@ static void superfx_register_save( legacy_cpu_device *device ) superfx_state *cpustate = get_safe_token(device); int i; - state_save_register_device_item(device, 0, cpustate->pipeline); - state_save_register_device_item(device, 0, cpustate->ramaddr); - - state_save_register_device_item_array(device, 0, cpustate->r); - state_save_register_device_item(device, 0, cpustate->sfr); - state_save_register_device_item(device, 0, cpustate->pbr); - state_save_register_device_item(device, 0, cpustate->rombr); - state_save_register_device_item(device, 0, cpustate->rambr); - state_save_register_device_item(device, 0, cpustate->cbr); - state_save_register_device_item(device, 0, cpustate->scbr); - state_save_register_device_item(device, 0, cpustate->scmr); - state_save_register_device_item(device, 0, cpustate->colr); - state_save_register_device_item(device, 0, cpustate->por); - state_save_register_device_item(device, 0, cpustate->bramr); - state_save_register_device_item(device, 0, cpustate->vcr); - state_save_register_device_item(device, 0, cpustate->cfgr); - state_save_register_device_item(device, 0, cpustate->clsr); - - state_save_register_device_item(device, 0, cpustate->romcl); - state_save_register_device_item(device, 0, cpustate->romdr); - - state_save_register_device_item(device, 0, cpustate->ramcl); - state_save_register_device_item(device, 0, cpustate->ramar); - state_save_register_device_item(device, 0, cpustate->ramdr); - - state_save_register_device_item(device, 0, cpustate->sreg_idx); - state_save_register_device_item(device, 0, cpustate->dreg_idx); - state_save_register_device_item(device, 0, cpustate->r15_modified); - - state_save_register_device_item(device, 0, cpustate->irq); - - state_save_register_device_item(device, 0, cpustate->cache_access_speed); - state_save_register_device_item(device, 0, cpustate->memory_access_speed); - - state_save_register_device_item_array(device, 0, cpustate->cache.buffer); - state_save_register_device_item_array(device, 0, cpustate->cache.valid); + device->save_item(NAME(cpustate->pipeline)); + device->save_item(NAME(cpustate->ramaddr)); + + device->save_item(NAME(cpustate->r)); + device->save_item(NAME(cpustate->sfr)); + device->save_item(NAME(cpustate->pbr)); + device->save_item(NAME(cpustate->rombr)); + device->save_item(NAME(cpustate->rambr)); + device->save_item(NAME(cpustate->cbr)); + device->save_item(NAME(cpustate->scbr)); + device->save_item(NAME(cpustate->scmr)); + device->save_item(NAME(cpustate->colr)); + device->save_item(NAME(cpustate->por)); + device->save_item(NAME(cpustate->bramr)); + device->save_item(NAME(cpustate->vcr)); + device->save_item(NAME(cpustate->cfgr)); + device->save_item(NAME(cpustate->clsr)); + + device->save_item(NAME(cpustate->romcl)); + device->save_item(NAME(cpustate->romdr)); + + device->save_item(NAME(cpustate->ramcl)); + device->save_item(NAME(cpustate->ramar)); + device->save_item(NAME(cpustate->ramdr)); + + device->save_item(NAME(cpustate->sreg_idx)); + device->save_item(NAME(cpustate->dreg_idx)); + device->save_item(NAME(cpustate->r15_modified)); + + device->save_item(NAME(cpustate->irq)); + + device->save_item(NAME(cpustate->cache_access_speed)); + device->save_item(NAME(cpustate->memory_access_speed)); + + device->save_item(NAME(cpustate->cache.buffer)); + device->save_item(NAME(cpustate->cache.valid)); for (i = 0; i < 2; i++) { - state_save_register_device_item(device, i, cpustate->pixelcache[i].offset); - state_save_register_device_item(device, i, cpustate->pixelcache[i].bitpend); - state_save_register_device_item_array(device, i, cpustate->pixelcache[i].data); + device->save_item(NAME(cpustate->pixelcache[i].offset), i); + device->save_item(NAME(cpustate->pixelcache[i].bitpend), i); + device->save_item(NAME(cpustate->pixelcache[i].data), i); } - state_save_register_device_item(device, 0, cpustate->icount); + device->save_item(NAME(cpustate->icount)); } static CPU_INIT( superfx ) diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index 32b0b86efcf..4c64cbec9ae 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -267,19 +267,19 @@ static CPU_INIT( t11 ) cpustate->program = device->space(AS_PROGRAM); cpustate->direct = &cpustate->program->direct(); - state_save_register_device_item(device, 0, cpustate->ppc.w.l); - state_save_register_device_item(device, 0, cpustate->reg[0].w.l); - state_save_register_device_item(device, 0, cpustate->reg[1].w.l); - state_save_register_device_item(device, 0, cpustate->reg[2].w.l); - state_save_register_device_item(device, 0, cpustate->reg[3].w.l); - state_save_register_device_item(device, 0, cpustate->reg[4].w.l); - state_save_register_device_item(device, 0, cpustate->reg[5].w.l); - state_save_register_device_item(device, 0, cpustate->reg[6].w.l); - state_save_register_device_item(device, 0, cpustate->reg[7].w.l); - state_save_register_device_item(device, 0, cpustate->psw.w.l); - state_save_register_device_item(device, 0, cpustate->initial_pc); - state_save_register_device_item(device, 0, cpustate->wait_state); - state_save_register_device_item(device, 0, cpustate->irq_state); + device->save_item(NAME(cpustate->ppc.w.l)); + device->save_item(NAME(cpustate->reg[0].w.l)); + device->save_item(NAME(cpustate->reg[1].w.l)); + device->save_item(NAME(cpustate->reg[2].w.l)); + device->save_item(NAME(cpustate->reg[3].w.l)); + device->save_item(NAME(cpustate->reg[4].w.l)); + device->save_item(NAME(cpustate->reg[5].w.l)); + device->save_item(NAME(cpustate->reg[6].w.l)); + device->save_item(NAME(cpustate->reg[7].w.l)); + device->save_item(NAME(cpustate->psw.w.l)); + device->save_item(NAME(cpustate->initial_pc)); + device->save_item(NAME(cpustate->wait_state)); + device->save_item(NAME(cpustate->irq_state)); } diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index 90ee80b9fae..926632cfc1a 100644 --- a/src/emu/cpu/tlcs90/tlcs90.c +++ b/src/emu/cpu/tlcs90/tlcs90.c @@ -2636,45 +2636,45 @@ static void state_register( legacy_cpu_device *device ) { t90_Regs *cpustate = get_safe_token(device); - state_save_register_device_item(device, 0, cpustate->prvpc.w.l); - state_save_register_device_item(device, 0, cpustate->pc.w.l); - state_save_register_device_item(device, 0, cpustate->sp.w.l); - state_save_register_device_item(device, 0, cpustate->af.w.l); - state_save_register_device_item(device, 0, cpustate->bc.w.l); - state_save_register_device_item(device, 0, cpustate->de.w.l); - state_save_register_device_item(device, 0, cpustate->hl.w.l); - state_save_register_device_item(device, 0, cpustate->ix.w.l); - state_save_register_device_item(device, 0, cpustate->iy.w.l); - state_save_register_device_item(device, 0, cpustate->af2.w.l); - state_save_register_device_item(device, 0, cpustate->bc2.w.l); - state_save_register_device_item(device, 0, cpustate->de2.w.l); - state_save_register_device_item(device, 0, cpustate->hl2.w.l); - state_save_register_device_item(device, 0, cpustate->halt); - state_save_register_device_item(device, 0, cpustate->after_EI); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->irq_mask); - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->extra_cycles); - - state_save_register_device_item_array(device, 0, cpustate->internal_registers); - state_save_register_device_item(device, 0, cpustate->ixbase); - state_save_register_device_item(device, 0, cpustate->iybase); - - state_save_register_device_item_array(device, 0, cpustate->timer_value); - state_save_register_device_item(device, 0, cpustate->timer4_value); + device->save_item(NAME(cpustate->prvpc.w.l)); + device->save_item(NAME(cpustate->pc.w.l)); + device->save_item(NAME(cpustate->sp.w.l)); + device->save_item(NAME(cpustate->af.w.l)); + device->save_item(NAME(cpustate->bc.w.l)); + device->save_item(NAME(cpustate->de.w.l)); + device->save_item(NAME(cpustate->hl.w.l)); + device->save_item(NAME(cpustate->ix.w.l)); + device->save_item(NAME(cpustate->iy.w.l)); + device->save_item(NAME(cpustate->af2.w.l)); + device->save_item(NAME(cpustate->bc2.w.l)); + device->save_item(NAME(cpustate->de2.w.l)); + device->save_item(NAME(cpustate->hl2.w.l)); + device->save_item(NAME(cpustate->halt)); + device->save_item(NAME(cpustate->after_EI)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->irq_mask)); + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->extra_cycles)); + + device->save_item(NAME(cpustate->internal_registers)); + device->save_item(NAME(cpustate->ixbase)); + device->save_item(NAME(cpustate->iybase)); + + device->save_item(NAME(cpustate->timer_value)); + device->save_item(NAME(cpustate->timer4_value)); // Work registers - state_save_register_device_item(device, 0, cpustate->op); - state_save_register_device_item(device, 0, cpustate->mode1); - state_save_register_device_item(device, 0, cpustate->r1); - state_save_register_device_item(device, 0, cpustate->r1b); - state_save_register_device_item(device, 0, cpustate->mode2); - state_save_register_device_item(device, 0, cpustate->r2); - state_save_register_device_item(device, 0, cpustate->r2b); - - state_save_register_device_item(device, 0, cpustate->cyc_t); - state_save_register_device_item(device, 0, cpustate->cyc_f); - state_save_register_device_item(device, 0, cpustate->addr); + device->save_item(NAME(cpustate->op)); + device->save_item(NAME(cpustate->mode1)); + device->save_item(NAME(cpustate->r1)); + device->save_item(NAME(cpustate->r1b)); + device->save_item(NAME(cpustate->mode2)); + device->save_item(NAME(cpustate->r2)); + device->save_item(NAME(cpustate->r2b)); + + device->save_item(NAME(cpustate->cyc_t)); + device->save_item(NAME(cpustate->cyc_f)); + device->save_item(NAME(cpustate->addr)); } diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c index 9fd97935769..acef08b54a6 100644 --- a/src/emu/cpu/tlcs900/tlcs900.c +++ b/src/emu/cpu/tlcs900/tlcs900.c @@ -225,32 +225,32 @@ static CPU_INIT( tlcs900 ) devcb_resolve_write8( &cpustate->to1, &cpustate->intf->to1, device ); devcb_resolve_write8( &cpustate->to3, &cpustate->intf->to3, device ); - state_save_register_device_item_array( device, 0, cpustate->xwa ); - state_save_register_device_item_array( device, 0, cpustate->xbc ); - state_save_register_device_item_array( device, 0, cpustate->xde ); - state_save_register_device_item_array( device, 0, cpustate->xhl ); - state_save_register_device_item( device, 0, cpustate->xix ); - state_save_register_device_item( device, 0, cpustate->xiy ); - state_save_register_device_item( device, 0, cpustate->xiz ); - state_save_register_device_item( device, 0, cpustate->xssp ); - state_save_register_device_item( device, 0, cpustate->xnsp ); - state_save_register_device_item( device, 0, cpustate->pc ); - state_save_register_device_item( device, 0, cpustate->sr ); - state_save_register_device_item( device, 0, cpustate->f2 ); - state_save_register_device_item_array( device, 0, cpustate->dmas ); - state_save_register_device_item_array( device, 0, cpustate->dmad ); - state_save_register_device_item_array( device, 0, cpustate->dmac ); - state_save_register_device_item_array( device, 0, cpustate->dmam ); - state_save_register_device_item_array( device, 0, cpustate->reg ); - state_save_register_device_item( device, 0, cpustate->timer_pre ); - state_save_register_device_item_array( device, 0, cpustate->timer ); - state_save_register_device_item( device, 0, cpustate->tff1 ); - state_save_register_device_item( device, 0, cpustate->tff3 ); - state_save_register_device_item_array( device, 0, cpustate->timer_change ); - state_save_register_device_item_array( device, 0, cpustate->level ); - state_save_register_device_item( device, 0, cpustate->check_irqs ); - state_save_register_device_item( device, 0, cpustate->ad_cycles_left ); - state_save_register_device_item( device, 0, cpustate->nmi_state ); + device->save_item( NAME(cpustate->xwa) ); + device->save_item( NAME(cpustate->xbc) ); + device->save_item( NAME(cpustate->xde) ); + device->save_item( NAME(cpustate->xhl) ); + device->save_item( NAME(cpustate->xix) ); + device->save_item( NAME(cpustate->xiy) ); + device->save_item( NAME(cpustate->xiz) ); + device->save_item( NAME(cpustate->xssp) ); + device->save_item( NAME(cpustate->xnsp) ); + device->save_item( NAME(cpustate->pc) ); + device->save_item( NAME(cpustate->sr) ); + device->save_item( NAME(cpustate->f2) ); + device->save_item( NAME(cpustate->dmas) ); + device->save_item( NAME(cpustate->dmad) ); + device->save_item( NAME(cpustate->dmac) ); + device->save_item( NAME(cpustate->dmam) ); + device->save_item( NAME(cpustate->reg) ); + device->save_item( NAME(cpustate->timer_pre) ); + device->save_item( NAME(cpustate->timer) ); + device->save_item( NAME(cpustate->tff1) ); + device->save_item( NAME(cpustate->tff3) ); + device->save_item( NAME(cpustate->timer_change) ); + device->save_item( NAME(cpustate->level) ); + device->save_item( NAME(cpustate->check_irqs) ); + device->save_item( NAME(cpustate->ad_cycles_left) ); + device->save_item( NAME(cpustate->nmi_state) ); } diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index 4ccda8b4c46..ad442573bc4 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -507,38 +507,38 @@ static void cpu_init_tms_common( legacy_cpu_device *device, const UINT32* decode cpustate->program = device->space( AS_PROGRAM ); cpustate->data = device->space( AS_PROGRAM ); - state_save_register_device_item( device, 0, cpustate->prev_pc ); - state_save_register_device_item( device, 0, cpustate->prev_pa ); - state_save_register_device_item( device, 0, cpustate->pc ); - state_save_register_device_item( device, 0, cpustate->pa ); - state_save_register_device_item( device, 0, cpustate->sr ); - state_save_register_device_item( device, 0, cpustate->pb ); - state_save_register_device_item( device, 0, cpustate->a ); - state_save_register_device_item( device, 0, cpustate->x ); - state_save_register_device_item( device, 0, cpustate->y ); - state_save_register_device_item( device, 0, cpustate->dam ); - state_save_register_device_item( device, 0, cpustate->ca ); - state_save_register_device_item( device, 0, cpustate->cb ); - state_save_register_device_item( device, 0, cpustate->cs ); - state_save_register_device_item( device, 0, cpustate->r ); - state_save_register_device_item( device, 0, cpustate->o ); - state_save_register_device_item( device, 0, cpustate->cki_bus ); - state_save_register_device_item( device, 0, cpustate->p ); - state_save_register_device_item( device, 0, cpustate->n ); - state_save_register_device_item( device, 0, cpustate->adder_result ); - state_save_register_device_item( device, 0, cpustate->carry_in ); - state_save_register_device_item( device, 0, cpustate->status ); - state_save_register_device_item( device, 0, cpustate->status_latch ); - state_save_register_device_item( device, 0, cpustate->special_status ); - state_save_register_device_item( device, 0, cpustate->call_latch ); - state_save_register_device_item( device, 0, cpustate->add_latch ); - state_save_register_device_item( device, 0, cpustate->branch_latch ); - state_save_register_device_item( device, 0, cpustate->subcycle ); - state_save_register_device_item( device, 0, cpustate->ram_address ); - state_save_register_device_item( device, 0, cpustate->ram_data ); - state_save_register_device_item( device, 0, cpustate->rom_address ); - state_save_register_device_item( device, 0, cpustate->opcode ); - state_save_register_device_item( device, 0, cpustate->decode ); + device->save_item( NAME(cpustate->prev_pc) ); + device->save_item( NAME(cpustate->prev_pa) ); + device->save_item( NAME(cpustate->pc) ); + device->save_item( NAME(cpustate->pa) ); + device->save_item( NAME(cpustate->sr) ); + device->save_item( NAME(cpustate->pb) ); + device->save_item( NAME(cpustate->a) ); + device->save_item( NAME(cpustate->x) ); + device->save_item( NAME(cpustate->y) ); + device->save_item( NAME(cpustate->dam) ); + device->save_item( NAME(cpustate->ca) ); + device->save_item( NAME(cpustate->cb) ); + device->save_item( NAME(cpustate->cs) ); + device->save_item( NAME(cpustate->r) ); + device->save_item( NAME(cpustate->o) ); + device->save_item( NAME(cpustate->cki_bus) ); + device->save_item( NAME(cpustate->p) ); + device->save_item( NAME(cpustate->n) ); + device->save_item( NAME(cpustate->adder_result) ); + device->save_item( NAME(cpustate->carry_in) ); + device->save_item( NAME(cpustate->status) ); + device->save_item( NAME(cpustate->status_latch) ); + device->save_item( NAME(cpustate->special_status) ); + device->save_item( NAME(cpustate->call_latch) ); + device->save_item( NAME(cpustate->add_latch) ); + device->save_item( NAME(cpustate->branch_latch) ); + device->save_item( NAME(cpustate->subcycle) ); + device->save_item( NAME(cpustate->ram_address) ); + device->save_item( NAME(cpustate->ram_data) ); + device->save_item( NAME(cpustate->rom_address) ); + device->save_item( NAME(cpustate->opcode) ); + device->save_item( NAME(cpustate->decode) ); } diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index dd3c1039047..007b18ad879 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -807,25 +807,25 @@ static CPU_INIT( tms32010 ) { tms32010_state *cpustate = get_safe_token(device); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->PREVPC); - state_save_register_device_item(device, 0, cpustate->STR); - state_save_register_device_item(device, 0, cpustate->ACC.d); - state_save_register_device_item(device, 0, cpustate->ALU.d); - state_save_register_device_item(device, 0, cpustate->Preg.d); - state_save_register_device_item(device, 0, cpustate->Treg); - state_save_register_device_item(device, 0, cpustate->AR[0]); - state_save_register_device_item(device, 0, cpustate->AR[1]); - state_save_register_device_item(device, 0, cpustate->STACK[0]); - state_save_register_device_item(device, 0, cpustate->STACK[1]); - state_save_register_device_item(device, 0, cpustate->STACK[2]); - state_save_register_device_item(device, 0, cpustate->STACK[3]); - state_save_register_device_item(device, 0, cpustate->INTF); - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->opcode.d); - state_save_register_device_item(device, 0, cpustate->oldacc.d); - state_save_register_device_item(device, 0, cpustate->memaccess); - state_save_register_device_item(device, 0, cpustate->addr_mask); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->PREVPC)); + device->save_item(NAME(cpustate->STR)); + device->save_item(NAME(cpustate->ACC.d)); + device->save_item(NAME(cpustate->ALU.d)); + device->save_item(NAME(cpustate->Preg.d)); + device->save_item(NAME(cpustate->Treg)); + device->save_item(NAME(cpustate->AR[0])); + device->save_item(NAME(cpustate->AR[1])); + device->save_item(NAME(cpustate->STACK[0])); + device->save_item(NAME(cpustate->STACK[1])); + device->save_item(NAME(cpustate->STACK[2])); + device->save_item(NAME(cpustate->STACK[3])); + device->save_item(NAME(cpustate->INTF)); + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->opcode.d)); + device->save_item(NAME(cpustate->oldacc.d)); + device->save_item(NAME(cpustate->memaccess)); + device->save_item(NAME(cpustate->addr_mask)); cpustate->device = device; cpustate->program = device->space(AS_PROGRAM); diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index 65085fe2318..aaffe9c8b41 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -1727,45 +1727,45 @@ static CPU_INIT( tms32025 ) cpustate->data = device->space(AS_DATA); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->STR0); - state_save_register_device_item(device, 0, cpustate->STR1); - state_save_register_device_item(device, 0, cpustate->PFC); - state_save_register_device_item(device, 0, cpustate->IFR); - state_save_register_device_item(device, 0, cpustate->RPTC); - state_save_register_device_item(device, 0, cpustate->ACC.d); - state_save_register_device_item(device, 0, cpustate->ALU.d); - state_save_register_device_item(device, 0, cpustate->Preg.d); - state_save_register_device_item(device, 0, cpustate->Treg); - state_save_register_device_item(device, 0, cpustate->AR[0]); - state_save_register_device_item(device, 0, cpustate->AR[1]); - state_save_register_device_item(device, 0, cpustate->AR[2]); - state_save_register_device_item(device, 0, cpustate->AR[3]); - state_save_register_device_item(device, 0, cpustate->AR[4]); - state_save_register_device_item(device, 0, cpustate->AR[5]); - state_save_register_device_item(device, 0, cpustate->AR[6]); - state_save_register_device_item(device, 0, cpustate->AR[7]); - state_save_register_device_item(device, 0, cpustate->STACK[0]); - state_save_register_device_item(device, 0, cpustate->STACK[1]); - state_save_register_device_item(device, 0, cpustate->STACK[2]); - state_save_register_device_item(device, 0, cpustate->STACK[3]); - state_save_register_device_item(device, 0, cpustate->STACK[4]); - state_save_register_device_item(device, 0, cpustate->STACK[5]); - state_save_register_device_item(device, 0, cpustate->STACK[6]); - state_save_register_device_item(device, 0, cpustate->STACK[7]); - - state_save_register_device_item(device, 0, cpustate->oldacc); - state_save_register_device_item(device, 0, cpustate->memaccess); - state_save_register_device_item(device, 0, cpustate->icount); - state_save_register_device_item(device, 0, cpustate->mHackIgnoreARP); - - state_save_register_device_item(device, 0, cpustate->idle); - state_save_register_device_item(device, 0, cpustate->hold); - state_save_register_device_item(device, 0, cpustate->external_mem_access); - state_save_register_device_item(device, 0, cpustate->init_load_addr); - state_save_register_device_item(device, 0, cpustate->PREVPC); - -// state_save_register_device_item_pointer(device, 0, cpustate->intRAM, 0x800*2); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->STR0)); + device->save_item(NAME(cpustate->STR1)); + device->save_item(NAME(cpustate->PFC)); + device->save_item(NAME(cpustate->IFR)); + device->save_item(NAME(cpustate->RPTC)); + device->save_item(NAME(cpustate->ACC.d)); + device->save_item(NAME(cpustate->ALU.d)); + device->save_item(NAME(cpustate->Preg.d)); + device->save_item(NAME(cpustate->Treg)); + device->save_item(NAME(cpustate->AR[0])); + device->save_item(NAME(cpustate->AR[1])); + device->save_item(NAME(cpustate->AR[2])); + device->save_item(NAME(cpustate->AR[3])); + device->save_item(NAME(cpustate->AR[4])); + device->save_item(NAME(cpustate->AR[5])); + device->save_item(NAME(cpustate->AR[6])); + device->save_item(NAME(cpustate->AR[7])); + device->save_item(NAME(cpustate->STACK[0])); + device->save_item(NAME(cpustate->STACK[1])); + device->save_item(NAME(cpustate->STACK[2])); + device->save_item(NAME(cpustate->STACK[3])); + device->save_item(NAME(cpustate->STACK[4])); + device->save_item(NAME(cpustate->STACK[5])); + device->save_item(NAME(cpustate->STACK[6])); + device->save_item(NAME(cpustate->STACK[7])); + + device->save_item(NAME(cpustate->oldacc)); + device->save_item(NAME(cpustate->memaccess)); + device->save_item(NAME(cpustate->icount)); + device->save_item(NAME(cpustate->mHackIgnoreARP)); + + device->save_item(NAME(cpustate->idle)); + device->save_item(NAME(cpustate->hold)); + device->save_item(NAME(cpustate->external_mem_access)); + device->save_item(NAME(cpustate->init_load_addr)); + device->save_item(NAME(cpustate->PREVPC)); + +// device->save_pointer(NAME(cpustate->intRAM), 0x800*2); } /**************************************************************************** diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 9cc63f3204c..21504cdd37f 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -491,15 +491,15 @@ void tms3203x_device::device_start() m_direct = &m_program->direct(); // save state - state_save_register_device_item(this, 0, m_pc); + save_item(NAME(m_pc)); for (int regnum = 0; regnum < 36; regnum++) - state_save_register_device_item_array(this, regnum, m_r[regnum].i32); - state_save_register_device_item(this, 0, m_bkmask); - state_save_register_device_item(this, 0, m_irq_state); - state_save_register_device_item(this, 0, m_delayed); - state_save_register_device_item(this, 0, m_irq_pending); - state_save_register_device_item(this, 0, m_mcu_mode); - state_save_register_device_item(this, 0, m_is_idling); + save_item(NAME(m_r[regnum].i32), regnum); + save_item(NAME(m_bkmask)); + save_item(NAME(m_irq_state)); + save_item(NAME(m_delayed)); + save_item(NAME(m_irq_pending)); + save_item(NAME(m_mcu_mode)); + save_item(NAME(m_is_idling)); // register our state for the debugger state_add(TMS3203X_PC, "PC", m_pc); diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index 42db4963dc6..db25ed5855b 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -658,17 +658,17 @@ static CPU_INIT( tms34010 ) /* allocate the shiftreg */ tms->shiftreg = auto_alloc_array(device->machine, UINT16, SHIFTREG_SIZE/2); - state_save_register_device_item(device, 0, tms->pc); - state_save_register_device_item(device, 0, tms->st); - state_save_register_device_item(device, 0, tms->reset_deferred); - state_save_register_device_item_pointer(device, 0, tms->shiftreg, SHIFTREG_SIZE / 2); - state_save_register_device_item_array(device, 0, tms->IOregs); - state_save_register_device_item(device, 0, tms->convsp); - state_save_register_device_item(device, 0, tms->convdp); - state_save_register_device_item(device, 0, tms->convmp); - state_save_register_device_item(device, 0, tms->pixelshift); - state_save_register_device_item(device, 0, tms->gfxcycles); - state_save_register_device_item_pointer(device, 0, (&tms->regs[0].reg), ARRAY_LENGTH(tms->regs)); + device->save_item(NAME(tms->pc)); + device->save_item(NAME(tms->st)); + device->save_item(NAME(tms->reset_deferred)); + device->save_pointer(NAME(tms->shiftreg), SHIFTREG_SIZE / 2); + device->save_item(NAME(tms->IOregs)); + device->save_item(NAME(tms->convsp)); + device->save_item(NAME(tms->convdp)); + device->save_item(NAME(tms->convmp)); + device->save_item(NAME(tms->pixelshift)); + device->save_item(NAME(tms->gfxcycles)); + device->save_pointer(NAME(&tms->regs[0].reg), ARRAY_LENGTH(tms->regs)); device->machine->state().register_postload(tms34010_state_postload, tms); } diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index ed5769e7628..6454eb27c2f 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -173,23 +173,23 @@ static CPU_INIT( tms7000 ) memset(cpustate->rf, 0, 0x80); /* Save register state */ - state_save_register_device_item(device, 0, pPC); - state_save_register_device_item(device, 0, pSP); - state_save_register_device_item(device, 0, pSR); + device->save_item(NAME(pPC)); + device->save_item(NAME(pSP)); + device->save_item(NAME(pSR)); /* Save Interrupt state */ - state_save_register_device_item_array(device, 0, cpustate->irq_state); + device->save_item(NAME(cpustate->irq_state)); /* Save register and perpherial file state */ - state_save_register_device_item_array(device, 0, cpustate->rf); - state_save_register_device_item_array(device, 0, cpustate->pf); + device->save_item(NAME(cpustate->rf)); + device->save_item(NAME(cpustate->pf)); /* Save timer state */ - state_save_register_device_item(device, 0, cpustate->t1_prescaler); - state_save_register_device_item(device, 0, cpustate->t1_capture_latch); - state_save_register_device_item(device, 0, cpustate->t1_decrementer); + device->save_item(NAME(cpustate->t1_prescaler)); + device->save_item(NAME(cpustate->t1_capture_latch)); + device->save_item(NAME(cpustate->t1_decrementer)); - state_save_register_device_item(device, 0, cpustate->idle_state); + device->save_item(NAME(cpustate->idle_state)); } static CPU_RESET( tms7000 ) diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index cb8745f42db..1e297fbcf4f 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -1211,76 +1211,76 @@ static void set_flag1(tms99xx_state *cpustate, int val); static void register_for_save_state(device_t *device) { tms99xx_state *cpustate = get_safe_token(device); - state_save_register_device_item(device, 0, cpustate->WP); - state_save_register_device_item(device, 0, cpustate->PC); - state_save_register_device_item(device, 0, cpustate->STATUS); - state_save_register_device_item(device, 0, cpustate->interrupt_pending); + device->save_item(NAME(cpustate->WP)); + device->save_item(NAME(cpustate->PC)); + device->save_item(NAME(cpustate->STATUS)); + device->save_item(NAME(cpustate->interrupt_pending)); #if ! ((TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)) - state_save_register_device_item(device, 0, cpustate->load_state); + device->save_item(NAME(cpustate->load_state)); #endif #if (TMS99XX_MODEL == TI990_10_ID) || (TMS99XX_MODEL == TMS9900_ID) || (TMS99XX_MODEL == TMS9980_ID) - state_save_register_device_item(device, 0, cpustate->irq_level); - state_save_register_device_item(device, 0, cpustate->irq_state); + device->save_item(NAME(cpustate->irq_level)); + device->save_item(NAME(cpustate->irq_state)); #elif (TMS99XX_MODEL == TMS9995_ID) - state_save_register_device_item(device, 0, cpustate->irq_level); - state_save_register_device_item(device, 0, cpustate->int_state); - state_save_register_device_item(device, 0, cpustate->int_latch); + device->save_item(NAME(cpustate->irq_level)); + device->save_item(NAME(cpustate->int_state)); + device->save_item(NAME(cpustate->int_latch)); #endif - state_save_register_device_item(device, 0, cpustate->IDLE); + device->save_item(NAME(cpustate->IDLE)); #if HAS_MAPPING - state_save_register_device_item(device, 0, cpustate->mapping_on); - state_save_register_device_item_array(device, 0, cpustate->map_files[0].L); - state_save_register_device_item_array(device, 0, cpustate->map_files[0].B); - state_save_register_device_item_array(device, 0, cpustate->map_files[0].limit); - state_save_register_device_item_array(device, 0, cpustate->map_files[0].bias); - state_save_register_device_item_array(device, 0, cpustate->map_files[1].L); - state_save_register_device_item_array(device, 0, cpustate->map_files[1].B); - state_save_register_device_item_array(device, 0, cpustate->map_files[1].limit); - state_save_register_device_item_array(device, 0, cpustate->map_files[1].bias); - state_save_register_device_item_array(device, 0, cpustate->map_files[2].L); - state_save_register_device_item_array(device, 0, cpustate->map_files[2].B); - state_save_register_device_item_array(device, 0, cpustate->map_files[2].limit); - state_save_register_device_item_array(device, 0, cpustate->map_files[2].bias); - state_save_register_device_item(device, 0, cpustate->cur_map); - state_save_register_device_item(device, 0, cpustate->cur_src_map); - state_save_register_device_item(device, 0, cpustate->cur_dst_map); + device->save_item(NAME(cpustate->mapping_on)); + device->save_item(NAME(cpustate->map_files[0].L)); + device->save_item(NAME(cpustate->map_files[0].B)); + device->save_item(NAME(cpustate->map_files[0].limit)); + device->save_item(NAME(cpustate->map_files[0].bias)); + device->save_item(NAME(cpustate->map_files[1].L)); + device->save_item(NAME(cpustate->map_files[1].B)); + device->save_item(NAME(cpustate->map_files[1].limit)); + device->save_item(NAME(cpustate->map_files[1].bias)); + device->save_item(NAME(cpustate->map_files[2].L)); + device->save_item(NAME(cpustate->map_files[2].B)); + device->save_item(NAME(cpustate->map_files[2].limit)); + device->save_item(NAME(cpustate->map_files[2].bias)); + device->save_item(NAME(cpustate->cur_map)); + device->save_item(NAME(cpustate->cur_src_map)); + device->save_item(NAME(cpustate->cur_dst_map)); #if (TMS99XX_MODEL == TI990_10_ID) - state_save_register_device_item(device, 0, cpustate->reset_maperr); - state_save_register_device_item(device, 0, cpustate->mapper_address_latch); - state_save_register_device_item(device, 0, cpustate->mapper_cru_read_register); - state_save_register_device_item(device, 0, cpustate->diaglat); - state_save_register_device_item_array(device, 0, cpustate->latch_control); + device->save_item(NAME(cpustate->reset_maperr)); + device->save_item(NAME(cpustate->mapper_address_latch)); + device->save_item(NAME(cpustate->mapper_cru_read_register)); + device->save_item(NAME(cpustate->diaglat)); + device->save_item(NAME(cpustate->latch_control)); #endif #endif #if (TMS99XX_MODEL == TI990_10_ID) - state_save_register_device_item(device, 0, cpustate->error_interrupt_register); + device->save_item(NAME(cpustate->error_interrupt_register)); #endif #if (TMS99XX_MODEL == TMS9985_ID) || (TMS99XX_MODEL == TMS9995_ID) - state_save_register_device_item_array(device, 0, cpustate->RAM); + device->save_item(NAME(cpustate->RAM)); #endif #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID) || (TMS99XX_MODEL == TMS9995_ID) - state_save_register_device_item(device, 0, cpustate->decrementer_enabled); - state_save_register_device_item(device, 0, cpustate->decrementer_interval); - state_save_register_device_item(device, 0, cpustate->decrementer_count); + device->save_item(NAME(cpustate->decrementer_enabled)); + device->save_item(NAME(cpustate->decrementer_interval)); + device->save_item(NAME(cpustate->decrementer_count)); #endif #if (TMS99XX_MODEL == TMS9995_ID) - state_save_register_device_item(device, 0, cpustate->flag); - state_save_register_device_item(device, 0, cpustate->MID_flag); - state_save_register_device_item(device, 0, cpustate->memory_wait_states_byte); - state_save_register_device_item(device, 0, cpustate->memory_wait_states_word); - state_save_register_device_item(device, 0, cpustate->is_mp9537); + device->save_item(NAME(cpustate->flag)); + device->save_item(NAME(cpustate->MID_flag)); + device->save_item(NAME(cpustate->memory_wait_states_byte)); + device->save_item(NAME(cpustate->memory_wait_states_word)); + device->save_item(NAME(cpustate->is_mp9537)); #endif - state_save_register_device_item(device, 0, cpustate->disable_interrupt_recognition); + device->save_item(NAME(cpustate->disable_interrupt_recognition)); } diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c index ec691b41eda..5466143268e 100755 --- a/src/emu/cpu/upd7725/upd7725.c +++ b/src/emu/cpu/upd7725/upd7725.c @@ -208,34 +208,34 @@ void necdsp_device::device_start() state_add(UPD7725_IDB, "IDB", regs.idb); // save state registrations - state_save_register_device_item(this, 0, regs.pc); - state_save_register_device_item(this, 0, regs.rp); - state_save_register_device_item(this, 0, regs.dp); - state_save_register_device_item(this, 0, regs.sp); - state_save_register_device_item(this, 0, regs.k); - state_save_register_device_item(this, 0, regs.l); - state_save_register_device_item(this, 0, regs.m); - state_save_register_device_item(this, 0, regs.n); - state_save_register_device_item(this, 0, regs.a); - state_save_register_device_item(this, 0, regs.b); - state_save_register_device_item(this, 0, regs.tr); - state_save_register_device_item(this, 0, regs.trb); - state_save_register_device_item(this, 0, regs.dr); - state_save_register_device_item(this, 0, regs.so); - state_save_register_device_item(this, 0, regs.idb); - state_save_register_device_item(this, 0, regs.sr.rqm); - state_save_register_device_item(this, 0, regs.sr.usf0); - state_save_register_device_item(this, 0, regs.sr.usf1); - state_save_register_device_item(this, 0, regs.sr.drs); - state_save_register_device_item(this, 0, regs.sr.dma); - state_save_register_device_item(this, 0, regs.sr.drc); - state_save_register_device_item(this, 0, regs.sr.soc); - state_save_register_device_item(this, 0, regs.sr.sic); - state_save_register_device_item(this, 0, regs.sr.ei); - state_save_register_device_item(this, 0, regs.sr.p0); - state_save_register_device_item(this, 0, regs.sr.p1); - state_save_register_device_item_array(this, 0, regs.stack); - state_save_register_device_item_array(this, 0, dataRAM); + save_item(NAME(regs.pc)); + save_item(NAME(regs.rp)); + save_item(NAME(regs.dp)); + save_item(NAME(regs.sp)); + save_item(NAME(regs.k)); + save_item(NAME(regs.l)); + save_item(NAME(regs.m)); + save_item(NAME(regs.n)); + save_item(NAME(regs.a)); + save_item(NAME(regs.b)); + save_item(NAME(regs.tr)); + save_item(NAME(regs.trb)); + save_item(NAME(regs.dr)); + save_item(NAME(regs.so)); + save_item(NAME(regs.idb)); + save_item(NAME(regs.sr.rqm)); + save_item(NAME(regs.sr.usf0)); + save_item(NAME(regs.sr.usf1)); + save_item(NAME(regs.sr.drs)); + save_item(NAME(regs.sr.dma)); + save_item(NAME(regs.sr.drc)); + save_item(NAME(regs.sr.soc)); + save_item(NAME(regs.sr.sic)); + save_item(NAME(regs.sr.ei)); + save_item(NAME(regs.sr.p0)); + save_item(NAME(regs.sr.p1)); + save_item(NAME(regs.stack)); + save_item(NAME(dataRAM)); m_icountptr = &m_icount; } diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 48101ea8963..d71668b1a73 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -1707,70 +1707,70 @@ static CPU_INIT( upd7810 ) cpustate->direct = &cpustate->program->direct(); cpustate->io = device->space(AS_IO); - state_save_register_device_item(device, 0, cpustate->ppc.w.l); - state_save_register_device_item(device, 0, cpustate->pc.w.l); - state_save_register_device_item(device, 0, cpustate->sp.w.l); - state_save_register_device_item(device, 0, cpustate->psw); - state_save_register_device_item(device, 0, cpustate->op); - state_save_register_device_item(device, 0, cpustate->op2); - state_save_register_device_item(device, 0, cpustate->iff); - state_save_register_device_item(device, 0, cpustate->ea.w.l); - state_save_register_device_item(device, 0, cpustate->va.w.l); - state_save_register_device_item(device, 0, cpustate->bc.w.l); - state_save_register_device_item(device, 0, cpustate->de.w.l); - state_save_register_device_item(device, 0, cpustate->hl.w.l); - state_save_register_device_item(device, 0, cpustate->ea2.w.l); - state_save_register_device_item(device, 0, cpustate->va2.w.l); - state_save_register_device_item(device, 0, cpustate->bc2.w.l); - state_save_register_device_item(device, 0, cpustate->de2.w.l); - state_save_register_device_item(device, 0, cpustate->hl2.w.l); - state_save_register_device_item(device, 0, cpustate->cnt.d); - state_save_register_device_item(device, 0, cpustate->tm.d); - state_save_register_device_item(device, 0, cpustate->ecnt.d); - state_save_register_device_item(device, 0, cpustate->etm.d); - state_save_register_device_item(device, 0, cpustate->ma); - state_save_register_device_item(device, 0, cpustate->mb); - state_save_register_device_item(device, 0, cpustate->mcc); - state_save_register_device_item(device, 0, cpustate->mc); - state_save_register_device_item(device, 0, cpustate->mm); - state_save_register_device_item(device, 0, cpustate->mf); - state_save_register_device_item(device, 0, cpustate->tmm); - state_save_register_device_item(device, 0, cpustate->etmm); - state_save_register_device_item(device, 0, cpustate->eom); - state_save_register_device_item(device, 0, cpustate->sml); - state_save_register_device_item(device, 0, cpustate->smh); - state_save_register_device_item(device, 0, cpustate->anm); - state_save_register_device_item(device, 0, cpustate->mkl); - state_save_register_device_item(device, 0, cpustate->mkh); - state_save_register_device_item(device, 0, cpustate->zcm); - state_save_register_device_item(device, 0, cpustate->pa_out); - state_save_register_device_item(device, 0, cpustate->pb_out); - state_save_register_device_item(device, 0, cpustate->pc_out); - state_save_register_device_item(device, 0, cpustate->pd_out); - state_save_register_device_item(device, 0, cpustate->pf_out); - state_save_register_device_item(device, 0, cpustate->cr0); - state_save_register_device_item(device, 0, cpustate->cr1); - state_save_register_device_item(device, 0, cpustate->cr2); - state_save_register_device_item(device, 0, cpustate->cr3); - state_save_register_device_item(device, 0, cpustate->txb); - state_save_register_device_item(device, 0, cpustate->rxb); - state_save_register_device_item(device, 0, cpustate->txd); - state_save_register_device_item(device, 0, cpustate->rxd); - state_save_register_device_item(device, 0, cpustate->sck); - state_save_register_device_item(device, 0, cpustate->ti); - state_save_register_device_item(device, 0, cpustate->to); - state_save_register_device_item(device, 0, cpustate->ci); - state_save_register_device_item(device, 0, cpustate->co0); - state_save_register_device_item(device, 0, cpustate->co1); - state_save_register_device_item(device, 0, cpustate->irr); - state_save_register_device_item(device, 0, cpustate->itf); - state_save_register_device_item(device, 0, cpustate->ovc0); - state_save_register_device_item(device, 0, cpustate->ovc1); - state_save_register_device_item(device, 0, cpustate->ovcf); - state_save_register_device_item(device, 0, cpustate->ovcs); - state_save_register_device_item(device, 0, cpustate->edges); - state_save_register_device_item(device, 0, cpustate->int1); - state_save_register_device_item(device, 0, cpustate->int2); + device->save_item(NAME(cpustate->ppc.w.l)); + device->save_item(NAME(cpustate->pc.w.l)); + device->save_item(NAME(cpustate->sp.w.l)); + device->save_item(NAME(cpustate->psw)); + device->save_item(NAME(cpustate->op)); + device->save_item(NAME(cpustate->op2)); + device->save_item(NAME(cpustate->iff)); + device->save_item(NAME(cpustate->ea.w.l)); + device->save_item(NAME(cpustate->va.w.l)); + device->save_item(NAME(cpustate->bc.w.l)); + device->save_item(NAME(cpustate->de.w.l)); + device->save_item(NAME(cpustate->hl.w.l)); + device->save_item(NAME(cpustate->ea2.w.l)); + device->save_item(NAME(cpustate->va2.w.l)); + device->save_item(NAME(cpustate->bc2.w.l)); + device->save_item(NAME(cpustate->de2.w.l)); + device->save_item(NAME(cpustate->hl2.w.l)); + device->save_item(NAME(cpustate->cnt.d)); + device->save_item(NAME(cpustate->tm.d)); + device->save_item(NAME(cpustate->ecnt.d)); + device->save_item(NAME(cpustate->etm.d)); + device->save_item(NAME(cpustate->ma)); + device->save_item(NAME(cpustate->mb)); + device->save_item(NAME(cpustate->mcc)); + device->save_item(NAME(cpustate->mc)); + device->save_item(NAME(cpustate->mm)); + device->save_item(NAME(cpustate->mf)); + device->save_item(NAME(cpustate->tmm)); + device->save_item(NAME(cpustate->etmm)); + device->save_item(NAME(cpustate->eom)); + device->save_item(NAME(cpustate->sml)); + device->save_item(NAME(cpustate->smh)); + device->save_item(NAME(cpustate->anm)); + device->save_item(NAME(cpustate->mkl)); + device->save_item(NAME(cpustate->mkh)); + device->save_item(NAME(cpustate->zcm)); + device->save_item(NAME(cpustate->pa_out)); + device->save_item(NAME(cpustate->pb_out)); + device->save_item(NAME(cpustate->pc_out)); + device->save_item(NAME(cpustate->pd_out)); + device->save_item(NAME(cpustate->pf_out)); + device->save_item(NAME(cpustate->cr0)); + device->save_item(NAME(cpustate->cr1)); + device->save_item(NAME(cpustate->cr2)); + device->save_item(NAME(cpustate->cr3)); + device->save_item(NAME(cpustate->txb)); + device->save_item(NAME(cpustate->rxb)); + device->save_item(NAME(cpustate->txd)); + device->save_item(NAME(cpustate->rxd)); + device->save_item(NAME(cpustate->sck)); + device->save_item(NAME(cpustate->ti)); + device->save_item(NAME(cpustate->to)); + device->save_item(NAME(cpustate->ci)); + device->save_item(NAME(cpustate->co0)); + device->save_item(NAME(cpustate->co1)); + device->save_item(NAME(cpustate->irr)); + device->save_item(NAME(cpustate->itf)); + device->save_item(NAME(cpustate->ovc0)); + device->save_item(NAME(cpustate->ovc1)); + device->save_item(NAME(cpustate->ovcf)); + device->save_item(NAME(cpustate->ovcs)); + device->save_item(NAME(cpustate->edges)); + device->save_item(NAME(cpustate->int1)); + device->save_item(NAME(cpustate->int2)); } #include "7810tbl.c" diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index 64d2a4dafa1..2a15d477e50 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -939,24 +939,24 @@ static void nec_init(legacy_cpu_device *device, device_irq_callback irqcallback, const nec_config *config = &default_config; - state_save_register_device_item_array(device, 0, cpustate->regs.w); - state_save_register_device_item_array(device, 0, cpustate->sregs); - - state_save_register_device_item(device, 0, cpustate->ip); - state_save_register_device_item(device, 0, cpustate->TF); - state_save_register_device_item(device, 0, cpustate->IF); - state_save_register_device_item(device, 0, cpustate->DF); - state_save_register_device_item(device, 0, cpustate->MF); - state_save_register_device_item(device, 0, cpustate->SignVal); - state_save_register_device_item(device, 0, cpustate->int_vector); - state_save_register_device_item(device, 0, cpustate->pending_irq); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->AuxVal); - state_save_register_device_item(device, 0, cpustate->OverVal); - state_save_register_device_item(device, 0, cpustate->ZeroVal); - state_save_register_device_item(device, 0, cpustate->CarryVal); - state_save_register_device_item(device, 0, cpustate->ParityVal); + device->save_item(NAME(cpustate->regs.w)); + device->save_item(NAME(cpustate->sregs)); + + device->save_item(NAME(cpustate->ip)); + device->save_item(NAME(cpustate->TF)); + device->save_item(NAME(cpustate->IF)); + device->save_item(NAME(cpustate->DF)); + device->save_item(NAME(cpustate->MF)); + device->save_item(NAME(cpustate->SignVal)); + device->save_item(NAME(cpustate->int_vector)); + device->save_item(NAME(cpustate->pending_irq)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->AuxVal)); + device->save_item(NAME(cpustate->OverVal)); + device->save_item(NAME(cpustate->ZeroVal)); + device->save_item(NAME(cpustate->CarryVal)); + device->save_item(NAME(cpustate->ParityVal)); cpustate->config = config; cpustate->irq_callback = irqcallback; diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index ca17d8afd13..71894191425 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -334,14 +334,14 @@ static void base_init(legacy_cpu_device *device, device_irq_callback irqcallback cpustate->irq_line = CLEAR_LINE; cpustate->nmi_line = CLEAR_LINE; - state_save_register_device_item_array(device, 0, cpustate->reg); - state_save_register_device_item(device, 0, cpustate->irq_line); - state_save_register_device_item(device, 0, cpustate->nmi_line); - state_save_register_device_item(device, 0, cpustate->PPC); - state_save_register_device_item(device, 0, cpustate->_CY); - state_save_register_device_item(device, 0, cpustate->_OV); - state_save_register_device_item(device, 0, cpustate->_S); - state_save_register_device_item(device, 0, cpustate->_Z); + device->save_item(NAME(cpustate->reg)); + device->save_item(NAME(cpustate->irq_line)); + device->save_item(NAME(cpustate->nmi_line)); + device->save_item(NAME(cpustate->PPC)); + device->save_item(NAME(cpustate->_CY)); + device->save_item(NAME(cpustate->_OV)); + device->save_item(NAME(cpustate->_S)); + device->save_item(NAME(cpustate->_Z)); } static CPU_INIT( v60 ) diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index 7c4ab5a7b20..ae05b52b865 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -1026,11 +1026,11 @@ static CPU_INIT( v810 ) cpustate->direct = &cpustate->program->direct(); cpustate->io = device->space(AS_IO); - state_save_register_device_item_array(device, 0, cpustate->reg); - state_save_register_device_item(device, 0, cpustate->irq_line); - state_save_register_device_item(device, 0, cpustate->irq_state); - state_save_register_device_item(device, 0, cpustate->nmi_line); - state_save_register_device_item(device, 0, cpustate->PPC); + device->save_item(NAME(cpustate->reg)); + device->save_item(NAME(cpustate->irq_line)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->nmi_line)); + device->save_item(NAME(cpustate->PPC)); } diff --git a/src/emu/cpu/vtlb.c b/src/emu/cpu/vtlb.c index a8b68d4bdda..2c3a1fd9099 100644 --- a/src/emu/cpu/vtlb.c +++ b/src/emu/cpu/vtlb.c @@ -77,17 +77,17 @@ vtlb_state *vtlb_alloc(device_t *cpu, int space, int fixed_entries, int dynamic_ /* allocate the entry array */ vtlb->live = auto_alloc_array_clear(cpu->machine, offs_t, fixed_entries + dynamic_entries); - state_save_register_device_item_pointer(cpu, space, vtlb->live, fixed_entries + dynamic_entries); + cpu->save_pointer(NAME(vtlb->live), fixed_entries + dynamic_entries, space); /* allocate the lookup table */ vtlb->table = auto_alloc_array_clear(cpu->machine, vtlb_entry, (size_t) 1 << (vtlb->addrwidth - vtlb->pageshift)); - state_save_register_device_item_pointer(cpu, space, vtlb->table, 1 << (vtlb->addrwidth - vtlb->pageshift)); + cpu->save_pointer(NAME(vtlb->table), 1 << (vtlb->addrwidth - vtlb->pageshift), space); /* allocate the fixed page count array */ if (fixed_entries > 0) { vtlb->fixedpages = auto_alloc_array_clear(cpu->machine, int, fixed_entries); - state_save_register_device_item_pointer(cpu, space, vtlb->fixedpages, fixed_entries); + cpu->save_pointer(NAME(vtlb->fixedpages), fixed_entries, space); } return vtlb; } diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index f68552be1eb..3911955dc03 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -2050,46 +2050,46 @@ static CPU_INIT( z180 ) state->state_add(Z180_IOCR, "IOCR", cpustate->IO_IOCR); } - state_save_register_device_item(device, 0, cpustate->AF.w.l); - state_save_register_device_item(device, 0, cpustate->BC.w.l); - state_save_register_device_item(device, 0, cpustate->DE.w.l); - state_save_register_device_item(device, 0, cpustate->HL.w.l); - state_save_register_device_item(device, 0, cpustate->IX.w.l); - state_save_register_device_item(device, 0, cpustate->IY.w.l); - state_save_register_device_item(device, 0, cpustate->PC.w.l); - state_save_register_device_item(device, 0, cpustate->SP.w.l); - state_save_register_device_item(device, 0, cpustate->AF2.w.l); - state_save_register_device_item(device, 0, cpustate->BC2.w.l); - state_save_register_device_item(device, 0, cpustate->DE2.w.l); - state_save_register_device_item(device, 0, cpustate->HL2.w.l); - state_save_register_device_item(device, 0, cpustate->R); - state_save_register_device_item(device, 0, cpustate->R2); - state_save_register_device_item(device, 0, cpustate->IFF1); - state_save_register_device_item(device, 0, cpustate->IFF2); - state_save_register_device_item(device, 0, cpustate->HALT); - state_save_register_device_item(device, 0, cpustate->IM); - state_save_register_device_item(device, 0, cpustate->I); - state_save_register_device_item(device, 0, cpustate->nmi_state); - state_save_register_device_item(device, 0, cpustate->nmi_pending); - state_save_register_device_item_array(device, 0, cpustate->irq_state); - state_save_register_device_item_array(device, 0, cpustate->int_pending); - state_save_register_device_item(device, 0, cpustate->timer_cnt); - state_save_register_device_item(device, 0, cpustate->dma0_cnt); - state_save_register_device_item(device, 0, cpustate->dma1_cnt); - state_save_register_device_item(device, 0, cpustate->after_EI); - - state_save_register_device_item_array(device, 0, cpustate->tif); - - state_save_register_device_item_array(device, 0, cpustate->read_tcr_tmdr); - state_save_register_device_item_array(device, 0, cpustate->tmdr_value); - state_save_register_device_item_array(device, 0, cpustate->tmdrh); - state_save_register_device_item(device, 0, cpustate->tmdr_latch); - - state_save_register_device_item_array(device, 0, cpustate->io); - state_save_register_device_item(device, 0, cpustate->iol); - state_save_register_device_item(device, 0, cpustate->ioltemp); - - state_save_register_device_item_array(device, 0, cpustate->mmu); + device->save_item(NAME(cpustate->AF.w.l)); + device->save_item(NAME(cpustate->BC.w.l)); + device->save_item(NAME(cpustate->DE.w.l)); + device->save_item(NAME(cpustate->HL.w.l)); + device->save_item(NAME(cpustate->IX.w.l)); + device->save_item(NAME(cpustate->IY.w.l)); + device->save_item(NAME(cpustate->PC.w.l)); + device->save_item(NAME(cpustate->SP.w.l)); + device->save_item(NAME(cpustate->AF2.w.l)); + device->save_item(NAME(cpustate->BC2.w.l)); + device->save_item(NAME(cpustate->DE2.w.l)); + device->save_item(NAME(cpustate->HL2.w.l)); + device->save_item(NAME(cpustate->R)); + device->save_item(NAME(cpustate->R2)); + device->save_item(NAME(cpustate->IFF1)); + device->save_item(NAME(cpustate->IFF2)); + device->save_item(NAME(cpustate->HALT)); + device->save_item(NAME(cpustate->IM)); + device->save_item(NAME(cpustate->I)); + device->save_item(NAME(cpustate->nmi_state)); + device->save_item(NAME(cpustate->nmi_pending)); + device->save_item(NAME(cpustate->irq_state)); + device->save_item(NAME(cpustate->int_pending)); + device->save_item(NAME(cpustate->timer_cnt)); + device->save_item(NAME(cpustate->dma0_cnt)); + device->save_item(NAME(cpustate->dma1_cnt)); + device->save_item(NAME(cpustate->after_EI)); + + device->save_item(NAME(cpustate->tif)); + + device->save_item(NAME(cpustate->read_tcr_tmdr)); + device->save_item(NAME(cpustate->tmdr_value)); + device->save_item(NAME(cpustate->tmdrh)); + device->save_item(NAME(cpustate->tmdr_latch)); + + device->save_item(NAME(cpustate->io)); + device->save_item(NAME(cpustate->iol)); + device->save_item(NAME(cpustate->ioltemp)); + + device->save_item(NAME(cpustate->mmu)); } diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c index dde5888c8dd..941fcae4d15 100644 --- a/src/emu/cpu/z8/z8.c +++ b/src/emu/cpu/z8/z8.c @@ -673,11 +673,11 @@ static CPU_INIT( z8 ) cpustate->t1_timer = device->machine->scheduler().timer_alloc(FUNC(t1_tick), cpustate); /* register for state saving */ - state_save_register_device_item(device, 0, cpustate->pc); - state_save_register_device_item_array(device, 0, cpustate->r); - state_save_register_device_item_array(device, 0, cpustate->input); - state_save_register_device_item_array(device, 0, cpustate->output); - state_save_register_device_item_array(device, 0, cpustate->irq); + device->save_item(NAME(cpustate->pc)); + device->save_item(NAME(cpustate->r)); + device->save_item(NAME(cpustate->input)); + device->save_item(NAME(cpustate->output)); + device->save_item(NAME(cpustate->irq)); } /*************************************************************************** diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 5c80f0ffec3..d9393bbac7d 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -3421,32 +3421,32 @@ static CPU_INIT( z80 ) if( (i & 0x0f) == 0x0f ) SZHV_dec[i] |= HF; } - state_save_register_device_item(device, 0, z80->prvpc.w.l); - state_save_register_device_item(device, 0, z80->PC); - state_save_register_device_item(device, 0, z80->SP); - state_save_register_device_item(device, 0, z80->AF); - state_save_register_device_item(device, 0, z80->BC); - state_save_register_device_item(device, 0, z80->DE); - state_save_register_device_item(device, 0, z80->HL); - state_save_register_device_item(device, 0, z80->IX); - state_save_register_device_item(device, 0, z80->IY); - state_save_register_device_item(device, 0, z80->WZ); - state_save_register_device_item(device, 0, z80->af2.w.l); - state_save_register_device_item(device, 0, z80->bc2.w.l); - state_save_register_device_item(device, 0, z80->de2.w.l); - state_save_register_device_item(device, 0, z80->hl2.w.l); - state_save_register_device_item(device, 0, z80->r); - state_save_register_device_item(device, 0, z80->r2); - state_save_register_device_item(device, 0, z80->iff1); - state_save_register_device_item(device, 0, z80->iff2); - state_save_register_device_item(device, 0, z80->halt); - state_save_register_device_item(device, 0, z80->im); - state_save_register_device_item(device, 0, z80->i); - state_save_register_device_item(device, 0, z80->nmi_state); - state_save_register_device_item(device, 0, z80->nmi_pending); - state_save_register_device_item(device, 0, z80->irq_state); - state_save_register_device_item(device, 0, z80->after_ei); - state_save_register_device_item(device, 0, z80->after_ldair); + device->save_item(NAME(z80->prvpc.w.l)); + device->save_item(NAME(z80->PC)); + device->save_item(NAME(z80->SP)); + device->save_item(NAME(z80->AF)); + device->save_item(NAME(z80->BC)); + device->save_item(NAME(z80->DE)); + device->save_item(NAME(z80->HL)); + device->save_item(NAME(z80->IX)); + device->save_item(NAME(z80->IY)); + device->save_item(NAME(z80->WZ)); + device->save_item(NAME(z80->af2.w.l)); + device->save_item(NAME(z80->bc2.w.l)); + device->save_item(NAME(z80->de2.w.l)); + device->save_item(NAME(z80->hl2.w.l)); + device->save_item(NAME(z80->r)); + device->save_item(NAME(z80->r2)); + device->save_item(NAME(z80->iff1)); + device->save_item(NAME(z80->iff2)); + device->save_item(NAME(z80->halt)); + device->save_item(NAME(z80->im)); + device->save_item(NAME(z80->i)); + device->save_item(NAME(z80->nmi_state)); + device->save_item(NAME(z80->nmi_pending)); + device->save_item(NAME(z80->irq_state)); + device->save_item(NAME(z80->after_ei)); + device->save_item(NAME(z80->after_ldair)); /* Reset registers to their initial values */ z80->PRVPC = 0; @@ -3535,7 +3535,7 @@ static CPU_INIT( z80 ) static CPU_INIT( nsc800 ) { z80_state *z80 = get_safe_token(device); - state_save_register_device_item_array(device, 0, z80->nsc800_irq_state); + device->save_item(NAME(z80->nsc800_irq_state)); CPU_INIT_CALL (z80); } diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index f6f1b91ba41..3fc292e60e0 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -756,9 +756,9 @@ void device_t::start() } // register our save states - state_save_register_device_item(this, 0, m_clock); - state_save_register_device_item(this, 0, m_unscaled_clock); - state_save_register_device_item(this, 0, m_clock_scale); + save_item(NAME(m_clock)); + save_item(NAME(m_unscaled_clock)); + save_item(NAME(m_clock_scale)); // we're now officially started m_started = true; diff --git a/src/emu/diexec.c b/src/emu/diexec.c index 6e116c86833..cf1404d8abe 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -563,14 +563,14 @@ void device_execute_interface::interface_pre_start() m_timedint_timer = device().machine->scheduler().timer_alloc(FUNC(static_trigger_periodic_interrupt), (void *)this); // register for save states - state_save_register_device_item(&m_device, 0, m_suspend); - state_save_register_device_item(&m_device, 0, m_nextsuspend); - state_save_register_device_item(&m_device, 0, m_eatcycles); - state_save_register_device_item(&m_device, 0, m_nexteatcycles); - state_save_register_device_item(&m_device, 0, m_trigger); - state_save_register_device_item(&m_device, 0, m_totalcycles); - state_save_register_device_item(&m_device, 0, m_localtime); - state_save_register_device_item(&m_device, 0, m_iloops); + m_device.save_item(NAME(m_suspend)); + m_device.save_item(NAME(m_nextsuspend)); + m_device.save_item(NAME(m_eatcycles)); + m_device.save_item(NAME(m_nexteatcycles)); + m_device.save_item(NAME(m_trigger)); + m_device.save_item(NAME(m_totalcycles)); + m_device.save_item(NAME(m_localtime)); + m_device.save_item(NAME(m_iloops)); } @@ -856,9 +856,9 @@ void device_execute_interface::device_input::start(device_execute_interface *exe reset(); - state_save_register_device_item(m_device, m_linenum, m_stored_vector); - state_save_register_device_item(m_device, m_linenum, m_curvector); - state_save_register_device_item(m_device, m_linenum, m_curstate); + m_device->save_item(NAME(m_stored_vector), m_linenum); + m_device->save_item(NAME(m_curvector), m_linenum); + m_device->save_item(NAME(m_curstate), m_linenum); } diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index 7f6ac84fb7f..7a956c37897 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -229,34 +229,34 @@ void via6522_device::device_start() } /* save state register */ - state_save_register_device_item(this, 0, m_in_a); - state_save_register_device_item(this, 0, m_in_ca1); - state_save_register_device_item(this, 0, m_in_ca2); - state_save_register_device_item(this, 0, m_out_a); - state_save_register_device_item(this, 0, m_out_ca2); - state_save_register_device_item(this, 0, m_ddr_a); - state_save_register_device_item(this, 0, m_in_b); - state_save_register_device_item(this, 0, m_in_cb1); - state_save_register_device_item(this, 0, m_in_cb2); - state_save_register_device_item(this, 0, m_out_b); - state_save_register_device_item(this, 0, m_out_cb2); - state_save_register_device_item(this, 0, m_ddr_b); - state_save_register_device_item(this, 0, m_t1cl); - state_save_register_device_item(this, 0, m_t1ch); - state_save_register_device_item(this, 0, m_t1ll); - state_save_register_device_item(this, 0, m_t1lh); - state_save_register_device_item(this, 0, m_t2cl); - state_save_register_device_item(this, 0, m_t2ch); - state_save_register_device_item(this, 0, m_t2ll); - state_save_register_device_item(this, 0, m_t2lh); - state_save_register_device_item(this, 0, m_sr); - state_save_register_device_item(this, 0, m_pcr); - state_save_register_device_item(this, 0, m_acr); - state_save_register_device_item(this, 0, m_ier); - state_save_register_device_item(this, 0, m_ifr); - state_save_register_device_item(this, 0, m_t1_active); - state_save_register_device_item(this, 0, m_t2_active); - state_save_register_device_item(this, 0, m_shift_counter); + save_item(NAME(m_in_a)); + save_item(NAME(m_in_ca1)); + save_item(NAME(m_in_ca2)); + save_item(NAME(m_out_a)); + save_item(NAME(m_out_ca2)); + save_item(NAME(m_ddr_a)); + save_item(NAME(m_in_b)); + save_item(NAME(m_in_cb1)); + save_item(NAME(m_in_cb2)); + save_item(NAME(m_out_b)); + save_item(NAME(m_out_cb2)); + save_item(NAME(m_ddr_b)); + save_item(NAME(m_t1cl)); + save_item(NAME(m_t1ch)); + save_item(NAME(m_t1ll)); + save_item(NAME(m_t1lh)); + save_item(NAME(m_t2cl)); + save_item(NAME(m_t2ch)); + save_item(NAME(m_t2ll)); + save_item(NAME(m_t2lh)); + save_item(NAME(m_sr)); + save_item(NAME(m_pcr)); + save_item(NAME(m_acr)); + save_item(NAME(m_ier)); + save_item(NAME(m_ifr)); + save_item(NAME(m_t1_active)); + save_item(NAME(m_t2_active)); + save_item(NAME(m_shift_counter)); } diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c index 4273dc5c9fc..a90652efded 100644 --- a/src/emu/machine/6526cia.c +++ b/src/emu/machine/6526cia.c @@ -212,39 +212,39 @@ void mos6526_device::device_start() } /* state save support */ - state_save_register_device_item(this, 0, m_port[0].m_ddr); - state_save_register_device_item(this, 0, m_port[0].m_latch); - state_save_register_device_item(this, 0, m_port[0].m_in); - state_save_register_device_item(this, 0, m_port[0].m_out); - state_save_register_device_item(this, 0, m_port[0].m_mask_value); - state_save_register_device_item(this, 0, m_port[1].m_ddr); - state_save_register_device_item(this, 0, m_port[1].m_latch); - state_save_register_device_item(this, 0, m_port[1].m_in); - state_save_register_device_item(this, 0, m_port[1].m_out); - state_save_register_device_item(this, 0, m_port[1].m_mask_value); - state_save_register_device_item(this, 0, m_timer[0].m_latch); - state_save_register_device_item(this, 0, m_timer[0].m_count); - state_save_register_device_item(this, 0, m_timer[0].m_mode); - state_save_register_device_item(this, 0, m_timer[0].m_irq); - state_save_register_device_item(this, 0, m_timer[1].m_latch); - state_save_register_device_item(this, 0, m_timer[1].m_count); - state_save_register_device_item(this, 0, m_timer[1].m_mode); - state_save_register_device_item(this, 0, m_timer[1].m_irq); - state_save_register_device_item(this, 0, m_tod); - state_save_register_device_item(this, 0, m_tod_latch); - state_save_register_device_item(this, 0, m_tod_latched); - state_save_register_device_item(this, 0, m_tod_running); - state_save_register_device_item(this, 0, m_alarm); - state_save_register_device_item(this, 0, m_icr); - state_save_register_device_item(this, 0, m_ics); - state_save_register_device_item(this, 0, m_irq); - state_save_register_device_item(this, 0, m_flag); - state_save_register_device_item(this, 0, m_loaded); - state_save_register_device_item(this, 0, m_sdr); - state_save_register_device_item(this, 0, m_sp); - state_save_register_device_item(this, 0, m_cnt); - state_save_register_device_item(this, 0, m_shift); - state_save_register_device_item(this, 0, m_serial); + save_item(NAME(m_port[0].m_ddr)); + save_item(NAME(m_port[0].m_latch)); + save_item(NAME(m_port[0].m_in)); + save_item(NAME(m_port[0].m_out)); + save_item(NAME(m_port[0].m_mask_value)); + save_item(NAME(m_port[1].m_ddr)); + save_item(NAME(m_port[1].m_latch)); + save_item(NAME(m_port[1].m_in)); + save_item(NAME(m_port[1].m_out)); + save_item(NAME(m_port[1].m_mask_value)); + save_item(NAME(m_timer[0].m_latch)); + save_item(NAME(m_timer[0].m_count)); + save_item(NAME(m_timer[0].m_mode)); + save_item(NAME(m_timer[0].m_irq)); + save_item(NAME(m_timer[1].m_latch)); + save_item(NAME(m_timer[1].m_count)); + save_item(NAME(m_timer[1].m_mode)); + save_item(NAME(m_timer[1].m_irq)); + save_item(NAME(m_tod)); + save_item(NAME(m_tod_latch)); + save_item(NAME(m_tod_latched)); + save_item(NAME(m_tod_running)); + save_item(NAME(m_alarm)); + save_item(NAME(m_icr)); + save_item(NAME(m_ics)); + save_item(NAME(m_irq)); + save_item(NAME(m_flag)); + save_item(NAME(m_loaded)); + save_item(NAME(m_sdr)); + save_item(NAME(m_sp)); + save_item(NAME(m_cnt)); + save_item(NAME(m_shift)); + save_item(NAME(m_serial)); } diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c index 8ed202356f1..63437a2dfa5 100644 --- a/src/emu/machine/6532riot.c +++ b/src/emu/machine/6532riot.c @@ -537,21 +537,21 @@ void riot6532_device::device_start() m_timer = m_machine.scheduler().timer_alloc(FUNC(timer_end_callback), (void *)this); /* register for save states */ - state_save_register_device_item(this, 0, m_port[0].m_in); - state_save_register_device_item(this, 0, m_port[0].m_out); - state_save_register_device_item(this, 0, m_port[0].m_ddr); - state_save_register_device_item(this, 0, m_port[1].m_in); - state_save_register_device_item(this, 0, m_port[1].m_out); - state_save_register_device_item(this, 0, m_port[1].m_ddr); + save_item(NAME(m_port[0].m_in)); + save_item(NAME(m_port[0].m_out)); + save_item(NAME(m_port[0].m_ddr)); + save_item(NAME(m_port[1].m_in)); + save_item(NAME(m_port[1].m_out)); + save_item(NAME(m_port[1].m_ddr)); - state_save_register_device_item(this, 0, m_irqstate); - state_save_register_device_item(this, 0, m_irqenable); + save_item(NAME(m_irqstate)); + save_item(NAME(m_irqenable)); - state_save_register_device_item(this, 0, m_pa7dir); - state_save_register_device_item(this, 0, m_pa7prev); + save_item(NAME(m_pa7dir)); + save_item(NAME(m_pa7prev)); - state_save_register_device_item(this, 0, m_timershift); - state_save_register_device_item(this, 0, m_timerstate); + save_item(NAME(m_timershift)); + save_item(NAME(m_timerstate)); } diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c index 892ec74f8a7..03afe7986c2 100644 --- a/src/emu/machine/6821pia.c +++ b/src/emu/machine/6821pia.c @@ -142,38 +142,38 @@ void pia6821_device::device_start() devcb_resolve_write_line(&m_irq_a_func, &m_config.m_irq_a_func, this); devcb_resolve_write_line(&m_irq_b_func, &m_config.m_irq_b_func, this); - state_save_register_device_item(this, 0, m_in_a); - state_save_register_device_item(this, 0, m_in_ca1); - state_save_register_device_item(this, 0, m_in_ca2); - state_save_register_device_item(this, 0, m_out_a); - state_save_register_device_item(this, 0, m_out_ca2); - state_save_register_device_item(this, 0, m_port_a_z_mask); - state_save_register_device_item(this, 0, m_ddr_a); - state_save_register_device_item(this, 0, m_ctl_a); - state_save_register_device_item(this, 0, m_irq_a1); - state_save_register_device_item(this, 0, m_irq_a2); - state_save_register_device_item(this, 0, m_irq_a_state); - state_save_register_device_item(this, 0, m_in_b); - state_save_register_device_item(this, 0, m_in_cb1); - state_save_register_device_item(this, 0, m_in_cb2); - state_save_register_device_item(this, 0, m_out_b); - state_save_register_device_item(this, 0, m_out_cb2); - state_save_register_device_item(this, 0, m_last_out_cb2_z); - state_save_register_device_item(this, 0, m_ddr_b); - state_save_register_device_item(this, 0, m_ctl_b); - state_save_register_device_item(this, 0, m_irq_b1); - state_save_register_device_item(this, 0, m_irq_b2); - state_save_register_device_item(this, 0, m_irq_b_state); - state_save_register_device_item(this, 0, m_in_a_pushed); - state_save_register_device_item(this, 0, m_out_a_needs_pulled); - state_save_register_device_item(this, 0, m_in_ca1_pushed); - state_save_register_device_item(this, 0, m_in_ca2_pushed); - state_save_register_device_item(this, 0, m_out_ca2_needs_pulled); - state_save_register_device_item(this, 0, m_in_b_pushed); - state_save_register_device_item(this, 0, m_out_b_needs_pulled); - state_save_register_device_item(this, 0, m_in_cb1_pushed); - state_save_register_device_item(this, 0, m_in_cb2_pushed); - state_save_register_device_item(this, 0, m_out_cb2_needs_pulled); + save_item(NAME(m_in_a)); + save_item(NAME(m_in_ca1)); + save_item(NAME(m_in_ca2)); + save_item(NAME(m_out_a)); + save_item(NAME(m_out_ca2)); + save_item(NAME(m_port_a_z_mask)); + save_item(NAME(m_ddr_a)); + save_item(NAME(m_ctl_a)); + save_item(NAME(m_irq_a1)); + save_item(NAME(m_irq_a2)); + save_item(NAME(m_irq_a_state)); + save_item(NAME(m_in_b)); + save_item(NAME(m_in_cb1)); + save_item(NAME(m_in_cb2)); + save_item(NAME(m_out_b)); + save_item(NAME(m_out_cb2)); + save_item(NAME(m_last_out_cb2_z)); + save_item(NAME(m_ddr_b)); + save_item(NAME(m_ctl_b)); + save_item(NAME(m_irq_b1)); + save_item(NAME(m_irq_b2)); + save_item(NAME(m_irq_b_state)); + save_item(NAME(m_in_a_pushed)); + save_item(NAME(m_out_a_needs_pulled)); + save_item(NAME(m_in_ca1_pushed)); + save_item(NAME(m_in_ca2_pushed)); + save_item(NAME(m_out_ca2_needs_pulled)); + save_item(NAME(m_in_b_pushed)); + save_item(NAME(m_out_b_needs_pulled)); + save_item(NAME(m_in_cb1_pushed)); + save_item(NAME(m_in_cb2_pushed)); + save_item(NAME(m_out_cb2_needs_pulled)); } diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c index 132597e36fe..e239e5b0446 100644 --- a/src/emu/machine/6840ptm.c +++ b/src/emu/machine/6840ptm.c @@ -144,25 +144,25 @@ void ptm6840_device::device_start() devcb_resolve_write_line(&m_irq_func, &m_config.m_irq_func, this); /* register for state saving */ - state_save_register_device_item(this, 0, m_lsb_buffer); - state_save_register_device_item(this, 0, m_msb_buffer); - state_save_register_device_item(this, 0, m_status_read_since_int); - state_save_register_device_item(this, 0, m_status_reg); - state_save_register_device_item(this, 0, m_t3_divisor); - state_save_register_device_item(this, 0, m_t3_scaler); - state_save_register_device_item(this, 0, m_internal_clock); - state_save_register_device_item(this, 0, m_IRQ); - - state_save_register_device_item_array(this, 0, m_control_reg); - state_save_register_device_item_array(this, 0, m_output); - state_save_register_device_item_array(this, 0, m_gate); - state_save_register_device_item_array(this, 0, m_clk); - state_save_register_device_item_array(this, 0, m_mode); - state_save_register_device_item_array(this, 0, m_fired); - state_save_register_device_item_array(this, 0, m_enabled); - state_save_register_device_item_array(this, 0, m_external_clock); - state_save_register_device_item_array(this, 0, m_counter); - state_save_register_device_item_array(this, 0, m_latch); + save_item(NAME(m_lsb_buffer)); + save_item(NAME(m_msb_buffer)); + save_item(NAME(m_status_read_since_int)); + save_item(NAME(m_status_reg)); + save_item(NAME(m_t3_divisor)); + save_item(NAME(m_t3_scaler)); + save_item(NAME(m_internal_clock)); + save_item(NAME(m_IRQ)); + + save_item(NAME(m_control_reg)); + save_item(NAME(m_output)); + save_item(NAME(m_gate)); + save_item(NAME(m_clk)); + save_item(NAME(m_mode)); + save_item(NAME(m_fired)); + save_item(NAME(m_enabled)); + save_item(NAME(m_external_clock)); + save_item(NAME(m_counter)); + save_item(NAME(m_latch)); } diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c index 06fd648e171..fba99000c12 100644 --- a/src/emu/machine/6850acia.c +++ b/src/emu/machine/6850acia.c @@ -125,29 +125,29 @@ void acia6850_device::device_start() m_rx_timer->reset(); m_tx_timer->reset(); - state_save_register_device_item(this, 0, m_ctrl); - state_save_register_device_item(this, 0, m_status); - state_save_register_device_item(this, 0, m_rx_clock); - state_save_register_device_item(this, 0, m_tx_clock); - state_save_register_device_item(this, 0, m_rx_counter); - state_save_register_device_item(this, 0, m_tx_counter); - state_save_register_device_item(this, 0, m_rx_shift); - state_save_register_device_item(this, 0, m_tx_shift); - state_save_register_device_item(this, 0, m_rdr); - state_save_register_device_item(this, 0, m_tdr); - state_save_register_device_item(this, 0, m_rx_bits); - state_save_register_device_item(this, 0, m_tx_bits); - state_save_register_device_item(this, 0, m_rx_parity); - state_save_register_device_item(this, 0, m_tx_parity); - state_save_register_device_item(this, 0, m_tx_int); - - state_save_register_device_item(this, 0, m_divide); - state_save_register_device_item(this, 0, m_overrun); - state_save_register_device_item(this, 0, m_reset); - state_save_register_device_item(this, 0, m_first_reset); - state_save_register_device_item(this, 0, m_rts); - state_save_register_device_item(this, 0, m_brk); - state_save_register_device_item(this, 0, m_status_read); + save_item(NAME(m_ctrl)); + save_item(NAME(m_status)); + save_item(NAME(m_rx_clock)); + save_item(NAME(m_tx_clock)); + save_item(NAME(m_rx_counter)); + save_item(NAME(m_tx_counter)); + save_item(NAME(m_rx_shift)); + save_item(NAME(m_tx_shift)); + save_item(NAME(m_rdr)); + save_item(NAME(m_tdr)); + save_item(NAME(m_rx_bits)); + save_item(NAME(m_tx_bits)); + save_item(NAME(m_rx_parity)); + save_item(NAME(m_tx_parity)); + save_item(NAME(m_tx_int)); + + save_item(NAME(m_divide)); + save_item(NAME(m_overrun)); + save_item(NAME(m_reset)); + save_item(NAME(m_first_reset)); + save_item(NAME(m_rts)); + save_item(NAME(m_brk)); + save_item(NAME(m_status_read)); } diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index d7b1a74ff5c..f4fb54d95da 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -714,45 +714,45 @@ static DEVICE_START(duart68681) duart68681->channel[1].tx_timer = device->machine->scheduler().timer_alloc(FUNC(tx_timer_callback), (void*)device); duart68681->duart_timer = device->machine->scheduler().timer_alloc(FUNC(duart_timer_callback), (void*)device); - state_save_register_device_item(device, 0, duart68681->ACR); - state_save_register_device_item(device, 0, duart68681->IMR); - state_save_register_device_item(device, 0, duart68681->ISR); - state_save_register_device_item(device, 0, duart68681->IVR); - state_save_register_device_item(device, 0, duart68681->OPCR); - state_save_register_device_item(device, 0, duart68681->CTR); - state_save_register_device_item(device, 0, duart68681->IP_last_state); - - state_save_register_device_item(device, 0, duart68681->channel[0].CR); - state_save_register_device_item(device, 0, duart68681->channel[0].CSR); - state_save_register_device_item(device, 0, duart68681->channel[0].MR1); - state_save_register_device_item(device, 0, duart68681->channel[0].MR2); - state_save_register_device_item(device, 0, duart68681->channel[0].MR_ptr); - state_save_register_device_item(device, 0, duart68681->channel[0].SR); - state_save_register_device_item(device, 0, duart68681->channel[0].baud_rate); - state_save_register_device_item(device, 0, duart68681->channel[0].rx_enabled); - state_save_register_device_item_array(device, 0, duart68681->channel[0].rx_fifo); - state_save_register_device_item(device, 0, duart68681->channel[0].rx_fifo_read_ptr); - state_save_register_device_item(device, 0, duart68681->channel[0].rx_fifo_write_ptr); - state_save_register_device_item(device, 0, duart68681->channel[0].rx_fifo_num); - state_save_register_device_item(device, 0, duart68681->channel[0].tx_enabled); - state_save_register_device_item(device, 0, duart68681->channel[0].tx_data); - state_save_register_device_item(device, 0, duart68681->channel[0].tx_ready); - - state_save_register_device_item(device, 0, duart68681->channel[1].CR); - state_save_register_device_item(device, 0, duart68681->channel[1].CSR); - state_save_register_device_item(device, 0, duart68681->channel[1].MR1); - state_save_register_device_item(device, 0, duart68681->channel[1].MR2); - state_save_register_device_item(device, 0, duart68681->channel[1].MR_ptr); - state_save_register_device_item(device, 0, duart68681->channel[1].SR); - state_save_register_device_item(device, 0, duart68681->channel[1].baud_rate); - state_save_register_device_item(device, 0, duart68681->channel[1].rx_enabled); - state_save_register_device_item_array(device, 0, duart68681->channel[1].rx_fifo); - state_save_register_device_item(device, 0, duart68681->channel[1].rx_fifo_read_ptr); - state_save_register_device_item(device, 0, duart68681->channel[1].rx_fifo_write_ptr); - state_save_register_device_item(device, 0, duart68681->channel[1].rx_fifo_num); - state_save_register_device_item(device, 0, duart68681->channel[1].tx_enabled); - state_save_register_device_item(device, 0, duart68681->channel[1].tx_data); - state_save_register_device_item(device, 0, duart68681->channel[1].tx_ready); + device->save_item(NAME(duart68681->ACR)); + device->save_item(NAME(duart68681->IMR)); + device->save_item(NAME(duart68681->ISR)); + device->save_item(NAME(duart68681->IVR)); + device->save_item(NAME(duart68681->OPCR)); + device->save_item(NAME(duart68681->CTR)); + device->save_item(NAME(duart68681->IP_last_state)); + + device->save_item(NAME(duart68681->channel[0].CR)); + device->save_item(NAME(duart68681->channel[0].CSR)); + device->save_item(NAME(duart68681->channel[0].MR1)); + device->save_item(NAME(duart68681->channel[0].MR2)); + device->save_item(NAME(duart68681->channel[0].MR_ptr)); + device->save_item(NAME(duart68681->channel[0].SR)); + device->save_item(NAME(duart68681->channel[0].baud_rate)); + device->save_item(NAME(duart68681->channel[0].rx_enabled)); + device->save_item(NAME(duart68681->channel[0].rx_fifo)); + device->save_item(NAME(duart68681->channel[0].rx_fifo_read_ptr)); + device->save_item(NAME(duart68681->channel[0].rx_fifo_write_ptr)); + device->save_item(NAME(duart68681->channel[0].rx_fifo_num)); + device->save_item(NAME(duart68681->channel[0].tx_enabled)); + device->save_item(NAME(duart68681->channel[0].tx_data)); + device->save_item(NAME(duart68681->channel[0].tx_ready)); + + device->save_item(NAME(duart68681->channel[1].CR)); + device->save_item(NAME(duart68681->channel[1].CSR)); + device->save_item(NAME(duart68681->channel[1].MR1)); + device->save_item(NAME(duart68681->channel[1].MR2)); + device->save_item(NAME(duart68681->channel[1].MR_ptr)); + device->save_item(NAME(duart68681->channel[1].SR)); + device->save_item(NAME(duart68681->channel[1].baud_rate)); + device->save_item(NAME(duart68681->channel[1].rx_enabled)); + device->save_item(NAME(duart68681->channel[1].rx_fifo)); + device->save_item(NAME(duart68681->channel[1].rx_fifo_read_ptr)); + device->save_item(NAME(duart68681->channel[1].rx_fifo_write_ptr)); + device->save_item(NAME(duart68681->channel[1].rx_fifo_num)); + device->save_item(NAME(duart68681->channel[1].tx_enabled)); + device->save_item(NAME(duart68681->channel[1].tx_data)); + device->save_item(NAME(duart68681->channel[1].tx_ready)); } /*------------------------------------------------- diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c index 1ce5a435b9b..2ab8ff8619f 100644 --- a/src/emu/machine/74123.c +++ b/src/emu/machine/74123.c @@ -114,9 +114,9 @@ void ttl74123_device::device_start() m_clear = m_config.m_clear; /* register for state saving */ - state_save_register_device_item(this, 0, m_a); - state_save_register_device_item(this, 0, m_b); - state_save_register_device_item(this, 0, m_clear); + save_item(NAME(m_a)); + save_item(NAME(m_b)); + save_item(NAME(m_clear)); } diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c index b12f471bb37..9a3a8df9556 100644 --- a/src/emu/machine/74148.c +++ b/src/emu/machine/74148.c @@ -184,14 +184,14 @@ static DEVICE_START( ttl74148 ) ttl74148_state *state = get_safe_token(device); state->output_cb = config->output_cb; - state_save_register_device_item_array(device, 0, state->input_lines); - state_save_register_device_item(device, 0, state->enable_input); - state_save_register_device_item(device, 0, state->output); - state_save_register_device_item(device, 0, state->output_valid); - state_save_register_device_item(device, 0, state->enable_output); - state_save_register_device_item(device, 0, state->last_output); - state_save_register_device_item(device, 0, state->last_output_valid); - state_save_register_device_item(device, 0, state->last_enable_output); + device->save_item(NAME(state->input_lines)); + device->save_item(NAME(state->enable_input)); + device->save_item(NAME(state->output)); + device->save_item(NAME(state->output_valid)); + device->save_item(NAME(state->enable_output)); + device->save_item(NAME(state->last_output)); + device->save_item(NAME(state->last_output_valid)); + device->save_item(NAME(state->last_enable_output)); } diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c index 037676b7aec..3d286195eed 100644 --- a/src/emu/machine/74153.c +++ b/src/emu/machine/74153.c @@ -140,18 +140,18 @@ static DEVICE_START( ttl74153 ) ttl74153_state *state = get_safe_token(device); state->output_cb = config->output_cb; - state_save_register_device_item_array(device, 0, state->enable); - state_save_register_device_item_array(device, 0, state->last_output); - state_save_register_device_item(device, 0, state->input_lines[0][0]); - state_save_register_device_item(device, 0, state->input_lines[0][1]); - state_save_register_device_item(device, 0, state->input_lines[0][2]); - state_save_register_device_item(device, 0, state->input_lines[0][3]); - state_save_register_device_item(device, 0, state->input_lines[1][0]); - state_save_register_device_item(device, 0, state->input_lines[1][1]); - state_save_register_device_item(device, 0, state->input_lines[1][2]); - state_save_register_device_item(device, 0, state->input_lines[1][3]); - state_save_register_device_item(device, 0, state->a); - state_save_register_device_item(device, 0, state->b); + device->save_item(NAME(state->enable)); + device->save_item(NAME(state->last_output)); + device->save_item(NAME(state->input_lines[0][0])); + device->save_item(NAME(state->input_lines[0][1])); + device->save_item(NAME(state->input_lines[0][2])); + device->save_item(NAME(state->input_lines[0][3])); + device->save_item(NAME(state->input_lines[1][0])); + device->save_item(NAME(state->input_lines[1][1])); + device->save_item(NAME(state->input_lines[1][2])); + device->save_item(NAME(state->input_lines[1][3])); + device->save_item(NAME(state->a)); + device->save_item(NAME(state->b)); } diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c index 6b0c57bf3ec..5e537210d89 100644 --- a/src/emu/machine/7474.c +++ b/src/emu/machine/7474.c @@ -155,15 +155,15 @@ ttl7474_device::ttl7474_device(running_machine &_machine, const ttl7474_device_c void ttl7474_device::device_start() { - state_save_register_device_item(this, 0, m_clear); - state_save_register_device_item(this, 0, m_preset); - state_save_register_device_item(this, 0, m_clk); - state_save_register_device_item(this, 0, m_d); - state_save_register_device_item(this, 0, m_output); - state_save_register_device_item(this, 0, m_output_comp); - state_save_register_device_item(this, 0, m_last_clock); - state_save_register_device_item(this, 0, m_last_output); - state_save_register_device_item(this, 0, m_last_output_comp); + save_item(NAME(m_clear)); + save_item(NAME(m_preset)); + save_item(NAME(m_clk)); + save_item(NAME(m_d)); + save_item(NAME(m_output)); + save_item(NAME(m_output_comp)); + save_item(NAME(m_last_clock)); + save_item(NAME(m_last_output)); + save_item(NAME(m_last_output_comp)); devcb_resolve_write_line(&m_output_cb, &m_config.m_output_cb, this); devcb_resolve_write_line(&m_comp_output_cb, &m_config.m_comp_output_cb, this); diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c index 3d890bd39e5..5ed908be7bb 100644 --- a/src/emu/machine/8255ppi.c +++ b/src/emu/machine/8255ppi.c @@ -161,24 +161,24 @@ void ppi8255_device::device_start() devcb_resolve_write8(&m_port_write[2], &m_config.m_port_c_write, this); /* register for state saving */ - state_save_register_device_item(this, 0, m_group_a_mode); - state_save_register_device_item(this, 0, m_group_b_mode); - state_save_register_device_item(this, 0, m_port_a_dir); - state_save_register_device_item(this, 0, m_port_b_dir); - state_save_register_device_item(this, 0, m_port_ch_dir); - state_save_register_device_item(this, 0, m_port_cl_dir); - state_save_register_device_item(this, 0, m_obf_a); - state_save_register_device_item(this, 0, m_obf_b); - state_save_register_device_item(this, 0, m_ibf_a); - state_save_register_device_item(this, 0, m_ibf_b); - state_save_register_device_item(this, 0, m_inte_a); - state_save_register_device_item(this, 0, m_inte_b); - state_save_register_device_item(this, 0, m_inte_1); - state_save_register_device_item(this, 0, m_inte_2); - state_save_register_device_item_array(this, 0, m_in_mask); - state_save_register_device_item_array(this, 0, m_out_mask); - state_save_register_device_item_array(this, 0, m_read); - state_save_register_device_item_array(this, 0, m_latch); + save_item(NAME(m_group_a_mode)); + save_item(NAME(m_group_b_mode)); + save_item(NAME(m_port_a_dir)); + save_item(NAME(m_port_b_dir)); + save_item(NAME(m_port_ch_dir)); + save_item(NAME(m_port_cl_dir)); + save_item(NAME(m_obf_a)); + save_item(NAME(m_obf_b)); + save_item(NAME(m_ibf_a)); + save_item(NAME(m_ibf_b)); + save_item(NAME(m_inte_a)); + save_item(NAME(m_inte_b)); + save_item(NAME(m_inte_1)); + save_item(NAME(m_inte_2)); + save_item(NAME(m_in_mask)); + save_item(NAME(m_out_mask)); + save_item(NAME(m_read)); + save_item(NAME(m_latch)); } diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c index c2cae7ce8d2..1a762eecca5 100644 --- a/src/emu/machine/8257dma.c +++ b/src/emu/machine/8257dma.c @@ -141,15 +141,15 @@ void i8257_device::device_start() m_msbflip_timer = timer_alloc(TIMER_MSBFLIP); /* register for state saving */ - state_save_register_device_item_array(this, 0, m_address); - state_save_register_device_item_array(this, 0, m_count); - state_save_register_device_item_array(this, 0, m_rwmode); - state_save_register_device_item_array(this, 0, m_registers); - state_save_register_device_item(this, 0, m_mode); - state_save_register_device_item(this, 0, m_rr); - state_save_register_device_item(this, 0, m_msb); - state_save_register_device_item(this, 0, m_drq); - state_save_register_device_item(this, 0, m_status); + save_item(NAME(m_address)); + save_item(NAME(m_count)); + save_item(NAME(m_rwmode)); + save_item(NAME(m_registers)); + save_item(NAME(m_mode)); + save_item(NAME(m_rr)); + save_item(NAME(m_msb)); + save_item(NAME(m_drq)); + save_item(NAME(m_status)); } diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c index f2215c4d0f8..06ad3b4a3fc 100644 --- a/src/emu/machine/adc083x.c +++ b/src/emu/machine/adc083x.c @@ -475,20 +475,20 @@ static DEVICE_START( adc0831 ) adc083x->input_callback_r = intf->input_callback_r; /* register for state saving */ - state_save_register_device_item( device, 0, adc083x->cs ); - state_save_register_device_item( device, 0, adc083x->clk ); - state_save_register_device_item( device, 0, adc083x->di ); - state_save_register_device_item( device, 0, adc083x->se ); - state_save_register_device_item( device, 0, adc083x->sars ); - state_save_register_device_item( device, 0, adc083x->_do ); - state_save_register_device_item( device, 0, adc083x->sgl ); - state_save_register_device_item( device, 0, adc083x->odd ); - state_save_register_device_item( device, 0, adc083x->sel1 ); - state_save_register_device_item( device, 0, adc083x->sel0 ); - state_save_register_device_item( device, 0, adc083x->state ); - state_save_register_device_item( device, 0, adc083x->bit ); - state_save_register_device_item( device, 0, adc083x->output ); - state_save_register_device_item( device, 0, adc083x->mux_bits ); + device->save_item( NAME(adc083x->cs) ); + device->save_item( NAME(adc083x->clk) ); + device->save_item( NAME(adc083x->di) ); + device->save_item( NAME(adc083x->se) ); + device->save_item( NAME(adc083x->sars) ); + device->save_item( NAME(adc083x->_do) ); + device->save_item( NAME(adc083x->sgl) ); + device->save_item( NAME(adc083x->odd) ); + device->save_item( NAME(adc083x->sel1) ); + device->save_item( NAME(adc083x->sel0) ); + device->save_item( NAME(adc083x->state) ); + device->save_item( NAME(adc083x->bit) ); + device->save_item( NAME(adc083x->output) ); + device->save_item( NAME(adc083x->mux_bits) ); } diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c index 3e58529b0d7..f0f9036a99c 100644 --- a/src/emu/machine/adc1038.c +++ b/src/emu/machine/adc1038.c @@ -139,13 +139,13 @@ static DEVICE_START( adc1038 ) adc1038->gticlub_hack = intf->gticlub_hack; adc1038->input_callback_r = intf->input_callback_r; - state_save_register_device_item(device, 0, adc1038->cycle); - state_save_register_device_item(device, 0, adc1038->clk); - state_save_register_device_item(device, 0, adc1038->adr); - state_save_register_device_item(device, 0, adc1038->data_in); - state_save_register_device_item(device, 0, adc1038->data_out); - state_save_register_device_item(device, 0, adc1038->adc_data); - state_save_register_device_item(device, 0, adc1038->sars); + device->save_item(NAME(adc1038->cycle)); + device->save_item(NAME(adc1038->clk)); + device->save_item(NAME(adc1038->adr)); + device->save_item(NAME(adc1038->data_in)); + device->save_item(NAME(adc1038->data_out)); + device->save_item(NAME(adc1038->adc_data)); + device->save_item(NAME(adc1038->sars)); } static DEVICE_RESET( adc1038 ) diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c index 96e336ecf0d..14a3fc1a48f 100644 --- a/src/emu/machine/adc1213x.c +++ b/src/emu/machine/adc1213x.c @@ -319,18 +319,18 @@ static DEVICE_START( adc12138 ) adc1213x->input_callback_r = intf->input_callback_r; /* register for state saving */ - state_save_register_device_item(device, 0, adc1213x->cycle); - state_save_register_device_item(device, 0, adc1213x->data_out); - state_save_register_device_item(device, 0, adc1213x->data_in); - state_save_register_device_item(device, 0, adc1213x->conv_mode); - state_save_register_device_item(device, 0, adc1213x->auto_cal); - state_save_register_device_item(device, 0, adc1213x->auto_zero); - state_save_register_device_item(device, 0, adc1213x->acq_time); - state_save_register_device_item(device, 0, adc1213x->data_out_sign); - state_save_register_device_item(device, 0, adc1213x->mode); - state_save_register_device_item(device, 0, adc1213x->input_shift_reg); - state_save_register_device_item(device, 0, adc1213x->output_shift_reg); - state_save_register_device_item(device, 0, adc1213x->end_conv); + device->save_item(NAME(adc1213x->cycle)); + device->save_item(NAME(adc1213x->data_out)); + device->save_item(NAME(adc1213x->data_in)); + device->save_item(NAME(adc1213x->conv_mode)); + device->save_item(NAME(adc1213x->auto_cal)); + device->save_item(NAME(adc1213x->auto_zero)); + device->save_item(NAME(adc1213x->acq_time)); + device->save_item(NAME(adc1213x->data_out_sign)); + device->save_item(NAME(adc1213x->mode)); + device->save_item(NAME(adc1213x->input_shift_reg)); + device->save_item(NAME(adc1213x->output_shift_reg)); + device->save_item(NAME(adc1213x->end_conv)); } diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c index ba78aa7b053..78fff44edfc 100644 --- a/src/emu/machine/at28c16.c +++ b/src/emu/machine/at28c16.c @@ -131,9 +131,9 @@ void at28c16_device::device_start() { m_write_timer = m_machine.scheduler().timer_alloc( FUNC(write_finished), this ); - state_save_register_device_item( this, 0, m_a9_12v ); - state_save_register_device_item( this, 0, m_oe_12v ); - state_save_register_device_item( this, 0, m_last_write ); + save_item( NAME(m_a9_12v) ); + save_item( NAME(m_oe_12v) ); + save_item( NAME(m_last_write) ); } diff --git a/src/emu/machine/cdp1852.c b/src/emu/machine/cdp1852.c index c15a62a7640..fe98f13d53b 100644 --- a/src/emu/machine/cdp1852.c +++ b/src/emu/machine/cdp1852.c @@ -170,11 +170,11 @@ static DEVICE_START( cdp1852 ) } /* register for state saving */ - state_save_register_device_item(device, 0, cdp1852->new_data); - state_save_register_device_item(device, 0, cdp1852->data); - state_save_register_device_item(device, 0, cdp1852->next_data); - state_save_register_device_item(device, 0, cdp1852->sr); - state_save_register_device_item(device, 0, cdp1852->next_sr); + device->save_item(NAME(cdp1852->new_data)); + device->save_item(NAME(cdp1852->data)); + device->save_item(NAME(cdp1852->next_data)); + device->save_item(NAME(cdp1852->sr)); + device->save_item(NAME(cdp1852->next_sr)); } /*------------------------------------------------- diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c index 9d02b1b97d3..6b59a0d6a09 100644 --- a/src/emu/machine/ds1302.c +++ b/src/emu/machine/ds1302.c @@ -97,12 +97,12 @@ ds1302_device::ds1302_device(running_machine &_machine, const ds1302_device_conf void ds1302_device::device_start() { - state_save_register_device_item(this, 0, m_shift_in); - state_save_register_device_item(this, 0, m_shift_out); - state_save_register_device_item(this, 0, m_icount); - state_save_register_device_item(this, 0, m_last_clk); - state_save_register_device_item(this, 0, m_last_cmd); - state_save_register_device_item_array(this, 0, m_sram); + save_item(NAME(m_shift_in)); + save_item(NAME(m_shift_out)); + save_item(NAME(m_icount)); + save_item(NAME(m_last_clk)); + save_item(NAME(m_last_cmd)); + save_item(NAME(m_sram)); } diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index 380e8885901..f3bac1f6674 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -223,16 +223,16 @@ eeprom_device::eeprom_device(running_machine &_machine, const eeprom_device_conf void eeprom_device::device_start() { - state_save_register_device_item_pointer(this, 0, m_serial_buffer, SERIAL_BUFFER_LENGTH); - state_save_register_device_item(this, 0, m_clock_line); - state_save_register_device_item(this, 0, m_reset_line); - state_save_register_device_item(this, 0, m_locked); - state_save_register_device_item(this, 0, m_serial_count); - state_save_register_device_item(this, 0, m_latch); - state_save_register_device_item(this, 0, m_reset_delay); - state_save_register_device_item(this, 0, m_clock_count); - state_save_register_device_item(this, 0, m_data_bits); - state_save_register_device_item(this, 0, m_read_address); + save_pointer(NAME(m_serial_buffer), SERIAL_BUFFER_LENGTH); + save_item(NAME(m_clock_line)); + save_item(NAME(m_reset_line)); + save_item(NAME(m_locked)); + save_item(NAME(m_serial_count)); + save_item(NAME(m_latch)); + save_item(NAME(m_reset_delay)); + save_item(NAME(m_clock_count)); + save_item(NAME(m_data_bits)); + save_item(NAME(m_read_address)); } diff --git a/src/emu/machine/er2055.c b/src/emu/machine/er2055.c index 674d81b8e59..4594f9ff7b2 100644 --- a/src/emu/machine/er2055.c +++ b/src/emu/machine/er2055.c @@ -129,9 +129,9 @@ er2055_device::er2055_device(running_machine &_machine, const er2055_device_conf void er2055_device::device_start() { - state_save_register_device_item(this, 0, m_control_state); - state_save_register_device_item(this, 0, m_address); - state_save_register_device_item(this, 0, m_data); + save_item(NAME(m_control_state)); + save_item(NAME(m_address)); + save_item(NAME(m_data)); m_control_state = 0; } diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c index 72729ef2f82..0cb2db9bb20 100644 --- a/src/emu/machine/f3853.c +++ b/src/emu/machine/f3853.c @@ -136,13 +136,13 @@ void f3853_device::device_start() m_timer = m_machine.scheduler().timer_alloc(FUNC(f3853_timer_callback), (void *)this ); - state_save_register_device_item(this, 0, m_high ); - state_save_register_device_item(this, 0, m_low ); - state_save_register_device_item(this, 0, m_external_enable ); - state_save_register_device_item(this, 0, m_timer_enable ); - state_save_register_device_item(this, 0, m_request_flipflop ); - state_save_register_device_item(this, 0, m_priority_line ); - state_save_register_device_item(this, 0, m_external_interrupt_line ); + save_item(NAME(m_high) ); + save_item(NAME(m_low) ); + save_item(NAME(m_external_enable) ); + save_item(NAME(m_timer_enable) ); + save_item(NAME(m_request_flipflop) ); + save_item(NAME(m_priority_line) ); + save_item(NAME(m_external_interrupt_line) ); } diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index bf67eb20597..d8478ea6f39 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -100,16 +100,16 @@ void generic_machine_init(running_machine *machine) state->interrupt_device[index++] = &exec->device(); /* register coin save state */ - state_save_register_item_array(machine, "coin", NULL, 0, state->coin_count); - state_save_register_item_array(machine, "coin", NULL, 0, state->coinlockedout); - state_save_register_item_array(machine, "coin", NULL, 0, state->lastcoin); + machine->state().save_item(NAME(state->coin_count)); + machine->state().save_item(NAME(state->coinlockedout)); + machine->state().save_item(NAME(state->lastcoin)); /* reset memory card info */ state->memcard_inserted = -1; /* register a reset callback and save state for interrupt enable */ machine->add_notifier(MACHINE_NOTIFY_RESET, interrupt_reset); - state_save_register_item_array(machine, "cpu", NULL, 0, state->interrupt_enable); + machine->state().save_item(NAME(state->interrupt_enable)); /* register for configuration */ config_register(machine, "counters", counters_load, counters_save); diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c index d942aebb86b..393c56eadb0 100644 --- a/src/emu/machine/i2cmem.c +++ b/src/emu/machine/i2cmem.c @@ -193,19 +193,19 @@ i2cmem_device::i2cmem_device( running_machine &_machine, const i2cmem_device_con void i2cmem_device::device_start() { - state_save_register_device_item( this, 0, m_scl ); - state_save_register_device_item( this, 0, m_sdaw ); - state_save_register_device_item( this, 0, m_e0 ); - state_save_register_device_item( this, 0, m_e1 ); - state_save_register_device_item( this, 0, m_e2 ); - state_save_register_device_item( this, 0, m_wc ); - state_save_register_device_item( this, 0, m_sdar ); - state_save_register_device_item( this, 0, m_state ); - state_save_register_device_item( this, 0, m_bits ); - state_save_register_device_item( this, 0, m_shift ); - state_save_register_device_item( this, 0, m_devsel ); - state_save_register_device_item( this, 0, m_byteaddr ); - state_save_register_device_item_pointer( this, 0, m_page, m_config.m_page_size ); + save_item( NAME(m_scl) ); + save_item( NAME(m_sdaw) ); + save_item( NAME(m_e0) ); + save_item( NAME(m_e1) ); + save_item( NAME(m_e2) ); + save_item( NAME(m_wc) ); + save_item( NAME(m_sdar) ); + save_item( NAME(m_state) ); + save_item( NAME(m_bits) ); + save_item( NAME(m_shift) ); + save_item( NAME(m_devsel) ); + save_item( NAME(m_byteaddr) ); + save_pointer( NAME(m_page), m_config.m_page_size ); } diff --git a/src/emu/machine/i8255a.c b/src/emu/machine/i8255a.c index fce03989390..cdf4b91c2c0 100644 --- a/src/emu/machine/i8255a.c +++ b/src/emu/machine/i8255a.c @@ -859,15 +859,15 @@ static DEVICE_START( i8255a ) devcb_resolve_write8(&i8255a->out_port_func[PORT_C], &intf->out_pc_func, device); /* register for state saving */ - state_save_register_device_item(device, 0, i8255a->control); - state_save_register_device_item_array(device, 0, i8255a->output); - state_save_register_device_item_array(device, 0, i8255a->input); - state_save_register_device_item_array(device, 0, i8255a->ibf); - state_save_register_device_item_array(device, 0, i8255a->obf); - state_save_register_device_item_array(device, 0, i8255a->inte); - state_save_register_device_item(device, 0, i8255a->inte1); - state_save_register_device_item(device, 0, i8255a->inte2); - state_save_register_device_item_array(device, 0, i8255a->intr); + device->save_item(NAME(i8255a->control)); + device->save_item(NAME(i8255a->output)); + device->save_item(NAME(i8255a->input)); + device->save_item(NAME(i8255a->ibf)); + device->save_item(NAME(i8255a->obf)); + device->save_item(NAME(i8255a->inte)); + device->save_item(NAME(i8255a->inte1)); + device->save_item(NAME(i8255a->inte2)); + device->save_item(NAME(i8255a->intr)); } /*------------------------------------------------- diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 04245376535..956d71ae7c8 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -1840,50 +1840,50 @@ static DEVICE_START( ide_controller ) ide->reset_timer = device->machine->scheduler().timer_alloc(FUNC(reset_callback), (void *)device); /* register ide states */ - state_save_register_device_item(device, 0, ide->adapter_control); - state_save_register_device_item(device, 0, ide->status); - state_save_register_device_item(device, 0, ide->error); - state_save_register_device_item(device, 0, ide->command); - state_save_register_device_item(device, 0, ide->interrupt_pending); - state_save_register_device_item(device, 0, ide->precomp_offset); - - state_save_register_device_item_array(device, 0, ide->buffer); - state_save_register_device_item_array(device, 0, ide->features); - state_save_register_device_item(device, 0, ide->buffer_offset); - state_save_register_device_item(device, 0, ide->sector_count); - - state_save_register_device_item(device, 0, ide->block_count); - state_save_register_device_item(device, 0, ide->sectors_until_int); - - state_save_register_device_item(device, 0, ide->dma_active); - state_save_register_device_item(device, 0, ide->dma_last_buffer); - state_save_register_device_item(device, 0, ide->dma_address); - state_save_register_device_item(device, 0, ide->dma_descriptor); - state_save_register_device_item(device, 0, ide->dma_bytes_left); - - state_save_register_device_item(device, 0, ide->bus_master_command); - state_save_register_device_item(device, 0, ide->bus_master_status); - state_save_register_device_item(device, 0, ide->bus_master_descriptor); - - state_save_register_device_item(device, 0, ide->cur_cylinder); - state_save_register_device_item(device, 0, ide->cur_sector); - state_save_register_device_item(device, 0, ide->cur_head); - state_save_register_device_item(device, 0, ide->cur_head_reg); - - state_save_register_device_item(device, 0, ide->cur_lba); - - state_save_register_device_item(device, 0, ide->num_cylinders); - state_save_register_device_item(device, 0, ide->num_sectors); - state_save_register_device_item(device, 0, ide->num_heads); - - state_save_register_device_item(device, 0, ide->config_unknown); - state_save_register_device_item_array(device, 0, ide->config_register); - state_save_register_device_item(device, 0, ide->config_register_num); - - state_save_register_device_item(device, 0, ide->master_password_enable); - state_save_register_device_item(device, 0, ide->user_password_enable); - - state_save_register_device_item(device, 0, ide->gnetreadlock); + device->save_item(NAME(ide->adapter_control)); + device->save_item(NAME(ide->status)); + device->save_item(NAME(ide->error)); + device->save_item(NAME(ide->command)); + device->save_item(NAME(ide->interrupt_pending)); + device->save_item(NAME(ide->precomp_offset)); + + device->save_item(NAME(ide->buffer)); + device->save_item(NAME(ide->features)); + device->save_item(NAME(ide->buffer_offset)); + device->save_item(NAME(ide->sector_count)); + + device->save_item(NAME(ide->block_count)); + device->save_item(NAME(ide->sectors_until_int)); + + device->save_item(NAME(ide->dma_active)); + device->save_item(NAME(ide->dma_last_buffer)); + device->save_item(NAME(ide->dma_address)); + device->save_item(NAME(ide->dma_descriptor)); + device->save_item(NAME(ide->dma_bytes_left)); + + device->save_item(NAME(ide->bus_master_command)); + device->save_item(NAME(ide->bus_master_status)); + device->save_item(NAME(ide->bus_master_descriptor)); + + device->save_item(NAME(ide->cur_cylinder)); + device->save_item(NAME(ide->cur_sector)); + device->save_item(NAME(ide->cur_head)); + device->save_item(NAME(ide->cur_head_reg)); + + device->save_item(NAME(ide->cur_lba)); + + device->save_item(NAME(ide->num_cylinders)); + device->save_item(NAME(ide->num_sectors)); + device->save_item(NAME(ide->num_heads)); + + device->save_item(NAME(ide->config_unknown)); + device->save_item(NAME(ide->config_register)); + device->save_item(NAME(ide->config_register_num)); + + device->save_item(NAME(ide->master_password_enable)); + device->save_item(NAME(ide->user_password_enable)); + + device->save_item(NAME(ide->gnetreadlock)); } diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c index 741e0ad959a..f075ad39a13 100644 --- a/src/emu/machine/ins8154.c +++ b/src/emu/machine/ins8154.c @@ -99,13 +99,13 @@ void ins8154_device::device_start() devcb_resolve_write_line(&m_out_irq_func, &m_config.m_out_irq_func, this); /* register for state saving */ - state_save_register_device_item(this, 0, m_in_a); - state_save_register_device_item(this, 0, m_in_b); - state_save_register_device_item(this, 0, m_out_a); - state_save_register_device_item(this, 0, m_out_b); - state_save_register_device_item(this, 0, m_mdr); - state_save_register_device_item(this, 0, m_odra); - state_save_register_device_item(this, 0, m_odrb); + save_item(NAME(m_in_a)); + save_item(NAME(m_in_b)); + save_item(NAME(m_out_a)); + save_item(NAME(m_out_b)); + save_item(NAME(m_mdr)); + save_item(NAME(m_odra)); + save_item(NAME(m_odrb)); } diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c index d4cd3e36a0a..aec0c7bac68 100644 --- a/src/emu/machine/intelfsh.c +++ b/src/emu/machine/intelfsh.c @@ -270,9 +270,9 @@ void intelfsh_device::device_start() { m_timer = timer_alloc(); - state_save_register_device_item( this, 0, m_status ); - state_save_register_device_item( this, 0, m_flash_mode ); - state_save_register_device_item( this, 0, m_flash_master_lock ); + save_item( NAME(m_status) ); + save_item( NAME(m_flash_mode) ); + save_item( NAME(m_flash_master_lock) ); } diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c index a9760713d56..30f8fa35baf 100644 --- a/src/emu/machine/k033906.c +++ b/src/emu/machine/k033906.c @@ -70,9 +70,9 @@ void k033906_device::device_start() m_reg_set = 0; - state_save_register_device_item_pointer(this, 0, m_reg, 256); - state_save_register_device_item_pointer(this, 0, m_ram, 32768); - state_save_register_device_item(this, 0, m_reg_set); + save_pointer(NAME(m_reg), 256); + save_pointer(NAME(m_ram), 32768); + save_item(NAME(m_reg_set)); } diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c index 02f9c194aab..df91b168eb6 100644 --- a/src/emu/machine/k056230.c +++ b/src/emu/machine/k056230.c @@ -76,7 +76,7 @@ void k056230_device::device_start() m_ram = auto_alloc_array(&m_machine, UINT32, 0x2000); - state_save_register_device_item_pointer(this, 0, m_ram, 0x2000); + save_pointer(NAME(m_ram), 0x2000); } diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c index d43013ec962..febe648d2cd 100644 --- a/src/emu/machine/latch8.c +++ b/src/emu/machine/latch8.c @@ -221,7 +221,7 @@ static DEVICE_START( latch8 ) latch8->has_read = 1; } - state_save_register_device_item(device, 0, latch8->value); + device->save_item(NAME(latch8->value)); } diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c index b01ade4533b..9b351ed4690 100644 --- a/src/emu/machine/mb14241.c +++ b/src/emu/machine/mb14241.c @@ -56,8 +56,8 @@ static DEVICE_START( mb14241 ) { mb14241_state *mb14241 = get_safe_token(device); - state_save_register_device_item(device, 0, mb14241->shift_data); - state_save_register_device_item(device, 0, mb14241->shift_count); + device->save_item(NAME(mb14241->shift_data)); + device->save_item(NAME(mb14241->shift_count)); } static DEVICE_RESET( mb14241 ) diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c index 9af9812e0e8..1f11cf1f4c3 100644 --- a/src/emu/machine/mb3773.c +++ b/src/emu/machine/mb3773.c @@ -108,7 +108,7 @@ void mb3773_device::device_start() m_watchdog_timer = m_machine.scheduler().timer_alloc( FUNC(watchdog_timeout), this ); reset_timer(); - state_save_register_device_item( this, 0, m_ck ); + save_item( NAME(m_ck) ); } diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c index 91a39fe69d4..5a60dd5686a 100644 --- a/src/emu/machine/mb87078.c +++ b/src/emu/machine/mb87078.c @@ -248,11 +248,11 @@ static DEVICE_START( mb87078 ) mb87078->gain_changed_cb = intf->gain_changed_cb; - state_save_register_device_item(device, 0, mb87078->channel_latch); - state_save_register_device_item(device, 0, mb87078->reset_comp); - state_save_register_device_item_array(device, 0, mb87078->latch[0]); - state_save_register_device_item_array(device, 0, mb87078->latch[1]); - state_save_register_device_item_array(device, 0, mb87078->gain); + device->save_item(NAME(mb87078->channel_latch)); + device->save_item(NAME(mb87078->reset_comp)); + device->save_item(NAME(mb87078->latch[0])); + device->save_item(NAME(mb87078->latch[1])); + device->save_item(NAME(mb87078->gain)); } static DEVICE_RESET( mb87078 ) diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c index 701209322ac..a43b2db82c0 100644 --- a/src/emu/machine/mc68901.c +++ b/src/emu/machine/mc68901.c @@ -819,40 +819,40 @@ void mc68901_device::device_start() } /* register for state saving */ - state_save_register_device_item(this, 0, m_gpip); - state_save_register_device_item(this, 0, m_aer); - state_save_register_device_item(this, 0, m_ddr); - state_save_register_device_item(this, 0, m_ier); - state_save_register_device_item(this, 0, m_ipr); - state_save_register_device_item(this, 0, m_isr); - state_save_register_device_item(this, 0, m_imr); - state_save_register_device_item(this, 0, m_vr); - state_save_register_device_item(this, 0, m_tacr); - state_save_register_device_item(this, 0, m_tbcr); - state_save_register_device_item(this, 0, m_tcdcr); - state_save_register_device_item_array(this, 0, m_tdr); - state_save_register_device_item_array(this, 0, m_tmc); - state_save_register_device_item_array(this, 0, m_to); - state_save_register_device_item_array(this, 0, m_ti); - state_save_register_device_item(this, 0, m_scr); - state_save_register_device_item(this, 0, m_ucr); - state_save_register_device_item(this, 0, m_rsr); - state_save_register_device_item(this, 0, m_tsr); - state_save_register_device_item(this, 0, m_udr); - state_save_register_device_item(this, 0, m_rx_bits); - state_save_register_device_item(this, 0, m_tx_bits); - state_save_register_device_item(this, 0, m_rx_parity); - state_save_register_device_item(this, 0, m_tx_parity); - state_save_register_device_item(this, 0, m_rx_state); - state_save_register_device_item(this, 0, m_tx_state); - state_save_register_device_item(this, 0, m_rx_buffer); - state_save_register_device_item(this, 0, m_tx_buffer); - state_save_register_device_item(this, 0, m_xmit_state); - state_save_register_device_item(this, 0, m_rxtx_word); - state_save_register_device_item(this, 0, m_rxtx_start); - state_save_register_device_item(this, 0, m_rxtx_stop); - state_save_register_device_item(this, 0, m_rsr_read); - state_save_register_device_item(this, 0, m_next_rsr); + save_item(NAME(m_gpip)); + save_item(NAME(m_aer)); + save_item(NAME(m_ddr)); + save_item(NAME(m_ier)); + save_item(NAME(m_ipr)); + save_item(NAME(m_isr)); + save_item(NAME(m_imr)); + save_item(NAME(m_vr)); + save_item(NAME(m_tacr)); + save_item(NAME(m_tbcr)); + save_item(NAME(m_tcdcr)); + save_item(NAME(m_tdr)); + save_item(NAME(m_tmc)); + save_item(NAME(m_to)); + save_item(NAME(m_ti)); + save_item(NAME(m_scr)); + save_item(NAME(m_ucr)); + save_item(NAME(m_rsr)); + save_item(NAME(m_tsr)); + save_item(NAME(m_udr)); + save_item(NAME(m_rx_bits)); + save_item(NAME(m_tx_bits)); + save_item(NAME(m_rx_parity)); + save_item(NAME(m_tx_parity)); + save_item(NAME(m_rx_state)); + save_item(NAME(m_tx_state)); + save_item(NAME(m_rx_buffer)); + save_item(NAME(m_tx_buffer)); + save_item(NAME(m_xmit_state)); + save_item(NAME(m_rxtx_word)); + save_item(NAME(m_rxtx_start)); + save_item(NAME(m_rxtx_stop)); + save_item(NAME(m_rsr_read)); + save_item(NAME(m_next_rsr)); } diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c index 2bcaac38a5a..c5fa7eed0b3 100644 --- a/src/emu/machine/pci.c +++ b/src/emu/machine/pci.c @@ -288,9 +288,9 @@ static DEVICE_START( pci_bus ) pci_add_sibling(device->machine, (char *)pcibus->config->father, (char *)device->tag()); /* register pci states */ - state_save_register_device_item(device, 0, pcibus->address); - state_save_register_device_item(device, 0, pcibus->devicenum); - state_save_register_device_item(device, 0, pcibus->busnum); + device->save_item(NAME(pcibus->address)); + device->save_item(NAME(pcibus->devicenum)); + device->save_item(NAME(pcibus->busnum)); device->machine->state().register_postload(pci_bus_postload, pcibus); } diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c index 1c8fa7e3f1e..7c41e867f04 100644 --- a/src/emu/machine/pd4990a.c +++ b/src/emu/machine/pd4990a.c @@ -470,29 +470,29 @@ static DEVICE_START( upd4990a ) upd4990a->weekday = systime->local_time.weekday; /* register for state saving */ - state_save_register_device_item(device, 0, upd4990a->seconds); - state_save_register_device_item(device, 0, upd4990a->minutes); - state_save_register_device_item(device, 0, upd4990a->hours); - state_save_register_device_item(device, 0, upd4990a->days); - state_save_register_device_item(device, 0, upd4990a->month); - state_save_register_device_item(device, 0, upd4990a->year); - state_save_register_device_item(device, 0, upd4990a->weekday); - - state_save_register_device_item(device, 0, upd4990a->shiftlo); - state_save_register_device_item(device, 0, upd4990a->shifthi); - - state_save_register_device_item(device, 0, upd4990a->retraces); - state_save_register_device_item(device, 0, upd4990a->testwaits); - state_save_register_device_item(device, 0, upd4990a->maxwaits); - state_save_register_device_item(device, 0, upd4990a->testbit); - - state_save_register_device_item(device, 0, upd4990a->outputbit); - state_save_register_device_item(device, 0, upd4990a->bitno); - state_save_register_device_item(device, 0, upd4990a->reading); - state_save_register_device_item(device, 0, upd4990a->writing); - - state_save_register_device_item(device, 0, upd4990a->clock_line); - state_save_register_device_item(device, 0, upd4990a->command_line); + device->save_item(NAME(upd4990a->seconds)); + device->save_item(NAME(upd4990a->minutes)); + device->save_item(NAME(upd4990a->hours)); + device->save_item(NAME(upd4990a->days)); + device->save_item(NAME(upd4990a->month)); + device->save_item(NAME(upd4990a->year)); + device->save_item(NAME(upd4990a->weekday)); + + device->save_item(NAME(upd4990a->shiftlo)); + device->save_item(NAME(upd4990a->shifthi)); + + device->save_item(NAME(upd4990a->retraces)); + device->save_item(NAME(upd4990a->testwaits)); + device->save_item(NAME(upd4990a->maxwaits)); + device->save_item(NAME(upd4990a->testbit)); + + device->save_item(NAME(upd4990a->outputbit)); + device->save_item(NAME(upd4990a->bitno)); + device->save_item(NAME(upd4990a->reading)); + device->save_item(NAME(upd4990a->writing)); + + device->save_item(NAME(upd4990a->clock_line)); + device->save_item(NAME(upd4990a->command_line)); } diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index e526674dd3e..abb85c08387 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -1089,24 +1089,24 @@ static void common_start( device_t *device, int device_type ) { devcb_resolve_write_line(&timer->out_out_func, &pit8253->config->timer[timerno].out_out_func, device); /* set up state save values */ - state_save_register_device_item(device, timerno, timer->clockin); - state_save_register_device_item(device, timerno, timer->control); - state_save_register_device_item(device, timerno, timer->status); - state_save_register_device_item(device, timerno, timer->lowcount); - state_save_register_device_item(device, timerno, timer->latch); - state_save_register_device_item(device, timerno, timer->count); - state_save_register_device_item(device, timerno, timer->value); - state_save_register_device_item(device, timerno, timer->wmsb); - state_save_register_device_item(device, timerno, timer->rmsb); - state_save_register_device_item(device, timerno, timer->output); - state_save_register_device_item(device, timerno, timer->gate); - state_save_register_device_item(device, timerno, timer->latched_count); - state_save_register_device_item(device, timerno, timer->latched_status); - state_save_register_device_item(device, timerno, timer->null_count); - state_save_register_device_item(device, timerno, timer->phase); - state_save_register_device_item(device, timerno, timer->cycles_to_output); - state_save_register_device_item(device, timerno, timer->last_updated); - state_save_register_device_item(device, timerno, timer->clock); + device->save_item(NAME(timer->clockin), timerno); + device->save_item(NAME(timer->control), timerno); + device->save_item(NAME(timer->status), timerno); + device->save_item(NAME(timer->lowcount), timerno); + device->save_item(NAME(timer->latch), timerno); + device->save_item(NAME(timer->count), timerno); + device->save_item(NAME(timer->value), timerno); + device->save_item(NAME(timer->wmsb), timerno); + device->save_item(NAME(timer->rmsb), timerno); + device->save_item(NAME(timer->output), timerno); + device->save_item(NAME(timer->gate), timerno); + device->save_item(NAME(timer->latched_count), timerno); + device->save_item(NAME(timer->latched_status), timerno); + device->save_item(NAME(timer->null_count), timerno); + device->save_item(NAME(timer->phase), timerno); + device->save_item(NAME(timer->cycles_to_output), timerno); + device->save_item(NAME(timer->last_updated), timerno); + device->save_item(NAME(timer->clock), timerno); } } diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c index 0d2de4d5a1a..c659e6e9b4a 100644 --- a/src/emu/machine/ram.c +++ b/src/emu/machine/ram.c @@ -117,8 +117,8 @@ static DEVICE_START( ram ) memset(ram->ram, config->default_value, ram->size); /* register for state saving */ - state_save_register_device_item(device, 0, ram->size); - state_save_register_device_item_pointer(device, 0, ram->ram, ram->size); + device->save_item(NAME(ram->size)); + device->save_pointer(NAME(ram->ram), ram->size); } static DEVICE_VALIDITY_CHECK( ram ) diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index 01fabb9cf3d..51b024e8664 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -178,11 +178,11 @@ static DEVICE_START( rp5h01 ) rp5h01->data = *device->region(); /* register for state saving */ - state_save_register_device_item(device, 0, rp5h01->counter); - state_save_register_device_item(device, 0, rp5h01->counter_mode); - state_save_register_device_item(device, 0, rp5h01->enabled); - state_save_register_device_item(device, 0, rp5h01->old_reset); - state_save_register_device_item(device, 0, rp5h01->old_clock); + device->save_item(NAME(rp5h01->counter)); + device->save_item(NAME(rp5h01->counter_mode)); + device->save_item(NAME(rp5h01->enabled)); + device->save_item(NAME(rp5h01->old_reset)); + device->save_item(NAME(rp5h01->old_clock)); } /*------------------------------------------------- diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c index c4be4221f49..b8bfe86e979 100644 --- a/src/emu/machine/rtc65271.c +++ b/src/emu/machine/rtc65271.c @@ -693,11 +693,11 @@ static DEVICE_START( rtc65271 ) state->SQW_timer = device->machine->scheduler().timer_alloc(FUNC(rtc_SQW_callback), (void *)device); state->interrupt_callback = config->interrupt_callback; - state_save_register_device_item_array(device, 0, state->regs); - state_save_register_device_item(device, 0, state->cur_reg); - state_save_register_device_item_array(device, 0, state->xram); - state_save_register_device_item(device, 0, state->cur_xram_page); - state_save_register_device_item(device, 0, state->SQW_internal_state); + device->save_item(NAME(state->regs)); + device->save_item(NAME(state->cur_reg)); + device->save_item(NAME(state->xram)); + device->save_item(NAME(state->cur_xram_page)); + device->save_item(NAME(state->SQW_internal_state)); } diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index 0d133d7185f..5232ba0a775 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -524,15 +524,15 @@ static DEVICE_START( smc91c9x ) smc->irq_handler = config->interrupt; /* register ide states */ - state_save_register_device_item_array(device, 0, smc->reg); - state_save_register_device_item_array(device, 0, smc->regmask); - state_save_register_device_item(device, 0, smc->irq_state); - state_save_register_device_item(device, 0, smc->alloc_count); - state_save_register_device_item(device, 0, smc->fifo_count); - state_save_register_device_item_array(device, 0, smc->rx); - state_save_register_device_item_array(device, 0, smc->tx); - state_save_register_device_item(device, 0, smc->sent); - state_save_register_device_item(device, 0, smc->recd); + device->save_item(NAME(smc->reg)); + device->save_item(NAME(smc->regmask)); + device->save_item(NAME(smc->irq_state)); + device->save_item(NAME(smc->alloc_count)); + device->save_item(NAME(smc->fifo_count)); + device->save_item(NAME(smc->rx)); + device->save_item(NAME(smc->tx)); + device->save_item(NAME(smc->sent)); + device->save_item(NAME(smc->recd)); } diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c index a17c86740c8..1dd0fa0d342 100644 --- a/src/emu/machine/timekpr.c +++ b/src/emu/machine/timekpr.c @@ -216,16 +216,16 @@ void timekeeper_device::device_start() assert( region()->bytes() == m_size ); } - state_save_register_device_item( this, 0, m_control ); - state_save_register_device_item( this, 0, m_seconds ); - state_save_register_device_item( this, 0, m_minutes ); - state_save_register_device_item( this, 0, m_hours ); - state_save_register_device_item( this, 0, m_day ); - state_save_register_device_item( this, 0, m_date ); - state_save_register_device_item( this, 0, m_month ); - state_save_register_device_item( this, 0, m_year ); - state_save_register_device_item( this, 0, m_century ); - state_save_register_device_item_pointer( this, 0, m_data, m_size ); + save_item( NAME(m_control) ); + save_item( NAME(m_seconds) ); + save_item( NAME(m_minutes) ); + save_item( NAME(m_hours) ); + save_item( NAME(m_day) ); + save_item( NAME(m_date) ); + save_item( NAME(m_month) ); + save_item( NAME(m_year) ); + save_item( NAME(m_century) ); + save_pointer( NAME(m_data), m_size ); timer = m_machine.scheduler().timer_alloc( FUNC(timekeeper_tick_callback), (void *)this ); duration = attotime::from_seconds(1); diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c index 43560e9bbf9..48f9b0aef30 100644 --- a/src/emu/machine/tms6100.c +++ b/src/emu/machine/tms6100.c @@ -118,14 +118,14 @@ INLINE tms6100_state *get_safe_token(device_t *device) static void register_for_save_states(tms6100_state *tms) { - state_save_register_device_item(tms->device, 0, tms->addr_bits); - state_save_register_device_item(tms->device, 0, tms->address); - state_save_register_device_item(tms->device, 0, tms->address_latch); - state_save_register_device_item(tms->device, 0, tms->data); - state_save_register_device_item(tms->device, 0, tms->loadptr); - state_save_register_device_item(tms->device, 0, tms->m0); - state_save_register_device_item(tms->device, 0, tms->m1); - state_save_register_device_item(tms->device, 0, tms->state); + tms->device->save_item(NAME(tms->addr_bits)); + tms->device->save_item(NAME(tms->address)); + tms->device->save_item(NAME(tms->address_latch)); + tms->device->save_item(NAME(tms->data)); + tms->device->save_item(NAME(tms->loadptr)); + tms->device->save_item(NAME(tms->m0)); + tms->device->save_item(NAME(tms->m1)); + tms->device->save_item(NAME(tms->state)); } /****************************************************************************** diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c index 1ed68a257ca..10e47dc0a62 100644 --- a/src/emu/machine/upd4701.c +++ b/src/emu/machine/upd4701.c @@ -261,20 +261,20 @@ static DEVICE_START( upd4701 ) upd4701_state *upd4701 = get_safe_token(device); /* register for state saving */ - state_save_register_device_item(device, 0, upd4701->cs); - state_save_register_device_item(device, 0, upd4701->xy); - state_save_register_device_item(device, 0, upd4701->ul); - state_save_register_device_item(device, 0, upd4701->resetx); - state_save_register_device_item(device, 0, upd4701->resety); - state_save_register_device_item(device, 0, upd4701->latchx); - state_save_register_device_item(device, 0, upd4701->latchy); - state_save_register_device_item(device, 0, upd4701->startx); - state_save_register_device_item(device, 0, upd4701->starty); - state_save_register_device_item(device, 0, upd4701->x); - state_save_register_device_item(device, 0, upd4701->y); - state_save_register_device_item(device, 0, upd4701->switches); - state_save_register_device_item(device, 0, upd4701->latchswitches); - state_save_register_device_item(device, 0, upd4701->cf); + device->save_item(NAME(upd4701->cs)); + device->save_item(NAME(upd4701->xy)); + device->save_item(NAME(upd4701->ul)); + device->save_item(NAME(upd4701->resetx)); + device->save_item(NAME(upd4701->resety)); + device->save_item(NAME(upd4701->latchx)); + device->save_item(NAME(upd4701->latchy)); + device->save_item(NAME(upd4701->startx)); + device->save_item(NAME(upd4701->starty)); + device->save_item(NAME(upd4701->x)); + device->save_item(NAME(upd4701->y)); + device->save_item(NAME(upd4701->switches)); + device->save_item(NAME(upd4701->latchswitches)); + device->save_item(NAME(upd4701->cf)); } /*------------------------------------------------- diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c index a0b9c67c07d..cc79b1be176 100644 --- a/src/emu/machine/x2212.c +++ b/src/emu/machine/x2212.c @@ -114,8 +114,8 @@ x2212_device::x2212_device(running_machine &_machine, const x2212_device_config void x2212_device::device_start() { - state_save_register_device_item(this, 0, m_store); - state_save_register_device_item(this, 0, m_array_recall); + save_item(NAME(m_store)); + save_item(NAME(m_array_recall)); m_sram = m_addrspace[0]; m_e2prom = m_addrspace[1]; diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c index 243f73c5d62..e112707233b 100644 --- a/src/emu/machine/z80ctc.c +++ b/src/emu/machine/z80ctc.c @@ -173,7 +173,7 @@ void z80ctc_device::device_start() m_channel[3].start(this, 3, (m_config.m_notimer & NOTIMER_3) != 0, NULL); // register for save states - state_save_register_device_item(this, 0, m_vector); + save_item(NAME(m_vector)); } @@ -339,11 +339,11 @@ void z80ctc_device::ctc_channel::start(z80ctc_device *device, int index, bool no m_timer = m_device->machine->scheduler().timer_alloc(FUNC(static_timer_callback), this); // register for save states - state_save_register_device_item(m_device, m_index, m_mode); - state_save_register_device_item(m_device, m_index, m_tconst); - state_save_register_device_item(m_device, m_index, m_down); - state_save_register_device_item(m_device, m_index, m_extclk); - state_save_register_device_item(m_device, m_index, m_int_state); + m_device->save_item(NAME(m_mode), m_index); + m_device->save_item(NAME(m_tconst), m_index); + m_device->save_item(NAME(m_down), m_index); + m_device->save_item(NAME(m_extclk), m_index); + m_device->save_item(NAME(m_int_state), m_index); } diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c index 91ee6d85068..8791de96b04 100644 --- a/src/emu/machine/z80dart.c +++ b/src/emu/machine/z80dart.c @@ -318,7 +318,7 @@ void z80dart_device::device_start() m_txcb_timer->adjust(attotime::zero, 0, attotime::from_hz(m_config.m_tx_clock_b)); } - state_save_register_device_item_array(this, 0, m_int_state); + save_item(NAME(m_int_state)); } @@ -526,32 +526,32 @@ void z80dart_device::dart_channel::start(z80dart_device *device, int index, cons devcb_resolve_write_line(&m_out_wrdy_func, &out_wrdy, m_device); devcb_resolve_write_line(&m_out_sync_func, &out_sync, m_device); - state_save_register_device_item_array(m_device, m_index, m_rr); - state_save_register_device_item_array(m_device, m_index, m_wr); - state_save_register_device_item_array(m_device, m_index, m_rx_data_fifo); - state_save_register_device_item_array(m_device, m_index, m_rx_error_fifo); - state_save_register_device_item(m_device, m_index, m_rx_shift); - state_save_register_device_item(m_device, m_index, m_rx_error); - state_save_register_device_item(m_device, m_index, m_rx_fifo); - state_save_register_device_item(m_device, m_index, m_rx_clock); - state_save_register_device_item(m_device, m_index, m_rx_state); - state_save_register_device_item(m_device, m_index, m_rx_bits); - state_save_register_device_item(m_device, m_index, m_rx_first); - state_save_register_device_item(m_device, m_index, m_rx_parity); - state_save_register_device_item(m_device, m_index, m_rx_break); - state_save_register_device_item(m_device, m_index, m_rx_rr0_latch); - state_save_register_device_item(m_device, m_index, m_ri); - state_save_register_device_item(m_device, m_index, m_cts); - state_save_register_device_item(m_device, m_index, m_dcd); - state_save_register_device_item(m_device, m_index, m_tx_data); - state_save_register_device_item(m_device, m_index, m_tx_shift); - state_save_register_device_item(m_device, m_index, m_tx_clock); - state_save_register_device_item(m_device, m_index, m_tx_state); - state_save_register_device_item(m_device, m_index, m_tx_bits); - state_save_register_device_item(m_device, m_index, m_tx_parity); - state_save_register_device_item(m_device, m_index, m_dtr); - state_save_register_device_item(m_device, m_index, m_rts); - state_save_register_device_item(m_device, m_index, m_sync); + m_device->save_item(NAME(m_rr), m_index); + m_device->save_item(NAME(m_wr), m_index); + m_device->save_item(NAME(m_rx_data_fifo), m_index); + m_device->save_item(NAME(m_rx_error_fifo), m_index); + m_device->save_item(NAME(m_rx_shift), m_index); + m_device->save_item(NAME(m_rx_error), m_index); + m_device->save_item(NAME(m_rx_fifo), m_index); + m_device->save_item(NAME(m_rx_clock), m_index); + m_device->save_item(NAME(m_rx_state), m_index); + m_device->save_item(NAME(m_rx_bits), m_index); + m_device->save_item(NAME(m_rx_first), m_index); + m_device->save_item(NAME(m_rx_parity), m_index); + m_device->save_item(NAME(m_rx_break), m_index); + m_device->save_item(NAME(m_rx_rr0_latch), m_index); + m_device->save_item(NAME(m_ri), m_index); + m_device->save_item(NAME(m_cts), m_index); + m_device->save_item(NAME(m_dcd), m_index); + m_device->save_item(NAME(m_tx_data), m_index); + m_device->save_item(NAME(m_tx_shift), m_index); + m_device->save_item(NAME(m_tx_clock), m_index); + m_device->save_item(NAME(m_tx_state), m_index); + m_device->save_item(NAME(m_tx_bits), m_index); + m_device->save_item(NAME(m_tx_parity), m_index); + m_device->save_item(NAME(m_dtr), m_index); + m_device->save_item(NAME(m_rts), m_index); + m_device->save_item(NAME(m_sync), m_index); } diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 5316d1d3adc..49ed267748d 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -241,23 +241,23 @@ void z80dma_device::device_start() m_timer = m_machine.scheduler().timer_alloc(FUNC(static_timerproc), (void *)this); // register for state saving - state_save_register_device_item_array(this, 0, m_regs); - state_save_register_device_item_array(this, 0, m_regs_follow); - state_save_register_device_item(this, 0, m_num_follow); - state_save_register_device_item(this, 0, m_cur_follow); - state_save_register_device_item(this, 0, m_status); - state_save_register_device_item(this, 0, m_dma_enabled); - state_save_register_device_item(this, 0, m_vector); - state_save_register_device_item(this, 0, m_ip); - state_save_register_device_item(this, 0, m_ius); - state_save_register_device_item(this, 0, m_addressA); - state_save_register_device_item(this, 0, m_addressB); - state_save_register_device_item(this, 0, m_count); - state_save_register_device_item(this, 0, m_rdy); - state_save_register_device_item(this, 0, m_force_ready); - state_save_register_device_item(this, 0, m_is_read); - state_save_register_device_item(this, 0, m_cur_cycle); - state_save_register_device_item(this, 0, m_latch); + save_item(NAME(m_regs)); + save_item(NAME(m_regs_follow)); + save_item(NAME(m_num_follow)); + save_item(NAME(m_cur_follow)); + save_item(NAME(m_status)); + save_item(NAME(m_dma_enabled)); + save_item(NAME(m_vector)); + save_item(NAME(m_ip)); + save_item(NAME(m_ius)); + save_item(NAME(m_addressA)); + save_item(NAME(m_addressB)); + save_item(NAME(m_count)); + save_item(NAME(m_rdy)); + save_item(NAME(m_force_ready)); + save_item(NAME(m_is_read)); + save_item(NAME(m_cur_cycle)); + save_item(NAME(m_latch)); } diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c index 1c4f3f5a6e8..3ca7bbd330c 100644 --- a/src/emu/machine/z80pio.c +++ b/src/emu/machine/z80pio.c @@ -332,20 +332,20 @@ void z80pio_device::pio_port::start(z80pio_device *device, int index, const devc devcb_resolve_write_line(&m_out_rdy_func, &rdyfunc, m_device); // register for state saving - state_save_register_device_item(m_device, m_index, m_mode); - state_save_register_device_item(m_device, m_index, m_next_control_word); - state_save_register_device_item(m_device, m_index, m_input); - state_save_register_device_item(m_device, m_index, m_output); - state_save_register_device_item(m_device, m_index, m_ior); - state_save_register_device_item(m_device, m_index, m_rdy); - state_save_register_device_item(m_device, m_index, m_stb); - state_save_register_device_item(m_device, m_index, m_ie); - state_save_register_device_item(m_device, m_index, m_ip); - state_save_register_device_item(m_device, m_index, m_ius); - state_save_register_device_item(m_device, m_index, m_icw); - state_save_register_device_item(m_device, m_index, m_vector); - state_save_register_device_item(m_device, m_index, m_mask); - state_save_register_device_item(m_device, m_index, m_match); + m_device->save_item(NAME(m_mode), m_index); + m_device->save_item(NAME(m_next_control_word), m_index); + m_device->save_item(NAME(m_input), m_index); + m_device->save_item(NAME(m_output), m_index); + m_device->save_item(NAME(m_ior), m_index); + m_device->save_item(NAME(m_rdy), m_index); + m_device->save_item(NAME(m_stb), m_index); + m_device->save_item(NAME(m_ie), m_index); + m_device->save_item(NAME(m_ip), m_index); + m_device->save_item(NAME(m_ius), m_index); + m_device->save_item(NAME(m_icw), m_index); + m_device->save_item(NAME(m_vector), m_index); + m_device->save_item(NAME(m_mask), m_index); + m_device->save_item(NAME(m_match), m_index); } diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c index c024ddd9079..61442abc32d 100644 --- a/src/emu/machine/z80sti.c +++ b/src/emu/machine/z80sti.c @@ -264,25 +264,25 @@ void z80sti_device::device_start() } // register for state saving - state_save_register_device_item(this, 0, m_gpip); - state_save_register_device_item(this, 0, m_aer); - state_save_register_device_item(this, 0, m_ddr); - state_save_register_device_item(this, 0, m_ier); - state_save_register_device_item(this, 0, m_ipr); - state_save_register_device_item(this, 0, m_isr); - state_save_register_device_item(this, 0, m_imr); - state_save_register_device_item(this, 0, m_pvr); - state_save_register_device_item_array(this, 0, m_int_state); - state_save_register_device_item(this, 0, m_tabc); - state_save_register_device_item(this, 0, m_tcdc); - state_save_register_device_item_array(this, 0, m_tdr); - state_save_register_device_item_array(this, 0, m_tmc); - state_save_register_device_item_array(this, 0, m_to); - state_save_register_device_item(this, 0, m_scr); - state_save_register_device_item(this, 0, m_ucr); - state_save_register_device_item(this, 0, m_rsr); - state_save_register_device_item(this, 0, m_tsr); - state_save_register_device_item(this, 0, m_udr); + save_item(NAME(m_gpip)); + save_item(NAME(m_aer)); + save_item(NAME(m_ddr)); + save_item(NAME(m_ier)); + save_item(NAME(m_ipr)); + save_item(NAME(m_isr)); + save_item(NAME(m_imr)); + save_item(NAME(m_pvr)); + save_item(NAME(m_int_state)); + save_item(NAME(m_tabc)); + save_item(NAME(m_tcdc)); + save_item(NAME(m_tdr)); + save_item(NAME(m_tmc)); + save_item(NAME(m_to)); + save_item(NAME(m_scr)); + save_item(NAME(m_ucr)); + save_item(NAME(m_rsr)); + save_item(NAME(m_tsr)); + save_item(NAME(m_udr)); } diff --git a/src/emu/memory.c b/src/emu/memory.c index f8982d1b456..97a782449f4 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -4143,7 +4143,7 @@ memory_bank::memory_bank(address_space &space, int index, offs_t bytestart, offs } if (!m_anonymous && space.m_machine.state().registration_allowed()) - state_save_register_item(&space.m_machine, "memory", m_tag, 0, m_curentry); + space.m_machine.state().save_item("memory", m_tag, 0, NAME(m_curentry)); } diff --git a/src/emu/schedule.c b/src/emu/schedule.c index 47f31bb8a85..da56b31fea0 100644 --- a/src/emu/schedule.c +++ b/src/emu/schedule.c @@ -281,11 +281,11 @@ void emu_timer::register_save() } // save the bits - state_save_register_item(m_machine, "timer", name, index, m_param); - state_save_register_item(m_machine, "timer", name, index, m_enabled); - state_save_register_item(m_machine, "timer", name, index, m_period); - state_save_register_item(m_machine, "timer", name, index, m_start); - state_save_register_item(m_machine, "timer", name, index, m_expire); + m_machine->state().save_item("timer", name, index, NAME(m_param)); + m_machine->state().save_item("timer", name, index, NAME(m_enabled)); + m_machine->state().save_item("timer", name, index, NAME(m_period)); + m_machine->state().save_item("timer", name, index, NAME(m_start)); + m_machine->state().save_item("timer", name, index, NAME(m_expire)); } @@ -335,7 +335,7 @@ device_scheduler::device_scheduler(running_machine &machine) : m_timer_list->adjust(attotime::never); // register global states - state_save_register_item(&m_machine, "timer", NULL, 0, m_basetime); + m_machine.state().save_item(NAME(m_basetime)); m_machine.state().register_postload(&state_postload_stub<device_scheduler, &device_scheduler::postload>, this); } diff --git a/src/emu/sound.c b/src/emu/sound.c index 7a324bab630..46a35b2cae4 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -111,16 +111,16 @@ sound_stream::sound_stream(device_t &device, int inputs, int outputs, int sample // create a unique tag for saving astring state_tag; state_tag.printf("%d", m_device.machine->sound().m_stream_list.count()); - state_save_register_item(m_device.machine, "stream", state_tag, 0, m_sample_rate); + m_device.machine->state().save_item("stream", state_tag, 0, NAME(m_sample_rate)); m_device.machine->state().register_postload(state_postload_stub<sound_stream, &sound_stream::postload>, this); // save the gain of each input and output for (int inputnum = 0; inputnum < m_inputs; inputnum++) - state_save_register_item(m_device.machine, "stream", state_tag, inputnum, m_input[inputnum].m_gain); + m_device.machine->state().save_item("stream", state_tag, inputnum, NAME(m_input[inputnum].m_gain)); for (int outputnum = 0; outputnum < m_outputs; outputnum++) { m_output[outputnum].m_stream = this; - state_save_register_item(m_device.machine, "stream", state_tag, outputnum, m_output[outputnum].m_gain); + m_device.machine->state().save_item("stream", state_tag, outputnum, NAME(m_output[outputnum].m_gain)); } // force an update to the sample rates; this will cause everything to be recomputed diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c index 23eb887ce46..7440b1b885b 100644 --- a/src/emu/sound/asc.c +++ b/src/emu/sound/asc.c @@ -135,17 +135,17 @@ void asc_device::device_start() m_sync_timer = this->machine->scheduler().timer_alloc(FUNC(sync_timer_cb), this); - state_save_register_device_item(this, 0, m_fifo_a_rdptr); - state_save_register_device_item(this, 0, m_fifo_b_rdptr); - state_save_register_device_item(this, 0, m_fifo_a_wrptr); - state_save_register_device_item(this, 0, m_fifo_b_wrptr); - state_save_register_device_item(this, 0, m_fifo_cap_a); - state_save_register_device_item(this, 0, m_fifo_cap_b); - state_save_register_device_item_array(this, 0, m_fifo_a); - state_save_register_device_item_array(this, 0, m_fifo_b); - state_save_register_device_item_array(this, 0, m_regs); - state_save_register_device_item_array(this, 0, m_phase); - state_save_register_device_item_array(this, 0, m_incr); + save_item(NAME(m_fifo_a_rdptr)); + save_item(NAME(m_fifo_b_rdptr)); + save_item(NAME(m_fifo_a_wrptr)); + save_item(NAME(m_fifo_b_wrptr)); + save_item(NAME(m_fifo_cap_a)); + save_item(NAME(m_fifo_cap_b)); + save_item(NAME(m_fifo_a)); + save_item(NAME(m_fifo_b)); + save_item(NAME(m_regs)); + save_item(NAME(m_phase)); + save_item(NAME(m_incr)); } diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c index f1ae66edf94..4547172cc8c 100644 --- a/src/emu/sound/astrocde.c +++ b/src/emu/sound/astrocde.c @@ -235,22 +235,22 @@ static DEVICE_RESET( astrocade ) static void astrocade_state_save_register(astrocade_state *chip, device_t *device) { - state_save_register_device_item_array(device, 0, chip->reg); + device->save_item(NAME(chip->reg)); - state_save_register_device_item(device, 0, chip->master_count); - state_save_register_device_item(device, 0, chip->vibrato_clock); + device->save_item(NAME(chip->master_count)); + device->save_item(NAME(chip->vibrato_clock)); - state_save_register_device_item(device, 0, chip->noise_clock); - state_save_register_device_item(device, 0, chip->noise_state); + device->save_item(NAME(chip->noise_clock)); + device->save_item(NAME(chip->noise_state)); - state_save_register_device_item(device, 0, chip->a_count); - state_save_register_device_item(device, 0, chip->a_state); + device->save_item(NAME(chip->a_count)); + device->save_item(NAME(chip->a_state)); - state_save_register_device_item(device, 0, chip->b_count); - state_save_register_device_item(device, 0, chip->b_state); + device->save_item(NAME(chip->b_count)); + device->save_item(NAME(chip->b_state)); - state_save_register_device_item(device, 0, chip->c_count); - state_save_register_device_item(device, 0, chip->c_state); + device->save_item(NAME(chip->c_count)); + device->save_item(NAME(chip->c_state)); } diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index 18b3a48efd8..3ff68bcc46f 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -704,25 +704,25 @@ static void build_mixer_table(ay8910_context *psg) static void ay8910_statesave(ay8910_context *psg, device_t *device) { - state_save_register_device_item(device, 0, psg->register_latch); - state_save_register_device_item_array(device, 0, psg->regs); - state_save_register_device_item(device, 0, psg->last_enable); + device->save_item(NAME(psg->register_latch)); + device->save_item(NAME(psg->regs)); + device->save_item(NAME(psg->last_enable)); - state_save_register_device_item_array(device, 0, psg->count); - state_save_register_device_item(device, 0, psg->count_noise); - state_save_register_device_item(device, 0, psg->count_env); + device->save_item(NAME(psg->count)); + device->save_item(NAME(psg->count_noise)); + device->save_item(NAME(psg->count_env)); - state_save_register_device_item(device, 0, psg->env_volume); + device->save_item(NAME(psg->env_volume)); - state_save_register_device_item_array(device, 0, psg->output); - state_save_register_device_item(device, 0, psg->output_noise); + device->save_item(NAME(psg->output)); + device->save_item(NAME(psg->output_noise)); - state_save_register_device_item(device, 0, psg->env_step); - state_save_register_device_item(device, 0, psg->hold); - state_save_register_device_item(device, 0, psg->alternate); - state_save_register_device_item(device, 0, psg->attack); - state_save_register_device_item(device, 0, psg->holding); - state_save_register_device_item(device, 0, psg->rng); + device->save_item(NAME(psg->env_step)); + device->save_item(NAME(psg->hold)); + device->save_item(NAME(psg->alternate)); + device->save_item(NAME(psg->attack)); + device->save_item(NAME(psg->holding)); + device->save_item(NAME(psg->rng)); } /************************************* diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c index 933a013a037..ed70b946baf 100644 --- a/src/emu/sound/bsmt2000.c +++ b/src/emu/sound/bsmt2000.c @@ -229,13 +229,13 @@ void bsmt2000_device::device_start() m_stream = m_machine.sound().stream_alloc(*this, 0, 2, clock() / 128); // register for save states - state_save_register_device_item(this, 0, m_register_select); - state_save_register_device_item(this, 0, m_write_data); - state_save_register_device_item(this, 0, m_rom_address); - state_save_register_device_item(this, 0, m_rom_bank); - state_save_register_device_item(this, 0, m_left_data); - state_save_register_device_item(this, 0, m_right_data); - state_save_register_device_item(this, 0, m_write_pending); + save_item(NAME(m_register_select)); + save_item(NAME(m_write_data)); + save_item(NAME(m_rom_address)); + save_item(NAME(m_rom_bank)); + save_item(NAME(m_left_data)); + save_item(NAME(m_right_data)); + save_item(NAME(m_write_pending)); } diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c index 90a3c1e6fc0..93e38fd841b 100644 --- a/src/emu/sound/c352.c +++ b/src/emu/sound/c352.c @@ -516,23 +516,23 @@ static void c352_init(c352_state *info, device_t *device) // register save state info for (i = 0; i < 32; i++) { - state_save_register_device_item(device, i, info->c352_ch[i].vol_l); - state_save_register_device_item(device, i, info->c352_ch[i].vol_r); - state_save_register_device_item(device, i, info->c352_ch[i].vol_l2); - state_save_register_device_item(device, i, info->c352_ch[i].vol_r2); - state_save_register_device_item(device, i, info->c352_ch[i].bank); - state_save_register_device_item(device, i, info->c352_ch[i].noise); - state_save_register_device_item(device, i, info->c352_ch[i].noisebuf); - state_save_register_device_item(device, i, info->c352_ch[i].noisecnt); - state_save_register_device_item(device, i, info->c352_ch[i].pitch); - state_save_register_device_item(device, i, info->c352_ch[i].start_addr); - state_save_register_device_item(device, i, info->c352_ch[i].end_addr); - state_save_register_device_item(device, i, info->c352_ch[i].repeat_addr); - state_save_register_device_item(device, i, info->c352_ch[i].flag); - state_save_register_device_item(device, i, info->c352_ch[i].start); - state_save_register_device_item(device, i, info->c352_ch[i].repeat); - state_save_register_device_item(device, i, info->c352_ch[i].current_addr); - state_save_register_device_item(device, i, info->c352_ch[i].pos); + device->save_item(NAME(info->c352_ch[i].vol_l), i); + device->save_item(NAME(info->c352_ch[i].vol_r), i); + device->save_item(NAME(info->c352_ch[i].vol_l2), i); + device->save_item(NAME(info->c352_ch[i].vol_r2), i); + device->save_item(NAME(info->c352_ch[i].bank), i); + device->save_item(NAME(info->c352_ch[i].noise), i); + device->save_item(NAME(info->c352_ch[i].noisebuf), i); + device->save_item(NAME(info->c352_ch[i].noisecnt), i); + device->save_item(NAME(info->c352_ch[i].pitch), i); + device->save_item(NAME(info->c352_ch[i].start_addr), i); + device->save_item(NAME(info->c352_ch[i].end_addr), i); + device->save_item(NAME(info->c352_ch[i].repeat_addr), i); + device->save_item(NAME(info->c352_ch[i].flag), i); + device->save_item(NAME(info->c352_ch[i].start), i); + device->save_item(NAME(info->c352_ch[i].repeat), i); + device->save_item(NAME(info->c352_ch[i].current_addr), i); + device->save_item(NAME(info->c352_ch[i].pos), i); } } diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c index 4087ce6888e..71d02515f7d 100644 --- a/src/emu/sound/cdda.c +++ b/src/emu/sound/cdda.c @@ -60,14 +60,14 @@ static DEVICE_START( cdda ) info->stream = device->machine->sound().stream_alloc(*device, 0, 2, 44100, info, cdda_update); - state_save_register_device_item( device, 0, info->audio_playing ); - state_save_register_device_item( device, 0, info->audio_pause ); - state_save_register_device_item( device, 0, info->audio_ended_normally ); - state_save_register_device_item( device, 0, info->audio_lba ); - state_save_register_device_item( device, 0, info->audio_length ); - state_save_register_device_item_pointer( device, 0, info->audio_cache, CD_MAX_SECTOR_DATA * MAX_SECTORS ); - state_save_register_device_item( device, 0, info->audio_samples ); - state_save_register_device_item( device, 0, info->audio_bptr ); + device->save_item( NAME(info->audio_playing) ); + device->save_item( NAME(info->audio_pause) ); + device->save_item( NAME(info->audio_ended_normally) ); + device->save_item( NAME(info->audio_lba) ); + device->save_item( NAME(info->audio_length) ); + device->save_pointer( NAME(info->audio_cache), CD_MAX_SECTOR_DATA * MAX_SECTORS ); + device->save_item( NAME(info->audio_samples) ); + device->save_item( NAME(info->audio_bptr) ); } diff --git a/src/emu/sound/cdp1863.c b/src/emu/sound/cdp1863.c index 0f174342ba2..59984173548 100644 --- a/src/emu/sound/cdp1863.c +++ b/src/emu/sound/cdp1863.c @@ -181,12 +181,12 @@ static DEVICE_START( cdp1863 ) cdp1863->oe = 1; /* register for state saving */ - state_save_register_device_item(device, 0, cdp1863->clock1); - state_save_register_device_item(device, 0, cdp1863->clock2); - state_save_register_device_item(device, 0, cdp1863->oe); - state_save_register_device_item(device, 0, cdp1863->latch); - state_save_register_device_item(device, 0, cdp1863->signal); - state_save_register_device_item(device, 0, cdp1863->incr); + device->save_item(NAME(cdp1863->clock1)); + device->save_item(NAME(cdp1863->clock2)); + device->save_item(NAME(cdp1863->oe)); + device->save_item(NAME(cdp1863->latch)); + device->save_item(NAME(cdp1863->signal)); + device->save_item(NAME(cdp1863->incr)); } /*------------------------------------------------- diff --git a/src/emu/sound/cdp1864.c b/src/emu/sound/cdp1864.c index 67d0f7ee563..1496bea0aba 100644 --- a/src/emu/sound/cdp1864.c +++ b/src/emu/sound/cdp1864.c @@ -454,17 +454,17 @@ static DEVICE_START( cdp1864 ) cdp1864->dma_timer = device->machine->scheduler().timer_alloc(FUNC(cdp1864_dma_tick), (void *)device); /* register for state saving */ - state_save_register_device_item(device, 0, cdp1864->disp); - state_save_register_device_item(device, 0, cdp1864->dmaout); - state_save_register_device_item(device, 0, cdp1864->bgcolor); - state_save_register_device_item(device, 0, cdp1864->con); + device->save_item(NAME(cdp1864->disp)); + device->save_item(NAME(cdp1864->dmaout)); + device->save_item(NAME(cdp1864->bgcolor)); + device->save_item(NAME(cdp1864->con)); - state_save_register_device_item(device, 0, cdp1864->aoe); - state_save_register_device_item(device, 0, cdp1864->latch); - state_save_register_device_item(device, 0, cdp1864->signal); - state_save_register_device_item(device, 0, cdp1864->incr); + device->save_item(NAME(cdp1864->aoe)); + device->save_item(NAME(cdp1864->latch)); + device->save_item(NAME(cdp1864->signal)); + device->save_item(NAME(cdp1864->incr)); - state_save_register_device_item_bitmap(device, 0, cdp1864->bitmap); + device->save_item(NAME(*cdp1864->bitmap)); } /*------------------------------------------------- diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index f80fc3c413f..51e459115a2 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -437,28 +437,28 @@ void cdp1869_device::device_start() m_stream = m_machine.sound().stream_alloc(*this, 0, 1, m_machine.sample_rate); // register for state saving - state_save_register_device_item(this, 0, m_prd); - state_save_register_device_item(this, 0, m_dispoff); - state_save_register_device_item(this, 0, m_fresvert); - state_save_register_device_item(this, 0, m_freshorz); - state_save_register_device_item(this, 0, m_cmem); - state_save_register_device_item(this, 0, m_dblpage); - state_save_register_device_item(this, 0, m_line16); - state_save_register_device_item(this, 0, m_line9); - state_save_register_device_item(this, 0, m_cfc); - state_save_register_device_item(this, 0, m_col); - state_save_register_device_item(this, 0, m_bkg); - state_save_register_device_item(this, 0, m_pma); - state_save_register_device_item(this, 0, m_hma); - state_save_register_device_item(this, 0, m_signal); - state_save_register_device_item(this, 0, m_incr); - state_save_register_device_item(this, 0, m_toneoff); - state_save_register_device_item(this, 0, m_wnoff); - state_save_register_device_item(this, 0, m_tonediv); - state_save_register_device_item(this, 0, m_tonefreq); - state_save_register_device_item(this, 0, m_toneamp); - state_save_register_device_item(this, 0, m_wnfreq); - state_save_register_device_item(this, 0, m_wnamp); + save_item(NAME(m_prd)); + save_item(NAME(m_dispoff)); + save_item(NAME(m_fresvert)); + save_item(NAME(m_freshorz)); + save_item(NAME(m_cmem)); + save_item(NAME(m_dblpage)); + save_item(NAME(m_line16)); + save_item(NAME(m_line9)); + save_item(NAME(m_cfc)); + save_item(NAME(m_col)); + save_item(NAME(m_bkg)); + save_item(NAME(m_pma)); + save_item(NAME(m_hma)); + save_item(NAME(m_signal)); + save_item(NAME(m_incr)); + save_item(NAME(m_toneoff)); + save_item(NAME(m_wnoff)); + save_item(NAME(m_tonediv)); + save_item(NAME(m_tonefreq)); + save_item(NAME(m_toneamp)); + save_item(NAME(m_wnfreq)); + save_item(NAME(m_wnamp)); } diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c index 3becc97bf8c..e703910374c 100644 --- a/src/emu/sound/cem3394.c +++ b/src/emu/sound/cem3394.c @@ -343,18 +343,18 @@ static DEVICE_START( cem3394 ) chip->mixer_buffer = auto_alloc_array(device->machine, INT16, chip->sample_rate); chip->external_buffer = auto_alloc_array(device->machine, INT16, chip->sample_rate); - state_save_register_device_item_array(device, 0, chip->values); - state_save_register_device_item(device, 0, chip->wave_select); - state_save_register_device_item(device, 0, chip->volume); - state_save_register_device_item(device, 0, chip->mixer_internal); - state_save_register_device_item(device, 0, chip->mixer_external); - state_save_register_device_item(device, 0, chip->position); - state_save_register_device_item(device, 0, chip->step); - state_save_register_device_item(device, 0, chip->filter_position); - state_save_register_device_item(device, 0, chip->filter_step); - state_save_register_device_item(device, 0, chip->modulation_depth); - state_save_register_device_item(device, 0, chip->last_ext); - state_save_register_device_item(device, 0, chip->pulse_width); + device->save_item(NAME(chip->values)); + device->save_item(NAME(chip->wave_select)); + device->save_item(NAME(chip->volume)); + device->save_item(NAME(chip->mixer_internal)); + device->save_item(NAME(chip->mixer_external)); + device->save_item(NAME(chip->position)); + device->save_item(NAME(chip->step)); + device->save_item(NAME(chip->filter_position)); + device->save_item(NAME(chip->filter_step)); + device->save_item(NAME(chip->modulation_depth)); + device->save_item(NAME(chip->last_ext)); + device->save_item(NAME(chip->pulse_width)); } diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c index 33a35580f80..4a600718d16 100644 --- a/src/emu/sound/dac.c +++ b/src/emu/sound/dac.c @@ -113,7 +113,7 @@ static DEVICE_START( dac ) info->channel = device->machine->sound().stream_alloc(*device,0,1,device->clock() ? device->clock() : DEFAULT_SAMPLE_RATE,info,DAC_update); info->output = 0; - state_save_register_device_item(device, 0, info->output); + device->save_item(NAME(info->output)); } diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c index 6d212db71b2..5fbb1cbf5f0 100644 --- a/src/emu/sound/digitalk.c +++ b/src/emu/sound/digitalk.c @@ -621,27 +621,27 @@ static int digitalker_intr_r(digitalker *dg) static void digitalker_register_for_save(digitalker *dg) { - state_save_register_device_item(dg->device, 0, dg->data); - state_save_register_device_item(dg->device, 0, dg->cs); - state_save_register_device_item(dg->device, 0, dg->cms); - state_save_register_device_item(dg->device, 0, dg->wr); - state_save_register_device_item(dg->device, 0, dg->intr); - state_save_register_device_item(dg->device, 0, dg->bpos); - state_save_register_device_item(dg->device, 0, dg->apos); - state_save_register_device_item(dg->device, 0, dg->mode); - state_save_register_device_item(dg->device, 0, dg->cur_segment); - state_save_register_device_item(dg->device, 0, dg->cur_repeat); - state_save_register_device_item(dg->device, 0, dg->segments); - state_save_register_device_item(dg->device, 0, dg->repeats); - state_save_register_device_item(dg->device, 0, dg->prev_pitch); - state_save_register_device_item(dg->device, 0, dg->pitch); - state_save_register_device_item(dg->device, 0, dg->pitch_pos); - state_save_register_device_item(dg->device, 0, dg->stop_after); - state_save_register_device_item(dg->device, 0, dg->cur_dac); - state_save_register_device_item(dg->device, 0, dg->cur_bits); - state_save_register_device_item(dg->device, 0, dg->zero_count); - state_save_register_device_item(dg->device, 0, dg->dac_index); - state_save_register_device_item_array(dg->device, 0, dg->dac); + dg->device->save_item(NAME(dg->data)); + dg->device->save_item(NAME(dg->cs)); + dg->device->save_item(NAME(dg->cms)); + dg->device->save_item(NAME(dg->wr)); + dg->device->save_item(NAME(dg->intr)); + dg->device->save_item(NAME(dg->bpos)); + dg->device->save_item(NAME(dg->apos)); + dg->device->save_item(NAME(dg->mode)); + dg->device->save_item(NAME(dg->cur_segment)); + dg->device->save_item(NAME(dg->cur_repeat)); + dg->device->save_item(NAME(dg->segments)); + dg->device->save_item(NAME(dg->repeats)); + dg->device->save_item(NAME(dg->prev_pitch)); + dg->device->save_item(NAME(dg->pitch)); + dg->device->save_item(NAME(dg->pitch_pos)); + dg->device->save_item(NAME(dg->stop_after)); + dg->device->save_item(NAME(dg->cur_dac)); + dg->device->save_item(NAME(dg->cur_bits)); + dg->device->save_item(NAME(dg->zero_count)); + dg->device->save_item(NAME(dg->dac_index)); + dg->device->save_item(NAME(dg->dac)); } static DEVICE_START(digitalker) diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 723be279454..7eb28f9de7e 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -385,7 +385,7 @@ void discrete_base_node::init(discrete_device *pdev, const discrete_block *xbloc void discrete_base_node::save_state(void) { if (m_block->node != NODE_SPECIAL) - state_save_register_device_item_array(m_device, m_block->node, m_output); + m_device->save_item(NAME(m_output), m_block->node); } discrete_base_node *discrete_device::discrete_find_node(int node) diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c index 3972cd6d0f6..470604834e2 100644 --- a/src/emu/sound/dmadac.c +++ b/src/emu/sound/dmadac.c @@ -115,12 +115,12 @@ static DEVICE_START( dmadac ) info->channel = device->machine->sound().stream_alloc(*device, 0, 1, DEFAULT_SAMPLE_RATE, info, dmadac_update); /* register with the save state system */ - state_save_register_device_item(device, 0, info->bufin); - state_save_register_device_item(device, 0, info->bufout); - state_save_register_device_item(device, 0, info->volume); - state_save_register_device_item(device, 0, info->enabled); - state_save_register_device_item(device, 0, info->frequency); - state_save_register_device_item_pointer(device, 0, info->buffer, BUFFER_SIZE); + device->save_item(NAME(info->bufin)); + device->save_item(NAME(info->bufout)); + device->save_item(NAME(info->volume)); + device->save_item(NAME(info->enabled)); + device->save_item(NAME(info->frequency)); + device->save_pointer(NAME(info->buffer), BUFFER_SIZE); } diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index 2b4e33deda9..f0e4f58a028 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -244,16 +244,16 @@ static DEVICE_START( es5503 ) for (osc = 0; osc < 32; osc++) { - state_save_register_device_item(device, osc, chip->oscillators[osc].freq); - state_save_register_device_item(device, osc, chip->oscillators[osc].wtsize); - state_save_register_device_item(device, osc, chip->oscillators[osc].control); - state_save_register_device_item(device, osc, chip->oscillators[osc].vol); - state_save_register_device_item(device, osc, chip->oscillators[osc].data); - state_save_register_device_item(device, osc, chip->oscillators[osc].wavetblpointer); - state_save_register_device_item(device, osc, chip->oscillators[osc].wavetblsize); - state_save_register_device_item(device, osc, chip->oscillators[osc].resolution); - state_save_register_device_item(device, osc, chip->oscillators[osc].accumulator); - state_save_register_device_item(device, osc, chip->oscillators[osc].irqpend); + device->save_item(NAME(chip->oscillators[osc].freq), osc); + device->save_item(NAME(chip->oscillators[osc].wtsize), osc); + device->save_item(NAME(chip->oscillators[osc].control), osc); + device->save_item(NAME(chip->oscillators[osc].vol), osc); + device->save_item(NAME(chip->oscillators[osc].data), osc); + device->save_item(NAME(chip->oscillators[osc].wavetblpointer), osc); + device->save_item(NAME(chip->oscillators[osc].wavetblsize), osc); + device->save_item(NAME(chip->oscillators[osc].resolution), osc); + device->save_item(NAME(chip->oscillators[osc].accumulator), osc); + device->save_item(NAME(chip->oscillators[osc].irqpend), osc); chip->oscillators[osc].data = 0x80; chip->oscillators[osc].irqpend = 0; diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index ca0abc972e7..f6e8572fbd2 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -943,44 +943,44 @@ static void es5506_start_common(device_t *device, const void *config, device_typ chip->scratch = auto_alloc_array(device->machine, INT32, 2 * MAX_SAMPLE_CHUNK); /* register save */ - state_save_register_device_item(device, 0, chip->sample_rate); - state_save_register_device_item(device, 0, chip->write_latch); - state_save_register_device_item(device, 0, chip->read_latch); + device->save_item(NAME(chip->sample_rate)); + device->save_item(NAME(chip->write_latch)); + device->save_item(NAME(chip->read_latch)); - state_save_register_device_item(device, 0, chip->current_page); - state_save_register_device_item(device, 0, chip->active_voices); - state_save_register_device_item(device, 0, chip->mode); - state_save_register_device_item(device, 0, chip->wst); - state_save_register_device_item(device, 0, chip->wend); - state_save_register_device_item(device, 0, chip->lrend); - state_save_register_device_item(device, 0, chip->irqv); + device->save_item(NAME(chip->current_page)); + device->save_item(NAME(chip->active_voices)); + device->save_item(NAME(chip->mode)); + device->save_item(NAME(chip->wst)); + device->save_item(NAME(chip->wend)); + device->save_item(NAME(chip->lrend)); + device->save_item(NAME(chip->irqv)); - state_save_register_device_item_pointer(device, 0, chip->scratch, 2 * MAX_SAMPLE_CHUNK); + device->save_pointer(NAME(chip->scratch), 2 * MAX_SAMPLE_CHUNK); for (j = 0; j < 32; j++) { - state_save_register_device_item(device, j, chip->voice[j].control); - state_save_register_device_item(device, j, chip->voice[j].freqcount); - state_save_register_device_item(device, j, chip->voice[j].start); - state_save_register_device_item(device, j, chip->voice[j].lvol); - state_save_register_device_item(device, j, chip->voice[j].end); - state_save_register_device_item(device, j, chip->voice[j].lvramp); - state_save_register_device_item(device, j, chip->voice[j].accum); - state_save_register_device_item(device, j, chip->voice[j].rvol); - state_save_register_device_item(device, j, chip->voice[j].rvramp); - state_save_register_device_item(device, j, chip->voice[j].ecount); - state_save_register_device_item(device, j, chip->voice[j].k2); - state_save_register_device_item(device, j, chip->voice[j].k2ramp); - state_save_register_device_item(device, j, chip->voice[j].k1); - state_save_register_device_item(device, j, chip->voice[j].k1ramp); - state_save_register_device_item(device, j, chip->voice[j].o4n1); - state_save_register_device_item(device, j, chip->voice[j].o3n1); - state_save_register_device_item(device, j, chip->voice[j].o3n2); - state_save_register_device_item(device, j, chip->voice[j].o2n1); - state_save_register_device_item(device, j, chip->voice[j].o2n2); - state_save_register_device_item(device, j, chip->voice[j].o1n1); - state_save_register_device_item(device, j, chip->voice[j].exbank); - state_save_register_device_item(device, j, chip->voice[j].filtcount); + device->save_item(NAME(chip->voice[j].control), j); + device->save_item(NAME(chip->voice[j].freqcount), j); + device->save_item(NAME(chip->voice[j].start), j); + device->save_item(NAME(chip->voice[j].lvol), j); + device->save_item(NAME(chip->voice[j].end), j); + device->save_item(NAME(chip->voice[j].lvramp), j); + device->save_item(NAME(chip->voice[j].accum), j); + device->save_item(NAME(chip->voice[j].rvol), j); + device->save_item(NAME(chip->voice[j].rvramp), j); + device->save_item(NAME(chip->voice[j].ecount), j); + device->save_item(NAME(chip->voice[j].k2), j); + device->save_item(NAME(chip->voice[j].k2ramp), j); + device->save_item(NAME(chip->voice[j].k1), j); + device->save_item(NAME(chip->voice[j].k1ramp), j); + device->save_item(NAME(chip->voice[j].o4n1), j); + device->save_item(NAME(chip->voice[j].o3n1), j); + device->save_item(NAME(chip->voice[j].o3n2), j); + device->save_item(NAME(chip->voice[j].o2n1), j); + device->save_item(NAME(chip->voice[j].o2n2), j); + device->save_item(NAME(chip->voice[j].o1n1), j); + device->save_item(NAME(chip->voice[j].exbank), j); + device->save_item(NAME(chip->voice[j].filtcount), j); } /* success */ diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c index 787daf2f54e..4615b5dc026 100644 --- a/src/emu/sound/es8712.c +++ b/src/emu/sound/es8712.c @@ -190,19 +190,19 @@ static STREAM_UPDATE( es8712_update ) static void es8712_state_save_register(es8712_state *chip, device_t *device) { - state_save_register_device_item(device, 0, chip->bank_offset); + device->save_item(NAME(chip->bank_offset)); - state_save_register_device_item(device, 0, chip->playing); - state_save_register_device_item(device, 0, chip->sample); - state_save_register_device_item(device, 0, chip->count); - state_save_register_device_item(device, 0, chip->signal); - state_save_register_device_item(device, 0, chip->step); + device->save_item(NAME(chip->playing)); + device->save_item(NAME(chip->sample)); + device->save_item(NAME(chip->count)); + device->save_item(NAME(chip->signal)); + device->save_item(NAME(chip->step)); - state_save_register_device_item(device, 0, chip->base_offset); + device->save_item(NAME(chip->base_offset)); - state_save_register_device_item(device, 0, chip->start); - state_save_register_device_item(device, 0, chip->end); - state_save_register_device_item(device, 0, chip->repeat); + device->save_item(NAME(chip->start)); + device->save_item(NAME(chip->end)); + device->save_item(NAME(chip->repeat)); } diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c index 1eba48e0622..256a6a595a8 100644 --- a/src/emu/sound/fm.c +++ b/src/emu/sound/fm.c @@ -1688,15 +1688,15 @@ static void FMsave_state_channel(device_t *device,FM_CH *CH,int num_ch) for(ch=0;ch<num_ch;ch++,CH++) { /* channel */ - state_save_register_device_item_array(device, ch, CH->op1_out); - state_save_register_device_item(device, ch, CH->fc); + device->save_item(NAME(CH->op1_out), ch); + device->save_item(NAME(CH->fc), ch); /* slots */ for(slot=0;slot<4;slot++) { FM_SLOT *SLOT = &CH->SLOT[slot]; - state_save_register_device_item(device, ch * 4 + slot, SLOT->phase); - state_save_register_device_item(device, ch * 4 + slot, SLOT->state); - state_save_register_device_item(device, ch * 4 + slot, SLOT->volume); + device->save_item(NAME(SLOT->phase), ch * 4 + slot); + device->save_item(NAME(SLOT->state), ch * 4 + slot); + device->save_item(NAME(SLOT->volume), ch * 4 + slot); } } } @@ -1704,19 +1704,19 @@ static void FMsave_state_channel(device_t *device,FM_CH *CH,int num_ch) static void FMsave_state_st(device_t *device,FM_ST *ST) { #if FM_BUSY_FLAG_SUPPORT - state_save_register_device_item(device, 0, ST->busy_expiry_time ); + device->save_item(NAME(ST->busy_expiry_time) ); #endif - state_save_register_device_item(device, 0, ST->address ); - state_save_register_device_item(device, 0, ST->irq ); - state_save_register_device_item(device, 0, ST->irqmask ); - state_save_register_device_item(device, 0, ST->status ); - state_save_register_device_item(device, 0, ST->mode ); - state_save_register_device_item(device, 0, ST->prescaler_sel ); - state_save_register_device_item(device, 0, ST->fn_h ); - state_save_register_device_item(device, 0, ST->TA ); - state_save_register_device_item(device, 0, ST->TAC ); - state_save_register_device_item(device, 0, ST->TB ); - state_save_register_device_item(device, 0, ST->TBC ); + device->save_item(NAME(ST->address) ); + device->save_item(NAME(ST->irq) ); + device->save_item(NAME(ST->irqmask) ); + device->save_item(NAME(ST->status) ); + device->save_item(NAME(ST->mode) ); + device->save_item(NAME(ST->prescaler_sel) ); + device->save_item(NAME(ST->fn_h) ); + device->save_item(NAME(ST->TA) ); + device->save_item(NAME(ST->TAC) ); + device->save_item(NAME(ST->TB) ); + device->save_item(NAME(ST->TBC) ); } #endif /* _STATE_H */ @@ -2243,13 +2243,13 @@ void ym2203_postload(void *chip) static void YM2203_save_state(YM2203 *F2203, device_t *device) { - state_save_register_device_item_array(device, 0, F2203->REGS); + device->save_item(NAME(F2203->REGS)); FMsave_state_st(device,&F2203->OPN.ST); FMsave_state_channel(device,F2203->CH,3); /* 3slots */ - state_save_register_device_item_array (device, 0, F2203->OPN.SL3.fc); - state_save_register_device_item (device, 0, F2203->OPN.SL3.fn_h); - state_save_register_device_item_array (device, 0, F2203->OPN.SL3.kcode); + device->save_item (NAME(F2203->OPN.SL3.fc)); + device->save_item (NAME(F2203->OPN.SL3.fn_h)); + device->save_item (NAME(F2203->OPN.SL3.kcode)); } #endif /* _STATE_H */ @@ -2658,13 +2658,13 @@ static void FMsave_state_adpcma(device_t *device,ADPCM_CH *adpcm) for(ch=0;ch<6;ch++,adpcm++) { - state_save_register_device_item(device, ch, adpcm->flag); - state_save_register_device_item(device, ch, adpcm->now_data); - state_save_register_device_item(device, ch, adpcm->now_addr); - state_save_register_device_item(device, ch, adpcm->now_step); - state_save_register_device_item(device, ch, adpcm->adpcm_acc); - state_save_register_device_item(device, ch, adpcm->adpcm_step); - state_save_register_device_item(device, ch, adpcm->adpcm_out); + device->save_item(NAME(adpcm->flag), ch); + device->save_item(NAME(adpcm->now_data), ch); + device->save_item(NAME(adpcm->now_addr), ch); + device->save_item(NAME(adpcm->now_step), ch); + device->save_item(NAME(adpcm->adpcm_acc), ch); + device->save_item(NAME(adpcm->adpcm_step), ch); + device->save_item(NAME(adpcm->adpcm_out), ch); } } #endif /* _STATE_H */ @@ -3453,15 +3453,15 @@ void ym2608_postload(void *chip) static void YM2608_save_state(YM2608 *F2608, device_t *device) { - state_save_register_device_item_array(device, 0, F2608->REGS); + device->save_item(NAME(F2608->REGS)); FMsave_state_st(device,&F2608->OPN.ST); FMsave_state_channel(device,F2608->CH,6); /* 3slots */ - state_save_register_device_item_array(device, 0, F2608->OPN.SL3.fc); - state_save_register_device_item(device, 0, F2608->OPN.SL3.fn_h); - state_save_register_device_item_array(device, 0, F2608->OPN.SL3.kcode); + device->save_item(NAME(F2608->OPN.SL3.fc)); + device->save_item(NAME(F2608->OPN.SL3.fn_h)); + device->save_item(NAME(F2608->OPN.SL3.kcode)); /* address register1 */ - state_save_register_device_item(device, 0, F2608->addr_A1); + device->save_item(NAME(F2608->addr_A1)); /* rythm(ADPCMA) */ FMsave_state_adpcma(device,F2608->adpcm); /* Delta-T ADPCM unit */ @@ -4133,17 +4133,17 @@ void ym2610_postload(void *chip) static void YM2610_save_state(YM2610 *F2610, device_t *device) { - state_save_register_device_item_array(device, 0, F2610->REGS); + device->save_item(NAME(F2610->REGS)); FMsave_state_st(device,&F2610->OPN.ST); FMsave_state_channel(device,F2610->CH,6); /* 3slots */ - state_save_register_device_item_array(device, 0, F2610->OPN.SL3.fc); - state_save_register_device_item(device, 0, F2610->OPN.SL3.fn_h); - state_save_register_device_item_array(device, 0, F2610->OPN.SL3.kcode); + device->save_item(NAME(F2610->OPN.SL3.fc)); + device->save_item(NAME(F2610->OPN.SL3.fn_h)); + device->save_item(NAME(F2610->OPN.SL3.kcode)); /* address register1 */ - state_save_register_device_item(device, 0, F2610->addr_A1); + device->save_item(NAME(F2610->addr_A1)); - state_save_register_device_item(device, 0, F2610->adpcm_arrivedEndAddress); + device->save_item(NAME(F2610->adpcm_arrivedEndAddress)); /* rythm(ADPCMA) */ FMsave_state_adpcma(device,F2610->adpcm); /* Delta-T ADPCM unit */ diff --git a/src/emu/sound/fm2612.c b/src/emu/sound/fm2612.c index ea1ede395b5..7a22e09dcc9 100644 --- a/src/emu/sound/fm2612.c +++ b/src/emu/sound/fm2612.c @@ -1691,15 +1691,15 @@ static void FMsave_state_channel(device_t *device,FM_CH *CH,int num_ch) for(ch=0;ch<num_ch;ch++,CH++) { /* channel */ - state_save_register_device_item_array(device, ch, CH->op1_out); - state_save_register_device_item(device, ch, CH->fc); + device->save_item(NAME(CH->op1_out), ch); + device->save_item(NAME(CH->fc), ch); /* slots */ for(slot=0;slot<4;slot++) { FM_SLOT *SLOT = &CH->SLOT[slot]; - state_save_register_device_item(device, ch * 4 + slot, SLOT->phase); - state_save_register_device_item(device, ch * 4 + slot, SLOT->state); - state_save_register_device_item(device, ch * 4 + slot, SLOT->volume); + device->save_item(NAME(SLOT->phase), ch * 4 + slot); + device->save_item(NAME(SLOT->state), ch * 4 + slot); + device->save_item(NAME(SLOT->volume), ch * 4 + slot); } } } @@ -1707,19 +1707,19 @@ static void FMsave_state_channel(device_t *device,FM_CH *CH,int num_ch) static void FMsave_state_st(device_t *device,FM_ST *ST) { #if FM_BUSY_FLAG_SUPPORT - state_save_register_device_item(device, 0, ST->busy_expiry_time ); + device->save_item(NAME(ST->busy_expiry_time) ); #endif - state_save_register_device_item(device, 0, ST->address ); - state_save_register_device_item(device, 0, ST->irq ); - state_save_register_device_item(device, 0, ST->irqmask ); - state_save_register_device_item(device, 0, ST->status ); - state_save_register_device_item(device, 0, ST->mode ); - state_save_register_device_item(device, 0, ST->prescaler_sel ); - state_save_register_device_item(device, 0, ST->fn_h ); - state_save_register_device_item(device, 0, ST->TA ); - state_save_register_device_item(device, 0, ST->TAC ); - state_save_register_device_item(device, 0, ST->TB ); - state_save_register_device_item(device, 0, ST->TBC ); + device->save_item(NAME(ST->address) ); + device->save_item(NAME(ST->irq) ); + device->save_item(NAME(ST->irqmask) ); + device->save_item(NAME(ST->status) ); + device->save_item(NAME(ST->mode) ); + device->save_item(NAME(ST->prescaler_sel) ); + device->save_item(NAME(ST->fn_h) ); + device->save_item(NAME(ST->TA) ); + device->save_item(NAME(ST->TAC) ); + device->save_item(NAME(ST->TB) ); + device->save_item(NAME(ST->TBC) ); } #endif /* _STATE_H */ @@ -2350,15 +2350,15 @@ void ym2612_postload(void *chip) static void YM2612_save_state(YM2612 *F2612, device_t *device) { - state_save_register_device_item_array(device, 0, F2612->REGS); + device->save_item(NAME(F2612->REGS)); FMsave_state_st(device,&F2612->OPN.ST); FMsave_state_channel(device,F2612->CH,6); /* 3slots */ - state_save_register_device_item_array(device, 0, F2612->OPN.SL3.fc); - state_save_register_device_item(device, 0, F2612->OPN.SL3.fn_h); - state_save_register_device_item_array(device, 0, F2612->OPN.SL3.kcode); + device->save_item(NAME(F2612->OPN.SL3.fc)); + device->save_item(NAME(F2612->OPN.SL3.fn_h)); + device->save_item(NAME(F2612->OPN.SL3.kcode)); /* address register1 */ - state_save_register_device_item(device, 0, F2612->addr_A1); + device->save_item(NAME(F2612->addr_A1)); } #endif /* _STATE_H */ diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c index f7fa61e34fc..7f885bc1119 100644 --- a/src/emu/sound/fmopl.c +++ b/src/emu/sound/fmopl.c @@ -1877,36 +1877,36 @@ static void OPLsave_state_channel(device_t *device, OPL_CH *CH) for( ch=0 ; ch < 9 ; ch++, CH++ ) { /* channel */ - state_save_register_device_item(device, ch, CH->block_fnum); - state_save_register_device_item(device, ch, CH->kcode); + device->save_item(NAME(CH->block_fnum), ch); + device->save_item(NAME(CH->kcode), ch); /* slots */ for( slot=0 ; slot < 2 ; slot++ ) { OPL_SLOT *SLOT = &CH->SLOT[slot]; - state_save_register_device_item(device, ch * 2 + slot, SLOT->ar); - state_save_register_device_item(device, ch * 2 + slot, SLOT->dr); - state_save_register_device_item(device, ch * 2 + slot, SLOT->rr); - state_save_register_device_item(device, ch * 2 + slot, SLOT->KSR); - state_save_register_device_item(device, ch * 2 + slot, SLOT->ksl); - state_save_register_device_item(device, ch * 2 + slot, SLOT->mul); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->Cnt); - state_save_register_device_item(device, ch * 2 + slot, SLOT->FB); - state_save_register_device_item_array(device, ch * 2 + slot, SLOT->op1_out); - state_save_register_device_item(device, ch * 2 + slot, SLOT->CON); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->eg_type); - state_save_register_device_item(device, ch * 2 + slot, SLOT->state); - state_save_register_device_item(device, ch * 2 + slot, SLOT->TL); - state_save_register_device_item(device, ch * 2 + slot, SLOT->volume); - state_save_register_device_item(device, ch * 2 + slot, SLOT->sl); - state_save_register_device_item(device, ch * 2 + slot, SLOT->key); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->AMmask); - state_save_register_device_item(device, ch * 2 + slot, SLOT->vib); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->wavetable); + device->save_item(NAME(SLOT->ar), ch * 2 + slot); + device->save_item(NAME(SLOT->dr), ch * 2 + slot); + device->save_item(NAME(SLOT->rr), ch * 2 + slot); + device->save_item(NAME(SLOT->KSR), ch * 2 + slot); + device->save_item(NAME(SLOT->ksl), ch * 2 + slot); + device->save_item(NAME(SLOT->mul), ch * 2 + slot); + + device->save_item(NAME(SLOT->Cnt), ch * 2 + slot); + device->save_item(NAME(SLOT->FB), ch * 2 + slot); + device->save_item(NAME(SLOT->op1_out), ch * 2 + slot); + device->save_item(NAME(SLOT->CON), ch * 2 + slot); + + device->save_item(NAME(SLOT->eg_type), ch * 2 + slot); + device->save_item(NAME(SLOT->state), ch * 2 + slot); + device->save_item(NAME(SLOT->TL), ch * 2 + slot); + device->save_item(NAME(SLOT->volume), ch * 2 + slot); + device->save_item(NAME(SLOT->sl), ch * 2 + slot); + device->save_item(NAME(SLOT->key), ch * 2 + slot); + + device->save_item(NAME(SLOT->AMmask), ch * 2 + slot); + device->save_item(NAME(SLOT->vib), ch * 2 + slot); + + device->save_item(NAME(SLOT->wavetable), ch * 2 + slot); } } } @@ -1918,26 +1918,26 @@ static void OPL_save_state(FM_OPL *OPL, device_t *device) { OPLsave_state_channel(device, OPL->P_CH); - state_save_register_device_item(device, 0, OPL->eg_cnt); - state_save_register_device_item(device, 0, OPL->eg_timer); + device->save_item(NAME(OPL->eg_cnt)); + device->save_item(NAME(OPL->eg_timer)); - state_save_register_device_item(device, 0, OPL->rhythm); + device->save_item(NAME(OPL->rhythm)); - state_save_register_device_item(device, 0, OPL->lfo_am_depth); - state_save_register_device_item(device, 0, OPL->lfo_pm_depth_range); - state_save_register_device_item(device, 0, OPL->lfo_am_cnt); - state_save_register_device_item(device, 0, OPL->lfo_pm_cnt); + device->save_item(NAME(OPL->lfo_am_depth)); + device->save_item(NAME(OPL->lfo_pm_depth_range)); + device->save_item(NAME(OPL->lfo_am_cnt)); + device->save_item(NAME(OPL->lfo_pm_cnt)); - state_save_register_device_item(device, 0, OPL->noise_rng); - state_save_register_device_item(device, 0, OPL->noise_p); + device->save_item(NAME(OPL->noise_rng)); + device->save_item(NAME(OPL->noise_p)); if( OPL->type & OPL_TYPE_WAVESEL ) { - state_save_register_device_item(device, 0, OPL->wavesel); + device->save_item(NAME(OPL->wavesel)); } - state_save_register_device_item_array(device, 0, OPL->T); - state_save_register_device_item_array(device, 0, OPL->st); + device->save_item(NAME(OPL->T)); + device->save_item(NAME(OPL->st)); #if BUILD_Y8950 if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) ) @@ -1947,15 +1947,15 @@ static void OPL_save_state(FM_OPL *OPL, device_t *device) if ( OPL->type & OPL_TYPE_IO ) { - state_save_register_device_item(device, 0, OPL->portDirection); - state_save_register_device_item(device, 0, OPL->portLatch); + device->save_item(NAME(OPL->portDirection)); + device->save_item(NAME(OPL->portLatch)); } #endif - state_save_register_device_item(device, 0, OPL->address); - state_save_register_device_item(device, 0, OPL->status); - state_save_register_device_item(device, 0, OPL->statusmask); - state_save_register_device_item(device, 0, OPL->mode); + device->save_item(NAME(OPL->address)); + device->save_item(NAME(OPL->status)); + device->save_item(NAME(OPL->statusmask)); + device->save_item(NAME(OPL->mode)); device->machine->state().register_postload(OPL_postload, OPL); } diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c index 23c0cfd3c09..c10f765a3c6 100644 --- a/src/emu/sound/hc55516.c +++ b/src/emu/sound/hc55516.c @@ -78,15 +78,15 @@ static void start_common(device_t *device, UINT8 _shiftreg_mask, int _active_clo /* create the stream */ chip->channel = device->machine->sound().stream_alloc(*device, 0, 1, SAMPLE_RATE, chip, hc55516_update); - state_save_register_device_item(device, 0, chip->last_clock_state); - state_save_register_device_item(device, 0, chip->digit); - state_save_register_device_item(device, 0, chip->new_digit); - state_save_register_device_item(device, 0, chip->shiftreg); - state_save_register_device_item(device, 0, chip->curr_sample); - state_save_register_device_item(device, 0, chip->next_sample); - state_save_register_device_item(device, 0, chip->update_count); - state_save_register_device_item(device, 0, chip->filter); - state_save_register_device_item(device, 0, chip->integrator); + device->save_item(NAME(chip->last_clock_state)); + device->save_item(NAME(chip->digit)); + device->save_item(NAME(chip->new_digit)); + device->save_item(NAME(chip->shiftreg)); + device->save_item(NAME(chip->curr_sample)); + device->save_item(NAME(chip->next_sample)); + device->save_item(NAME(chip->update_count)); + device->save_item(NAME(chip->filter)); + device->save_item(NAME(chip->integrator)); } diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c index 914b0b167d9..0a15dae9b6d 100644 --- a/src/emu/sound/ics2115.c +++ b/src/emu/sound/ics2115.c @@ -77,40 +77,40 @@ void ics2115_device::device_start() m_ulaw[i] = (i & 0x80) ? -value : value; } - state_save_register_device_item(this, 0, m_timer[0].period); - state_save_register_device_item(this, 0, m_timer[0].scale); - state_save_register_device_item(this, 0, m_timer[0].preset); - state_save_register_device_item(this, 0, m_timer[1].period); - state_save_register_device_item(this, 0, m_timer[1].scale); - state_save_register_device_item(this, 0, m_timer[1].preset); - state_save_register_device_item(this, 0, m_reg_select); - state_save_register_device_item(this, 0, m_osc_select); - state_save_register_device_item(this, 0, m_irq_enabled); - state_save_register_device_item(this, 0, m_irq_pending); - state_save_register_device_item(this, 0, m_irq_on); - state_save_register_device_item(this, 0, m_active_osc); - state_save_register_device_item(this, 0, m_vmode); + save_item(NAME(m_timer[0].period)); + save_item(NAME(m_timer[0].scale)); + save_item(NAME(m_timer[0].preset)); + save_item(NAME(m_timer[1].period)); + save_item(NAME(m_timer[1].scale)); + save_item(NAME(m_timer[1].preset)); + save_item(NAME(m_reg_select)); + save_item(NAME(m_osc_select)); + save_item(NAME(m_irq_enabled)); + save_item(NAME(m_irq_pending)); + save_item(NAME(m_irq_on)); + save_item(NAME(m_active_osc)); + save_item(NAME(m_vmode)); for(int i = 0; i < 32; i++) { - state_save_register_device_item(this, i, m_voice[i].osc_conf.value); - state_save_register_device_item(this, i, m_voice[i].state.value); - state_save_register_device_item(this, i, m_voice[i].vol_ctrl.value); - state_save_register_device_item(this, i, m_voice[i].osc.left); - state_save_register_device_item(this, i, m_voice[i].osc.acc); - state_save_register_device_item(this, i, m_voice[i].osc.start); - state_save_register_device_item(this, i, m_voice[i].osc.end); - state_save_register_device_item(this, i, m_voice[i].osc.fc); - state_save_register_device_item(this, i, m_voice[i].osc.ctl); - state_save_register_device_item(this, i, m_voice[i].osc.saddr); - state_save_register_device_item(this, i, m_voice[i].vol.left); - state_save_register_device_item(this, i, m_voice[i].vol.add); - state_save_register_device_item(this, i, m_voice[i].vol.start); - state_save_register_device_item(this, i, m_voice[i].vol.end); - state_save_register_device_item(this, i, m_voice[i].vol.acc); - state_save_register_device_item(this, i, m_voice[i].vol.regacc); - state_save_register_device_item(this, i, m_voice[i].vol.incr); - state_save_register_device_item(this, i, m_voice[i].vol.pan); - state_save_register_device_item(this, i, m_voice[i].vol.mode); + save_item(NAME(m_voice[i].osc_conf.value), i); + save_item(NAME(m_voice[i].state.value), i); + save_item(NAME(m_voice[i].vol_ctrl.value), i); + save_item(NAME(m_voice[i].osc.left), i); + save_item(NAME(m_voice[i].osc.acc), i); + save_item(NAME(m_voice[i].osc.start), i); + save_item(NAME(m_voice[i].osc.end), i); + save_item(NAME(m_voice[i].osc.fc), i); + save_item(NAME(m_voice[i].osc.ctl), i); + save_item(NAME(m_voice[i].osc.saddr), i); + save_item(NAME(m_voice[i].vol.left), i); + save_item(NAME(m_voice[i].vol.add), i); + save_item(NAME(m_voice[i].vol.start), i); + save_item(NAME(m_voice[i].vol.end), i); + save_item(NAME(m_voice[i].vol.acc), i); + save_item(NAME(m_voice[i].vol.regacc), i); + save_item(NAME(m_voice[i].vol.incr), i); + save_item(NAME(m_voice[i].vol.pan), i); + save_item(NAME(m_voice[i].vol.mode), i); } } diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c index d1956cbbed0..cb8aa2cc451 100644 --- a/src/emu/sound/iremga20.c +++ b/src/emu/sound/iremga20.c @@ -249,18 +249,18 @@ static DEVICE_START( iremga20 ) chip->stream = device->machine->sound().stream_alloc( *device, 0, 2, device->clock()/4, chip, IremGA20_update ); - state_save_register_device_item_array(device, 0, chip->regs); + device->save_item(NAME(chip->regs)); for (i = 0; i < 4; i++) { - state_save_register_device_item(device, i, chip->channel[i].rate); - state_save_register_device_item(device, i, chip->channel[i].size); - state_save_register_device_item(device, i, chip->channel[i].start); - state_save_register_device_item(device, i, chip->channel[i].pos); - state_save_register_device_item(device, i, chip->channel[i].end); - state_save_register_device_item(device, i, chip->channel[i].volume); - state_save_register_device_item(device, i, chip->channel[i].pan); - state_save_register_device_item(device, i, chip->channel[i].effect); - state_save_register_device_item(device, i, chip->channel[i].play); + device->save_item(NAME(chip->channel[i].rate), i); + device->save_item(NAME(chip->channel[i].size), i); + device->save_item(NAME(chip->channel[i].start), i); + device->save_item(NAME(chip->channel[i].pos), i); + device->save_item(NAME(chip->channel[i].end), i); + device->save_item(NAME(chip->channel[i].volume), i); + device->save_item(NAME(chip->channel[i].pan), i); + device->save_item(NAME(chip->channel[i].effect), i); + device->save_item(NAME(chip->channel[i].play), i); } } diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index 25b9f8f2997..068e026159e 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -238,22 +238,22 @@ static DEVICE_START( k053260 ) InitDeltaTable( ic, rate, device->clock() ); /* register with the save state system */ - state_save_register_device_item(device, 0, ic->mode); - state_save_register_device_item_array(device, 0, ic->regs); + device->save_item(NAME(ic->mode)); + device->save_item(NAME(ic->regs)); for ( i = 0; i < 4; i++ ) { - state_save_register_device_item(device, i, ic->channels[i].rate); - state_save_register_device_item(device, i, ic->channels[i].size); - state_save_register_device_item(device, i, ic->channels[i].start); - state_save_register_device_item(device, i, ic->channels[i].bank); - state_save_register_device_item(device, i, ic->channels[i].volume); - state_save_register_device_item(device, i, ic->channels[i].play); - state_save_register_device_item(device, i, ic->channels[i].pan); - state_save_register_device_item(device, i, ic->channels[i].pos); - state_save_register_device_item(device, i, ic->channels[i].loop); - state_save_register_device_item(device, i, ic->channels[i].ppcm); - state_save_register_device_item(device, i, ic->channels[i].ppcm_data); + device->save_item(NAME(ic->channels[i].rate), i); + device->save_item(NAME(ic->channels[i].size), i); + device->save_item(NAME(ic->channels[i].start), i); + device->save_item(NAME(ic->channels[i].bank), i); + device->save_item(NAME(ic->channels[i].volume), i); + device->save_item(NAME(ic->channels[i].play), i); + device->save_item(NAME(ic->channels[i].pan), i); + device->save_item(NAME(ic->channels[i].pos), i); + device->save_item(NAME(ic->channels[i].loop), i); + device->save_item(NAME(ic->channels[i].ppcm), i); + device->save_item(NAME(ic->channels[i].ppcm_data), i); } /* setup SH1 timer if necessary */ diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c index 82c99c8828f..00d44b5cdb1 100644 --- a/src/emu/sound/k054539.c +++ b/src/emu/sound/k054539.c @@ -474,9 +474,9 @@ static void k054539_init_chip(device_t *device, k054539_state *info) info->stream = device->machine->sound().stream_alloc(*device, 0, 2, device->clock(), info, k054539_update); - state_save_register_device_item_array(device, 0, info->regs); - state_save_register_device_item_pointer(device, 0, info->ram, 0x4000); - state_save_register_device_item(device, 0, info->cur_ptr); + device->save_item(NAME(info->regs)); + device->save_pointer(NAME(info->ram), 0x4000); + device->save_item(NAME(info->cur_ptr)); } WRITE8_DEVICE_HANDLER( k054539_w ) diff --git a/src/emu/sound/k056800.c b/src/emu/sound/k056800.c index f292a7acf06..eb2c671b59d 100644 --- a/src/emu/sound/k056800.c +++ b/src/emu/sound/k056800.c @@ -149,9 +149,9 @@ static DEVICE_START( k056800 ) k056800->sound_cpu_timer = device->machine->scheduler().timer_alloc(FUNC(k056800_sound_cpu_timer_tick), k056800); k056800->sound_cpu_timer->adjust(timer_period, 0, timer_period); - state_save_register_device_item_array(device, 0, k056800->host_reg); - state_save_register_device_item_array(device, 0, k056800->sound_reg); - state_save_register_device_item(device, 0, k056800->sound_cpu_irq1_enable); + device->save_item(NAME(k056800->host_reg)); + device->save_item(NAME(k056800->sound_reg)); + device->save_item(NAME(k056800->sound_cpu_irq1_enable)); } static DEVICE_RESET( k056800 ) diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c index b67333cf1b9..029522df475 100644 --- a/src/emu/sound/mos6560.c +++ b/src/emu/sound/mos6560.c @@ -847,43 +847,43 @@ static DEVICE_START( mos6560 ) mos6560_sound_start(device); - state_save_register_device_item(device, 0, mos6560->lightpenreadtime); - state_save_register_device_item(device, 0, mos6560->rasterline); - state_save_register_device_item(device, 0, mos6560->lastline); - - state_save_register_device_item(device, 0, mos6560->charheight); - state_save_register_device_item(device, 0, mos6560->matrix8x16); - state_save_register_device_item(device, 0, mos6560->inverted); - state_save_register_device_item(device, 0, mos6560->chars_x); - state_save_register_device_item(device, 0, mos6560->chars_y); - state_save_register_device_item(device, 0, mos6560->xsize); - state_save_register_device_item(device, 0, mos6560->ysize); - state_save_register_device_item(device, 0, mos6560->xpos); - state_save_register_device_item(device, 0, mos6560->ypos); - state_save_register_device_item(device, 0, mos6560->chargenaddr); - state_save_register_device_item(device, 0, mos6560->videoaddr); - - state_save_register_device_item(device, 0, mos6560->backgroundcolor); - state_save_register_device_item(device, 0, mos6560->framecolor); - state_save_register_device_item(device, 0, mos6560->helpercolor); - - state_save_register_device_item_array(device, 0, mos6560->reg); - - state_save_register_device_item_array(device, 0, mos6560->mono); - state_save_register_device_item_array(device, 0, mos6560->monoinverted); - state_save_register_device_item_array(device, 0, mos6560->multi); - state_save_register_device_item_array(device, 0, mos6560->multiinverted); - - state_save_register_device_item_bitmap(device, 0, mos6560->bitmap); - - state_save_register_device_item(device, 0, mos6560->tone1pos); - state_save_register_device_item(device, 0, mos6560->tone2pos); - state_save_register_device_item(device, 0, mos6560->tone3pos); - state_save_register_device_item(device, 0, mos6560->tone1samples); - state_save_register_device_item(device, 0, mos6560->tone2samples); - state_save_register_device_item(device, 0, mos6560->tone3samples); - state_save_register_device_item(device, 0, mos6560->noisepos); - state_save_register_device_item(device, 0, mos6560->noisesamples); + device->save_item(NAME(mos6560->lightpenreadtime)); + device->save_item(NAME(mos6560->rasterline)); + device->save_item(NAME(mos6560->lastline)); + + device->save_item(NAME(mos6560->charheight)); + device->save_item(NAME(mos6560->matrix8x16)); + device->save_item(NAME(mos6560->inverted)); + device->save_item(NAME(mos6560->chars_x)); + device->save_item(NAME(mos6560->chars_y)); + device->save_item(NAME(mos6560->xsize)); + device->save_item(NAME(mos6560->ysize)); + device->save_item(NAME(mos6560->xpos)); + device->save_item(NAME(mos6560->ypos)); + device->save_item(NAME(mos6560->chargenaddr)); + device->save_item(NAME(mos6560->videoaddr)); + + device->save_item(NAME(mos6560->backgroundcolor)); + device->save_item(NAME(mos6560->framecolor)); + device->save_item(NAME(mos6560->helpercolor)); + + device->save_item(NAME(mos6560->reg)); + + device->save_item(NAME(mos6560->mono)); + device->save_item(NAME(mos6560->monoinverted)); + device->save_item(NAME(mos6560->multi)); + device->save_item(NAME(mos6560->multiinverted)); + + device->save_item(NAME(*mos6560->bitmap)); + + device->save_item(NAME(mos6560->tone1pos)); + device->save_item(NAME(mos6560->tone2pos)); + device->save_item(NAME(mos6560->tone3pos)); + device->save_item(NAME(mos6560->tone1samples)); + device->save_item(NAME(mos6560->tone2samples)); + device->save_item(NAME(mos6560->tone3samples)); + device->save_item(NAME(mos6560->noisepos)); + device->save_item(NAME(mos6560->noisesamples)); } /*------------------------------------------------- diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 174e1f74b44..cf50d6e442d 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -194,14 +194,14 @@ static DEVICE_START( msm5205 ) DEVICE_RESET_CALL(msm5205); /* register for save states */ - state_save_register_device_item(device, 0, voice->clock); - state_save_register_device_item(device, 0, voice->data); - state_save_register_device_item(device, 0, voice->vclk); - state_save_register_device_item(device, 0, voice->reset); - state_save_register_device_item(device, 0, voice->prescaler); - state_save_register_device_item(device, 0, voice->bitwidth); - state_save_register_device_item(device, 0, voice->signal); - state_save_register_device_item(device, 0, voice->step); + device->save_item(NAME(voice->clock)); + device->save_item(NAME(voice->data)); + device->save_item(NAME(voice->vclk)); + device->save_item(NAME(voice->reset)); + device->save_item(NAME(voice->prescaler)); + device->save_item(NAME(voice->bitwidth)); + device->save_item(NAME(voice->signal)); + device->save_item(NAME(voice->step)); } /* diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index 329930584fb..f7bcd3378f9 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -800,40 +800,40 @@ static DEVICE_START( msm5232 ) /* register with the save state system */ device->machine->state().register_postload(msm5232_postload, chip); - state_save_register_device_item_array(device, 0, chip->EN_out16); - state_save_register_device_item_array(device, 0, chip->EN_out8); - state_save_register_device_item_array(device, 0, chip->EN_out4); - state_save_register_device_item_array(device, 0, chip->EN_out2); - state_save_register_device_item(device, 0, chip->noise_cnt); - state_save_register_device_item(device, 0, chip->noise_rng); - state_save_register_device_item(device, 0, chip->noise_clocks); - state_save_register_device_item(device, 0, chip->control1); - state_save_register_device_item(device, 0, chip->control2); - state_save_register_device_item(device, 0, chip->gate); - state_save_register_device_item(device, 0, chip->clock); - state_save_register_device_item(device, 0, chip->rate); + device->save_item(NAME(chip->EN_out16)); + device->save_item(NAME(chip->EN_out8)); + device->save_item(NAME(chip->EN_out4)); + device->save_item(NAME(chip->EN_out2)); + device->save_item(NAME(chip->noise_cnt)); + device->save_item(NAME(chip->noise_rng)); + device->save_item(NAME(chip->noise_clocks)); + device->save_item(NAME(chip->control1)); + device->save_item(NAME(chip->control2)); + device->save_item(NAME(chip->gate)); + device->save_item(NAME(chip->clock)); + device->save_item(NAME(chip->rate)); /* register voice-specific data for save states */ for (voicenum = 0; voicenum < 8; voicenum++) { VOICE *voice = &chip->voi[voicenum]; - state_save_register_device_item(device, voicenum, voice->mode); - state_save_register_device_item(device, voicenum, voice->TG_count_period); - state_save_register_device_item(device, voicenum, voice->TG_cnt); - state_save_register_device_item(device, voicenum, voice->TG_out16); - state_save_register_device_item(device, voicenum, voice->TG_out8); - state_save_register_device_item(device, voicenum, voice->TG_out4); - state_save_register_device_item(device, voicenum, voice->TG_out2); - state_save_register_device_item(device, voicenum, voice->egvol); - state_save_register_device_item(device, voicenum, voice->eg_sect); - state_save_register_device_item(device, voicenum, voice->counter); - state_save_register_device_item(device, voicenum, voice->eg); - state_save_register_device_item(device, voicenum, voice->eg_arm); - state_save_register_device_item(device, voicenum, voice->ar_rate); - state_save_register_device_item(device, voicenum, voice->dr_rate); - state_save_register_device_item(device, voicenum, voice->pitch); - state_save_register_device_item(device, voicenum, voice->GF); + device->save_item(NAME(voice->mode), voicenum); + device->save_item(NAME(voice->TG_count_period), voicenum); + device->save_item(NAME(voice->TG_cnt), voicenum); + device->save_item(NAME(voice->TG_out16), voicenum); + device->save_item(NAME(voice->TG_out8), voicenum); + device->save_item(NAME(voice->TG_out4), voicenum); + device->save_item(NAME(voice->TG_out2), voicenum); + device->save_item(NAME(voice->egvol), voicenum); + device->save_item(NAME(voice->eg_sect), voicenum); + device->save_item(NAME(voice->counter), voicenum); + device->save_item(NAME(voice->eg), voicenum); + device->save_item(NAME(voice->eg_arm), voicenum); + device->save_item(NAME(voice->ar_rate), voicenum); + device->save_item(NAME(voice->dr_rate), voicenum); + device->save_item(NAME(voice->pitch), voicenum); + device->save_item(NAME(voice->GF), voicenum); } } diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c index a810f58a4cf..29f11d42ace 100644 --- a/src/emu/sound/multipcm.c +++ b/src/emu/sound/multipcm.c @@ -605,39 +605,39 @@ static DEVICE_START( multipcm ) ptChip->Samples[i].AM=ptSample[11]; } - state_save_register_device_item(device, 0, ptChip->CurSlot); - state_save_register_device_item(device, 0, ptChip->Address); - state_save_register_device_item(device, 0, ptChip->BankL); - state_save_register_device_item(device, 0, ptChip->BankR); + device->save_item(NAME(ptChip->CurSlot)); + device->save_item(NAME(ptChip->Address)); + device->save_item(NAME(ptChip->BankL)); + device->save_item(NAME(ptChip->BankR)); for(i=0;i<28;++i) { ptChip->Slots[i].Num=i; ptChip->Slots[i].Playing=0; - state_save_register_device_item(device, i, ptChip->Slots[i].Num); - state_save_register_device_item_array(device, i, ptChip->Slots[i].Regs); - state_save_register_device_item(device, i, ptChip->Slots[i].Playing); - state_save_register_device_item(device, i, ptChip->Slots[i].Base); - state_save_register_device_item(device, i, ptChip->Slots[i].offset); - state_save_register_device_item(device, i, ptChip->Slots[i].step); - state_save_register_device_item(device, i, ptChip->Slots[i].Pan); - state_save_register_device_item(device, i, ptChip->Slots[i].TL); - state_save_register_device_item(device, i, ptChip->Slots[i].DstTL); - state_save_register_device_item(device, i, ptChip->Slots[i].TLStep); - state_save_register_device_item(device, i, ptChip->Slots[i].Prev); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.volume); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.state); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.step); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.AR); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.D1R); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.D2R); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.RR); - state_save_register_device_item(device, i, ptChip->Slots[i].EG.DL); - state_save_register_device_item(device, i, ptChip->Slots[i].PLFO.phase); - state_save_register_device_item(device, i, ptChip->Slots[i].PLFO.phase_step); - state_save_register_device_item(device, i, ptChip->Slots[i].ALFO.phase); - state_save_register_device_item(device, i, ptChip->Slots[i].ALFO.phase_step); + device->save_item(NAME(ptChip->Slots[i].Num), i); + device->save_item(NAME(ptChip->Slots[i].Regs), i); + device->save_item(NAME(ptChip->Slots[i].Playing), i); + device->save_item(NAME(ptChip->Slots[i].Base), i); + device->save_item(NAME(ptChip->Slots[i].offset), i); + device->save_item(NAME(ptChip->Slots[i].step), i); + device->save_item(NAME(ptChip->Slots[i].Pan), i); + device->save_item(NAME(ptChip->Slots[i].TL), i); + device->save_item(NAME(ptChip->Slots[i].DstTL), i); + device->save_item(NAME(ptChip->Slots[i].TLStep), i); + device->save_item(NAME(ptChip->Slots[i].Prev), i); + device->save_item(NAME(ptChip->Slots[i].EG.volume), i); + device->save_item(NAME(ptChip->Slots[i].EG.state), i); + device->save_item(NAME(ptChip->Slots[i].EG.step), i); + device->save_item(NAME(ptChip->Slots[i].EG.AR), i); + device->save_item(NAME(ptChip->Slots[i].EG.D1R), i); + device->save_item(NAME(ptChip->Slots[i].EG.D2R), i); + device->save_item(NAME(ptChip->Slots[i].EG.RR), i); + device->save_item(NAME(ptChip->Slots[i].EG.DL), i); + device->save_item(NAME(ptChip->Slots[i].PLFO.phase), i); + device->save_item(NAME(ptChip->Slots[i].PLFO.phase_step), i); + device->save_item(NAME(ptChip->Slots[i].ALFO.phase), i); + device->save_item(NAME(ptChip->Slots[i].ALFO.phase_step), i); } LFO_Init(); diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index 5a0821ec09c..8d60b93aa2d 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -396,15 +396,14 @@ static DEVICE_START( namco ) chip->sound_enable = 1; /* register with the save state system */ - state_save_register_device_item_pointer(device, 0, chip->soundregs, 0x400); + device->save_pointer(NAME(chip->soundregs), 0x400); if (device->region() == NULL) - state_save_register_device_item_pointer(device, 0, chip->wavedata, 0x400); + device->save_pointer(NAME(chip->wavedata), 0x400); - state_save_register_device_item(device, 0, chip->num_voices); - state_save_register_device_item(device, 0, chip->sound_enable); - state_save_register_device_item_pointer(device, 0, chip->waveform[0], - MAX_VOLUME * 32 * 8 * (1+chip->wave_size)); + device->save_item(NAME(chip->num_voices)); + device->save_item(NAME(chip->sound_enable)); + device->save_pointer(NAME(chip->waveform[0]), MAX_VOLUME * 32 * 8 * (1+chip->wave_size)); /* reset all the voices */ for (voice = chip->channel_list; voice < chip->last_channel; voice++) @@ -422,15 +421,15 @@ static DEVICE_START( namco ) voice->noise_hold = 0; /* register with the save state system */ - state_save_register_device_item(device, voicenum, voice->frequency); - state_save_register_device_item(device, voicenum, voice->counter); - state_save_register_device_item_array(device, voicenum, voice->volume); - state_save_register_device_item(device, voicenum, voice->noise_sw); - state_save_register_device_item(device, voicenum, voice->noise_state); - state_save_register_device_item(device, voicenum, voice->noise_seed); - state_save_register_device_item(device, voicenum, voice->noise_hold); - state_save_register_device_item(device, voicenum, voice->noise_counter); - state_save_register_device_item(device, voicenum, voice->waveform_select); + device->save_item(NAME(voice->frequency), voicenum); + device->save_item(NAME(voice->counter), voicenum); + device->save_item(NAME(voice->volume), voicenum); + device->save_item(NAME(voice->noise_sw), voicenum); + device->save_item(NAME(voice->noise_state), voicenum); + device->save_item(NAME(voice->noise_seed), voicenum); + device->save_item(NAME(voice->noise_hold), voicenum); + device->save_item(NAME(voice->noise_counter), voicenum); + device->save_item(NAME(voice->waveform_select), voicenum); } } diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c index a0bd3f224a8..7c02e270a2f 100644 --- a/src/emu/sound/nes_apu.c +++ b/src/emu/sound/nes_apu.c @@ -711,57 +711,57 @@ static DEVICE_START( nesapu ) /* register for save */ for (i = 0; i < 2; i++) { - state_save_register_device_item_array(device, i, info->APU.squ[i].regs); - state_save_register_device_item(device, i, info->APU.squ[i].vbl_length); - state_save_register_device_item(device, i, info->APU.squ[i].freq); - state_save_register_device_item(device, i, info->APU.squ[i].phaseacc); - state_save_register_device_item(device, i, info->APU.squ[i].output_vol); - state_save_register_device_item(device, i, info->APU.squ[i].env_phase); - state_save_register_device_item(device, i, info->APU.squ[i].sweep_phase); - state_save_register_device_item(device, i, info->APU.squ[i].adder); - state_save_register_device_item(device, i, info->APU.squ[i].env_vol); - state_save_register_device_item(device, i, info->APU.squ[i].enabled); + device->save_item(NAME(info->APU.squ[i].regs), i); + device->save_item(NAME(info->APU.squ[i].vbl_length), i); + device->save_item(NAME(info->APU.squ[i].freq), i); + device->save_item(NAME(info->APU.squ[i].phaseacc), i); + device->save_item(NAME(info->APU.squ[i].output_vol), i); + device->save_item(NAME(info->APU.squ[i].env_phase), i); + device->save_item(NAME(info->APU.squ[i].sweep_phase), i); + device->save_item(NAME(info->APU.squ[i].adder), i); + device->save_item(NAME(info->APU.squ[i].env_vol), i); + device->save_item(NAME(info->APU.squ[i].enabled), i); } - state_save_register_device_item_array(device, 0, info->APU.tri.regs); - state_save_register_device_item(device, 0, info->APU.tri.linear_length); - state_save_register_device_item(device, 0, info->APU.tri.vbl_length); - state_save_register_device_item(device, 0, info->APU.tri.write_latency); - state_save_register_device_item(device, 0, info->APU.tri.phaseacc); - state_save_register_device_item(device, 0, info->APU.tri.output_vol); - state_save_register_device_item(device, 0, info->APU.tri.adder); - state_save_register_device_item(device, 0, info->APU.tri.counter_started); - state_save_register_device_item(device, 0, info->APU.tri.enabled); - - state_save_register_device_item_array(device, 0, info->APU.noi.regs); - state_save_register_device_item(device, 0, info->APU.noi.cur_pos); - state_save_register_device_item(device, 0, info->APU.noi.vbl_length); - state_save_register_device_item(device, 0, info->APU.noi.phaseacc); - state_save_register_device_item(device, 0, info->APU.noi.output_vol); - state_save_register_device_item(device, 0, info->APU.noi.env_phase); - state_save_register_device_item(device, 0, info->APU.noi.env_vol); - state_save_register_device_item(device, 0, info->APU.noi.enabled); - - state_save_register_device_item_array(device, 0, info->APU.dpcm.regs); - state_save_register_device_item(device, 0, info->APU.dpcm.address); - state_save_register_device_item(device, 0, info->APU.dpcm.length); - state_save_register_device_item(device, 0, info->APU.dpcm.bits_left); - state_save_register_device_item(device, 0, info->APU.dpcm.phaseacc); - state_save_register_device_item(device, 0, info->APU.dpcm.output_vol); - state_save_register_device_item(device, 0, info->APU.dpcm.cur_byte); - state_save_register_device_item(device, 0, info->APU.dpcm.enabled); - state_save_register_device_item(device, 0, info->APU.dpcm.irq_occurred); - state_save_register_device_item(device, 0, info->APU.dpcm.vol); - - state_save_register_device_item_array(device, 0, info->APU.regs); + device->save_item(NAME(info->APU.tri.regs)); + device->save_item(NAME(info->APU.tri.linear_length)); + device->save_item(NAME(info->APU.tri.vbl_length)); + device->save_item(NAME(info->APU.tri.write_latency)); + device->save_item(NAME(info->APU.tri.phaseacc)); + device->save_item(NAME(info->APU.tri.output_vol)); + device->save_item(NAME(info->APU.tri.adder)); + device->save_item(NAME(info->APU.tri.counter_started)); + device->save_item(NAME(info->APU.tri.enabled)); + + device->save_item(NAME(info->APU.noi.regs)); + device->save_item(NAME(info->APU.noi.cur_pos)); + device->save_item(NAME(info->APU.noi.vbl_length)); + device->save_item(NAME(info->APU.noi.phaseacc)); + device->save_item(NAME(info->APU.noi.output_vol)); + device->save_item(NAME(info->APU.noi.env_phase)); + device->save_item(NAME(info->APU.noi.env_vol)); + device->save_item(NAME(info->APU.noi.enabled)); + + device->save_item(NAME(info->APU.dpcm.regs)); + device->save_item(NAME(info->APU.dpcm.address)); + device->save_item(NAME(info->APU.dpcm.length)); + device->save_item(NAME(info->APU.dpcm.bits_left)); + device->save_item(NAME(info->APU.dpcm.phaseacc)); + device->save_item(NAME(info->APU.dpcm.output_vol)); + device->save_item(NAME(info->APU.dpcm.cur_byte)); + device->save_item(NAME(info->APU.dpcm.enabled)); + device->save_item(NAME(info->APU.dpcm.irq_occurred)); + device->save_item(NAME(info->APU.dpcm.vol)); + + device->save_item(NAME(info->APU.regs)); #ifdef USE_QUEUE - state_save_register_device_item_array(device, 0, info->APU.queue); - state_save_register_device_item(device, 0, info->APU.head); - state_save_register_device_item(device, 0, info->APU.tail); + device->save_item(NAME(info->APU.queue)); + device->save_item(NAME(info->APU.head)); + device->save_item(NAME(info->APU.tail)); #else - state_save_register_device_item(device, 0, info->APU.buf_pos); - state_save_register_device_item(device, 0, info->APU.step_mode); + device->save_item(NAME(info->APU.buf_pos)); + device->save_item(NAME(info->APU.step_mode)); #endif } diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c index 0921fd9d4ca..1bff117eaf2 100644 --- a/src/emu/sound/okim6258.c +++ b/src/emu/sound/okim6258.c @@ -171,13 +171,13 @@ static STREAM_UPDATE( okim6258_update ) static void okim6258_state_save_register(okim6258_state *info, device_t *device) { - state_save_register_device_item(device, 0, info->status); - state_save_register_device_item(device, 0, info->master_clock); - state_save_register_device_item(device, 0, info->divider); - state_save_register_device_item(device, 0, info->data_in); - state_save_register_device_item(device, 0, info->nibble_shift); - state_save_register_device_item(device, 0, info->signal); - state_save_register_device_item(device, 0, info->step); + device->save_item(NAME(info->status)); + device->save_item(NAME(info->master_clock)); + device->save_item(NAME(info->divider)); + device->save_item(NAME(info->data_in)); + device->save_item(NAME(info->nibble_shift)); + device->save_item(NAME(info->signal)); + device->save_item(NAME(info->step)); } diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index 2462426644c..9ac2a107121 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -179,17 +179,17 @@ void okim6295_device::device_start() int divisor = m_config.m_pin7 ? 132 : 165; m_stream = m_machine.sound().stream_alloc(*this, 0, 1, clock() / divisor); - state_save_register_device_item(this, 0, m_command); - state_save_register_device_item(this, 0, m_bank_offs); + save_item(NAME(m_command)); + save_item(NAME(m_bank_offs)); for (int voicenum = 0; voicenum < OKIM6295_VOICES; voicenum++) { - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_playing); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_sample); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_count); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_adpcm.m_signal); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_adpcm.m_step); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_volume); - state_save_register_device_item(this, voicenum, m_voice[voicenum].m_base_offset); + save_item(NAME(m_voice[voicenum].m_playing), voicenum); + save_item(NAME(m_voice[voicenum].m_sample), voicenum); + save_item(NAME(m_voice[voicenum].m_count), voicenum); + save_item(NAME(m_voice[voicenum].m_adpcm.m_signal), voicenum); + save_item(NAME(m_voice[voicenum].m_adpcm.m_step), voicenum); + save_item(NAME(m_voice[voicenum].m_volume), voicenum); + save_item(NAME(m_voice[voicenum].m_base_offset), voicenum); } } diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c index 20384770c69..fcfda3f9ba9 100644 --- a/src/emu/sound/okim6376.c +++ b/src/emu/sound/okim6376.c @@ -267,20 +267,20 @@ static STREAM_UPDATE( okim6376_update ) static void adpcm_state_save_register(struct ADPCMVoice *voice, device_t *device, int index) { - state_save_register_device_item(device, index, voice->playing); - state_save_register_device_item(device, index, voice->sample); - state_save_register_device_item(device, index, voice->count); - state_save_register_device_item(device, index, voice->signal); - state_save_register_device_item(device, index, voice->step); - state_save_register_device_item(device, index, voice->volume); - state_save_register_device_item(device, index, voice->base_offset); + device->save_item(NAME(voice->playing), index); + device->save_item(NAME(voice->sample), index); + device->save_item(NAME(voice->count), index); + device->save_item(NAME(voice->signal), index); + device->save_item(NAME(voice->step), index); + device->save_item(NAME(voice->volume), index); + device->save_item(NAME(voice->base_offset), index); } static void okim6376_state_save_register(okim6376_state *info, device_t *device) { int j; - state_save_register_device_item(device, 0, info->command); + device->save_item(NAME(info->command)); for (j = 0; j < OKIM6376_VOICES; j++) adpcm_state_save_register(&info->voice[j], device, j); } diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index 7d108a48678..54f15f94d88 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -574,38 +574,38 @@ static void rand_init(UINT8 *rng, int size, int left, int right, int add) static void register_for_save(pokey_state *chip, device_t *device) { - state_save_register_device_item_array(device, 0, chip->counter); - state_save_register_device_item_array(device, 0, chip->divisor); - state_save_register_device_item_array(device, 0, chip->volume); - state_save_register_device_item_array(device, 0, chip->output); - state_save_register_device_item_array(device, 0, chip->audible); - state_save_register_device_item(device, 0, chip->samplepos_fract); - state_save_register_device_item(device, 0, chip->samplepos_whole); - state_save_register_device_item(device, 0, chip->polyadjust); - state_save_register_device_item(device, 0, chip->p4); - state_save_register_device_item(device, 0, chip->p5); - state_save_register_device_item(device, 0, chip->p9); - state_save_register_device_item(device, 0, chip->p17); - state_save_register_device_item(device, 0, chip->r9); - state_save_register_device_item(device, 0, chip->r17); - state_save_register_device_item(device, 0, chip->clockmult); - state_save_register_device_item(device, 0, chip->timer_period[0]); - state_save_register_device_item(device, 0, chip->timer_period[1]); - state_save_register_device_item(device, 0, chip->timer_period[2]); - state_save_register_device_item_array(device, 0, chip->timer_param); - state_save_register_device_item_array(device, 0, chip->AUDF); - state_save_register_device_item_array(device, 0, chip->AUDC); - state_save_register_device_item_array(device, 0, chip->POTx); - state_save_register_device_item(device, 0, chip->AUDCTL); - state_save_register_device_item(device, 0, chip->ALLPOT); - state_save_register_device_item(device, 0, chip->KBCODE); - state_save_register_device_item(device, 0, chip->RANDOM); - state_save_register_device_item(device, 0, chip->SERIN); - state_save_register_device_item(device, 0, chip->SEROUT); - state_save_register_device_item(device, 0, chip->IRQST); - state_save_register_device_item(device, 0, chip->IRQEN); - state_save_register_device_item(device, 0, chip->SKSTAT); - state_save_register_device_item(device, 0, chip->SKCTL); + device->save_item(NAME(chip->counter)); + device->save_item(NAME(chip->divisor)); + device->save_item(NAME(chip->volume)); + device->save_item(NAME(chip->output)); + device->save_item(NAME(chip->audible)); + device->save_item(NAME(chip->samplepos_fract)); + device->save_item(NAME(chip->samplepos_whole)); + device->save_item(NAME(chip->polyadjust)); + device->save_item(NAME(chip->p4)); + device->save_item(NAME(chip->p5)); + device->save_item(NAME(chip->p9)); + device->save_item(NAME(chip->p17)); + device->save_item(NAME(chip->r9)); + device->save_item(NAME(chip->r17)); + device->save_item(NAME(chip->clockmult)); + device->save_item(NAME(chip->timer_period[0])); + device->save_item(NAME(chip->timer_period[1])); + device->save_item(NAME(chip->timer_period[2])); + device->save_item(NAME(chip->timer_param)); + device->save_item(NAME(chip->AUDF)); + device->save_item(NAME(chip->AUDC)); + device->save_item(NAME(chip->POTx)); + device->save_item(NAME(chip->AUDCTL)); + device->save_item(NAME(chip->ALLPOT)); + device->save_item(NAME(chip->KBCODE)); + device->save_item(NAME(chip->RANDOM)); + device->save_item(NAME(chip->SERIN)); + device->save_item(NAME(chip->SEROUT)); + device->save_item(NAME(chip->IRQST)); + device->save_item(NAME(chip->IRQEN)); + device->save_item(NAME(chip->SKSTAT)); + device->save_item(NAME(chip->SKCTL)); } diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c index ea95c678e8e..d160cf51c51 100644 --- a/src/emu/sound/psx.c +++ b/src/emu/sound/psx.c @@ -328,44 +328,44 @@ static DEVICE_START( psxspu ) chip->m_p_n_spuram = auto_alloc_array( device->machine, UINT16, SPU_RAM_SIZE/2 ); - state_save_register_device_item( device, 0, chip->m_n_mainvolumeleft ); - state_save_register_device_item( device, 0, chip->m_n_mainvolumeright ); - state_save_register_device_item( device, 0, chip->m_n_reverberationdepthleft ); - state_save_register_device_item( device, 0, chip->m_n_reverberationdepthright ); - state_save_register_device_item( device, 0, chip->m_n_voiceon ); - state_save_register_device_item( device, 0, chip->m_n_voiceoff ); - state_save_register_device_item( device, 0, chip->m_n_modulationmode ); - state_save_register_device_item( device, 0, chip->m_n_noisemode ); - state_save_register_device_item( device, 0, chip->m_n_reverbmode ); - state_save_register_device_item( device, 0, chip->m_n_channelonoff ); - state_save_register_device_item( device, 0, chip->m_n_reverbworkareastart ); - state_save_register_device_item( device, 0, chip->m_n_irqaddress ); - state_save_register_device_item( device, 0, chip->m_n_spuoffset ); - state_save_register_device_item( device, 0, chip->m_n_spudata ); - state_save_register_device_item( device, 0, chip->m_n_spucontrol ); - state_save_register_device_item( device, 0, chip->m_n_spustatus ); - state_save_register_device_item( device, 0, chip->m_n_cdvolumeleft ); - state_save_register_device_item( device, 0, chip->m_n_cdvolumeright ); - state_save_register_device_item( device, 0, chip->m_n_externalvolumeleft ); - state_save_register_device_item( device, 0, chip->m_n_externalvolumeright ); - state_save_register_device_item_array( device, 0, chip->m_p_n_volumeleft ); - state_save_register_device_item_array( device, 0, chip->m_p_n_volumeright ); - state_save_register_device_item_array( device, 0, chip->m_p_n_pitch ); - state_save_register_device_item_array( device, 0, chip->m_p_n_address ); - state_save_register_device_item_array( device, 0, chip->m_p_n_envelopestate ); - state_save_register_device_item_array( device, 0, chip->m_p_n_attackdecaysustain ); - state_save_register_device_item_array( device, 0, chip->m_p_n_sustainrelease ); - state_save_register_device_item_array( device, 0, chip->m_p_n_adsrvolume ); - state_save_register_device_item_array( device, 0, chip->m_p_n_repeataddress ); - state_save_register_device_item_array( device, 0, chip->m_p_n_effect ); - state_save_register_device_item_pointer( device, 0, chip->m_p_n_spuram, SPU_RAM_SIZE/2 ); - state_save_register_device_item_array( device, 0, chip->m_p_n_blockaddress ); - state_save_register_device_item_array( device, 0, chip->m_p_n_blockoffset ); - state_save_register_device_item_array( device, 0, chip->m_p_n_blockstatus ); - state_save_register_device_item_array( device, 0, chip->m_p_n_blockbuffer ); - state_save_register_device_item_array( device, 0, chip->m_p_n_s1 ); - state_save_register_device_item_array( device, 0, chip->m_p_n_s2 ); - state_save_register_device_item_array( device, 0, chip->m_n_loop ); + device->save_item( NAME(chip->m_n_mainvolumeleft) ); + device->save_item( NAME(chip->m_n_mainvolumeright) ); + device->save_item( NAME(chip->m_n_reverberationdepthleft) ); + device->save_item( NAME(chip->m_n_reverberationdepthright) ); + device->save_item( NAME(chip->m_n_voiceon) ); + device->save_item( NAME(chip->m_n_voiceoff) ); + device->save_item( NAME(chip->m_n_modulationmode) ); + device->save_item( NAME(chip->m_n_noisemode) ); + device->save_item( NAME(chip->m_n_reverbmode) ); + device->save_item( NAME(chip->m_n_channelonoff) ); + device->save_item( NAME(chip->m_n_reverbworkareastart) ); + device->save_item( NAME(chip->m_n_irqaddress) ); + device->save_item( NAME(chip->m_n_spuoffset) ); + device->save_item( NAME(chip->m_n_spudata) ); + device->save_item( NAME(chip->m_n_spucontrol) ); + device->save_item( NAME(chip->m_n_spustatus) ); + device->save_item( NAME(chip->m_n_cdvolumeleft) ); + device->save_item( NAME(chip->m_n_cdvolumeright) ); + device->save_item( NAME(chip->m_n_externalvolumeleft) ); + device->save_item( NAME(chip->m_n_externalvolumeright) ); + device->save_item( NAME(chip->m_p_n_volumeleft) ); + device->save_item( NAME(chip->m_p_n_volumeright) ); + device->save_item( NAME(chip->m_p_n_pitch) ); + device->save_item( NAME(chip->m_p_n_address) ); + device->save_item( NAME(chip->m_p_n_envelopestate) ); + device->save_item( NAME(chip->m_p_n_attackdecaysustain) ); + device->save_item( NAME(chip->m_p_n_sustainrelease) ); + device->save_item( NAME(chip->m_p_n_adsrvolume) ); + device->save_item( NAME(chip->m_p_n_repeataddress) ); + device->save_item( NAME(chip->m_p_n_effect) ); + device->save_pointer( NAME(chip->m_p_n_spuram), SPU_RAM_SIZE/2 ); + device->save_item( NAME(chip->m_p_n_blockaddress) ); + device->save_item( NAME(chip->m_p_n_blockoffset) ); + device->save_item( NAME(chip->m_p_n_blockstatus) ); + device->save_item( NAME(chip->m_p_n_blockbuffer) ); + device->save_item( NAME(chip->m_p_n_s1) ); + device->save_item( NAME(chip->m_p_n_s2) ); + device->save_item( NAME(chip->m_n_loop) ); chip->installHack = 0; diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c index bc590386b23..af1222395d9 100644 --- a/src/emu/sound/qsound.c +++ b/src/emu/sound/qsound.c @@ -139,18 +139,18 @@ static DEVICE_START( qsound ) /* state save */ for (i=0; i<QSOUND_CHANNELS; i++) { - state_save_register_device_item(device, i, chip->channel[i].bank); - state_save_register_device_item(device, i, chip->channel[i].address); - state_save_register_device_item(device, i, chip->channel[i].pitch); - state_save_register_device_item(device, i, chip->channel[i].loop); - state_save_register_device_item(device, i, chip->channel[i].end); - state_save_register_device_item(device, i, chip->channel[i].vol); - state_save_register_device_item(device, i, chip->channel[i].pan); - state_save_register_device_item(device, i, chip->channel[i].key); - state_save_register_device_item(device, i, chip->channel[i].lvol); - state_save_register_device_item(device, i, chip->channel[i].rvol); - state_save_register_device_item(device, i, chip->channel[i].lastdt); - state_save_register_device_item(device, i, chip->channel[i].offset); + device->save_item(NAME(chip->channel[i].bank), i); + device->save_item(NAME(chip->channel[i].address), i); + device->save_item(NAME(chip->channel[i].pitch), i); + device->save_item(NAME(chip->channel[i].loop), i); + device->save_item(NAME(chip->channel[i].end), i); + device->save_item(NAME(chip->channel[i].vol), i); + device->save_item(NAME(chip->channel[i].pan), i); + device->save_item(NAME(chip->channel[i].key), i); + device->save_item(NAME(chip->channel[i].lvol), i); + device->save_item(NAME(chip->channel[i].rvol), i); + device->save_item(NAME(chip->channel[i].lastdt), i); + device->save_item(NAME(chip->channel[i].offset), i); } } diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 62129c5fac0..feaebf8dcff 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -323,26 +323,26 @@ static void rf5c400_init_chip(device_t *device, rf5c400_state *info) for (i = 0; i < ARRAY_LENGTH(info->channels); i++) { - state_save_register_device_item(device, i, info->channels[i].startH); - state_save_register_device_item(device, i, info->channels[i].startL); - state_save_register_device_item(device, i, info->channels[i].freq); - state_save_register_device_item(device, i, info->channels[i].endL); - state_save_register_device_item(device, i, info->channels[i].endHloopH); - state_save_register_device_item(device, i, info->channels[i].loopL); - state_save_register_device_item(device, i, info->channels[i].pan); - state_save_register_device_item(device, i, info->channels[i].effect); - state_save_register_device_item(device, i, info->channels[i].volume); - state_save_register_device_item(device, i, info->channels[i].attack); - state_save_register_device_item(device, i, info->channels[i].decay); - state_save_register_device_item(device, i, info->channels[i].release); - state_save_register_device_item(device, i, info->channels[i].cutoff); - state_save_register_device_item(device, i, info->channels[i].pos); - state_save_register_device_item(device, i, info->channels[i].step); - state_save_register_device_item(device, i, info->channels[i].keyon); - state_save_register_device_item(device, i, info->channels[i].env_phase); - state_save_register_device_item(device, i, info->channels[i].env_level); - state_save_register_device_item(device, i, info->channels[i].env_step); - state_save_register_device_item(device, i, info->channels[i].env_scale); + device->save_item(NAME(info->channels[i].startH), i); + device->save_item(NAME(info->channels[i].startL), i); + device->save_item(NAME(info->channels[i].freq), i); + device->save_item(NAME(info->channels[i].endL), i); + device->save_item(NAME(info->channels[i].endHloopH), i); + device->save_item(NAME(info->channels[i].loopL), i); + device->save_item(NAME(info->channels[i].pan), i); + device->save_item(NAME(info->channels[i].effect), i); + device->save_item(NAME(info->channels[i].volume), i); + device->save_item(NAME(info->channels[i].attack), i); + device->save_item(NAME(info->channels[i].decay), i); + device->save_item(NAME(info->channels[i].release), i); + device->save_item(NAME(info->channels[i].cutoff), i); + device->save_item(NAME(info->channels[i].pos), i); + device->save_item(NAME(info->channels[i].step), i); + device->save_item(NAME(info->channels[i].keyon), i); + device->save_item(NAME(info->channels[i].env_phase), i); + device->save_item(NAME(info->channels[i].env_level), i); + device->save_item(NAME(info->channels[i].env_step), i); + device->save_item(NAME(info->channels[i].env_scale), i); } info->stream = device->machine->sound().stream_alloc(*device, 0, 2, device->clock()/384, info, rf5c400_update); diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c index 3615df582f4..81f61b57b02 100644 --- a/src/emu/sound/samples.c +++ b/src/emu/sound/samples.c @@ -493,13 +493,13 @@ static DEVICE_START( samples ) info->channel[i].paused = 0; /* register with the save state system */ - state_save_register_device_item(device, i, info->channel[i].source_length); - state_save_register_device_item(device, i, info->channel[i].source_num); - state_save_register_device_item(device, i, info->channel[i].pos); - state_save_register_device_item(device, i, info->channel[i].frac); - state_save_register_device_item(device, i, info->channel[i].step); - state_save_register_device_item(device, i, info->channel[i].loop); - state_save_register_device_item(device, i, info->channel[i].paused); + device->save_item(NAME(info->channel[i].source_length), i); + device->save_item(NAME(info->channel[i].source_num), i); + device->save_item(NAME(info->channel[i].pos), i); + device->save_item(NAME(info->channel[i].frac), i); + device->save_item(NAME(info->channel[i].step), i); + device->save_item(NAME(info->channel[i].loop), i); + device->save_item(NAME(info->channel[i].paused), i); } device->machine->state().register_postload(samples_postload, info); diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c index 15fd74eaf29..c7edc760ef6 100644 --- a/src/emu/sound/segapcm.c +++ b/src/emu/sound/segapcm.c @@ -129,8 +129,8 @@ static DEVICE_START( segapcm ) spcm->stream = device->machine->sound().stream_alloc(*device, 0, 2, device->clock() / 128, spcm, SEGAPCM_update); - state_save_register_device_item_array(device, 0, spcm->low); - state_save_register_device_item_pointer(device, 0, spcm->ram, 0x800); + device->save_item(NAME(spcm->low)); + device->save_pointer(NAME(spcm->ram), 0x800); } diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c index 4c6ab6fa96c..689549b6a18 100644 --- a/src/emu/sound/sn76477.c +++ b/src/emu/sound/sn76477.c @@ -2329,58 +2329,58 @@ static STREAM_UPDATE( SN76477_update ) static void state_save_register(device_t *device, sn76477_state *sn) { - state_save_register_device_item(device, 0, sn->enable); - state_save_register_device_item(device, 0, sn->envelope_mode); - state_save_register_device_item(device, 0, sn->vco_mode); - state_save_register_device_item(device, 0, sn->mixer_mode); - - state_save_register_device_item(device, 0, sn->one_shot_res); - state_save_register_device_item(device, 0, sn->one_shot_cap); - state_save_register_device_item(device, 0, sn->one_shot_cap_voltage_ext); - - state_save_register_device_item(device, 0, sn->slf_res); - state_save_register_device_item(device, 0, sn->slf_cap); - state_save_register_device_item(device, 0, sn->slf_cap_voltage_ext); - - state_save_register_device_item(device, 0, sn->vco_voltage); - state_save_register_device_item(device, 0, sn->vco_res); - state_save_register_device_item(device, 0, sn->vco_cap); - state_save_register_device_item(device, 0, sn->vco_cap_voltage_ext); - - state_save_register_device_item(device, 0, sn->noise_clock_res); - state_save_register_device_item(device, 0, sn->noise_clock_ext); - state_save_register_device_item(device, 0, sn->noise_clock); - state_save_register_device_item(device, 0, sn->noise_filter_res); - state_save_register_device_item(device, 0, sn->noise_filter_cap); - state_save_register_device_item(device, 0, sn->noise_filter_cap_voltage_ext); - - state_save_register_device_item(device, 0, sn->attack_res); - state_save_register_device_item(device, 0, sn->decay_res); - state_save_register_device_item(device, 0, sn->attack_decay_cap); - state_save_register_device_item(device, 0, sn->attack_decay_cap_voltage_ext); - - state_save_register_device_item(device, 0, sn->amplitude_res); - state_save_register_device_item(device, 0, sn->feedback_res); - state_save_register_device_item(device, 0, sn->pitch_voltage); - - state_save_register_device_item(device, 0, sn->one_shot_cap_voltage); - state_save_register_device_item(device, 0, sn->one_shot_running_ff); - - state_save_register_device_item(device, 0, sn->slf_cap_voltage); - state_save_register_device_item(device, 0, sn->slf_out_ff); - - state_save_register_device_item(device, 0, sn->vco_cap_voltage); - state_save_register_device_item(device, 0, sn->vco_out_ff); - state_save_register_device_item(device, 0, sn->vco_alt_pos_edge_ff); - - state_save_register_device_item(device, 0, sn->noise_filter_cap_voltage); - state_save_register_device_item(device, 0, sn->real_noise_bit_ff); - state_save_register_device_item(device, 0, sn->filtered_noise_bit_ff); - state_save_register_device_item(device, 0, sn->noise_gen_count); - - state_save_register_device_item(device, 0, sn->attack_decay_cap_voltage); - - state_save_register_device_item(device, 0, sn->rng); + device->save_item(NAME(sn->enable)); + device->save_item(NAME(sn->envelope_mode)); + device->save_item(NAME(sn->vco_mode)); + device->save_item(NAME(sn->mixer_mode)); + + device->save_item(NAME(sn->one_shot_res)); + device->save_item(NAME(sn->one_shot_cap)); + device->save_item(NAME(sn->one_shot_cap_voltage_ext)); + + device->save_item(NAME(sn->slf_res)); + device->save_item(NAME(sn->slf_cap)); + device->save_item(NAME(sn->slf_cap_voltage_ext)); + + device->save_item(NAME(sn->vco_voltage)); + device->save_item(NAME(sn->vco_res)); + device->save_item(NAME(sn->vco_cap)); + device->save_item(NAME(sn->vco_cap_voltage_ext)); + + device->save_item(NAME(sn->noise_clock_res)); + device->save_item(NAME(sn->noise_clock_ext)); + device->save_item(NAME(sn->noise_clock)); + device->save_item(NAME(sn->noise_filter_res)); + device->save_item(NAME(sn->noise_filter_cap)); + device->save_item(NAME(sn->noise_filter_cap_voltage_ext)); + + device->save_item(NAME(sn->attack_res)); + device->save_item(NAME(sn->decay_res)); + device->save_item(NAME(sn->attack_decay_cap)); + device->save_item(NAME(sn->attack_decay_cap_voltage_ext)); + + device->save_item(NAME(sn->amplitude_res)); + device->save_item(NAME(sn->feedback_res)); + device->save_item(NAME(sn->pitch_voltage)); + + device->save_item(NAME(sn->one_shot_cap_voltage)); + device->save_item(NAME(sn->one_shot_running_ff)); + + device->save_item(NAME(sn->slf_cap_voltage)); + device->save_item(NAME(sn->slf_out_ff)); + + device->save_item(NAME(sn->vco_cap_voltage)); + device->save_item(NAME(sn->vco_out_ff)); + device->save_item(NAME(sn->vco_alt_pos_edge_ff)); + + device->save_item(NAME(sn->noise_filter_cap_voltage)); + device->save_item(NAME(sn->real_noise_bit_ff)); + device->save_item(NAME(sn->filtered_noise_bit_ff)); + device->save_item(NAME(sn->noise_gen_count)); + + device->save_item(NAME(sn->attack_decay_cap_voltage)); + + device->save_item(NAME(sn->rng)); } diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index 0f44e928352..3a5d498d888 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -395,23 +395,23 @@ static void generic_start(device_t *device, int feedbackmask, int noisetap1, int chip->ClockDivider = clockdivider; chip->CurrentClock = clockdivider-1; - state_save_register_device_item_array(device, 0, chip->VolTable); - state_save_register_device_item_array(device, 0, chip->Register); - state_save_register_device_item(device, 0, chip->LastRegister); - state_save_register_device_item_array(device, 0, chip->Volume); - state_save_register_device_item(device, 0, chip->RNG); - state_save_register_device_item(device, 0, chip->ClockDivider); - state_save_register_device_item(device, 0, chip->CurrentClock); - state_save_register_device_item(device, 0, chip->FeedbackMask); - state_save_register_device_item(device, 0, chip->WhitenoiseTap1); - state_save_register_device_item(device, 0, chip->WhitenoiseTap2); - state_save_register_device_item(device, 0, chip->Negate); - state_save_register_device_item(device, 0, chip->Stereo); - state_save_register_device_item(device, 0, chip->StereoMask); - state_save_register_device_item_array(device, 0, chip->Period); - state_save_register_device_item_array(device, 0, chip->Count); - state_save_register_device_item_array(device, 0, chip->Output); - state_save_register_device_item(device, 0, chip->CyclestoREADY); + device->save_item(NAME(chip->VolTable)); + device->save_item(NAME(chip->Register)); + device->save_item(NAME(chip->LastRegister)); + device->save_item(NAME(chip->Volume)); + device->save_item(NAME(chip->RNG)); + device->save_item(NAME(chip->ClockDivider)); + device->save_item(NAME(chip->CurrentClock)); + device->save_item(NAME(chip->FeedbackMask)); + device->save_item(NAME(chip->WhitenoiseTap1)); + device->save_item(NAME(chip->WhitenoiseTap2)); + device->save_item(NAME(chip->Negate)); + device->save_item(NAME(chip->Stereo)); + device->save_item(NAME(chip->StereoMask)); + device->save_item(NAME(chip->Period)); + device->save_item(NAME(chip->Count)); + device->save_item(NAME(chip->Output)); + device->save_item(NAME(chip->CyclestoREADY)); } // function parameters: device, feedback destination tap, feedback source taps, diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c index 1cc18df3743..b2ccc46b1f7 100644 --- a/src/emu/sound/snkwave.c +++ b/src/emu/sound/snkwave.c @@ -127,10 +127,10 @@ static DEVICE_START( snkwave ) chip->waveform_position = 0; /* register with the save state system */ - state_save_register_device_item(device, 0, chip->frequency); - state_save_register_device_item(device, 0, chip->counter); - state_save_register_device_item(device, 0, chip->waveform_position); - state_save_register_device_item_pointer(device, 0, chip->waveform, WAVEFORM_LENGTH); + device->save_item(NAME(chip->frequency)); + device->save_item(NAME(chip->counter)); + device->save_item(NAME(chip->waveform_position)); + device->save_pointer(NAME(chip->waveform), WAVEFORM_LENGTH); } diff --git a/src/emu/sound/t6w28.c b/src/emu/sound/t6w28.c index e678b50ea25..864f31a3d0f 100644 --- a/src/emu/sound/t6w28.c +++ b/src/emu/sound/t6w28.c @@ -355,14 +355,14 @@ static DEVICE_START( t6w28 ) chip->WhitenoiseTaps = 0x06; chip->WhitenoiseInvert = FALSE; - state_save_register_device_item_array(device, 0, chip->Register); - state_save_register_device_item_array(device, 0, chip->LastRegister); - state_save_register_device_item_array(device, 0, chip->Volume); - state_save_register_device_item_array(device, 0, chip->RNG); - state_save_register_device_item_array(device, 0, chip->NoiseMode); - state_save_register_device_item_array(device, 0, chip->Period); - state_save_register_device_item_array(device, 0, chip->Count); - state_save_register_device_item_array(device, 0, chip->Output); + device->save_item(NAME(chip->Register)); + device->save_item(NAME(chip->LastRegister)); + device->save_item(NAME(chip->Volume)); + device->save_item(NAME(chip->RNG)); + device->save_item(NAME(chip->NoiseMode)); + device->save_item(NAME(chip->Period)); + device->save_item(NAME(chip->Count)); + device->save_item(NAME(chip->Output)); } diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index f8accaa18a1..09f34a1b124 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -281,45 +281,45 @@ static UINT8 new_int_read(tms5110_state *tms) static void register_for_save_states(tms5110_state *tms) { - state_save_register_device_item_array(tms->device, 0, tms->fifo); - state_save_register_device_item(tms->device, 0, tms->fifo_head); - state_save_register_device_item(tms->device, 0, tms->fifo_tail); - state_save_register_device_item(tms->device, 0, tms->fifo_count); + tms->device->save_item(NAME(tms->fifo)); + tms->device->save_item(NAME(tms->fifo_head)); + tms->device->save_item(NAME(tms->fifo_tail)); + tms->device->save_item(NAME(tms->fifo_count)); - state_save_register_device_item(tms->device, 0, tms->PDC); - state_save_register_device_item(tms->device, 0, tms->CTL_pins); - state_save_register_device_item(tms->device, 0, tms->speaking_now); - state_save_register_device_item(tms->device, 0, tms->talk_status); - state_save_register_device_item(tms->device, 0, tms->state); + tms->device->save_item(NAME(tms->PDC)); + tms->device->save_item(NAME(tms->CTL_pins)); + tms->device->save_item(NAME(tms->speaking_now)); + tms->device->save_item(NAME(tms->talk_status)); + tms->device->save_item(NAME(tms->state)); - state_save_register_device_item(tms->device, 0, tms->old_energy); - state_save_register_device_item(tms->device, 0, tms->old_pitch); - state_save_register_device_item_array(tms->device, 0, tms->old_k); + tms->device->save_item(NAME(tms->old_energy)); + tms->device->save_item(NAME(tms->old_pitch)); + tms->device->save_item(NAME(tms->old_k)); - state_save_register_device_item(tms->device, 0, tms->new_energy); - state_save_register_device_item(tms->device, 0, tms->new_pitch); - state_save_register_device_item_array(tms->device, 0, tms->new_k); + tms->device->save_item(NAME(tms->new_energy)); + tms->device->save_item(NAME(tms->new_pitch)); + tms->device->save_item(NAME(tms->new_k)); - state_save_register_device_item(tms->device, 0, tms->current_energy); - state_save_register_device_item(tms->device, 0, tms->current_pitch); - state_save_register_device_item_array(tms->device, 0, tms->current_k); + tms->device->save_item(NAME(tms->current_energy)); + tms->device->save_item(NAME(tms->current_pitch)); + tms->device->save_item(NAME(tms->current_k)); - state_save_register_device_item(tms->device, 0, tms->target_energy); - state_save_register_device_item(tms->device, 0, tms->target_pitch); - state_save_register_device_item_array(tms->device, 0, tms->target_k); + tms->device->save_item(NAME(tms->target_energy)); + tms->device->save_item(NAME(tms->target_pitch)); + tms->device->save_item(NAME(tms->target_k)); - state_save_register_device_item(tms->device, 0, tms->interp_count); - state_save_register_device_item(tms->device, 0, tms->sample_count); - state_save_register_device_item(tms->device, 0, tms->pitch_count); + tms->device->save_item(NAME(tms->interp_count)); + tms->device->save_item(NAME(tms->sample_count)); + tms->device->save_item(NAME(tms->pitch_count)); - state_save_register_device_item(tms->device, 0, tms->next_is_address); - state_save_register_device_item(tms->device, 0, tms->address); - state_save_register_device_item(tms->device, 0, tms->schedule_dummy_read); - state_save_register_device_item(tms->device, 0, tms->addr_bit); + tms->device->save_item(NAME(tms->next_is_address)); + tms->device->save_item(NAME(tms->address)); + tms->device->save_item(NAME(tms->schedule_dummy_read)); + tms->device->save_item(NAME(tms->addr_bit)); - state_save_register_device_item_array(tms->device, 0, tms->x); + tms->device->save_item(NAME(tms->x)); - state_save_register_device_item(tms->device, 0, tms->RNG); + tms->device->save_item(NAME(tms->RNG)); } @@ -1352,12 +1352,12 @@ void tms5110_set_frequency(device_t *device, int frequency) static void register_for_save_states_prom(tmsprom_state *tms) { - state_save_register_device_item(tms->device, 0, tms->address); - state_save_register_device_item(tms->device, 0, tms->base_address); - state_save_register_device_item(tms->device, 0, tms->bit); - state_save_register_device_item(tms->device, 0, tms->enable); - state_save_register_device_item(tms->device, 0, tms->prom_cnt); - state_save_register_device_item(tms->device, 0, tms->m0); + tms->device->save_item(NAME(tms->address)); + tms->device->save_item(NAME(tms->base_address)); + tms->device->save_item(NAME(tms->bit)); + tms->device->save_item(NAME(tms->enable)); + tms->device->save_item(NAME(tms->prom_cnt)); + tms->device->save_item(NAME(tms->m0)); } diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index 56956fb985a..0ad9576a78b 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -481,61 +481,61 @@ static void tms5220_set_variant(tms5220_state *tms, int variant) static void register_for_save_states(tms5220_state *tms) { - state_save_register_device_item_array(tms->device, 0, tms->fifo); - state_save_register_device_item(tms->device, 0, tms->fifo_head); - state_save_register_device_item(tms->device, 0, tms->fifo_tail); - state_save_register_device_item(tms->device, 0, tms->fifo_count); - state_save_register_device_item(tms->device, 0, tms->fifo_bits_taken); - - state_save_register_device_item(tms->device, 0, tms->speaking_now); - state_save_register_device_item(tms->device, 0, tms->speak_external); - state_save_register_device_item(tms->device, 0, tms->talk_status); - state_save_register_device_item(tms->device, 0, tms->buffer_low); - state_save_register_device_item(tms->device, 0, tms->buffer_empty); - state_save_register_device_item(tms->device, 0, tms->irq_pin); - state_save_register_device_item(tms->device, 0, tms->ready_pin); - - state_save_register_device_item(tms->device, 0, tms->OLDE); - state_save_register_device_item(tms->device, 0, tms->OLDP); - - state_save_register_device_item(tms->device, 0, tms->new_frame_energy_idx); - state_save_register_device_item(tms->device, 0, tms->new_frame_pitch_idx); - state_save_register_device_item_array(tms->device, 0, tms->new_frame_k_idx); + tms->device->save_item(NAME(tms->fifo)); + tms->device->save_item(NAME(tms->fifo_head)); + tms->device->save_item(NAME(tms->fifo_tail)); + tms->device->save_item(NAME(tms->fifo_count)); + tms->device->save_item(NAME(tms->fifo_bits_taken)); + + tms->device->save_item(NAME(tms->speaking_now)); + tms->device->save_item(NAME(tms->speak_external)); + tms->device->save_item(NAME(tms->talk_status)); + tms->device->save_item(NAME(tms->buffer_low)); + tms->device->save_item(NAME(tms->buffer_empty)); + tms->device->save_item(NAME(tms->irq_pin)); + tms->device->save_item(NAME(tms->ready_pin)); + + tms->device->save_item(NAME(tms->OLDE)); + tms->device->save_item(NAME(tms->OLDP)); + + tms->device->save_item(NAME(tms->new_frame_energy_idx)); + tms->device->save_item(NAME(tms->new_frame_pitch_idx)); + tms->device->save_item(NAME(tms->new_frame_k_idx)); #ifdef PERFECT_INTERPOLATION_HACK - state_save_register_device_item(tms->device, 0, tms->old_frame_energy_idx); - state_save_register_device_item(tms->device, 0, tms->old_frame_pitch_idx); - state_save_register_device_item_array(tms->device, 0, tms->old_frame_k_idx); + tms->device->save_item(NAME(tms->old_frame_energy_idx)); + tms->device->save_item(NAME(tms->old_frame_pitch_idx)); + tms->device->save_item(NAME(tms->old_frame_k_idx)); #endif - state_save_register_device_item(tms->device, 0, tms->current_energy); - state_save_register_device_item(tms->device, 0, tms->current_pitch); - state_save_register_device_item_array(tms->device, 0, tms->current_k); + tms->device->save_item(NAME(tms->current_energy)); + tms->device->save_item(NAME(tms->current_pitch)); + tms->device->save_item(NAME(tms->current_k)); - state_save_register_device_item(tms->device, 0, tms->target_energy); - state_save_register_device_item(tms->device, 0, tms->target_pitch); - state_save_register_device_item_array(tms->device, 0, tms->target_k); + tms->device->save_item(NAME(tms->target_energy)); + tms->device->save_item(NAME(tms->target_pitch)); + tms->device->save_item(NAME(tms->target_k)); - state_save_register_device_item(tms->device, 0, tms->previous_energy); + tms->device->save_item(NAME(tms->previous_energy)); - state_save_register_device_item(tms->device, 0, tms->subcycle); - state_save_register_device_item(tms->device, 0, tms->subc_reload); - state_save_register_device_item(tms->device, 0, tms->PC); - state_save_register_device_item(tms->device, 0, tms->interp_period); - state_save_register_device_item(tms->device, 0, tms->inhibit); - state_save_register_device_item(tms->device, 0, tms->tms5220c_rate); - state_save_register_device_item(tms->device, 0, tms->pitch_count); + tms->device->save_item(NAME(tms->subcycle)); + tms->device->save_item(NAME(tms->subc_reload)); + tms->device->save_item(NAME(tms->PC)); + tms->device->save_item(NAME(tms->interp_period)); + tms->device->save_item(NAME(tms->inhibit)); + tms->device->save_item(NAME(tms->tms5220c_rate)); + tms->device->save_item(NAME(tms->pitch_count)); - state_save_register_device_item_array(tms->device, 0, tms->u); - state_save_register_device_item_array(tms->device, 0, tms->x); + tms->device->save_item(NAME(tms->u)); + tms->device->save_item(NAME(tms->x)); - state_save_register_device_item(tms->device, 0, tms->RNG); - state_save_register_device_item(tms->device, 0, tms->excitation_data); + tms->device->save_item(NAME(tms->RNG)); + tms->device->save_item(NAME(tms->excitation_data)); - state_save_register_device_item(tms->device, 0, tms->schedule_dummy_read); - state_save_register_device_item(tms->device, 0, tms->data_register); - state_save_register_device_item(tms->device, 0, tms->RDB_flag); - state_save_register_device_item(tms->device, 0, tms->digital_select); + tms->device->save_item(NAME(tms->schedule_dummy_read)); + tms->device->save_item(NAME(tms->data_register)); + tms->device->save_item(NAME(tms->RDB_flag)); + tms->device->save_item(NAME(tms->digital_select)); - state_save_register_device_item(tms->device, 0, tms->io_ready); + tms->device->save_item(NAME(tms->io_ready)); } diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index 0f2579d356f..7d6fffa2991 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -601,33 +601,33 @@ static STATE_POSTLOAD( upd7759_postload ) static void register_for_save(upd7759_state *chip, device_t *device) { - state_save_register_device_item(device, 0, chip->pos); - state_save_register_device_item(device, 0, chip->step); - - state_save_register_device_item(device, 0, chip->fifo_in); - state_save_register_device_item(device, 0, chip->reset); - state_save_register_device_item(device, 0, chip->start); - state_save_register_device_item(device, 0, chip->drq); - - state_save_register_device_item(device, 0, chip->state); - state_save_register_device_item(device, 0, chip->clocks_left); - state_save_register_device_item(device, 0, chip->nibbles_left); - state_save_register_device_item(device, 0, chip->repeat_count); - state_save_register_device_item(device, 0, chip->post_drq_state); - state_save_register_device_item(device, 0, chip->post_drq_clocks); - state_save_register_device_item(device, 0, chip->req_sample); - state_save_register_device_item(device, 0, chip->last_sample); - state_save_register_device_item(device, 0, chip->block_header); - state_save_register_device_item(device, 0, chip->sample_rate); - state_save_register_device_item(device, 0, chip->first_valid_header); - state_save_register_device_item(device, 0, chip->offset); - state_save_register_device_item(device, 0, chip->repeat_offset); - - state_save_register_device_item(device, 0, chip->adpcm_state); - state_save_register_device_item(device, 0, chip->adpcm_data); - state_save_register_device_item(device, 0, chip->sample); - - state_save_register_device_item(device, 0, chip->romoffset); + device->save_item(NAME(chip->pos)); + device->save_item(NAME(chip->step)); + + device->save_item(NAME(chip->fifo_in)); + device->save_item(NAME(chip->reset)); + device->save_item(NAME(chip->start)); + device->save_item(NAME(chip->drq)); + + device->save_item(NAME(chip->state)); + device->save_item(NAME(chip->clocks_left)); + device->save_item(NAME(chip->nibbles_left)); + device->save_item(NAME(chip->repeat_count)); + device->save_item(NAME(chip->post_drq_state)); + device->save_item(NAME(chip->post_drq_clocks)); + device->save_item(NAME(chip->req_sample)); + device->save_item(NAME(chip->last_sample)); + device->save_item(NAME(chip->block_header)); + device->save_item(NAME(chip->sample_rate)); + device->save_item(NAME(chip->first_valid_header)); + device->save_item(NAME(chip->offset)); + device->save_item(NAME(chip->repeat_offset)); + + device->save_item(NAME(chip->adpcm_state)); + device->save_item(NAME(chip->adpcm_data)); + device->save_item(NAME(chip->sample)); + + device->save_item(NAME(chip->romoffset)); device->machine->state().register_postload(upd7759_postload, chip); } diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c index e18606e24a4..351233f72ad 100644 --- a/src/emu/sound/vlm5030.c +++ b/src/emu/sound/vlm5030.c @@ -707,25 +707,25 @@ static DEVICE_START( vlm5030 ) /* don't restore "UINT8 *chip->rom" when use vlm5030_set_rom() */ - state_save_register_device_item(device,0,chip->address); - state_save_register_device_item(device,0,chip->pin_BSY); - state_save_register_device_item(device,0,chip->pin_ST); - state_save_register_device_item(device,0,chip->pin_VCU); - state_save_register_device_item(device,0,chip->pin_RST); - state_save_register_device_item(device,0,chip->latch_data); - state_save_register_device_item(device,0,chip->vcu_addr_h); - state_save_register_device_item(device,0,chip->parameter); - state_save_register_device_item(device,0,chip->phase); - state_save_register_device_item(device,0,chip->interp_count); - state_save_register_device_item(device,0,chip->sample_count); - state_save_register_device_item(device,0,chip->pitch_count); - state_save_register_device_item(device,0,chip->old_energy); - state_save_register_device_item(device,0,chip->old_pitch); - state_save_register_device_item_array(device,0,chip->old_k); - state_save_register_device_item(device,0,chip->target_energy); - state_save_register_device_item(device,0,chip->target_pitch); - state_save_register_device_item_array(device,0,chip->target_k); - state_save_register_device_item_array(device,0,chip->x); + device->save_item(NAME(chip->address)); + device->save_item(NAME(chip->pin_BSY)); + device->save_item(NAME(chip->pin_ST)); + device->save_item(NAME(chip->pin_VCU)); + device->save_item(NAME(chip->pin_RST)); + device->save_item(NAME(chip->latch_data)); + device->save_item(NAME(chip->vcu_addr_h)); + device->save_item(NAME(chip->parameter)); + device->save_item(NAME(chip->phase)); + device->save_item(NAME(chip->interp_count)); + device->save_item(NAME(chip->sample_count)); + device->save_item(NAME(chip->pitch_count)); + device->save_item(NAME(chip->old_energy)); + device->save_item(NAME(chip->old_pitch)); + device->save_item(NAME(chip->old_k)); + device->save_item(NAME(chip->target_energy)); + device->save_item(NAME(chip->target_pitch)); + device->save_item(NAME(chip->target_k)); + device->save_item(NAME(chip->x)); device->machine->state().register_postload(vlm5030_restore_state, chip); } diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c index 94c1e7129fe..46ca52ed6ae 100644 --- a/src/emu/sound/vrender0.c +++ b/src/emu/sound/vrender0.c @@ -112,7 +112,7 @@ static DEVICE_START( vrender0 ) VR0->stream = device->machine->sound().stream_alloc(*device, 0, 2, 44100, VR0, VR0_Update); - state_save_register_device_item_array(device, 0, VR0->SOUNDREGS); + device->save_item(NAME(VR0->SOUNDREGS)); } WRITE32_DEVICE_HANDLER(vr0_snd_write) diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c index 8b8b7d0efc1..924790fea68 100644 --- a/src/emu/sound/ym2151.c +++ b/src/emu/sound/ym2151.c @@ -1401,89 +1401,89 @@ static void ym2151_state_save_register( YM2151 *chip, device_t *device ) op = &chip->oper[(j&7)*4+(j>>3)]; - state_save_register_device_item(device, j, op->phase); - state_save_register_device_item(device, j, op->freq); - state_save_register_device_item(device, j, op->dt1); - state_save_register_device_item(device, j, op->mul); - state_save_register_device_item(device, j, op->dt1_i); - state_save_register_device_item(device, j, op->dt2); + device->save_item(NAME(op->phase), j); + device->save_item(NAME(op->freq), j); + device->save_item(NAME(op->dt1), j); + device->save_item(NAME(op->mul), j); + device->save_item(NAME(op->dt1_i), j); + device->save_item(NAME(op->dt2), j); /* operators connection is saved in chip data block */ - state_save_register_device_item(device, j, op->mem_value); - - state_save_register_device_item(device, j, op->fb_shift); - state_save_register_device_item(device, j, op->fb_out_curr); - state_save_register_device_item(device, j, op->fb_out_prev); - state_save_register_device_item(device, j, op->kc); - state_save_register_device_item(device, j, op->kc_i); - state_save_register_device_item(device, j, op->pms); - state_save_register_device_item(device, j, op->ams); - state_save_register_device_item(device, j, op->AMmask); - - state_save_register_device_item(device, j, op->state); - state_save_register_device_item(device, j, op->eg_sh_ar); - state_save_register_device_item(device, j, op->eg_sel_ar); - state_save_register_device_item(device, j, op->tl); - state_save_register_device_item(device, j, op->volume); - state_save_register_device_item(device, j, op->eg_sh_d1r); - state_save_register_device_item(device, j, op->eg_sel_d1r); - state_save_register_device_item(device, j, op->d1l); - state_save_register_device_item(device, j, op->eg_sh_d2r); - state_save_register_device_item(device, j, op->eg_sel_d2r); - state_save_register_device_item(device, j, op->eg_sh_rr); - state_save_register_device_item(device, j, op->eg_sel_rr); - - state_save_register_device_item(device, j, op->key); - state_save_register_device_item(device, j, op->ks); - state_save_register_device_item(device, j, op->ar); - state_save_register_device_item(device, j, op->d1r); - state_save_register_device_item(device, j, op->d2r); - state_save_register_device_item(device, j, op->rr); - - state_save_register_device_item(device, j, op->reserved0); - state_save_register_device_item(device, j, op->reserved1); + device->save_item(NAME(op->mem_value), j); + + device->save_item(NAME(op->fb_shift), j); + device->save_item(NAME(op->fb_out_curr), j); + device->save_item(NAME(op->fb_out_prev), j); + device->save_item(NAME(op->kc), j); + device->save_item(NAME(op->kc_i), j); + device->save_item(NAME(op->pms), j); + device->save_item(NAME(op->ams), j); + device->save_item(NAME(op->AMmask), j); + + device->save_item(NAME(op->state), j); + device->save_item(NAME(op->eg_sh_ar), j); + device->save_item(NAME(op->eg_sel_ar), j); + device->save_item(NAME(op->tl), j); + device->save_item(NAME(op->volume), j); + device->save_item(NAME(op->eg_sh_d1r), j); + device->save_item(NAME(op->eg_sel_d1r), j); + device->save_item(NAME(op->d1l), j); + device->save_item(NAME(op->eg_sh_d2r), j); + device->save_item(NAME(op->eg_sel_d2r), j); + device->save_item(NAME(op->eg_sh_rr), j); + device->save_item(NAME(op->eg_sel_rr), j); + + device->save_item(NAME(op->key), j); + device->save_item(NAME(op->ks), j); + device->save_item(NAME(op->ar), j); + device->save_item(NAME(op->d1r), j); + device->save_item(NAME(op->d2r), j); + device->save_item(NAME(op->rr), j); + + device->save_item(NAME(op->reserved0), j); + device->save_item(NAME(op->reserved1), j); } - state_save_register_device_item_array(device, 0, chip->pan); - - state_save_register_device_item(device, 0, chip->eg_cnt); - state_save_register_device_item(device, 0, chip->eg_timer); - state_save_register_device_item(device, 0, chip->eg_timer_add); - state_save_register_device_item(device, 0, chip->eg_timer_overflow); - - state_save_register_device_item(device, 0, chip->lfo_phase); - state_save_register_device_item(device, 0, chip->lfo_timer); - state_save_register_device_item(device, 0, chip->lfo_timer_add); - state_save_register_device_item(device, 0, chip->lfo_overflow); - state_save_register_device_item(device, 0, chip->lfo_counter); - state_save_register_device_item(device, 0, chip->lfo_counter_add); - state_save_register_device_item(device, 0, chip->lfo_wsel); - state_save_register_device_item(device, 0, chip->amd); - state_save_register_device_item(device, 0, chip->pmd); - state_save_register_device_item(device, 0, chip->lfa); - state_save_register_device_item(device, 0, chip->lfp); - - state_save_register_device_item(device, 0, chip->test); - state_save_register_device_item(device, 0, chip->ct); - - state_save_register_device_item(device, 0, chip->noise); - state_save_register_device_item(device, 0, chip->noise_rng); - state_save_register_device_item(device, 0, chip->noise_p); - state_save_register_device_item(device, 0, chip->noise_f); - - state_save_register_device_item(device, 0, chip->csm_req); - state_save_register_device_item(device, 0, chip->irq_enable); - state_save_register_device_item(device, 0, chip->status); - - state_save_register_device_item(device, 0, chip->timer_A_index); - state_save_register_device_item(device, 0, chip->timer_B_index); - state_save_register_device_item(device, 0, chip->timer_A_index_old); - state_save_register_device_item(device, 0, chip->timer_B_index_old); + device->save_item(NAME(chip->pan)); + + device->save_item(NAME(chip->eg_cnt)); + device->save_item(NAME(chip->eg_timer)); + device->save_item(NAME(chip->eg_timer_add)); + device->save_item(NAME(chip->eg_timer_overflow)); + + device->save_item(NAME(chip->lfo_phase)); + device->save_item(NAME(chip->lfo_timer)); + device->save_item(NAME(chip->lfo_timer_add)); + device->save_item(NAME(chip->lfo_overflow)); + device->save_item(NAME(chip->lfo_counter)); + device->save_item(NAME(chip->lfo_counter_add)); + device->save_item(NAME(chip->lfo_wsel)); + device->save_item(NAME(chip->amd)); + device->save_item(NAME(chip->pmd)); + device->save_item(NAME(chip->lfa)); + device->save_item(NAME(chip->lfp)); + + device->save_item(NAME(chip->test)); + device->save_item(NAME(chip->ct)); + + device->save_item(NAME(chip->noise)); + device->save_item(NAME(chip->noise_rng)); + device->save_item(NAME(chip->noise_p)); + device->save_item(NAME(chip->noise_f)); + + device->save_item(NAME(chip->csm_req)); + device->save_item(NAME(chip->irq_enable)); + device->save_item(NAME(chip->status)); + + device->save_item(NAME(chip->timer_A_index)); + device->save_item(NAME(chip->timer_B_index)); + device->save_item(NAME(chip->timer_A_index_old)); + device->save_item(NAME(chip->timer_B_index_old)); #ifdef USE_MAME_TIMERS - state_save_register_device_item(device, 0, chip->irqlinestate); + device->save_item(NAME(chip->irqlinestate)); #endif - state_save_register_device_item_array(device, 0, chip->connect); + device->save_item(NAME(chip->connect)); device->machine->state().register_postload(ym2151_postload, chip); } diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c index a6469694e0e..68992390a33 100644 --- a/src/emu/sound/ym2413.c +++ b/src/emu/sound/ym2413.c @@ -1258,69 +1258,69 @@ static void OPLL_init_save(YM2413 *chip, device_t *device) { int chnum; - state_save_register_device_item_array(device, 0, chip->instvol_r); - state_save_register_device_item(device, 0, chip->eg_cnt); - state_save_register_device_item(device, 0, chip->eg_timer); - state_save_register_device_item(device, 0, chip->eg_timer_add); - state_save_register_device_item(device, 0, chip->eg_timer_overflow); - state_save_register_device_item(device, 0, chip->rhythm); - state_save_register_device_item(device, 0, chip->lfo_am_cnt); - state_save_register_device_item(device, 0, chip->lfo_am_inc); - state_save_register_device_item(device, 0, chip->lfo_pm_cnt); - state_save_register_device_item(device, 0, chip->lfo_pm_inc); - state_save_register_device_item(device, 0, chip->noise_rng); - state_save_register_device_item(device, 0, chip->noise_p); - state_save_register_device_item(device, 0, chip->noise_f); - state_save_register_device_item_2d_array(device, 0, chip->inst_tab); - state_save_register_device_item(device, 0, chip->address); - state_save_register_device_item(device, 0, chip->status); + device->save_item(NAME(chip->instvol_r)); + device->save_item(NAME(chip->eg_cnt)); + device->save_item(NAME(chip->eg_timer)); + device->save_item(NAME(chip->eg_timer_add)); + device->save_item(NAME(chip->eg_timer_overflow)); + device->save_item(NAME(chip->rhythm)); + device->save_item(NAME(chip->lfo_am_cnt)); + device->save_item(NAME(chip->lfo_am_inc)); + device->save_item(NAME(chip->lfo_pm_cnt)); + device->save_item(NAME(chip->lfo_pm_inc)); + device->save_item(NAME(chip->noise_rng)); + device->save_item(NAME(chip->noise_p)); + device->save_item(NAME(chip->noise_f)); + device->save_item(NAME(chip->inst_tab)); + device->save_item(NAME(chip->address)); + device->save_item(NAME(chip->status)); for (chnum = 0; chnum < ARRAY_LENGTH(chip->P_CH); chnum++) { OPLL_CH *ch = &chip->P_CH[chnum]; int slotnum; - state_save_register_device_item(device, chnum, ch->block_fnum); - state_save_register_device_item(device, chnum, ch->fc); - state_save_register_device_item(device, chnum, ch->ksl_base); - state_save_register_device_item(device, chnum, ch->kcode); - state_save_register_device_item(device, chnum, ch->sus); + device->save_item(NAME(ch->block_fnum), chnum); + device->save_item(NAME(ch->fc), chnum); + device->save_item(NAME(ch->ksl_base), chnum); + device->save_item(NAME(ch->kcode), chnum); + device->save_item(NAME(ch->sus), chnum); for (slotnum = 0; slotnum < ARRAY_LENGTH(ch->SLOT); slotnum++) { OPLL_SLOT *sl = &ch->SLOT[slotnum]; - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ar); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->dr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->rr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->KSR); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ksl); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ksr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->mul); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->phase); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->freq); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->fb_shift); - state_save_register_device_item_array(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->op1_out); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_type); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->state); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->TL); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->TLL); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->volume); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->sl); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_dp); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_dp); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_ar); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_ar); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_dr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_dr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_rr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_rr); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_rs); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_rs); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->key); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->AMmask); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->vib); - state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->wavetable); + device->save_item(NAME(sl->ar), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->dr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->rr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->KSR), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->ksl), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->ksr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->mul), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->phase), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->freq), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->fb_shift), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->op1_out), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_type), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->state), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->TL), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->TLL), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->volume), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->sl), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sh_dp), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sel_dp), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sh_ar), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sel_ar), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sh_dr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sel_dr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sh_rr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sel_rr), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sh_rs), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->eg_sel_rs), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->key), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->AMmask), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->vib), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); + device->save_item(NAME(sl->wavetable), chnum * ARRAY_LENGTH(ch->SLOT) + slotnum); } } } diff --git a/src/emu/sound/ymdeltat.c b/src/emu/sound/ymdeltat.c index 951a9f59a88..77e5397beb7 100644 --- a/src/emu/sound/ymdeltat.c +++ b/src/emu/sound/ymdeltat.c @@ -456,13 +456,13 @@ void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs) void YM_DELTAT_savestate(device_t *device,YM_DELTAT *DELTAT) { #ifdef __STATE_H__ - state_save_register_device_item(device, 0, DELTAT->portstate); - state_save_register_device_item(device, 0, DELTAT->now_addr); - state_save_register_device_item(device, 0, DELTAT->now_step); - state_save_register_device_item(device, 0, DELTAT->acc); - state_save_register_device_item(device, 0, DELTAT->prev_acc); - state_save_register_device_item(device, 0, DELTAT->adpcmd); - state_save_register_device_item(device, 0, DELTAT->adpcml); + device->save_item(NAME(DELTAT->portstate)); + device->save_item(NAME(DELTAT->now_addr)); + device->save_item(NAME(DELTAT->now_step)); + device->save_item(NAME(DELTAT->acc)); + device->save_item(NAME(DELTAT->prev_acc)); + device->save_item(NAME(DELTAT->adpcmd)); + device->save_item(NAME(DELTAT->adpcml)); #endif } diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index f0a8cdbe6fc..3a476785612 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -1681,73 +1681,73 @@ static void init_state(YMF271Chip *chip, device_t *device) for (i = 0; i < ARRAY_LENGTH(chip->slots); i++) { - state_save_register_device_item(device, i, chip->slots[i].extout); - state_save_register_device_item(device, i, chip->slots[i].lfoFreq); - state_save_register_device_item(device, i, chip->slots[i].pms); - state_save_register_device_item(device, i, chip->slots[i].ams); - state_save_register_device_item(device, i, chip->slots[i].detune); - state_save_register_device_item(device, i, chip->slots[i].multiple); - state_save_register_device_item(device, i, chip->slots[i].tl); - state_save_register_device_item(device, i, chip->slots[i].keyscale); - state_save_register_device_item(device, i, chip->slots[i].ar); - state_save_register_device_item(device, i, chip->slots[i].decay1rate); - state_save_register_device_item(device, i, chip->slots[i].decay2rate); - state_save_register_device_item(device, i, chip->slots[i].decay1lvl); - state_save_register_device_item(device, i, chip->slots[i].relrate); - state_save_register_device_item(device, i, chip->slots[i].fns); - state_save_register_device_item(device, i, chip->slots[i].block); - state_save_register_device_item(device, i, chip->slots[i].feedback); - state_save_register_device_item(device, i, chip->slots[i].waveform); - state_save_register_device_item(device, i, chip->slots[i].accon); - state_save_register_device_item(device, i, chip->slots[i].algorithm); - state_save_register_device_item(device, i, chip->slots[i].ch0_level); - state_save_register_device_item(device, i, chip->slots[i].ch1_level); - state_save_register_device_item(device, i, chip->slots[i].ch2_level); - state_save_register_device_item(device, i, chip->slots[i].ch3_level); - state_save_register_device_item(device, i, chip->slots[i].startaddr); - state_save_register_device_item(device, i, chip->slots[i].loopaddr); - state_save_register_device_item(device, i, chip->slots[i].endaddr); - state_save_register_device_item(device, i, chip->slots[i].fs); - state_save_register_device_item(device, i, chip->slots[i].srcnote); - state_save_register_device_item(device, i, chip->slots[i].srcb); - state_save_register_device_item(device, i, chip->slots[i].step); - state_save_register_device_item(device, i, chip->slots[i].stepptr); - state_save_register_device_item(device, i, chip->slots[i].active); - state_save_register_device_item(device, i, chip->slots[i].bits); - state_save_register_device_item(device, i, chip->slots[i].volume); - state_save_register_device_item(device, i, chip->slots[i].env_state); - state_save_register_device_item(device, i, chip->slots[i].env_attack_step); - state_save_register_device_item(device, i, chip->slots[i].env_decay1_step); - state_save_register_device_item(device, i, chip->slots[i].env_decay2_step); - state_save_register_device_item(device, i, chip->slots[i].env_release_step); - state_save_register_device_item(device, i, chip->slots[i].feedback_modulation0); - state_save_register_device_item(device, i, chip->slots[i].feedback_modulation1); - state_save_register_device_item(device, i, chip->slots[i].lfo_phase); - state_save_register_device_item(device, i, chip->slots[i].lfo_step); - state_save_register_device_item(device, i, chip->slots[i].lfo_amplitude); + device->save_item(NAME(chip->slots[i].extout), i); + device->save_item(NAME(chip->slots[i].lfoFreq), i); + device->save_item(NAME(chip->slots[i].pms), i); + device->save_item(NAME(chip->slots[i].ams), i); + device->save_item(NAME(chip->slots[i].detune), i); + device->save_item(NAME(chip->slots[i].multiple), i); + device->save_item(NAME(chip->slots[i].tl), i); + device->save_item(NAME(chip->slots[i].keyscale), i); + device->save_item(NAME(chip->slots[i].ar), i); + device->save_item(NAME(chip->slots[i].decay1rate), i); + device->save_item(NAME(chip->slots[i].decay2rate), i); + device->save_item(NAME(chip->slots[i].decay1lvl), i); + device->save_item(NAME(chip->slots[i].relrate), i); + device->save_item(NAME(chip->slots[i].fns), i); + device->save_item(NAME(chip->slots[i].block), i); + device->save_item(NAME(chip->slots[i].feedback), i); + device->save_item(NAME(chip->slots[i].waveform), i); + device->save_item(NAME(chip->slots[i].accon), i); + device->save_item(NAME(chip->slots[i].algorithm), i); + device->save_item(NAME(chip->slots[i].ch0_level), i); + device->save_item(NAME(chip->slots[i].ch1_level), i); + device->save_item(NAME(chip->slots[i].ch2_level), i); + device->save_item(NAME(chip->slots[i].ch3_level), i); + device->save_item(NAME(chip->slots[i].startaddr), i); + device->save_item(NAME(chip->slots[i].loopaddr), i); + device->save_item(NAME(chip->slots[i].endaddr), i); + device->save_item(NAME(chip->slots[i].fs), i); + device->save_item(NAME(chip->slots[i].srcnote), i); + device->save_item(NAME(chip->slots[i].srcb), i); + device->save_item(NAME(chip->slots[i].step), i); + device->save_item(NAME(chip->slots[i].stepptr), i); + device->save_item(NAME(chip->slots[i].active), i); + device->save_item(NAME(chip->slots[i].bits), i); + device->save_item(NAME(chip->slots[i].volume), i); + device->save_item(NAME(chip->slots[i].env_state), i); + device->save_item(NAME(chip->slots[i].env_attack_step), i); + device->save_item(NAME(chip->slots[i].env_decay1_step), i); + device->save_item(NAME(chip->slots[i].env_decay2_step), i); + device->save_item(NAME(chip->slots[i].env_release_step), i); + device->save_item(NAME(chip->slots[i].feedback_modulation0), i); + device->save_item(NAME(chip->slots[i].feedback_modulation1), i); + device->save_item(NAME(chip->slots[i].lfo_phase), i); + device->save_item(NAME(chip->slots[i].lfo_step), i); + device->save_item(NAME(chip->slots[i].lfo_amplitude), i); } for (i = 0; i < sizeof(chip->groups) / sizeof(chip->groups[0]); i++) { - state_save_register_device_item(device, i, chip->groups[i].sync); - state_save_register_device_item(device, i, chip->groups[i].pfm); + device->save_item(NAME(chip->groups[i].sync), i); + device->save_item(NAME(chip->groups[i].pfm), i); } - state_save_register_device_item(device, 0, chip->timerA); - state_save_register_device_item(device, 0, chip->timerB); - state_save_register_device_item(device, 0, chip->timerAVal); - state_save_register_device_item(device, 0, chip->timerBVal); - state_save_register_device_item(device, 0, chip->irqstate); - state_save_register_device_item(device, 0, chip->status); - state_save_register_device_item(device, 0, chip->enable); - state_save_register_device_item(device, 0, chip->reg0); - state_save_register_device_item(device, 0, chip->reg1); - state_save_register_device_item(device, 0, chip->reg2); - state_save_register_device_item(device, 0, chip->reg3); - state_save_register_device_item(device, 0, chip->pcmreg); - state_save_register_device_item(device, 0, chip->timerreg); - state_save_register_device_item(device, 0, chip->ext_address); - state_save_register_device_item(device, 0, chip->ext_read); + device->save_item(NAME(chip->timerA)); + device->save_item(NAME(chip->timerB)); + device->save_item(NAME(chip->timerAVal)); + device->save_item(NAME(chip->timerBVal)); + device->save_item(NAME(chip->irqstate)); + device->save_item(NAME(chip->status)); + device->save_item(NAME(chip->enable)); + device->save_item(NAME(chip->reg0)); + device->save_item(NAME(chip->reg1)); + device->save_item(NAME(chip->reg2)); + device->save_item(NAME(chip->reg3)); + device->save_item(NAME(chip->pcmreg)); + device->save_item(NAME(chip->timerreg)); + device->save_item(NAME(chip->ext_address)); + device->save_item(NAME(chip->ext_read)); } static void ymf271_init(device_t *device, YMF271Chip *chip, UINT8 *rom, void (*cb)(device_t *,int), const devcb_read8 *ext_read, const devcb_write8 *ext_write) diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index afa256c0436..7584588fffa 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -676,57 +676,57 @@ static void ymf278b_register_save_state(device_t *device, YMF278BChip *chip) { int i; - state_save_register_device_item(device, 0, chip->lsitest0); - state_save_register_device_item(device, 0, chip->lsitest1); - state_save_register_device_item(device, 0, chip->wavetblhdr); - state_save_register_device_item(device, 0, chip->memmode); - state_save_register_device_item(device, 0, chip->memadr); - state_save_register_device_item(device, 0, chip->fm_l); - state_save_register_device_item(device, 0, chip->fm_r); - state_save_register_device_item(device, 0, chip->pcm_l); - state_save_register_device_item(device, 0, chip->pcm_r); - state_save_register_device_item(device, 0, chip->timer_a_count); - state_save_register_device_item(device, 0, chip->timer_b_count); - state_save_register_device_item(device, 0, chip->enable); - state_save_register_device_item(device, 0, chip->current_irq); - state_save_register_device_item(device, 0, chip->irq_line); - state_save_register_device_item(device, 0, chip->port_A); - state_save_register_device_item(device, 0, chip->port_B); - state_save_register_device_item(device, 0, chip->port_C); + device->save_item(NAME(chip->lsitest0)); + device->save_item(NAME(chip->lsitest1)); + device->save_item(NAME(chip->wavetblhdr)); + device->save_item(NAME(chip->memmode)); + device->save_item(NAME(chip->memadr)); + device->save_item(NAME(chip->fm_l)); + device->save_item(NAME(chip->fm_r)); + device->save_item(NAME(chip->pcm_l)); + device->save_item(NAME(chip->pcm_r)); + device->save_item(NAME(chip->timer_a_count)); + device->save_item(NAME(chip->timer_b_count)); + device->save_item(NAME(chip->enable)); + device->save_item(NAME(chip->current_irq)); + device->save_item(NAME(chip->irq_line)); + device->save_item(NAME(chip->port_A)); + device->save_item(NAME(chip->port_B)); + device->save_item(NAME(chip->port_C)); for (i = 0; i < 24; ++i) { - state_save_register_device_item(device, i, chip->slots[i].wave); - state_save_register_device_item(device, i, chip->slots[i].FN); - state_save_register_device_item(device, i, chip->slots[i].OCT); - state_save_register_device_item(device, i, chip->slots[i].PRVB); - state_save_register_device_item(device, i, chip->slots[i].LD); - state_save_register_device_item(device, i, chip->slots[i].TL); - state_save_register_device_item(device, i, chip->slots[i].pan); - state_save_register_device_item(device, i, chip->slots[i].lfo); - state_save_register_device_item(device, i, chip->slots[i].vib); - state_save_register_device_item(device, i, chip->slots[i].AM); - - state_save_register_device_item(device, i, chip->slots[i].AR); - state_save_register_device_item(device, i, chip->slots[i].D1R); - state_save_register_device_item(device, i, chip->slots[i].DL); - state_save_register_device_item(device, i, chip->slots[i].D2R); - state_save_register_device_item(device, i, chip->slots[i].RC); - state_save_register_device_item(device, i, chip->slots[i].RR); - - state_save_register_device_item(device, i, chip->slots[i].step); - state_save_register_device_item(device, i, chip->slots[i].stepptr); - - state_save_register_device_item(device, i, chip->slots[i].active); - state_save_register_device_item(device, i, chip->slots[i].bits); - state_save_register_device_item(device, i, chip->slots[i].startaddr); - state_save_register_device_item(device, i, chip->slots[i].loopaddr); - state_save_register_device_item(device, i, chip->slots[i].endaddr); - - state_save_register_device_item(device, i, chip->slots[i].env_step); - state_save_register_device_item(device, i, chip->slots[i].env_vol); - state_save_register_device_item(device, i, chip->slots[i].env_vol_step); - state_save_register_device_item(device, i, chip->slots[i].env_vol_lim); + device->save_item(NAME(chip->slots[i].wave), i); + device->save_item(NAME(chip->slots[i].FN), i); + device->save_item(NAME(chip->slots[i].OCT), i); + device->save_item(NAME(chip->slots[i].PRVB), i); + device->save_item(NAME(chip->slots[i].LD), i); + device->save_item(NAME(chip->slots[i].TL), i); + device->save_item(NAME(chip->slots[i].pan), i); + device->save_item(NAME(chip->slots[i].lfo), i); + device->save_item(NAME(chip->slots[i].vib), i); + device->save_item(NAME(chip->slots[i].AM), i); + + device->save_item(NAME(chip->slots[i].AR), i); + device->save_item(NAME(chip->slots[i].D1R), i); + device->save_item(NAME(chip->slots[i].DL), i); + device->save_item(NAME(chip->slots[i].D2R), i); + device->save_item(NAME(chip->slots[i].RC), i); + device->save_item(NAME(chip->slots[i].RR), i); + + device->save_item(NAME(chip->slots[i].step), i); + device->save_item(NAME(chip->slots[i].stepptr), i); + + device->save_item(NAME(chip->slots[i].active), i); + device->save_item(NAME(chip->slots[i].bits), i); + device->save_item(NAME(chip->slots[i].startaddr), i); + device->save_item(NAME(chip->slots[i].loopaddr), i); + device->save_item(NAME(chip->slots[i].endaddr), i); + + device->save_item(NAME(chip->slots[i].env_step), i); + device->save_item(NAME(chip->slots[i].env_vol), i); + device->save_item(NAME(chip->slots[i].env_vol_step), i); + device->save_item(NAME(chip->slots[i].env_vol_lim), i); } } diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c index e3c931acce3..f363b80d98b 100644 --- a/src/emu/sound/ymz280b.c +++ b/src/emu/sound/ymz280b.c @@ -659,38 +659,38 @@ static DEVICE_START( ymz280b ) /* state save */ { int j; - state_save_register_device_item(device, 0, chip->current_register); - state_save_register_device_item(device, 0, chip->status_register); - state_save_register_device_item(device, 0, chip->irq_state); - state_save_register_device_item(device, 0, chip->irq_mask); - state_save_register_device_item(device, 0, chip->irq_enable); - state_save_register_device_item(device, 0, chip->keyon_enable); - state_save_register_device_item(device, 0, chip->rom_readback_addr); + device->save_item(NAME(chip->current_register)); + device->save_item(NAME(chip->status_register)); + device->save_item(NAME(chip->irq_state)); + device->save_item(NAME(chip->irq_mask)); + device->save_item(NAME(chip->irq_enable)); + device->save_item(NAME(chip->keyon_enable)); + device->save_item(NAME(chip->rom_readback_addr)); for (j = 0; j < 8; j++) { - state_save_register_device_item(device, j, chip->voice[j].playing); - state_save_register_device_item(device, j, chip->voice[j].keyon); - state_save_register_device_item(device, j, chip->voice[j].looping); - state_save_register_device_item(device, j, chip->voice[j].mode); - state_save_register_device_item(device, j, chip->voice[j].fnum); - state_save_register_device_item(device, j, chip->voice[j].level); - state_save_register_device_item(device, j, chip->voice[j].pan); - state_save_register_device_item(device, j, chip->voice[j].start); - state_save_register_device_item(device, j, chip->voice[j].stop); - state_save_register_device_item(device, j, chip->voice[j].loop_start); - state_save_register_device_item(device, j, chip->voice[j].loop_end); - state_save_register_device_item(device, j, chip->voice[j].position); - state_save_register_device_item(device, j, chip->voice[j].signal); - state_save_register_device_item(device, j, chip->voice[j].step); - state_save_register_device_item(device, j, chip->voice[j].loop_signal); - state_save_register_device_item(device, j, chip->voice[j].loop_step); - state_save_register_device_item(device, j, chip->voice[j].loop_count); - state_save_register_device_item(device, j, chip->voice[j].output_left); - state_save_register_device_item(device, j, chip->voice[j].output_right); - state_save_register_device_item(device, j, chip->voice[j].output_pos); - state_save_register_device_item(device, j, chip->voice[j].last_sample); - state_save_register_device_item(device, j, chip->voice[j].curr_sample); - state_save_register_device_item(device, j, chip->voice[j].irq_schedule); + device->save_item(NAME(chip->voice[j].playing), j); + device->save_item(NAME(chip->voice[j].keyon), j); + device->save_item(NAME(chip->voice[j].looping), j); + device->save_item(NAME(chip->voice[j].mode), j); + device->save_item(NAME(chip->voice[j].fnum), j); + device->save_item(NAME(chip->voice[j].level), j); + device->save_item(NAME(chip->voice[j].pan), j); + device->save_item(NAME(chip->voice[j].start), j); + device->save_item(NAME(chip->voice[j].stop), j); + device->save_item(NAME(chip->voice[j].loop_start), j); + device->save_item(NAME(chip->voice[j].loop_end), j); + device->save_item(NAME(chip->voice[j].position), j); + device->save_item(NAME(chip->voice[j].signal), j); + device->save_item(NAME(chip->voice[j].step), j); + device->save_item(NAME(chip->voice[j].loop_signal), j); + device->save_item(NAME(chip->voice[j].loop_step), j); + device->save_item(NAME(chip->voice[j].loop_count), j); + device->save_item(NAME(chip->voice[j].output_left), j); + device->save_item(NAME(chip->voice[j].output_right), j); + device->save_item(NAME(chip->voice[j].output_pos), j); + device->save_item(NAME(chip->voice[j].last_sample), j); + device->save_item(NAME(chip->voice[j].curr_sample), j); + device->save_item(NAME(chip->voice[j].irq_schedule), j); } } diff --git a/src/emu/state.c b/src/emu/state.c index bcef78d61bf..8ebc7935e2b 100644 --- a/src/emu/state.c +++ b/src/emu/state.c @@ -60,7 +60,7 @@ // DEBUGGING //************************************************************************** -#define VERBOSE 1 +#define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/emu/state.h b/src/emu/state.h index 0af6e94c77f..450a3a50810 100644 --- a/src/emu/state.h +++ b/src/emu/state.h @@ -104,24 +104,6 @@ void state_postload_stub(running_machine *machine, void *param) -// register device items -#define state_save_register_device_item(_dev, _index, _val) \ - (_dev)->machine->state().save_item((_dev)->name(), (_dev)->tag(), _index, _val, #_val) - -#define state_save_register_device_item_pointer(_dev, _index, _val, _count) \ - (_dev)->machine->state().save_pointer((_dev)->name(), (_dev)->tag(), _index, _val, #_val, _count) - -#define state_save_register_device_item_array(_dev, _index, _val) \ - (_dev)->machine->state().save_item((_dev)->name(), (_dev)->tag(), _index, _val, #_val) - -#define state_save_register_device_item_2d_array(_dev, _index, _val) \ - (_dev)->machine->state().save_item((_dev)->name(), (_dev)->tag(), _index, _val, #_val) - -#define state_save_register_device_item_bitmap(_dev, _index, _val) \ - (_dev)->machine->state().save_item((_dev)->name(), (_dev)->tag(), _index, *(_val), #_val) - - - // register global items #define state_save_register_global(_mach, _val) \ (_mach)->state().save_item(_val, #_val) diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index 592d9cbab8e..41e3e48a604 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -396,18 +396,18 @@ static tilemap_t *tilemap_create_common(running_machine *machine, void *get_info machine->tilemap_data->tailptr = &tmap->next; /* save relevant state */ - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->enable); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->attributes); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->palette_offset); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->pen_data_offset); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->scrollrows); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->scrollcols); - state_save_register_item_pointer(machine, "tilemap", NULL, tilemap_instance, tmap->rowscroll, rows * tileheight); - state_save_register_item_pointer(machine, "tilemap", NULL, tilemap_instance, tmap->colscroll, cols * tilewidth); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dx); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dx_flipped); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dy); - state_save_register_item(machine, "tilemap", NULL, tilemap_instance, tmap->dy_flipped); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->enable)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->attributes)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->palette_offset)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->pen_data_offset)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->scrollrows)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->scrollcols)); + machine->state().save_pointer("tilemap", NULL, tilemap_instance, NAME(tmap->rowscroll), rows * tileheight); + machine->state().save_pointer("tilemap", NULL, tilemap_instance, NAME(tmap->colscroll), cols * tilewidth); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->dx)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->dx_flipped)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->dy)); + machine->state().save_item("tilemap", NULL, tilemap_instance, NAME(tmap->dy_flipped)); machine->tilemap_data->instance++; /* reset everything after a load */ diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index dead579d78a..86fd1eb179d 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -233,8 +233,8 @@ void generic_video_init(running_machine *machine) state = machine->generic_video_data = auto_alloc_clear(machine, generic_video_private); - state_save_register_item(machine, "video", NULL, 0, state->flip_screen_x); - state_save_register_item(machine, "video", NULL, 0, state->flip_screen_y); + machine->state().save_item(NAME(state->flip_screen_x)); + machine->state().save_item(NAME(state->flip_screen_y)); // create spriteram buffers if necessary if (machine->config->m_video_attributes & VIDEO_BUFFERS_SPRITERAM) @@ -276,7 +276,7 @@ VIDEO_START( generic_bitmapped ) machine->generic.tmpbitmap = machine->primary_screen->alloc_compatible_bitmap(); /* ensure the contents of the bitmap are saved */ - state_save_register_global_bitmap(machine, machine->generic.tmpbitmap); + machine->state().save_item(NAME(*machine->generic.tmpbitmap)); } diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c index 3f422040155..2e8a5efea7e 100644 --- a/src/emu/video/hd63484.c +++ b/src/emu/video/hd63484.c @@ -1564,9 +1564,9 @@ static DEVICE_START( hd63484 ) hd63484->skattva_hack = intf->skattva_hack; hd63484->ram = auto_alloc_array_clear(device->machine, UINT16, HD63484_RAM_SIZE); -// state_save_register_device_item(device, 0, hd63484->clear_bitmap); -// state_save_register_device_item_pointer(device, 0, hd63484->spriteram, 0x1000); -// state_save_register_device_item_bitmap(device, 0, hd63484->sprites_bitmap); +// device->save_item(NAME(hd63484->clear_bitmap)); +// device->save_pointer(NAME(hd63484->spriteram), 0x1000); +// device->save_item(NAME(*hd63484->sprites_bitmap)); } static DEVICE_RESET( hd63484 ) diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index c577f7a30f4..076e47d6eb8 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -911,44 +911,44 @@ static void common_start(device_t *device, int device_type) /* register for state saving */ device->machine->state().register_postload(mc6845_state_save_postload, mc6845); - state_save_register_device_item(device, 0, mc6845->clock); - state_save_register_device_item(device, 0, mc6845->hpixels_per_column); - state_save_register_device_item(device, 0, mc6845->register_address_latch); - state_save_register_device_item(device, 0, mc6845->horiz_char_total); - state_save_register_device_item(device, 0, mc6845->horiz_disp); - state_save_register_device_item(device, 0, mc6845->horiz_sync_pos); - state_save_register_device_item(device, 0, mc6845->sync_width); - state_save_register_device_item(device, 0, mc6845->vert_char_total); - state_save_register_device_item(device, 0, mc6845->vert_total_adj); - state_save_register_device_item(device, 0, mc6845->vert_disp); - state_save_register_device_item(device, 0, mc6845->vert_sync_pos); - state_save_register_device_item(device, 0, mc6845->mode_control); - state_save_register_device_item(device, 0, mc6845->max_ras_addr); - state_save_register_device_item(device, 0, mc6845->cursor_start_ras); - state_save_register_device_item(device, 0, mc6845->cursor_end_ras); - state_save_register_device_item(device, 0, mc6845->disp_start_addr); - state_save_register_device_item(device, 0, mc6845->cursor_addr); - state_save_register_device_item(device, 0, mc6845->light_pen_addr); - state_save_register_device_item(device, 0, mc6845->light_pen_latched); - state_save_register_device_item(device, 0, mc6845->cursor_state); - state_save_register_device_item(device, 0, mc6845->cursor_blink_count); - state_save_register_device_item(device, 0, mc6845->update_addr); - state_save_register_device_item(device, 0, mc6845->update_ready_bit); - state_save_register_device_item(device, 0, mc6845->cur); - state_save_register_device_item(device, 0, mc6845->hsync); - state_save_register_device_item(device, 0, mc6845->vsync); - state_save_register_device_item(device, 0, mc6845->de); - state_save_register_device_item(device, 0, mc6845->character_counter); - state_save_register_device_item(device, 0, mc6845->hsync_width_counter); - state_save_register_device_item(device, 0, mc6845->line_counter); - state_save_register_device_item(device, 0, mc6845->raster_counter); - state_save_register_device_item(device, 0, mc6845->adjust_counter); - state_save_register_device_item(device, 0, mc6845->vsync_width_counter); - state_save_register_device_item(device, 0, mc6845->line_enable_ff); - state_save_register_device_item(device, 0, mc6845->vsync_ff); - state_save_register_device_item(device, 0, mc6845->adjust_active); - state_save_register_device_item(device, 0, mc6845->line_address); - state_save_register_device_item(device, 0, mc6845->cursor_x); + device->save_item(NAME(mc6845->clock)); + device->save_item(NAME(mc6845->hpixels_per_column)); + device->save_item(NAME(mc6845->register_address_latch)); + device->save_item(NAME(mc6845->horiz_char_total)); + device->save_item(NAME(mc6845->horiz_disp)); + device->save_item(NAME(mc6845->horiz_sync_pos)); + device->save_item(NAME(mc6845->sync_width)); + device->save_item(NAME(mc6845->vert_char_total)); + device->save_item(NAME(mc6845->vert_total_adj)); + device->save_item(NAME(mc6845->vert_disp)); + device->save_item(NAME(mc6845->vert_sync_pos)); + device->save_item(NAME(mc6845->mode_control)); + device->save_item(NAME(mc6845->max_ras_addr)); + device->save_item(NAME(mc6845->cursor_start_ras)); + device->save_item(NAME(mc6845->cursor_end_ras)); + device->save_item(NAME(mc6845->disp_start_addr)); + device->save_item(NAME(mc6845->cursor_addr)); + device->save_item(NAME(mc6845->light_pen_addr)); + device->save_item(NAME(mc6845->light_pen_latched)); + device->save_item(NAME(mc6845->cursor_state)); + device->save_item(NAME(mc6845->cursor_blink_count)); + device->save_item(NAME(mc6845->update_addr)); + device->save_item(NAME(mc6845->update_ready_bit)); + device->save_item(NAME(mc6845->cur)); + device->save_item(NAME(mc6845->hsync)); + device->save_item(NAME(mc6845->vsync)); + device->save_item(NAME(mc6845->de)); + device->save_item(NAME(mc6845->character_counter)); + device->save_item(NAME(mc6845->hsync_width_counter)); + device->save_item(NAME(mc6845->line_counter)); + device->save_item(NAME(mc6845->raster_counter)); + device->save_item(NAME(mc6845->adjust_counter)); + device->save_item(NAME(mc6845->vsync_width_counter)); + device->save_item(NAME(mc6845->line_enable_ff)); + device->save_item(NAME(mc6845->vsync_ff)); + device->save_item(NAME(mc6845->adjust_active)); + device->save_item(NAME(mc6845->line_address)); + device->save_item(NAME(mc6845->cursor_x)); } static DEVICE_START( mc6845 ) diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c index 9ad1cd6f5c3..75045759216 100644 --- a/src/emu/video/s2636.c +++ b/src/emu/video/s2636.c @@ -363,11 +363,11 @@ static DEVICE_START( s2636 ) s2636->bitmap = auto_bitmap_alloc(device->machine, width, height, BITMAP_FORMAT_INDEXED16); s2636->collision_bitmap = auto_bitmap_alloc(device->machine, width, height, BITMAP_FORMAT_INDEXED16); - state_save_register_device_item(device, 0, s2636->x_offset); - state_save_register_device_item(device, 0, s2636->y_offset); - state_save_register_device_item_pointer(device, 0, s2636->work_ram, s2636->work_ram_size); - state_save_register_device_item_bitmap(device, 0, s2636->bitmap); - state_save_register_device_item_bitmap(device, 0, s2636->collision_bitmap); + device->save_item(NAME(s2636->x_offset)); + device->save_item(NAME(s2636->y_offset)); + device->save_pointer(NAME(s2636->work_ram), s2636->work_ram_size); + device->save_item(NAME(*s2636->bitmap)); + device->save_item(NAME(*s2636->collision_bitmap)); } static const char DEVTEMPLATE_SOURCE[] = __FILE__; diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c index 3b1eaef0b9b..8ca8457dd2e 100644 --- a/src/emu/video/saa5050.c +++ b/src/emu/video/saa5050.c @@ -353,13 +353,13 @@ static DEVICE_START( saa5050 ) saa5050->videoram = auto_alloc_array(device->machine, UINT8, 0x800); - state_save_register_device_item_pointer(device, 0, saa5050->videoram, 0x800); - state_save_register_device_item(device, 0, saa5050->flags); - state_save_register_device_item(device, 0, saa5050->forecol); - state_save_register_device_item(device, 0, saa5050->backcol); - state_save_register_device_item(device, 0, saa5050->prvcol); - state_save_register_device_item(device, 0, saa5050->prvchr); - state_save_register_device_item(device, 0, saa5050->frame_count); + device->save_pointer(NAME(saa5050->videoram), 0x800); + device->save_item(NAME(saa5050->flags)); + device->save_item(NAME(saa5050->forecol)); + device->save_item(NAME(saa5050->backcol)); + device->save_item(NAME(saa5050->prvcol)); + device->save_item(NAME(saa5050->prvchr)); + device->save_item(NAME(saa5050->frame_count)); } static DEVICE_RESET( saa5050 ) diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c index 21997405172..5ef5425d04d 100644 --- a/src/emu/video/tms9927.c +++ b/src/emu/video/tms9927.c @@ -285,11 +285,11 @@ static DEVICE_START( tms9927 ) /* register for state saving */ device->machine->state().register_postload(tms9927_state_save_postload, tms); - state_save_register_device_item(device, 0, tms->clock); - state_save_register_device_item_array(device, 0, tms->reg); - state_save_register_device_item(device, 0, tms->start_datarow); - state_save_register_device_item(device, 0, tms->reset); - state_save_register_device_item(device, 0, tms->hpixels_per_column); + device->save_item(NAME(tms->clock)); + device->save_item(NAME(tms->reg)); + device->save_item(NAME(tms->start_datarow)); + device->save_item(NAME(tms->reset)); + device->save_item(NAME(tms->hpixels_per_column)); } diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 1d6ed0c32f9..a57e5b85efd 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -659,114 +659,114 @@ static void init_save_state(device_t *device) device->machine->state().register_postload(voodoo_postload, v); /* register states: core */ - state_save_register_device_item(device, 0, v->extra_cycles); - state_save_register_device_item_pointer(device, 0, (&v->reg[0].u), ARRAY_LENGTH(v->reg)); - state_save_register_device_item(device, 0, v->alt_regmap); + device->save_item(NAME(v->extra_cycles)); + device->save_pointer(NAME(&v->reg[0].u), ARRAY_LENGTH(v->reg)); + device->save_item(NAME(v->alt_regmap)); /* register states: pci */ - state_save_register_device_item(device, 0, v->pci.fifo.in); - state_save_register_device_item(device, 0, v->pci.fifo.out); - state_save_register_device_item(device, 0, v->pci.init_enable); - state_save_register_device_item(device, 0, v->pci.stall_state); - state_save_register_device_item(device, 0, v->pci.op_pending); - state_save_register_device_item(device, 0, v->pci.op_end_time); - state_save_register_device_item_array(device, 0, v->pci.fifo_mem); + device->save_item(NAME(v->pci.fifo.in)); + device->save_item(NAME(v->pci.fifo.out)); + device->save_item(NAME(v->pci.init_enable)); + device->save_item(NAME(v->pci.stall_state)); + device->save_item(NAME(v->pci.op_pending)); + device->save_item(NAME(v->pci.op_end_time)); + device->save_item(NAME(v->pci.fifo_mem)); /* register states: dac */ - state_save_register_device_item_array(device, 0, v->dac.reg); - state_save_register_device_item(device, 0, v->dac.read_result); + device->save_item(NAME(v->dac.reg)); + device->save_item(NAME(v->dac.read_result)); /* register states: fbi */ - state_save_register_device_item_pointer(device, 0, v->fbi.ram, v->fbi.mask + 1); - state_save_register_device_item_array(device, 0, v->fbi.rgboffs); - state_save_register_device_item(device, 0, v->fbi.auxoffs); - state_save_register_device_item(device, 0, v->fbi.frontbuf); - state_save_register_device_item(device, 0, v->fbi.backbuf); - state_save_register_device_item(device, 0, v->fbi.swaps_pending); - state_save_register_device_item(device, 0, v->fbi.video_changed); - state_save_register_device_item(device, 0, v->fbi.yorigin); - state_save_register_device_item(device, 0, v->fbi.lfb_base); - state_save_register_device_item(device, 0, v->fbi.lfb_stride); - state_save_register_device_item(device, 0, v->fbi.width); - state_save_register_device_item(device, 0, v->fbi.height); - state_save_register_device_item(device, 0, v->fbi.xoffs); - state_save_register_device_item(device, 0, v->fbi.yoffs); - state_save_register_device_item(device, 0, v->fbi.vsyncscan); - state_save_register_device_item(device, 0, v->fbi.rowpixels); - state_save_register_device_item(device, 0, v->fbi.vblank); - state_save_register_device_item(device, 0, v->fbi.vblank_count); - state_save_register_device_item(device, 0, v->fbi.vblank_swap_pending); - state_save_register_device_item(device, 0, v->fbi.vblank_swap); - state_save_register_device_item(device, 0, v->fbi.vblank_dont_swap); - state_save_register_device_item(device, 0, v->fbi.cheating_allowed); - state_save_register_device_item(device, 0, v->fbi.sign); - state_save_register_device_item(device, 0, v->fbi.ax); - state_save_register_device_item(device, 0, v->fbi.ay); - state_save_register_device_item(device, 0, v->fbi.bx); - state_save_register_device_item(device, 0, v->fbi.by); - state_save_register_device_item(device, 0, v->fbi.cx); - state_save_register_device_item(device, 0, v->fbi.cy); - state_save_register_device_item(device, 0, v->fbi.startr); - state_save_register_device_item(device, 0, v->fbi.startg); - state_save_register_device_item(device, 0, v->fbi.startb); - state_save_register_device_item(device, 0, v->fbi.starta); - state_save_register_device_item(device, 0, v->fbi.startz); - state_save_register_device_item(device, 0, v->fbi.startw); - state_save_register_device_item(device, 0, v->fbi.drdx); - state_save_register_device_item(device, 0, v->fbi.dgdx); - state_save_register_device_item(device, 0, v->fbi.dbdx); - state_save_register_device_item(device, 0, v->fbi.dadx); - state_save_register_device_item(device, 0, v->fbi.dzdx); - state_save_register_device_item(device, 0, v->fbi.dwdx); - state_save_register_device_item(device, 0, v->fbi.drdy); - state_save_register_device_item(device, 0, v->fbi.dgdy); - state_save_register_device_item(device, 0, v->fbi.dbdy); - state_save_register_device_item(device, 0, v->fbi.dady); - state_save_register_device_item(device, 0, v->fbi.dzdy); - state_save_register_device_item(device, 0, v->fbi.dwdy); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.pixels_in); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.pixels_out); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.chroma_fail); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.zfunc_fail); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.afunc_fail); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.clip_fail); - state_save_register_device_item(device, 0, v->fbi.lfb_stats.stipple_count); - state_save_register_device_item(device, 0, v->fbi.sverts); + device->save_pointer(NAME(v->fbi.ram), v->fbi.mask + 1); + device->save_item(NAME(v->fbi.rgboffs)); + device->save_item(NAME(v->fbi.auxoffs)); + device->save_item(NAME(v->fbi.frontbuf)); + device->save_item(NAME(v->fbi.backbuf)); + device->save_item(NAME(v->fbi.swaps_pending)); + device->save_item(NAME(v->fbi.video_changed)); + device->save_item(NAME(v->fbi.yorigin)); + device->save_item(NAME(v->fbi.lfb_base)); + device->save_item(NAME(v->fbi.lfb_stride)); + device->save_item(NAME(v->fbi.width)); + device->save_item(NAME(v->fbi.height)); + device->save_item(NAME(v->fbi.xoffs)); + device->save_item(NAME(v->fbi.yoffs)); + device->save_item(NAME(v->fbi.vsyncscan)); + device->save_item(NAME(v->fbi.rowpixels)); + device->save_item(NAME(v->fbi.vblank)); + device->save_item(NAME(v->fbi.vblank_count)); + device->save_item(NAME(v->fbi.vblank_swap_pending)); + device->save_item(NAME(v->fbi.vblank_swap)); + device->save_item(NAME(v->fbi.vblank_dont_swap)); + device->save_item(NAME(v->fbi.cheating_allowed)); + device->save_item(NAME(v->fbi.sign)); + device->save_item(NAME(v->fbi.ax)); + device->save_item(NAME(v->fbi.ay)); + device->save_item(NAME(v->fbi.bx)); + device->save_item(NAME(v->fbi.by)); + device->save_item(NAME(v->fbi.cx)); + device->save_item(NAME(v->fbi.cy)); + device->save_item(NAME(v->fbi.startr)); + device->save_item(NAME(v->fbi.startg)); + device->save_item(NAME(v->fbi.startb)); + device->save_item(NAME(v->fbi.starta)); + device->save_item(NAME(v->fbi.startz)); + device->save_item(NAME(v->fbi.startw)); + device->save_item(NAME(v->fbi.drdx)); + device->save_item(NAME(v->fbi.dgdx)); + device->save_item(NAME(v->fbi.dbdx)); + device->save_item(NAME(v->fbi.dadx)); + device->save_item(NAME(v->fbi.dzdx)); + device->save_item(NAME(v->fbi.dwdx)); + device->save_item(NAME(v->fbi.drdy)); + device->save_item(NAME(v->fbi.dgdy)); + device->save_item(NAME(v->fbi.dbdy)); + device->save_item(NAME(v->fbi.dady)); + device->save_item(NAME(v->fbi.dzdy)); + device->save_item(NAME(v->fbi.dwdy)); + device->save_item(NAME(v->fbi.lfb_stats.pixels_in)); + device->save_item(NAME(v->fbi.lfb_stats.pixels_out)); + device->save_item(NAME(v->fbi.lfb_stats.chroma_fail)); + device->save_item(NAME(v->fbi.lfb_stats.zfunc_fail)); + device->save_item(NAME(v->fbi.lfb_stats.afunc_fail)); + device->save_item(NAME(v->fbi.lfb_stats.clip_fail)); + device->save_item(NAME(v->fbi.lfb_stats.stipple_count)); + device->save_item(NAME(v->fbi.sverts)); for (index = 0; index < ARRAY_LENGTH(v->fbi.svert); index++) { - state_save_register_device_item(device, index, v->fbi.svert[index].x); - state_save_register_device_item(device, index, v->fbi.svert[index].y); - state_save_register_device_item(device, index, v->fbi.svert[index].a); - state_save_register_device_item(device, index, v->fbi.svert[index].r); - state_save_register_device_item(device, index, v->fbi.svert[index].g); - state_save_register_device_item(device, index, v->fbi.svert[index].b); - state_save_register_device_item(device, index, v->fbi.svert[index].z); - state_save_register_device_item(device, index, v->fbi.svert[index].wb); - state_save_register_device_item(device, index, v->fbi.svert[index].w0); - state_save_register_device_item(device, index, v->fbi.svert[index].s0); - state_save_register_device_item(device, index, v->fbi.svert[index].t0); - state_save_register_device_item(device, index, v->fbi.svert[index].w1); - state_save_register_device_item(device, index, v->fbi.svert[index].s1); - state_save_register_device_item(device, index, v->fbi.svert[index].t1); + device->save_item(NAME(v->fbi.svert[index].x), index); + device->save_item(NAME(v->fbi.svert[index].y), index); + device->save_item(NAME(v->fbi.svert[index].a), index); + device->save_item(NAME(v->fbi.svert[index].r), index); + device->save_item(NAME(v->fbi.svert[index].g), index); + device->save_item(NAME(v->fbi.svert[index].b), index); + device->save_item(NAME(v->fbi.svert[index].z), index); + device->save_item(NAME(v->fbi.svert[index].wb), index); + device->save_item(NAME(v->fbi.svert[index].w0), index); + device->save_item(NAME(v->fbi.svert[index].s0), index); + device->save_item(NAME(v->fbi.svert[index].t0), index); + device->save_item(NAME(v->fbi.svert[index].w1), index); + device->save_item(NAME(v->fbi.svert[index].s1), index); + device->save_item(NAME(v->fbi.svert[index].t1), index); } - state_save_register_device_item(device, 0, v->fbi.fifo.size); - state_save_register_device_item(device, 0, v->fbi.fifo.in); - state_save_register_device_item(device, 0, v->fbi.fifo.out); + device->save_item(NAME(v->fbi.fifo.size)); + device->save_item(NAME(v->fbi.fifo.in)); + device->save_item(NAME(v->fbi.fifo.out)); for (index = 0; index < ARRAY_LENGTH(v->fbi.cmdfifo); index++) { - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].enable); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].count_holes); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].base); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].end); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].rdptr); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].amin); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].amax); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].depth); - state_save_register_device_item(device, index, v->fbi.cmdfifo[index].holes); + device->save_item(NAME(v->fbi.cmdfifo[index].enable), index); + device->save_item(NAME(v->fbi.cmdfifo[index].count_holes), index); + device->save_item(NAME(v->fbi.cmdfifo[index].base), index); + device->save_item(NAME(v->fbi.cmdfifo[index].end), index); + device->save_item(NAME(v->fbi.cmdfifo[index].rdptr), index); + device->save_item(NAME(v->fbi.cmdfifo[index].amin), index); + device->save_item(NAME(v->fbi.cmdfifo[index].amax), index); + device->save_item(NAME(v->fbi.cmdfifo[index].depth), index); + device->save_item(NAME(v->fbi.cmdfifo[index].holes), index); } - state_save_register_device_item_array(device, 0, v->fbi.fogblend); - state_save_register_device_item_array(device, 0, v->fbi.fogdelta); - state_save_register_device_item_array(device, 0, v->fbi.clut); + device->save_item(NAME(v->fbi.fogblend)); + device->save_item(NAME(v->fbi.fogdelta)); + device->save_item(NAME(v->fbi.clut)); /* register states: tmu */ for (index = 0; index < ARRAY_LENGTH(v->tmu); index++) @@ -775,39 +775,39 @@ static void init_save_state(device_t *device) if (tmu->ram == NULL) continue; if (tmu->ram != v->fbi.ram) - state_save_register_device_item_pointer(device, index, tmu->ram, tmu->mask + 1); - state_save_register_device_item(device, index, tmu->starts); - state_save_register_device_item(device, index, tmu->startt); - state_save_register_device_item(device, index, tmu->startw); - state_save_register_device_item(device, index, tmu->dsdx); - state_save_register_device_item(device, index, tmu->dtdx); - state_save_register_device_item(device, index, tmu->dwdx); - state_save_register_device_item(device, index, tmu->dsdy); - state_save_register_device_item(device, index, tmu->dtdy); - state_save_register_device_item(device, index, tmu->dwdy); + device->save_pointer(NAME(tmu->ram), tmu->mask + 1, index); + device->save_item(NAME(tmu->starts), index); + device->save_item(NAME(tmu->startt), index); + device->save_item(NAME(tmu->startw), index); + device->save_item(NAME(tmu->dsdx), index); + device->save_item(NAME(tmu->dtdx), index); + device->save_item(NAME(tmu->dwdx), index); + device->save_item(NAME(tmu->dsdy), index); + device->save_item(NAME(tmu->dtdy), index); + device->save_item(NAME(tmu->dwdy), index); for (subindex = 0; subindex < ARRAY_LENGTH(tmu->ncc); subindex++) { - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].ir); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].ig); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].ib); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].qr); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].qg); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].qb); - state_save_register_device_item_array(device, index * ARRAY_LENGTH(tmu->ncc) + subindex, tmu->ncc[subindex].y); + device->save_item(NAME(tmu->ncc[subindex].ir), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].ig), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].ib), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].qr), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].qg), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].qb), index * ARRAY_LENGTH(tmu->ncc) + subindex); + device->save_item(NAME(tmu->ncc[subindex].y), index * ARRAY_LENGTH(tmu->ncc) + subindex); } } /* register states: banshee */ if (v->type >= VOODOO_BANSHEE) { - state_save_register_device_item_array(device, 0, v->banshee.io); - state_save_register_device_item_array(device, 0, v->banshee.agp); - state_save_register_device_item_array(device, 0, v->banshee.vga); - state_save_register_device_item_array(device, 0, v->banshee.crtc); - state_save_register_device_item_array(device, 0, v->banshee.seq); - state_save_register_device_item_array(device, 0, v->banshee.gc); - state_save_register_device_item_array(device, 0, v->banshee.att); - state_save_register_device_item(device, 0, v->banshee.attff); + device->save_item(NAME(v->banshee.io)); + device->save_item(NAME(v->banshee.agp)); + device->save_item(NAME(v->banshee.vga)); + device->save_item(NAME(v->banshee.crtc)); + device->save_item(NAME(v->banshee.seq)); + device->save_item(NAME(v->banshee.gc)); + device->save_item(NAME(v->banshee.att)); + device->save_item(NAME(v->banshee.attff)); } } diff --git a/src/emu/watchdog.c b/src/emu/watchdog.c index a714973ac44..e495bc39dda 100644 --- a/src/emu/watchdog.c +++ b/src/emu/watchdog.c @@ -44,8 +44,8 @@ void watchdog_init(running_machine *machine) machine->add_notifier(MACHINE_NOTIFY_RESET, watchdog_internal_reset); /* save some stuff in the default tag */ - state_save_register_item(machine, "watchdog", NULL, 0, watchdog_enabled); - state_save_register_item(machine, "watchdog", NULL, 0, watchdog_counter); + machine->state().save_item(NAME(watchdog_enabled)); + machine->state().save_item(NAME(watchdog_counter)); } diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c index 838b7a22a9c..2a4e68ff834 100644 --- a/src/mame/audio/beezer.c +++ b/src/mame/audio/beezer.c @@ -242,34 +242,34 @@ static void sh6840_register_state_globals(device_t *device) { beezer_sound_state *state = get_safe_token(device); - state_save_register_device_item_array(device, 0, state->sh6840_volume); - state_save_register_device_item(device, 0, state->sh6840_MSB_latch); - state_save_register_device_item(device, 0, state->sh6840_LSB_latch); - state_save_register_device_item(device, 0, state->sh6840_LFSR); - state_save_register_device_item(device, 0, state->sh6840_LFSR_clocks); - state_save_register_device_item(device, 0, state->sh6840_clock_count); - state_save_register_device_item(device, 0, state->sh6840_latchwrite); - state_save_register_device_item(device, 0, state->sh6840_latchwriteold); - state_save_register_device_item(device, 0, state->sh6840_noiselatch1); - state_save_register_device_item(device, 0, state->sh6840_noiselatch3); - state_save_register_device_item(device, 0, state->sh6840_timer[0].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[0].state); - state_save_register_device_item(device, 0, state->sh6840_timer[0].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[0].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[0].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[0].counter.w); - state_save_register_device_item(device, 0, state->sh6840_timer[1].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[1].state); - state_save_register_device_item(device, 0, state->sh6840_timer[1].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[1].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[1].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[1].counter.w); - state_save_register_device_item(device, 0, state->sh6840_timer[2].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[2].state); - state_save_register_device_item(device, 0, state->sh6840_timer[2].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[2].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[2].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[2].counter.w); + device->save_item(NAME(state->sh6840_volume)); + device->save_item(NAME(state->sh6840_MSB_latch)); + device->save_item(NAME(state->sh6840_LSB_latch)); + device->save_item(NAME(state->sh6840_LFSR)); + device->save_item(NAME(state->sh6840_LFSR_clocks)); + device->save_item(NAME(state->sh6840_clock_count)); + device->save_item(NAME(state->sh6840_latchwrite)); + device->save_item(NAME(state->sh6840_latchwriteold)); + device->save_item(NAME(state->sh6840_noiselatch1)); + device->save_item(NAME(state->sh6840_noiselatch3)); + device->save_item(NAME(state->sh6840_timer[0].cr)); + device->save_item(NAME(state->sh6840_timer[0].state)); + device->save_item(NAME(state->sh6840_timer[0].leftovers)); + device->save_item(NAME(state->sh6840_timer[0].timer)); + device->save_item(NAME(state->sh6840_timer[0].clocks)); + device->save_item(NAME(state->sh6840_timer[0].counter.w)); + device->save_item(NAME(state->sh6840_timer[1].cr)); + device->save_item(NAME(state->sh6840_timer[1].state)); + device->save_item(NAME(state->sh6840_timer[1].leftovers)); + device->save_item(NAME(state->sh6840_timer[1].timer)); + device->save_item(NAME(state->sh6840_timer[1].clocks)); + device->save_item(NAME(state->sh6840_timer[1].counter.w)); + device->save_item(NAME(state->sh6840_timer[2].cr)); + device->save_item(NAME(state->sh6840_timer[2].state)); + device->save_item(NAME(state->sh6840_timer[2].leftovers)); + device->save_item(NAME(state->sh6840_timer[2].timer)); + device->save_item(NAME(state->sh6840_timer[2].clocks)); + device->save_item(NAME(state->sh6840_timer[2].counter.w)); } diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index 8d9934cf12e..21ff1ba6391 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -244,34 +244,34 @@ static void sh6840_register_state_globals(device_t *device) { exidy_sound_state *state = get_safe_token(device); - state_save_register_device_item_array(device, 0, state->sh6840_volume); - state_save_register_device_item(device, 0, state->sh6840_MSB_latch); - state_save_register_device_item(device, 0, state->sh6840_LSB_latch); - state_save_register_device_item(device, 0, state->sh6840_LFSR_oldxor); - state_save_register_device_item(device, 0, state->sh6840_LFSR_0); - state_save_register_device_item(device, 0, state->sh6840_LFSR_1); - state_save_register_device_item(device, 0, state->sh6840_LFSR_2); - state_save_register_device_item(device, 0, state->sh6840_LFSR_3); - state_save_register_device_item(device, 0, state->sh6840_clock_count); - state_save_register_device_item(device, 0, state->sfxctrl); - state_save_register_device_item(device, 0, state->sh6840_timer[0].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[0].state); - state_save_register_device_item(device, 0, state->sh6840_timer[0].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[0].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[0].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[0].counter.w); - state_save_register_device_item(device, 0, state->sh6840_timer[1].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[1].state); - state_save_register_device_item(device, 0, state->sh6840_timer[1].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[1].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[1].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[1].counter.w); - state_save_register_device_item(device, 0, state->sh6840_timer[2].cr); - state_save_register_device_item(device, 0, state->sh6840_timer[2].state); - state_save_register_device_item(device, 0, state->sh6840_timer[2].leftovers); - state_save_register_device_item(device, 0, state->sh6840_timer[2].timer); - state_save_register_device_item(device, 0, state->sh6840_timer[2].clocks); - state_save_register_device_item(device, 0, state->sh6840_timer[2].counter.w); + device->save_item(NAME(state->sh6840_volume)); + device->save_item(NAME(state->sh6840_MSB_latch)); + device->save_item(NAME(state->sh6840_LSB_latch)); + device->save_item(NAME(state->sh6840_LFSR_oldxor)); + device->save_item(NAME(state->sh6840_LFSR_0)); + device->save_item(NAME(state->sh6840_LFSR_1)); + device->save_item(NAME(state->sh6840_LFSR_2)); + device->save_item(NAME(state->sh6840_LFSR_3)); + device->save_item(NAME(state->sh6840_clock_count)); + device->save_item(NAME(state->sfxctrl)); + device->save_item(NAME(state->sh6840_timer[0].cr)); + device->save_item(NAME(state->sh6840_timer[0].state)); + device->save_item(NAME(state->sh6840_timer[0].leftovers)); + device->save_item(NAME(state->sh6840_timer[0].timer)); + device->save_item(NAME(state->sh6840_timer[0].clocks)); + device->save_item(NAME(state->sh6840_timer[0].counter.w)); + device->save_item(NAME(state->sh6840_timer[1].cr)); + device->save_item(NAME(state->sh6840_timer[1].state)); + device->save_item(NAME(state->sh6840_timer[1].leftovers)); + device->save_item(NAME(state->sh6840_timer[1].timer)); + device->save_item(NAME(state->sh6840_timer[1].clocks)); + device->save_item(NAME(state->sh6840_timer[1].counter.w)); + device->save_item(NAME(state->sh6840_timer[2].cr)); + device->save_item(NAME(state->sh6840_timer[2].state)); + device->save_item(NAME(state->sh6840_timer[2].leftovers)); + device->save_item(NAME(state->sh6840_timer[2].timer)); + device->save_item(NAME(state->sh6840_timer[2].clocks)); + device->save_item(NAME(state->sh6840_timer[2].counter.w)); } @@ -559,21 +559,21 @@ static void sh8253_register_state_globals(device_t *device) { exidy_sound_state *state = get_safe_token(device); - state_save_register_device_item(device, 0, state->sh8253_timer[0].clstate); - state_save_register_device_item(device, 0, state->sh8253_timer[0].enable); - state_save_register_device_item(device, 0, state->sh8253_timer[0].count); - state_save_register_device_item(device, 0, state->sh8253_timer[0].step); - state_save_register_device_item(device, 0, state->sh8253_timer[0].fraction); - state_save_register_device_item(device, 0, state->sh8253_timer[1].clstate); - state_save_register_device_item(device, 0, state->sh8253_timer[1].enable); - state_save_register_device_item(device, 0, state->sh8253_timer[1].count); - state_save_register_device_item(device, 0, state->sh8253_timer[1].step); - state_save_register_device_item(device, 0, state->sh8253_timer[1].fraction); - state_save_register_device_item(device, 0, state->sh8253_timer[2].clstate); - state_save_register_device_item(device, 0, state->sh8253_timer[2].enable); - state_save_register_device_item(device, 0, state->sh8253_timer[2].count); - state_save_register_device_item(device, 0, state->sh8253_timer[2].step); - state_save_register_device_item(device, 0, state->sh8253_timer[2].fraction); + device->save_item(NAME(state->sh8253_timer[0].clstate)); + device->save_item(NAME(state->sh8253_timer[0].enable)); + device->save_item(NAME(state->sh8253_timer[0].count)); + device->save_item(NAME(state->sh8253_timer[0].step)); + device->save_item(NAME(state->sh8253_timer[0].fraction)); + device->save_item(NAME(state->sh8253_timer[1].clstate)); + device->save_item(NAME(state->sh8253_timer[1].enable)); + device->save_item(NAME(state->sh8253_timer[1].count)); + device->save_item(NAME(state->sh8253_timer[1].step)); + device->save_item(NAME(state->sh8253_timer[1].fraction)); + device->save_item(NAME(state->sh8253_timer[2].clstate)); + device->save_item(NAME(state->sh8253_timer[2].enable)); + device->save_item(NAME(state->sh8253_timer[2].count)); + device->save_item(NAME(state->sh8253_timer[2].step)); + device->save_item(NAME(state->sh8253_timer[2].fraction)); } /************************************* @@ -818,7 +818,7 @@ static DEVICE_START( venture_common_sh_start ) /* 8253 */ state->freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK; - state_save_register_device_item(device, 0, state->riot_irq_state); + device->save_item(NAME(state->riot_irq_state)); sh8253_register_state_globals(device); } @@ -1057,7 +1057,7 @@ static DEVICE_START( victory_sound ) { exidy_sound_state *state = get_safe_token(device); - state_save_register_device_item(device, 0, state->victory_sound_response_ack_clk); + device->save_item(NAME(state->victory_sound_response_ack_clk)); DEVICE_START_CALL(venture_common_sh_start); state->tms = device->machine->device("tms"); diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c index d75ae7e1194..d8f9f501a44 100644 --- a/src/mame/audio/flower.c +++ b/src/mame/audio/flower.c @@ -191,8 +191,8 @@ static DEVICE_START( flower_sound ) state->sound_enable = 1; /* save globals */ - state_save_register_device_item(device, 0, state->num_voices); - state_save_register_device_item(device, 0, state->sound_enable); + device->save_item(NAME(state->num_voices)); + device->save_item(NAME(state->sound_enable)); /* reset all the voices */ for (i = 0; i < state->num_voices; i++) @@ -204,12 +204,12 @@ static DEVICE_START( flower_sound ) voice->counter = 0; voice->rom_offset = 0; - state_save_register_device_item(device, i+1, voice->frequency); - state_save_register_device_item(device, i+1, voice->counter); - state_save_register_device_item(device, i+1, voice->volume); - state_save_register_device_item(device, i+1, voice->oneshot); - state_save_register_device_item(device, i+1, voice->oneshotplaying); - state_save_register_device_item(device, i+1, voice->rom_offset); + device->save_item(NAME(voice->frequency), i+1); + device->save_item(NAME(voice->counter), i+1); + device->save_item(NAME(voice->volume), i+1); + device->save_item(NAME(voice->oneshot), i+1); + device->save_item(NAME(voice->oneshotplaying), i+1); + device->save_item(NAME(voice->rom_offset), i+1); } } diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c index 73397b556a2..64d12ebe54c 100644 --- a/src/mame/audio/hyprolyb.c +++ b/src/mame/audio/hyprolyb.c @@ -27,9 +27,9 @@ static DEVICE_START( hyprolyb_adpcm ) state->space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM); state->msm = device->machine->device("msm"); - state_save_register_device_item(device, 0, state->adpcm_ready); // only bootlegs - state_save_register_device_item(device, 0, state->adpcm_busy); - state_save_register_device_item(device, 0, state->vck_ready); + device->save_item(NAME(state->adpcm_ready)); // only bootlegs + device->save_item(NAME(state->adpcm_busy)); + device->save_item(NAME(state->vck_ready)); } diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 79ed950987a..b9f68704294 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -48,8 +48,8 @@ static DEVICE_START( irem_audio ) state->ay1 = machine->device("ay1"); state->ay2 = machine->device("ay2"); - state_save_register_device_item(device, 0, state->port1); - state_save_register_device_item(device, 0, state->port2); + device->save_item(NAME(state->port1)); + device->save_item(NAME(state->port2)); } diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c index 48f3290efc7..d2cc6e7c4ea 100644 --- a/src/mame/audio/phoenix.c +++ b/src/mame/audio/phoenix.c @@ -510,17 +510,17 @@ static void register_state(device_t *device) { phoenix_sound_state *state = get_safe_token(device); - state_save_register_device_item(device, 0, state->sound_latch_a); - state_save_register_device_item(device, 0, state->c24_state.counter); - state_save_register_device_item(device, 0, state->c24_state.level); - state_save_register_device_item(device, 0, state->c25_state.counter); - state_save_register_device_item(device, 0, state->c25_state.level); - state_save_register_device_item(device, 0, state->noise_state.counter); - state_save_register_device_item(device, 0, state->noise_state.polybit); - state_save_register_device_item(device, 0, state->noise_state.polyoffs); - state_save_register_device_item(device, 0, state->noise_state.lowpass_counter); - state_save_register_device_item(device, 0, state->noise_state.lowpass_polybit); - state_save_register_device_item_pointer(device, 0, state->poly18, (1ul << (18-5))); + device->save_item(NAME(state->sound_latch_a)); + device->save_item(NAME(state->c24_state.counter)); + device->save_item(NAME(state->c24_state.level)); + device->save_item(NAME(state->c25_state.counter)); + device->save_item(NAME(state->c25_state.level)); + device->save_item(NAME(state->noise_state.counter)); + device->save_item(NAME(state->noise_state.polybit)); + device->save_item(NAME(state->noise_state.polyoffs)); + device->save_item(NAME(state->noise_state.lowpass_counter)); + device->save_item(NAME(state->noise_state.lowpass_polybit)); + device->save_pointer(NAME(state->poly18), (1ul << (18-5))); } WRITE8_DEVICE_HANDLER( phoenix_sound_control_b_w ) diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c index 601074c5942..bbbd623351d 100644 --- a/src/mame/audio/snes_snd.c +++ b/src/mame/audio/snes_snd.c @@ -1261,46 +1261,46 @@ static void state_register( device_t *device ) snes_sound_state *spc700 = get_safe_token(device); int v; - state_save_register_device_item_array(device, 0, spc700->dsp_regs); - state_save_register_device_item_array(device, 0, spc700->ipl_region); + device->save_item(NAME(spc700->dsp_regs)); + device->save_item(NAME(spc700->ipl_region)); - state_save_register_device_item(device, 0, spc700->keyed_on); - state_save_register_device_item(device, 0, spc700->keys); + device->save_item(NAME(spc700->keyed_on)); + device->save_item(NAME(spc700->keys)); - state_save_register_device_item(device, 0, spc700->noise_cnt); - state_save_register_device_item(device, 0, spc700->noise_lev); + device->save_item(NAME(spc700->noise_cnt)); + device->save_item(NAME(spc700->noise_lev)); #ifndef NO_ECHO - state_save_register_device_item_array(device, 0, spc700->fir_lbuf); - state_save_register_device_item_array(device, 0, spc700->fir_rbuf); - state_save_register_device_item(device, 0, spc700->fir_ptr); - state_save_register_device_item(device, 0, spc700->echo_ptr); + device->save_item(NAME(spc700->fir_lbuf)); + device->save_item(NAME(spc700->fir_rbuf)); + device->save_item(NAME(spc700->fir_ptr)); + device->save_item(NAME(spc700->echo_ptr)); #endif - state_save_register_device_item_array(device, 0, spc700->enabled); - state_save_register_device_item_array(device, 0, spc700->counter); - state_save_register_device_item_array(device, 0, spc700->port_in); - state_save_register_device_item_array(device, 0, spc700->port_out); + device->save_item(NAME(spc700->enabled)); + device->save_item(NAME(spc700->counter)); + device->save_item(NAME(spc700->port_in)); + device->save_item(NAME(spc700->port_out)); for (v = 0; v < 8; v++) { - state_save_register_device_item(device, v, spc700->voice_state[v].mem_ptr); - state_save_register_device_item(device, v, spc700->voice_state[v].end); - state_save_register_device_item(device, v, spc700->voice_state[v].envcnt); - state_save_register_device_item(device, v, spc700->voice_state[v].envstate); - state_save_register_device_item(device, v, spc700->voice_state[v].envx); - state_save_register_device_item(device, v, spc700->voice_state[v].filter); - state_save_register_device_item(device, v, spc700->voice_state[v].half); - state_save_register_device_item(device, v, spc700->voice_state[v].header_cnt); - state_save_register_device_item(device, v, spc700->voice_state[v].mixfrac); - state_save_register_device_item(device, v, spc700->voice_state[v].on_cnt); - state_save_register_device_item(device, v, spc700->voice_state[v].pitch); - state_save_register_device_item(device, v, spc700->voice_state[v].range); - state_save_register_device_item(device, v, spc700->voice_state[v].samp_id); - state_save_register_device_item(device, v, spc700->voice_state[v].sampptr); - state_save_register_device_item(device, v, spc700->voice_state[v].smp1); - state_save_register_device_item(device, v, spc700->voice_state[v].smp2); - state_save_register_device_item_array(device, v, spc700->voice_state[v].sampbuf); + device->save_item(NAME(spc700->voice_state[v].mem_ptr), v); + device->save_item(NAME(spc700->voice_state[v].end), v); + device->save_item(NAME(spc700->voice_state[v].envcnt), v); + device->save_item(NAME(spc700->voice_state[v].envstate), v); + device->save_item(NAME(spc700->voice_state[v].envx), v); + device->save_item(NAME(spc700->voice_state[v].filter), v); + device->save_item(NAME(spc700->voice_state[v].half), v); + device->save_item(NAME(spc700->voice_state[v].header_cnt), v); + device->save_item(NAME(spc700->voice_state[v].mixfrac), v); + device->save_item(NAME(spc700->voice_state[v].on_cnt), v); + device->save_item(NAME(spc700->voice_state[v].pitch), v); + device->save_item(NAME(spc700->voice_state[v].range), v); + device->save_item(NAME(spc700->voice_state[v].samp_id), v); + device->save_item(NAME(spc700->voice_state[v].sampptr), v); + device->save_item(NAME(spc700->voice_state[v].smp1), v); + device->save_item(NAME(spc700->voice_state[v].smp2), v); + device->save_item(NAME(spc700->voice_state[v].sampbuf), v); } } @@ -1331,7 +1331,7 @@ static DEVICE_START( snes_sound ) spc700->timer[2]->enable(false); state_register(device); - state_save_register_device_item_pointer(device, 0, spc700->ram, SNES_SPCRAM_SIZE); + device->save_pointer(NAME(spc700->ram), SNES_SPCRAM_SIZE); } static DEVICE_RESET( snes_sound ) diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c index da113b3116d..e7ad0f750db 100644 --- a/src/mame/audio/taitosnd.c +++ b/src/mame/audio/taitosnd.c @@ -293,13 +293,13 @@ static DEVICE_START( tc0140syt ) tc0140syt->mastercpu = device->machine->device(intf->master); tc0140syt->slavecpu = device->machine->device(intf->slave); - state_save_register_device_item(device, 0, tc0140syt->mainmode); - state_save_register_device_item(device, 0, tc0140syt->submode); - state_save_register_device_item(device, 0, tc0140syt->status); - state_save_register_device_item(device, 0, tc0140syt->nmi_enabled); - state_save_register_device_item(device, 0, tc0140syt->nmi_req); - state_save_register_device_item_array(device, 0, tc0140syt->slavedata); - state_save_register_device_item_array(device, 0, tc0140syt->masterdata); + device->save_item(NAME(tc0140syt->mainmode)); + device->save_item(NAME(tc0140syt->submode)); + device->save_item(NAME(tc0140syt->status)); + device->save_item(NAME(tc0140syt->nmi_enabled)); + device->save_item(NAME(tc0140syt->nmi_req)); + device->save_item(NAME(tc0140syt->slavedata)); + device->save_item(NAME(tc0140syt->masterdata)); } static DEVICE_RESET( tc0140syt ) diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index 44da1ce6f6d..6b61412ac13 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -62,7 +62,7 @@ static DEVICE_START( timeplt_audio ) state->filter_1_2 = machine->device("filter.1.2"); state->last_irq_state = 0; - state_save_register_device_item(device, 0, state->last_irq_state); + device->save_item(NAME(state->last_irq_state)); } diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c index 9c6346d5b4e..b6631a5435d 100644 --- a/src/mame/audio/trackfld.c +++ b/src/mame/audio/trackfld.c @@ -46,9 +46,9 @@ static DEVICE_START( trackfld_audio ) state->vlm = device->machine->device("vlm"); /* sound */ - state_save_register_device_item(device, 0, state->SN76496_latch); - state_save_register_device_item(device, 0, state->last_addr); - state_save_register_device_item(device, 0, state->last_irq); + device->save_item(NAME(state->SN76496_latch)); + device->save_item(NAME(state->last_addr)); + device->save_item(NAME(state->last_irq)); } static DEVICE_RESET( trackfld_audio ) diff --git a/src/mame/machine/atari_vg.c b/src/mame/machine/atari_vg.c index a4cbe6de49b..355505c8c88 100644 --- a/src/mame/machine/atari_vg.c +++ b/src/mame/machine/atari_vg.c @@ -116,8 +116,8 @@ static DEVICE_START( atari_vg_earom ) earom->device = device; /* register for save states */ - state_save_register_device_item(device, 0, earom->offset); - state_save_register_device_item(device, 0, earom->data); + device->save_item(NAME(earom->offset)); + device->save_item(NAME(earom->data)); } diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 2dd279d1267..5bd196afe51 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -1562,8 +1562,8 @@ void atarigen_state::machine_start() // until everyone is converted to modern devices, call our parent driver_device::machine_start(); - state_save_register_device_item(this, 0, m_earom_data); - state_save_register_device_item(this, 0, m_earom_control); + save_item(NAME(m_earom_data)); + save_item(NAME(m_earom_control)); } diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c index 0046b28e36c..3f45ad14f93 100644 --- a/src/mame/machine/buggychl.c +++ b/src/mame/machine/buggychl.c @@ -193,19 +193,19 @@ static DEVICE_START( buggychl_mcu ) state->mcu = device->machine->device("mcu"); - state_save_register_device_item(device, 0, state->from_main); - state_save_register_device_item(device, 0, state->from_mcu); - state_save_register_device_item(device, 0, state->mcu_sent); - state_save_register_device_item(device, 0, state->main_sent); - state_save_register_device_item(device, 0, state->port_a_in); - state_save_register_device_item(device, 0, state->port_a_out); - state_save_register_device_item(device, 0, state->ddr_a); - state_save_register_device_item(device, 0, state->port_b_in); - state_save_register_device_item(device, 0, state->port_b_out); - state_save_register_device_item(device, 0, state->ddr_b); - state_save_register_device_item(device, 0, state->port_c_in); - state_save_register_device_item(device, 0, state->port_c_out); - state_save_register_device_item(device, 0, state->ddr_c); + device->save_item(NAME(state->from_main)); + device->save_item(NAME(state->from_mcu)); + device->save_item(NAME(state->mcu_sent)); + device->save_item(NAME(state->main_sent)); + device->save_item(NAME(state->port_a_in)); + device->save_item(NAME(state->port_a_out)); + device->save_item(NAME(state->ddr_a)); + device->save_item(NAME(state->port_b_in)); + device->save_item(NAME(state->port_b_out)); + device->save_item(NAME(state->ddr_b)); + device->save_item(NAME(state->port_c_in)); + device->save_item(NAME(state->port_c_out)); + device->save_item(NAME(state->ddr_c)); } static DEVICE_RESET( buggychl_mcu ) diff --git a/src/mame/machine/cdicdic.c b/src/mame/machine/cdicdic.c index fdd91a8d84a..24084022185 100644 --- a/src/mame/machine/cdicdic.c +++ b/src/mame/machine/cdicdic.c @@ -1271,20 +1271,20 @@ void cdicdic_device::init() void cdicdic_device::register_globals() { - state_save_register_device_item(this, 0, m_command); - state_save_register_device_item(this, 0, m_time); - state_save_register_device_item(this, 0, m_file); - state_save_register_device_item(this, 0, m_channel); - state_save_register_device_item(this, 0, m_audio_channel); - state_save_register_device_item(this, 0, m_audio_buffer); - state_save_register_device_item(this, 0, m_x_buffer); - state_save_register_device_item(this, 0, m_dma_control); - state_save_register_device_item(this, 0, m_z_buffer); - state_save_register_device_item(this, 0, m_interrupt_vector); - state_save_register_device_item(this, 0, m_data_buffer); - - state_save_register_device_item(this, 0, m_audio_sample_freq); - state_save_register_device_item(this, 0, m_audio_sample_size); + save_item(NAME(m_command)); + save_item(NAME(m_time)); + save_item(NAME(m_file)); + save_item(NAME(m_channel)); + save_item(NAME(m_audio_channel)); + save_item(NAME(m_audio_buffer)); + save_item(NAME(m_x_buffer)); + save_item(NAME(m_dma_control)); + save_item(NAME(m_z_buffer)); + save_item(NAME(m_interrupt_vector)); + save_item(NAME(m_data_buffer)); + + save_item(NAME(m_audio_sample_freq)); + save_item(NAME(m_audio_sample_size)); } WRITE16_DEVICE_HANDLER( cdic_ram_w ) diff --git a/src/mame/machine/cdislave.c b/src/mame/machine/cdislave.c index e79838015d8..52c01f0d2fe 100644 --- a/src/mame/machine/cdislave.c +++ b/src/mame/machine/cdislave.c @@ -519,50 +519,50 @@ void cdislave_device::init() void cdislave_device::register_globals() { - state_save_register_device_item(this, 0, m_channel[0].m_out_buf[0]); - state_save_register_device_item(this, 0, m_channel[0].m_out_buf[1]); - state_save_register_device_item(this, 0, m_channel[0].m_out_buf[2]); - state_save_register_device_item(this, 0, m_channel[0].m_out_buf[3]); - state_save_register_device_item(this, 0, m_channel[0].m_out_index); - state_save_register_device_item(this, 0, m_channel[0].m_out_count); - state_save_register_device_item(this, 0, m_channel[0].m_out_cmd); - state_save_register_device_item(this, 0, m_channel[1].m_out_buf[0]); - state_save_register_device_item(this, 0, m_channel[1].m_out_buf[1]); - state_save_register_device_item(this, 0, m_channel[1].m_out_buf[2]); - state_save_register_device_item(this, 0, m_channel[1].m_out_buf[3]); - state_save_register_device_item(this, 0, m_channel[1].m_out_index); - state_save_register_device_item(this, 0, m_channel[1].m_out_count); - state_save_register_device_item(this, 0, m_channel[1].m_out_cmd); - state_save_register_device_item(this, 0, m_channel[2].m_out_buf[0]); - state_save_register_device_item(this, 0, m_channel[2].m_out_buf[1]); - state_save_register_device_item(this, 0, m_channel[2].m_out_buf[2]); - state_save_register_device_item(this, 0, m_channel[2].m_out_buf[3]); - state_save_register_device_item(this, 0, m_channel[2].m_out_index); - state_save_register_device_item(this, 0, m_channel[2].m_out_count); - state_save_register_device_item(this, 0, m_channel[2].m_out_cmd); - state_save_register_device_item(this, 0, m_channel[3].m_out_buf[0]); - state_save_register_device_item(this, 0, m_channel[3].m_out_buf[1]); - state_save_register_device_item(this, 0, m_channel[3].m_out_buf[2]); - state_save_register_device_item(this, 0, m_channel[3].m_out_buf[3]); - state_save_register_device_item(this, 0, m_channel[3].m_out_index); - state_save_register_device_item(this, 0, m_channel[3].m_out_count); - state_save_register_device_item(this, 0, m_channel[3].m_out_cmd); - - state_save_register_device_item_array(this, 0, m_in_buf); - state_save_register_device_item(this, 0, m_in_index); - state_save_register_device_item(this, 0, m_in_count); - - state_save_register_device_item(this, 0, m_polling_active); - - state_save_register_device_item(this, 0, m_xbus_interrupt_enable); - - state_save_register_device_item_array(this, 0, m_lcd_state); - - state_save_register_device_item(this, 0, m_real_mouse_x); - state_save_register_device_item(this, 0, m_real_mouse_y); - - state_save_register_device_item(this, 0, m_fake_mouse_x); - state_save_register_device_item(this, 0, m_fake_mouse_y); + save_item(NAME(m_channel[0].m_out_buf[0])); + save_item(NAME(m_channel[0].m_out_buf[1])); + save_item(NAME(m_channel[0].m_out_buf[2])); + save_item(NAME(m_channel[0].m_out_buf[3])); + save_item(NAME(m_channel[0].m_out_index)); + save_item(NAME(m_channel[0].m_out_count)); + save_item(NAME(m_channel[0].m_out_cmd)); + save_item(NAME(m_channel[1].m_out_buf[0])); + save_item(NAME(m_channel[1].m_out_buf[1])); + save_item(NAME(m_channel[1].m_out_buf[2])); + save_item(NAME(m_channel[1].m_out_buf[3])); + save_item(NAME(m_channel[1].m_out_index)); + save_item(NAME(m_channel[1].m_out_count)); + save_item(NAME(m_channel[1].m_out_cmd)); + save_item(NAME(m_channel[2].m_out_buf[0])); + save_item(NAME(m_channel[2].m_out_buf[1])); + save_item(NAME(m_channel[2].m_out_buf[2])); + save_item(NAME(m_channel[2].m_out_buf[3])); + save_item(NAME(m_channel[2].m_out_index)); + save_item(NAME(m_channel[2].m_out_count)); + save_item(NAME(m_channel[2].m_out_cmd)); + save_item(NAME(m_channel[3].m_out_buf[0])); + save_item(NAME(m_channel[3].m_out_buf[1])); + save_item(NAME(m_channel[3].m_out_buf[2])); + save_item(NAME(m_channel[3].m_out_buf[3])); + save_item(NAME(m_channel[3].m_out_index)); + save_item(NAME(m_channel[3].m_out_count)); + save_item(NAME(m_channel[3].m_out_cmd)); + + save_item(NAME(m_in_buf)); + save_item(NAME(m_in_index)); + save_item(NAME(m_in_count)); + + save_item(NAME(m_polling_active)); + + save_item(NAME(m_xbus_interrupt_enable)); + + save_item(NAME(m_lcd_state)); + + save_item(NAME(m_real_mouse_x)); + save_item(NAME(m_real_mouse_y)); + + save_item(NAME(m_fake_mouse_x)); + save_item(NAME(m_fake_mouse_y)); } const device_type MACHINE_CDISLAVE = cdislave_device_config::static_alloc_device_config; diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index 79b87fa2555..2420b4849c5 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -2211,9 +2211,9 @@ static DEVICE_START( decocass_tape ) } /* register states */ - state_save_register_device_item(device, 0, tape->speed); - state_save_register_device_item(device, 0, tape->bitnum); - state_save_register_device_item(device, 0, tape->clockpos); + device->save_item(NAME(tape->speed)); + device->save_item(NAME(tape->bitnum)); + device->save_item(NAME(tape->clockpos)); } diff --git a/src/mame/machine/gaelco3d.c b/src/mame/machine/gaelco3d.c index a8ef5d3175f..7b1be614a0a 100644 --- a/src/mame/machine/gaelco3d.c +++ b/src/mame/machine/gaelco3d.c @@ -468,8 +468,8 @@ static DEVICE_START( gaelco_serial ) state->sync_timer = device->machine->scheduler().timer_alloc(FUNC(link_cb), state); /* register for save states */ - //state_save_register_device_item(device, 0, earom->offset); - //state_save_register_device_item(device, 0, earom->data); + //device->save_item(NAME(earom->offset)); + //device->save_item(NAME(earom->data)); #ifdef SHARED_MEM_DRIVER state->sync_timer->adjust(attotime::zero,0,attotime::from_hz(SYNC_FREQ)); diff --git a/src/mame/machine/mathbox.c b/src/mame/machine/mathbox.c index 9c911835859..3ee043afe88 100644 --- a/src/mame/machine/mathbox.c +++ b/src/mame/machine/mathbox.c @@ -324,8 +324,8 @@ static DEVICE_START( mathbox ) mb->device = device; /* register for save states */ - state_save_register_device_item(device, 0, mb->result); - state_save_register_device_item_array(device, 0, mb->reg); + device->save_item(NAME(mb->result)); + device->save_item(NAME(mb->reg)); } diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c index 9a3712a47f5..43a4eba28fe 100644 --- a/src/mame/machine/namco06.c +++ b/src/mame/machine/namco06.c @@ -273,7 +273,7 @@ static DEVICE_START( namco_06xx ) /* allocate a timer */ state->nmi_timer = device->machine->scheduler().timer_alloc(FUNC(nmi_generate), (void *)device); - state_save_register_device_item(device, 0, state->control); + device->save_item(NAME(state->control)); } diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c index 265fbeb4eb5..9f0cdf68fc9 100644 --- a/src/mame/machine/namco50.c +++ b/src/mame/machine/namco50.c @@ -286,9 +286,9 @@ static DEVICE_START( namco_50xx ) state->cpu = device->subdevice("mcu"); assert(state->cpu != NULL); - state_save_register_device_item(device, 0, state->latched_cmd); - state_save_register_device_item(device, 0, state->latched_rw); - state_save_register_device_item(device, 0, state->portO); + device->save_item(NAME(state->latched_cmd)); + device->save_item(NAME(state->latched_rw)); + device->save_item(NAME(state->portO)); } diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c index fdecaf6b51c..8f05318abc5 100644 --- a/src/mame/machine/namco51.c +++ b/src/mame/machine/namco51.c @@ -404,16 +404,16 @@ static DEVICE_START( namco_51xx ) INT32 in_count; INT32 mode,coincred_mode,remap_joy; #endif - state_save_register_device_item(device, 0, state->lastcoins); - state_save_register_device_item(device, 0, state->lastbuttons); - state_save_register_device_item(device, 0, state->credits); - state_save_register_device_item_array(device, 0, state->coins); - state_save_register_device_item_array(device, 0, state->coins_per_cred); - state_save_register_device_item_array(device, 0, state->creds_per_coin); - state_save_register_device_item(device, 0, state->in_count); - state_save_register_device_item(device, 0, state->mode); - state_save_register_device_item(device, 0, state->coincred_mode); - state_save_register_device_item(device, 0, state->remap_joy); + device->save_item(NAME(state->lastcoins)); + device->save_item(NAME(state->lastbuttons)); + device->save_item(NAME(state->credits)); + device->save_item(NAME(state->coins)); + device->save_item(NAME(state->coins_per_cred)); + device->save_item(NAME(state->creds_per_coin)); + device->save_item(NAME(state->in_count)); + device->save_item(NAME(state->mode)); + device->save_item(NAME(state->coincred_mode)); + device->save_item(NAME(state->remap_joy)); } diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c index 0db99af2c75..eadefa985e7 100644 --- a/src/mame/machine/namco53.c +++ b/src/mame/machine/namco53.c @@ -188,7 +188,7 @@ static DEVICE_START( namco_53xx ) devcb_resolve_read8(&state->in[3], &config->in[3], device); devcb_resolve_write8(&state->p, &config->p, device); - state_save_register_device_item(device, 0, state->portO); + device->save_item(NAME(state->portO)); } diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c index 75f56506d82..32bb6d35fd6 100644 --- a/src/mame/machine/namcoio.c +++ b/src/mame/machine/namcoio.c @@ -521,15 +521,15 @@ static DEVICE_START( namcoio ) devcb_resolve_write8(&namcoio->out[0], &intf->out[0], device); devcb_resolve_write8(&namcoio->out[1], &intf->out[1], device); - state_save_register_device_item_array(device, 0, namcoio->ram); - state_save_register_device_item(device, 0, namcoio->reset); - state_save_register_device_item(device, 0, namcoio->lastcoins); - state_save_register_device_item(device, 0, namcoio->lastbuttons); - state_save_register_device_item(device, 0, namcoio->credits); - state_save_register_device_item_array(device, 0, namcoio->coins); - state_save_register_device_item_array(device, 0, namcoio->coins_per_cred); - state_save_register_device_item_array(device, 0, namcoio->creds_per_coin); - state_save_register_device_item(device, 0, namcoio->in_count); + device->save_item(NAME(namcoio->ram)); + device->save_item(NAME(namcoio->reset)); + device->save_item(NAME(namcoio->lastcoins)); + device->save_item(NAME(namcoio->lastbuttons)); + device->save_item(NAME(namcoio->credits)); + device->save_item(NAME(namcoio->coins)); + device->save_item(NAME(namcoio->coins_per_cred)); + device->save_item(NAME(namcoio->creds_per_coin)); + device->save_item(NAME(namcoio->in_count)); } diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c index 53dbdc6a4ab..4acf2ab2dc2 100644 --- a/src/mame/machine/naomibd.c +++ b/src/mame/machine/naomibd.c @@ -416,16 +416,16 @@ static void init_save_state(device_t *device) device->machine->state().register_postload(naomibd_postload, v); /* register states */ - state_save_register_device_item(device, 0, v->rom_offset); - state_save_register_device_item(device, 0, v->rom_offset_flags); - state_save_register_device_item(device, 0, v->dma_count); - state_save_register_device_item(device, 0, v->dma_offset); - state_save_register_device_item(device, 0, v->dma_offset_flags); - state_save_register_device_item(device, 0, v->prot_offset); - state_save_register_device_item(device, 0, v->prot_key); - state_save_register_device_item(device, 0, v->aw_offset); - state_save_register_device_item(device, 0, v->aw_file_base); - state_save_register_device_item(device, 0, v->aw_file_offset); + device->save_item(NAME(v->rom_offset)); + device->save_item(NAME(v->rom_offset_flags)); + device->save_item(NAME(v->dma_count)); + device->save_item(NAME(v->dma_offset)); + device->save_item(NAME(v->dma_offset_flags)); + device->save_item(NAME(v->prot_offset)); + device->save_item(NAME(v->prot_key)); + device->save_item(NAME(v->aw_offset)); + device->save_item(NAME(v->aw_file_base)); + device->save_item(NAME(v->aw_file_offset)); } diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c index eef608bbdcd..269f6be37a0 100644 --- a/src/mame/machine/nmk112.c +++ b/src/mame/machine/nmk112.c @@ -139,7 +139,7 @@ static DEVICE_START( nmk112 ) nmk112->page_mask = ~intf->disable_page_mask; - state_save_register_device_item_array(device, 0, nmk112->current_bank); + device->save_item(NAME(nmk112->current_bank)); device->machine->state().register_postload(nmk112_postload_bankswitch, nmk112); } diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c index 67aec52a6b9..819a090f48b 100644 --- a/src/mame/machine/segaic16.c +++ b/src/mame/machine/segaic16.c @@ -465,7 +465,7 @@ static DEVICE_START( ic_315_5248 ) { ic_315_5248_state *ic_315_5248 = _315_5248_get_safe_token(device); - state_save_register_device_item_array(device, 0, ic_315_5248->regs); + device->save_item(NAME(ic_315_5248->regs)); } static DEVICE_RESET( ic_315_5248 ) @@ -619,7 +619,7 @@ static DEVICE_START( ic_315_5249 ) { ic_315_5249_state *ic_315_5249 = _315_5249_get_safe_token(device); - state_save_register_device_item_array(device, 0, ic_315_5249->regs); + device->save_item(NAME(ic_315_5249->regs)); } static DEVICE_RESET( ic_315_5249 ) @@ -792,9 +792,9 @@ static DEVICE_START( ic_315_5250 ) ic_315_5250->sound_w = intf->sound_write_callback; ic_315_5250->timer_ack = intf->timer_ack_callback; - state_save_register_device_item(device, 0, ic_315_5250->counter); - state_save_register_device_item(device, 0, ic_315_5250->bit); - state_save_register_device_item_array(device, 0, ic_315_5250->regs); + device->save_item(NAME(ic_315_5250->counter)); + device->save_item(NAME(ic_315_5250->bit)); + device->save_item(NAME(ic_315_5250->regs)); } static DEVICE_RESET( ic_315_5250 ) diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c index 4bfa0060007..3ef25648b5b 100644 --- a/src/mame/machine/taitoio.c +++ b/src/mame/machine/taitoio.c @@ -188,8 +188,8 @@ static DEVICE_START( tc0220ioc ) devcb_resolve_read8(&tc0220ioc->read_3, &intf->read_3, device); devcb_resolve_read8(&tc0220ioc->read_7, &intf->read_7, device); - state_save_register_device_item_array(device, 0, tc0220ioc->regs); - state_save_register_device_item(device, 0, tc0220ioc->port); + device->save_item(NAME(tc0220ioc->regs)); + device->save_item(NAME(tc0220ioc->port)); } static DEVICE_RESET( tc0220ioc ) @@ -343,7 +343,7 @@ static DEVICE_START( tc0510nio ) devcb_resolve_read8(&tc0510nio->read_3, &intf->read_3, device); devcb_resolve_read8(&tc0510nio->read_7, &intf->read_7, device); - state_save_register_device_item_array(device, 0, tc0510nio->regs); + device->save_item(NAME(tc0510nio->regs)); } static DEVICE_RESET( tc0510nio ) @@ -498,7 +498,7 @@ static DEVICE_START( tc0640fio ) devcb_resolve_read8(&tc0640fio->read_3, &intf->read_3, device); devcb_resolve_read8(&tc0640fio->read_7, &intf->read_7, device); - state_save_register_device_item_array(device, 0, tc0640fio->regs); + device->save_item(NAME(tc0640fio->regs)); } static DEVICE_RESET( tc0640fio ) diff --git a/src/mame/machine/ticket.c b/src/mame/machine/ticket.c index d224f6cabe1..a5df5fc2992 100644 --- a/src/mame/machine/ticket.c +++ b/src/mame/machine/ticket.c @@ -135,8 +135,8 @@ static DEVICE_START( ticket ) state->timer = device->machine->scheduler().timer_alloc(FUNC(ticket_dispenser_toggle), (void *)device); - state_save_register_device_item(device, 0, state->status); - state_save_register_device_item(device, 0, state->power); + device->save_item(NAME(state->status)); + device->save_item(NAME(state->power)); } diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index e0d104b18f2..4111c6af29d 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -1308,31 +1308,31 @@ static DEVICE_START( deco16ic ) deco16ic->pf12_control = auto_alloc_array_clear(device->machine, UINT16, 0x10 / 2); deco16ic->pf34_control = auto_alloc_array_clear(device->machine, UINT16, 0x10 / 2); - state_save_register_device_item(device, 0, deco16ic->priority); - state_save_register_device_item(device, 0, deco16ic->raster_display_position); - state_save_register_device_item(device, 0, deco16ic->use_custom_pf1); - state_save_register_device_item(device, 0, deco16ic->use_custom_pf2); - state_save_register_device_item(device, 0, deco16ic->use_custom_pf3); - state_save_register_device_item(device, 0, deco16ic->use_custom_pf4); - state_save_register_device_item(device, 0, deco16ic->pf1_bank); - state_save_register_device_item(device, 0, deco16ic->pf2_bank); - state_save_register_device_item(device, 0, deco16ic->pf3_bank); - state_save_register_device_item(device, 0, deco16ic->pf4_bank); - state_save_register_device_item(device, 0, deco16ic->pf12_8x8_gfx_bank); - state_save_register_device_item(device, 0, deco16ic->pf12_16x16_gfx_bank); - state_save_register_device_item(device, 0, deco16ic->pf34_16x16_gfx_bank); - state_save_register_device_item(device, 0, deco16ic->pf12_last_small); - state_save_register_device_item(device, 0, deco16ic->pf12_last_big); - state_save_register_device_item(device, 0, deco16ic->pf34_last_big); - - state_save_register_device_item_pointer(device, 0, deco16ic->dirty_palette, 4096); - state_save_register_device_item_pointer(device, 0, deco16ic->raster_display_list, 20 * 256 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf1_data, 0x2000 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf2_data, 0x2000 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf3_data, 0x2000 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf4_data, 0x2000 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf12_control, 0x10 / 2); - state_save_register_device_item_pointer(device, 0, deco16ic->pf34_control, 0x10 / 2); + device->save_item(NAME(deco16ic->priority)); + device->save_item(NAME(deco16ic->raster_display_position)); + device->save_item(NAME(deco16ic->use_custom_pf1)); + device->save_item(NAME(deco16ic->use_custom_pf2)); + device->save_item(NAME(deco16ic->use_custom_pf3)); + device->save_item(NAME(deco16ic->use_custom_pf4)); + device->save_item(NAME(deco16ic->pf1_bank)); + device->save_item(NAME(deco16ic->pf2_bank)); + device->save_item(NAME(deco16ic->pf3_bank)); + device->save_item(NAME(deco16ic->pf4_bank)); + device->save_item(NAME(deco16ic->pf12_8x8_gfx_bank)); + device->save_item(NAME(deco16ic->pf12_16x16_gfx_bank)); + device->save_item(NAME(deco16ic->pf34_16x16_gfx_bank)); + device->save_item(NAME(deco16ic->pf12_last_small)); + device->save_item(NAME(deco16ic->pf12_last_big)); + device->save_item(NAME(deco16ic->pf34_last_big)); + + device->save_pointer(NAME(deco16ic->dirty_palette), 4096); + device->save_pointer(NAME(deco16ic->raster_display_list), 20 * 256 / 2); + device->save_pointer(NAME(deco16ic->pf1_data), 0x2000 / 2); + device->save_pointer(NAME(deco16ic->pf2_data), 0x2000 / 2); + device->save_pointer(NAME(deco16ic->pf3_data), 0x2000 / 2); + device->save_pointer(NAME(deco16ic->pf4_data), 0x2000 / 2); + device->save_pointer(NAME(deco16ic->pf12_control), 0x10 / 2); + device->save_pointer(NAME(deco16ic->pf34_control), 0x10 / 2); } static DEVICE_RESET( deco16ic ) diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index 76835e94397..e0ca2fcd9a8 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -355,30 +355,30 @@ void gp9001vdp_device::device_start() create_tilemaps(m_gfxregion); - state_save_register_device_item_pointer(this, 0, sp.vram16, GP9001_SPRITERAM_SIZE/2); - state_save_register_device_item_pointer(this, 0, sp.vram16_buffer, GP9001_SPRITERAM_SIZE/2); - state_save_register_device_item_pointer(this, 0, top.vram16, GP9001_TOP_VRAM_SIZE/2); - state_save_register_device_item_pointer(this, 0, fg.vram16, GP9001_FG_VRAM_SIZE/2); - state_save_register_device_item_pointer(this, 0, bg.vram16, GP9001_BG_VRAM_SIZE/2); - - state_save_register_device_item(this,0, gp9001_scroll_reg); - state_save_register_device_item(this,0, gp9001_voffs); - state_save_register_device_item(this,0, bg.scrollx); - state_save_register_device_item(this,0, bg.scrolly); - state_save_register_device_item(this,0, fg.scrollx); - state_save_register_device_item(this,0, fg.scrolly); - state_save_register_device_item(this,0, top.scrollx); - state_save_register_device_item(this,0, top.scrolly); - state_save_register_device_item(this,0, sp.scrollx); - state_save_register_device_item(this,0, sp.scrolly); - state_save_register_device_item(this,0, bg.flip); - state_save_register_device_item(this,0, fg.flip); - state_save_register_device_item(this,0, top.flip); - state_save_register_device_item(this,0, sp.flip); + save_pointer(NAME(sp.vram16), GP9001_SPRITERAM_SIZE/2); + save_pointer(NAME(sp.vram16_buffer), GP9001_SPRITERAM_SIZE/2); + save_pointer(NAME(top.vram16), GP9001_TOP_VRAM_SIZE/2); + save_pointer(NAME(fg.vram16), GP9001_FG_VRAM_SIZE/2); + save_pointer(NAME(bg.vram16), GP9001_BG_VRAM_SIZE/2); + + save_item(NAME(gp9001_scroll_reg)); + save_item(NAME(gp9001_voffs)); + save_item(NAME(bg.scrollx)); + save_item(NAME(bg.scrolly)); + save_item(NAME(fg.scrollx)); + save_item(NAME(fg.scrolly)); + save_item(NAME(top.scrollx)); + save_item(NAME(top.scrolly)); + save_item(NAME(sp.scrollx)); + save_item(NAME(sp.scrolly)); + save_item(NAME(bg.flip)); + save_item(NAME(fg.flip)); + save_item(NAME(top.flip)); + save_item(NAME(sp.flip)); gp9001_gfxrom_is_banked = 0; gp9001_gfxrom_bank_dirty = 0; - state_save_register_device_item_array(this,0,gp9001_gfxrom_bank); + save_item(NAME(gp9001_gfxrom_bank)); // default layer offsets used by all original games bg.extra_xoffset.normal = -0x1d6; diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c index 665c696512b..da568f8107f 100644 --- a/src/mame/video/kan_pand.c +++ b/src/mame/video/kan_pand.c @@ -311,9 +311,9 @@ static DEVICE_START( kaneko_pandora ) pandora->sprites_bitmap = pandora->screen->alloc_compatible_bitmap(); - state_save_register_device_item(device, 0, pandora->clear_bitmap); - state_save_register_device_item_pointer(device, 0, pandora->spriteram, 0x1000); - state_save_register_device_item_bitmap(device, 0, pandora->sprites_bitmap); + device->save_item(NAME(pandora->clear_bitmap)); + device->save_pointer(NAME(pandora->spriteram), 0x1000); + device->save_item(NAME(*pandora->sprites_bitmap)); } static DEVICE_RESET( kaneko_pandora ) diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index caa91652040..860c2b73bac 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1561,8 +1561,8 @@ static DEVICE_START( k007121 ) { k007121_state *k007121 = k007121_get_safe_token(device); - state_save_register_device_item_array(device, 0, k007121->ctrlram); - state_save_register_device_item(device, 0, k007121->flipscreen); + device->save_item(NAME(k007121->ctrlram)); + device->save_item(NAME(k007121->flipscreen)); } static DEVICE_RESET( k007121 ) @@ -1842,13 +1842,13 @@ static DEVICE_START( k007342 ) tilemap_set_transparent_pen(k007342->tilemap[0], 0); tilemap_set_transparent_pen(k007342->tilemap[1], 0); - state_save_register_device_item_pointer(device, 0, k007342->ram, 0x2000); - state_save_register_device_item_pointer(device, 0, k007342->scroll_ram, 0x0200); - state_save_register_device_item(device, 0, k007342->int_enabled); - state_save_register_device_item(device, 0, k007342->flipscreen); - state_save_register_device_item_array(device, 0, k007342->scrollx); - state_save_register_device_item_array(device, 0, k007342->scrolly); - state_save_register_device_item_array(device, 0, k007342->regs); + device->save_pointer(NAME(k007342->ram), 0x2000); + device->save_pointer(NAME(k007342->scroll_ram), 0x0200); + device->save_item(NAME(k007342->int_enabled)); + device->save_item(NAME(k007342->flipscreen)); + device->save_item(NAME(k007342->scrollx)); + device->save_item(NAME(k007342->scrolly)); + device->save_item(NAME(k007342->regs)); } static DEVICE_RESET( k007342 ) @@ -2111,9 +2111,9 @@ static DEVICE_START( k007420 ) k007420->ram = auto_alloc_array(device->machine, UINT8, 0x200); - state_save_register_device_item_pointer(device, 0, k007420->ram, 0x200); - state_save_register_device_item(device, 0, k007420->flipscreen); // current one uses 7342 one - state_save_register_device_item_array(device, 0, k007420->regs); // current one uses 7342 ones + device->save_pointer(NAME(k007420->ram), 0x200); + device->save_item(NAME(k007420->flipscreen)); // current one uses 7342 one + device->save_item(NAME(k007420->regs)); // current one uses 7342 ones } static DEVICE_RESET( k007420 ) @@ -2736,16 +2736,16 @@ static DEVICE_START( k052109 ) tilemap_set_transparent_pen(k052109->tilemap[1], 0); tilemap_set_transparent_pen(k052109->tilemap[2], 0); - state_save_register_device_item_pointer(device, 0, k052109->ram, 0x6000); - state_save_register_device_item(device, 0, k052109->rmrd_line); - state_save_register_device_item(device, 0, k052109->romsubbank); - state_save_register_device_item(device, 0, k052109->scrollctrl); - state_save_register_device_item(device, 0, k052109->irq_enabled); - state_save_register_device_item_array(device, 0, k052109->charrombank); - state_save_register_device_item_array(device, 0, k052109->charrombank_2); - state_save_register_device_item_array(device, 0, k052109->dx); - state_save_register_device_item_array(device, 0, k052109->dy); - state_save_register_device_item(device, 0, k052109->has_extra_video_ram); + device->save_pointer(NAME(k052109->ram), 0x6000); + device->save_item(NAME(k052109->rmrd_line)); + device->save_item(NAME(k052109->romsubbank)); + device->save_item(NAME(k052109->scrollctrl)); + device->save_item(NAME(k052109->irq_enabled)); + device->save_item(NAME(k052109->charrombank)); + device->save_item(NAME(k052109->charrombank_2)); + device->save_item(NAME(k052109->dx)); + device->save_item(NAME(k052109->dy)); + device->save_item(NAME(k052109->has_extra_video_ram)); device->machine->state().register_postload(k052109_tileflip_reset, k052109); } @@ -3277,17 +3277,17 @@ static DEVICE_START( k051960 ) k051960->callback = intf->callback; k051960->ram = auto_alloc_array_clear(machine, UINT8, 0x400); - state_save_register_device_item(device, 0, k051960->romoffset); - state_save_register_device_item(device, 0, k051960->spriteflip); - state_save_register_device_item(device, 0, k051960->readroms); - state_save_register_device_item_array(device, 0, k051960->spriterombank); - state_save_register_device_item_pointer(device, 0, k051960->ram, 0x400); - state_save_register_device_item(device, 0, k051960->irq_enabled); - state_save_register_device_item(device, 0, k051960->nmi_enabled); - state_save_register_device_item(device, 0, k051960->dx); - state_save_register_device_item(device, 0, k051960->dy); + device->save_item(NAME(k051960->romoffset)); + device->save_item(NAME(k051960->spriteflip)); + device->save_item(NAME(k051960->readroms)); + device->save_item(NAME(k051960->spriterombank)); + device->save_pointer(NAME(k051960->ram), 0x400); + device->save_item(NAME(k051960->irq_enabled)); + device->save_item(NAME(k051960->nmi_enabled)); + device->save_item(NAME(k051960->dx)); + device->save_item(NAME(k051960->dy)); - state_save_register_device_item(device, 0, k051960->k051937_counter); + device->save_item(NAME(k051960->k051937_counter)); } static DEVICE_RESET( k051960 ) @@ -4085,11 +4085,11 @@ static DEVICE_START( k05324x ) k05324x->buffer = auto_alloc_array(machine, UINT16, k05324x->ramsize / 2); - state_save_register_device_item_pointer(device, 0, k05324x->ram, k05324x->ramsize / 2); - state_save_register_device_item_pointer(device, 0, k05324x->buffer, k05324x->ramsize / 2); - state_save_register_device_item(device, 0, k05324x->rombank); - state_save_register_device_item(device, 0, k05324x->z_rejection); - state_save_register_device_item_array(device, 0, k05324x->regs); + device->save_pointer(NAME(k05324x->ram), k05324x->ramsize / 2); + device->save_pointer(NAME(k05324x->buffer), k05324x->ramsize / 2); + device->save_item(NAME(k05324x->rombank)); + device->save_item(NAME(k05324x->z_rejection)); + device->save_item(NAME(k05324x->regs)); } static DEVICE_RESET( k05324x ) @@ -4926,12 +4926,12 @@ static DEVICE_START( k053247 ) k053247->ram = auto_alloc_array_clear(machine, UINT16, 0x1000 / 2); - state_save_register_device_item_pointer(device, 0, k053247->ram, 0x1000 / 2); - state_save_register_device_item_array(device, 0, k053247->kx46_regs); - state_save_register_device_item_array(device, 0, k053247->kx47_regs); - state_save_register_device_item(device, 0, k053247->objcha_line); - state_save_register_device_item(device, 0, k053247->wraparound); - state_save_register_device_item(device, 0, k053247->z_rejection); + device->save_pointer(NAME(k053247->ram), 0x1000 / 2); + device->save_item(NAME(k053247->kx46_regs)); + device->save_item(NAME(k053247->kx47_regs)); + device->save_item(NAME(k053247->objcha_line)); + device->save_item(NAME(k053247->wraparound)); + device->save_item(NAME(k053247->z_rejection)); } /* K055673 used with the 54246 in PreGX/Run and Gun/System GX games */ @@ -5049,12 +5049,12 @@ static DEVICE_START( k055673 ) k053247->ram = auto_alloc_array(machine, UINT16, 0x1000 / 2); - state_save_register_device_item_pointer(device, 0, k053247->ram, 0x800); - state_save_register_device_item_array(device, 0, k053247->kx46_regs); - state_save_register_device_item_array(device, 0, k053247->kx47_regs); - state_save_register_device_item(device, 0, k053247->objcha_line); - state_save_register_device_item(device, 0, k053247->wraparound); - state_save_register_device_item(device, 0, k053247->z_rejection); + device->save_pointer(NAME(k053247->ram), 0x800); + device->save_item(NAME(k053247->kx46_regs)); + device->save_item(NAME(k053247->kx47_regs)); + device->save_item(NAME(k053247->objcha_line)); + device->save_item(NAME(k053247->wraparound)); + device->save_item(NAME(k053247->z_rejection)); } static DEVICE_RESET( k053247 ) @@ -5381,9 +5381,9 @@ static DEVICE_START( k051316 ) k051316->offset[0] = intf->xoffs; k051316->offset[1] = intf->yoffs; - state_save_register_device_item_pointer(device, 0, k051316->ram, 0x800); - state_save_register_device_item_array(device, 0, k051316->ctrlram); - state_save_register_device_item(device, 0, k051316->wraparound); + device->save_pointer(NAME(k051316->ram), 0x800); + device->save_item(NAME(k051316->ctrlram)); + device->save_item(NAME(k051316->wraparound)); } static DEVICE_RESET( k051316 ) @@ -5607,8 +5607,8 @@ static DEVICE_START( k053936 ) k053936->offset[0] = intf->xoff; k053936->offset[1] = intf->yoff; - state_save_register_device_item_pointer(device, 0, k053936->ctrl, 0x20); - state_save_register_device_item_pointer(device, 0, k053936->linectrl, 0x4000); + device->save_pointer(NAME(k053936->ctrl), 0x20); + device->save_pointer(NAME(k053936->linectrl), 0x4000); } static DEVICE_RESET( k053936 ) @@ -5753,9 +5753,9 @@ static DEVICE_START( k053251 ) { k053251_state *k053251 = k053251_get_safe_token(device); - state_save_register_device_item_array(device, 0, k053251->ram); - state_save_register_device_item(device, 0, k053251->tilemaps_set); - state_save_register_device_item_array(device, 0, k053251->dirty_tmap); + device->save_item(NAME(k053251->ram)); + device->save_item(NAME(k053251->tilemaps_set)); + device->save_item(NAME(k053251->dirty_tmap)); device->machine->state().register_postload(k053251_reset_indexes, k053251); } @@ -5873,7 +5873,7 @@ static DEVICE_START( k054000 ) { k054000_state *k054000 = k054000_get_safe_token(device); - state_save_register_device_item_array(device, 0, k054000->regs); + device->save_item(NAME(k054000->regs)); } static DEVICE_RESET( k054000 ) @@ -6023,7 +6023,7 @@ static DEVICE_START( k051733 ) { k051733_state *k051733 = k051733_get_safe_token(device); - state_save_register_device_item_array(device, 0, k051733->ram); + device->save_item(NAME(k051733->ram)); } static DEVICE_RESET( k051733 ) @@ -7968,39 +7968,39 @@ static DEVICE_START( k056832 ) k056832_change_rambank(k056832); k056832_change_rombank(k056832); - state_save_register_device_item_pointer(device, 0, k056832->videoram, 0x10000); - state_save_register_device_item_array(device, 0, k056832->regs); - state_save_register_device_item_array(device, 0, k056832->regsb); - state_save_register_device_item_array(device, 0, k056832->x); - state_save_register_device_item_array(device, 0, k056832->y); - state_save_register_device_item_array(device, 0, k056832->w); - state_save_register_device_item_array(device, 0, k056832->h); - state_save_register_device_item_array(device, 0, k056832->dx); - state_save_register_device_item_array(device, 0, k056832->dy); - state_save_register_device_item_array(device, 0, k056832->layer_tile_mode); - - state_save_register_device_item(device, 0, k056832->default_layer_association); - state_save_register_device_item(device, 0, k056832->active_layer); - state_save_register_device_item(device, 0, k056832->linemap_enabled); - state_save_register_device_item(device, 0, k056832->use_ext_linescroll); - state_save_register_device_item(device, 0, k056832->uses_tile_banks); - state_save_register_device_item(device, 0, k056832->cur_tile_bank); - state_save_register_device_item(device, 0, k056832->rom_half); - state_save_register_device_item_array(device, 0, k056832->all_lines_dirty); - state_save_register_device_item_array(device, 0, k056832->page_tile_mode); + device->save_pointer(NAME(k056832->videoram), 0x10000); + device->save_item(NAME(k056832->regs)); + device->save_item(NAME(k056832->regsb)); + device->save_item(NAME(k056832->x)); + device->save_item(NAME(k056832->y)); + device->save_item(NAME(k056832->w)); + device->save_item(NAME(k056832->h)); + device->save_item(NAME(k056832->dx)); + device->save_item(NAME(k056832->dy)); + device->save_item(NAME(k056832->layer_tile_mode)); + + device->save_item(NAME(k056832->default_layer_association)); + device->save_item(NAME(k056832->active_layer)); + device->save_item(NAME(k056832->linemap_enabled)); + device->save_item(NAME(k056832->use_ext_linescroll)); + device->save_item(NAME(k056832->uses_tile_banks)); + device->save_item(NAME(k056832->cur_tile_bank)); + device->save_item(NAME(k056832->rom_half)); + device->save_item(NAME(k056832->all_lines_dirty)); + device->save_item(NAME(k056832->page_tile_mode)); for (i = 0; i < 8; i++) { - state_save_register_device_item_array(device, i, k056832->layer_offs[i]); - state_save_register_device_item_array(device, i, k056832->lsram_page[i]); + device->save_item(NAME(k056832->layer_offs[i]), i); + device->save_item(NAME(k056832->lsram_page[i]), i); } for (i = 0; i < K056832_PAGE_COUNT; i++) { - state_save_register_device_item_array(device, i, k056832->line_dirty[i]); - state_save_register_device_item(device, i, k056832->all_lines_dirty[i]); - state_save_register_device_item(device, i, k056832->page_tile_mode[i]); - state_save_register_device_item(device, i, k056832->last_colorbase[i]); + device->save_item(NAME(k056832->line_dirty[i]), i); + device->save_item(NAME(k056832->all_lines_dirty[i]), i); + device->save_item(NAME(k056832->page_tile_mode[i]), i); + device->save_item(NAME(k056832->last_colorbase[i]), i); } device->machine->state().register_postload(k056832_postload, k056832); @@ -8116,7 +8116,7 @@ int k055555_get_palette_index( device_t *device, int idx ) static DEVICE_START( k055555 ) { k055555_state *k055555 = k055555_get_safe_token(device); - state_save_register_device_item_array(device, 0, k055555->regs); + device->save_item(NAME(k055555->regs)); } static DEVICE_RESET( k055555 ) @@ -8418,8 +8418,8 @@ static DEVICE_START( k054338 ) k054338->alphainverted = intf->alpha_inv; - state_save_register_device_item_array(device, 0, k054338->regs); - state_save_register_device_item_array(device, 0, k054338->shd_rgb); + device->save_item(NAME(k054338->regs)); + device->save_item(NAME(k054338->shd_rgb)); } static DEVICE_RESET( k054338 ) @@ -8962,10 +8962,10 @@ static DEVICE_START( k053250 ) /* unpack graphics */ k053250_unpack_pixels(device->machine, intf->gfx_memory_region); - state_save_register_device_item_pointer(device, 0, k053250->ram, 0x6000 / 2); - state_save_register_device_item_array(device, 0, k053250->regs); - state_save_register_device_item(device, 0, k053250->page); - state_save_register_device_item(device, 0, k053250->frame); + device->save_pointer(NAME(k053250->ram), 0x6000 / 2); + device->save_item(NAME(k053250->regs)); + device->save_item(NAME(k053250->page)); + device->save_item(NAME(k053250->frame)); } static DEVICE_RESET( k053250 ) @@ -9037,7 +9037,7 @@ static DEVICE_START( k053252 ) { k053252_state *k053252 = k053252_get_safe_token(device); - state_save_register_device_item_array(device, 0, k053252->regs); + device->save_item(NAME(k053252->regs)); } static DEVICE_RESET( k053252 ) @@ -9209,11 +9209,11 @@ static DEVICE_START( k001006 ) k001006->gfx_region = intf->gfx_region; - state_save_register_device_item_pointer(device, 0, k001006->pal_ram, 0x800*sizeof(UINT16)); - state_save_register_device_item_pointer(device, 0, k001006->unknown_ram, 0x1000*sizeof(UINT16)); - state_save_register_device_item_pointer(device, 0, k001006->palette, 0x800*sizeof(UINT32)); - state_save_register_device_item(device, 0, k001006->device_sel); - state_save_register_device_item(device, 0, k001006->addr); + device->save_pointer(NAME(k001006->pal_ram), 0x800*sizeof(UINT16)); + device->save_pointer(NAME(k001006->unknown_ram), 0x1000*sizeof(UINT16)); + device->save_pointer(NAME(k001006->palette), 0x800*sizeof(UINT32)); + device->save_item(NAME(k001006->device_sel)); + device->save_item(NAME(k001006->addr)); } static DEVICE_RESET( k001006 ) @@ -10114,21 +10114,21 @@ static DEVICE_START( k001005 ) } - state_save_register_device_item_pointer(device, 0, k001005->texture, 0x800000); - state_save_register_device_item_pointer(device, 0, k001005->ram[0], 0x140000); - state_save_register_device_item_pointer(device, 0, k001005->ram[1], 0x140000); - state_save_register_device_item_pointer(device, 0, k001005->fifo, 0x800); - state_save_register_device_item_pointer(device, 0, k001005->_3d_fifo, 0x10000); - state_save_register_device_item(device, 0, k001005->status); - state_save_register_device_item(device, 0, k001005->ram_ptr); - state_save_register_device_item(device, 0, k001005->fifo_read_ptr); - state_save_register_device_item(device, 0, k001005->fifo_write_ptr); - state_save_register_device_item(device, 0, k001005->_3d_fifo_ptr); - state_save_register_device_item(device, 0, k001005->bitmap_page); - state_save_register_device_item(device, 0, k001005->prev_poly_type); - state_save_register_device_item_bitmap(device, 0, k001005->bitmap[0]); - state_save_register_device_item_bitmap(device, 0, k001005->bitmap[1]); - state_save_register_device_item_bitmap(device, 0, k001005->zbuffer); + device->save_pointer(NAME(k001005->texture), 0x800000); + device->save_pointer(NAME(k001005->ram[0]), 0x140000); + device->save_pointer(NAME(k001005->ram[1]), 0x140000); + device->save_pointer(NAME(k001005->fifo), 0x800); + device->save_pointer(NAME(k001005->_3d_fifo), 0x10000); + device->save_item(NAME(k001005->status)); + device->save_item(NAME(k001005->ram_ptr)); + device->save_item(NAME(k001005->fifo_read_ptr)); + device->save_item(NAME(k001005->fifo_write_ptr)); + device->save_item(NAME(k001005->_3d_fifo_ptr)); + device->save_item(NAME(k001005->bitmap_page)); + device->save_item(NAME(k001005->prev_poly_type)); + device->save_item(NAME(*k001005->bitmap[0])); + device->save_item(NAME(*k001005->bitmap[1])); + device->save_item(NAME(*k001005->zbuffer)); // FIXME: shall we save poly as well? } @@ -10557,9 +10557,9 @@ static DEVICE_START( k001604 ) device->machine->gfx[k001604->gfx_index[0]] = gfx_element_alloc(device->machine, &k001604_char_layout_layer_8x8, (UINT8*)&k001604->char_ram[0], device->machine->total_colors() / 16, 0); device->machine->gfx[k001604->gfx_index[1]] = gfx_element_alloc(device->machine, &k001604_char_layout_layer_16x16, (UINT8*)&k001604->char_ram[0], device->machine->total_colors() / 16, 0); - state_save_register_device_item_pointer(device, 0, k001604->reg, 0x400 / 4); - state_save_register_device_item_pointer(device, 0, k001604->char_ram, 0x200000 / 4); - state_save_register_device_item_pointer(device, 0, k001604->tile_ram, 0x20000 / 4); + device->save_pointer(NAME(k001604->reg), 0x400 / 4); + device->save_pointer(NAME(k001604->char_ram), 0x200000 / 4); + device->save_pointer(NAME(k001604->tile_ram), 0x20000 / 4); } static DEVICE_RESET( k001604 ) @@ -10798,9 +10798,9 @@ static DEVICE_START( k037122 ) device->machine->gfx[k037122->gfx_index] = gfx_element_alloc(device->machine, &k037122_char_layout, (UINT8*)k037122->char_ram, device->machine->total_colors() / 16, 0); - state_save_register_device_item_pointer(device, 0, k037122->reg, 0x400 / 4); - state_save_register_device_item_pointer(device, 0, k037122->char_ram, 0x200000 / 4); - state_save_register_device_item_pointer(device, 0, k037122->tile_ram, 0x20000 / 4); + device->save_pointer(NAME(k037122->reg), 0x400 / 4); + device->save_pointer(NAME(k037122->char_ram), 0x200000 / 4); + device->save_pointer(NAME(k037122->tile_ram), 0x20000 / 4); } static DEVICE_RESET( k037122 ) diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 58763ab07bb..5ae68a2e9a9 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -1319,27 +1319,27 @@ static DEVICE_START( ppu2c0x ) ppu2c0x->colortable = auto_alloc_array(device->machine, pen_t, ARRAY_LENGTH(default_colortable)); ppu2c0x->colortable_mono = auto_alloc_array(device->machine, pen_t, ARRAY_LENGTH(default_colortable_mono)); - state_save_register_device_item(device, 0, ppu2c0x->scanline); - state_save_register_device_item(device, 0, ppu2c0x->refresh_data); - state_save_register_device_item(device, 0, ppu2c0x->refresh_latch); - state_save_register_device_item(device, 0, ppu2c0x->x_fine); - state_save_register_device_item(device, 0, ppu2c0x->toggle); - state_save_register_device_item(device, 0, ppu2c0x->add); - state_save_register_device_item(device, 0, ppu2c0x->videomem_addr); - state_save_register_device_item(device, 0, ppu2c0x->addr_latch); - state_save_register_device_item(device, 0, ppu2c0x->data_latch); - state_save_register_device_item(device, 0, ppu2c0x->buffered_data); - state_save_register_device_item(device, 0, ppu2c0x->tile_page); - state_save_register_device_item(device, 0, ppu2c0x->sprite_page); - state_save_register_device_item(device, 0, ppu2c0x->back_color); - state_save_register_device_item(device, 0, ppu2c0x->scan_scale); - state_save_register_device_item(device, 0, ppu2c0x->scanlines_per_frame); - state_save_register_device_item_array(device, 0, ppu2c0x->regs); - state_save_register_device_item_array(device, 0, ppu2c0x->palette_ram); - state_save_register_device_item_pointer(device, 0, ppu2c0x->spriteram, SPRITERAM_SIZE); - state_save_register_device_item_pointer(device, 0, ppu2c0x->colortable, ARRAY_LENGTH(default_colortable)); - state_save_register_device_item_pointer(device, 0, ppu2c0x->colortable_mono, ARRAY_LENGTH(default_colortable_mono)); - state_save_register_device_item_bitmap(device, 0, ppu2c0x->bitmap); + device->save_item(NAME(ppu2c0x->scanline)); + device->save_item(NAME(ppu2c0x->refresh_data)); + device->save_item(NAME(ppu2c0x->refresh_latch)); + device->save_item(NAME(ppu2c0x->x_fine)); + device->save_item(NAME(ppu2c0x->toggle)); + device->save_item(NAME(ppu2c0x->add)); + device->save_item(NAME(ppu2c0x->videomem_addr)); + device->save_item(NAME(ppu2c0x->addr_latch)); + device->save_item(NAME(ppu2c0x->data_latch)); + device->save_item(NAME(ppu2c0x->buffered_data)); + device->save_item(NAME(ppu2c0x->tile_page)); + device->save_item(NAME(ppu2c0x->sprite_page)); + device->save_item(NAME(ppu2c0x->back_color)); + device->save_item(NAME(ppu2c0x->scan_scale)); + device->save_item(NAME(ppu2c0x->scanlines_per_frame)); + device->save_item(NAME(ppu2c0x->regs)); + device->save_item(NAME(ppu2c0x->palette_ram)); + device->save_pointer(NAME(ppu2c0x->spriteram), SPRITERAM_SIZE); + device->save_pointer(NAME(ppu2c0x->colortable), ARRAY_LENGTH(default_colortable)); + device->save_pointer(NAME(ppu2c0x->colortable_mono), ARRAY_LENGTH(default_colortable_mono)); + device->save_item(NAME(*ppu2c0x->bitmap)); } /************************************* diff --git a/src/mame/video/sega16sp.c b/src/mame/video/sega16sp.c index 3cfc910d0aa..20987191c9d 100644 --- a/src/mame/video/sega16sp.c +++ b/src/mame/video/sega16sp.c @@ -1663,14 +1663,14 @@ static DEVICE_START( sega16sp ) sega16sp->buffer = auto_alloc_array(device->machine, UINT16, sega16sp->ramsize/2); - state_save_register_device_item(device, 0, sega16sp->flip); - state_save_register_device_item(device, 0, sega16sp->shadow); - state_save_register_device_item_array(device, 0, sega16sp->bank); - state_save_register_device_item(device, 0, sega16sp->colorbase); - state_save_register_device_item(device, 0, sega16sp->xoffs); + device->save_item(NAME(sega16sp->flip)); + device->save_item(NAME(sega16sp->shadow)); + device->save_item(NAME(sega16sp->bank)); + device->save_item(NAME(sega16sp->colorbase)); + device->save_item(NAME(sega16sp->xoffs)); if (intf->buffer) - state_save_register_device_item_pointer(device, 0, ((UINT8 *) sega16sp->buffer), sega16sp->ramsize); + device->save_pointer(NAME(((UINT8 *) sega16sp->buffer)), sega16sp->ramsize); } diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 7b356f50cde..1d06d7e6014 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -1019,8 +1019,8 @@ static DEVICE_START( pc080sn ) pc080sn->bgscroll_ram[0] = pc080sn->ram + 0x4000 /2; pc080sn->bgscroll_ram[1] = pc080sn->ram + 0xc000 /2; - state_save_register_device_item_pointer(device, 0, pc080sn->ram, PC080SN_RAM_SIZE / 2); - state_save_register_device_item_array(device, 0, pc080sn->ctrl); + device->save_pointer(NAME(pc080sn->ram), PC080SN_RAM_SIZE / 2); + device->save_item(NAME(pc080sn->ctrl)); device->machine->state().register_postload(pc080sn_restore_scroll, pc080sn); } @@ -1205,10 +1205,10 @@ static DEVICE_START( pc090oj ) pc090oj->ram = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); pc090oj->ram_buffered = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, pc090oj->ram, PC090OJ_RAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, pc090oj->ram_buffered, PC090OJ_RAM_SIZE / 2); - state_save_register_device_item(device, 0, pc090oj->ctrl); - state_save_register_device_item(device, 0, pc090oj->sprite_ctrl); // should this be set in intf?!? + device->save_pointer(NAME(pc090oj->ram), PC090OJ_RAM_SIZE / 2); + device->save_pointer(NAME(pc090oj->ram_buffered), PC090OJ_RAM_SIZE / 2); + device->save_item(NAME(pc090oj->ctrl)); + device->save_item(NAME(pc090oj->sprite_ctrl)); // should this be set in intf?!? } static DEVICE_RESET( pc090oj ) @@ -1906,7 +1906,7 @@ static DEVICE_START( tc0080vco ) /* create the char set (gfx will then be updated dynamically from RAM) */ device->machine->gfx[tc0080vco->tx_gfx] = gfx_element_alloc(device->machine, &tc0080vco_charlayout, (UINT8 *)tc0080vco->char_ram, 64, 0); - state_save_register_device_item_pointer(device, 0, tc0080vco->ram, TC0080VCO_RAM_SIZE / 2); + device->save_pointer(NAME(tc0080vco->ram), TC0080VCO_RAM_SIZE / 2); device->machine->state().register_postload(tc0080vco_postload, tc0080vco); } @@ -2513,10 +2513,10 @@ static DEVICE_START( tc0100scn ) /* create the char set (gfx will then be updated dynamically from RAM) */ device->machine->gfx[tc0100scn->tx_gfx] = gfx_element_alloc(device->machine, &tc0100scn_charlayout, (UINT8 *)tc0100scn->char_ram, 64, 0); - state_save_register_device_item_pointer(device, 0, tc0100scn->ram, TC0100SCN_RAM_SIZE / 2); - state_save_register_device_item_array(device, 0, tc0100scn->ctrl); - state_save_register_device_item(device, 0, tc0100scn->dblwidth); - state_save_register_device_item(device, 0, tc0100scn->gfxbank); + device->save_pointer(NAME(tc0100scn->ram), TC0100SCN_RAM_SIZE / 2); + device->save_item(NAME(tc0100scn->ctrl)); + device->save_item(NAME(tc0100scn->dblwidth)); + device->save_item(NAME(tc0100scn->gfxbank)); device->machine->state().register_postload(tc0100scn_postload, tc0100scn); } @@ -2698,8 +2698,8 @@ static DEVICE_START( tc0280grd ) tc0280grd->ram = auto_alloc_array(device->machine, UINT16, TC0280GRD_RAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, tc0280grd->ram, TC0280GRD_RAM_SIZE / 2); - state_save_register_device_item_array(device, 0, tc0280grd->ctrl); + device->save_pointer(NAME(tc0280grd->ram), TC0280GRD_RAM_SIZE / 2); + device->save_item(NAME(tc0280grd->ctrl)); } static DEVICE_RESET( tc0280grd ) @@ -2769,7 +2769,7 @@ READ8_DEVICE_HANDLER( tc0360pri_r ) static DEVICE_START( tc0360pri ) { tc0360pri_state *tc0360pri = tc0360pri_get_safe_token(device); - state_save_register_device_item_array(device, 0, tc0360pri->regs); + device->save_item(NAME(tc0360pri->regs)); } static DEVICE_RESET( tc0360pri ) @@ -3724,9 +3724,9 @@ static DEVICE_START( tc0480scp ) /* create the char set (gfx will then be updated dynamically from RAM) */ device->machine->gfx[tc0480scp->tx_gfx] = gfx_element_alloc(device->machine, &tc0480scp_charlayout, (UINT8 *)tc0480scp->char_ram, 64, 0); - state_save_register_device_item_pointer(device, 0, tc0480scp->ram, TC0480SCP_RAM_SIZE / 2); - state_save_register_device_item_array(device, 0, tc0480scp->ctrl); - state_save_register_device_item(device, 0, tc0480scp->dblwidth); + device->save_pointer(NAME(tc0480scp->ram), TC0480SCP_RAM_SIZE / 2); + device->save_item(NAME(tc0480scp->ctrl)); + device->save_item(NAME(tc0480scp->dblwidth)); device->machine->state().register_postload(tc0480scp_postload, tc0480scp); } @@ -4546,7 +4546,7 @@ static DEVICE_START( tc0150rod ) tc0150rod->ram = auto_alloc_array(device->machine, UINT16, TC0150ROD_RAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, tc0150rod->ram, TC0150ROD_RAM_SIZE / 2); + device->save_pointer(NAME(tc0150rod->ram), TC0150ROD_RAM_SIZE / 2); } @@ -4758,8 +4758,8 @@ static DEVICE_START( tc0110pcr ) tc0110pcr->ram = auto_alloc_array(device->machine, UINT16, TC0110PCR_RAM_SIZE); - state_save_register_device_item_pointer(device, 0, tc0110pcr->ram, TC0110PCR_RAM_SIZE); - state_save_register_device_item(device, 0, tc0110pcr->type); + device->save_pointer(NAME(tc0110pcr->ram), TC0110PCR_RAM_SIZE); + device->save_item(NAME(tc0110pcr->type)); device->machine->state().register_postload(tc0110pcr_restore_colors, tc0110pcr); } @@ -5093,17 +5093,17 @@ static DEVICE_START( tc0180vcu ) tc0180vcu->ram = auto_alloc_array_clear(device->machine, UINT16, TC0180VCU_RAM_SIZE / 2); tc0180vcu->scrollram = auto_alloc_array_clear(device->machine, UINT16, TC0180VCU_SCROLLRAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, tc0180vcu->ram, TC0180VCU_RAM_SIZE / 2); - state_save_register_device_item_pointer(device, 0, tc0180vcu->scrollram, TC0180VCU_SCROLLRAM_SIZE / 2); + device->save_pointer(NAME(tc0180vcu->ram), TC0180VCU_RAM_SIZE / 2); + device->save_pointer(NAME(tc0180vcu->scrollram), TC0180VCU_SCROLLRAM_SIZE / 2); - state_save_register_device_item_array(device, 0, tc0180vcu->bg_rambank); - state_save_register_device_item_array(device, 0, tc0180vcu->fg_rambank); - state_save_register_device_item(device, 0, tc0180vcu->tx_rambank); + device->save_item(NAME(tc0180vcu->bg_rambank)); + device->save_item(NAME(tc0180vcu->fg_rambank)); + device->save_item(NAME(tc0180vcu->tx_rambank)); - state_save_register_device_item(device, 0, tc0180vcu->framebuffer_page); + device->save_item(NAME(tc0180vcu->framebuffer_page)); - state_save_register_device_item(device, 0, tc0180vcu->video_control); - state_save_register_device_item_array(device, 0, tc0180vcu->ctrl); + device->save_item(NAME(tc0180vcu->video_control)); + device->save_item(NAME(tc0180vcu->ctrl)); } static DEVICE_RESET( tc0180vcu ) diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c index a902a7d6364..4458462c70c 100644 --- a/src/mame/video/vrender0.c +++ b/src/mame/video/vrender0.c @@ -568,29 +568,29 @@ static DEVICE_START( vr0video ) vr0->cpu = device->machine->device(intf->cpu); - state_save_register_device_item_array(device, 0, vr0->InternalPalette); - state_save_register_device_item(device, 0, vr0->LastPalUpdate); - - state_save_register_device_item(device, 0, vr0->RenderState.Tx); - state_save_register_device_item(device, 0, vr0->RenderState.Ty); - state_save_register_device_item(device, 0, vr0->RenderState.Txdx); - state_save_register_device_item(device, 0, vr0->RenderState.Tydx); - state_save_register_device_item(device, 0, vr0->RenderState.Txdy); - state_save_register_device_item(device, 0, vr0->RenderState.Tydy); - state_save_register_device_item(device, 0, vr0->RenderState.SrcAlphaColor); - state_save_register_device_item(device, 0, vr0->RenderState.SrcBlend); - state_save_register_device_item(device, 0, vr0->RenderState.DstAlphaColor); - state_save_register_device_item(device, 0, vr0->RenderState.DstBlend); - state_save_register_device_item(device, 0, vr0->RenderState.ShadeColor); - state_save_register_device_item(device, 0, vr0->RenderState.TransColor); - state_save_register_device_item(device, 0, vr0->RenderState.TileOffset); - state_save_register_device_item(device, 0, vr0->RenderState.FontOffset); - state_save_register_device_item(device, 0, vr0->RenderState.PalOffset); - state_save_register_device_item(device, 0, vr0->RenderState.PaletteBank); - state_save_register_device_item(device, 0, vr0->RenderState.TextureMode); - state_save_register_device_item(device, 0, vr0->RenderState.PixelFormat); - state_save_register_device_item(device, 0, vr0->RenderState.Width); - state_save_register_device_item(device, 0, vr0->RenderState.Height); + device->save_item(NAME(vr0->InternalPalette)); + device->save_item(NAME(vr0->LastPalUpdate)); + + device->save_item(NAME(vr0->RenderState.Tx)); + device->save_item(NAME(vr0->RenderState.Ty)); + device->save_item(NAME(vr0->RenderState.Txdx)); + device->save_item(NAME(vr0->RenderState.Tydx)); + device->save_item(NAME(vr0->RenderState.Txdy)); + device->save_item(NAME(vr0->RenderState.Tydy)); + device->save_item(NAME(vr0->RenderState.SrcAlphaColor)); + device->save_item(NAME(vr0->RenderState.SrcBlend)); + device->save_item(NAME(vr0->RenderState.DstAlphaColor)); + device->save_item(NAME(vr0->RenderState.DstBlend)); + device->save_item(NAME(vr0->RenderState.ShadeColor)); + device->save_item(NAME(vr0->RenderState.TransColor)); + device->save_item(NAME(vr0->RenderState.TileOffset)); + device->save_item(NAME(vr0->RenderState.FontOffset)); + device->save_item(NAME(vr0->RenderState.PalOffset)); + device->save_item(NAME(vr0->RenderState.PaletteBank)); + device->save_item(NAME(vr0->RenderState.TextureMode)); + device->save_item(NAME(vr0->RenderState.PixelFormat)); + device->save_item(NAME(vr0->RenderState.Width)); + device->save_item(NAME(vr0->RenderState.Height)); } static DEVICE_RESET( vr0video ) |