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 /src/emu/cpu/sharc/sharc.c | |
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\);
Diffstat (limited to 'src/emu/cpu/sharc/sharc.c')
-rw-r--r-- | src/emu/cpu/sharc/sharc.c | 184 |
1 files changed, 92 insertions, 92 deletions
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 ) |