diff options
Diffstat (limited to 'src/emu/cpu/sh2')
| -rw-r--r-- | src/emu/cpu/sh2/sh2comn.c | 78 |
1 files changed, 39 insertions, 39 deletions
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)); } |
