diff options
author | 2010-03-08 17:06:27 +0000 | |
---|---|---|
committer | 2010-03-08 17:06:27 +0000 | |
commit | ec586731b9a1d8bb7a4d48de9ada4e8905a4f74e (patch) | |
tree | da971ef612bddc69e8d748f920ac52fe71d7c63b /src/emu/cpu/sh4/sh4comn.c | |
parent | 5826c45ea48778bd9bf513fef1311a77c447ff8e (diff) |
Made device->tag and devconfig->tag into private member variables (m_tag).
Added inline tag() function to return a const char * version. Updated
callers to use this instead of directly accessing tag.cstr() which
was awkward.
Diffstat (limited to 'src/emu/cpu/sh4/sh4comn.c')
-rw-r--r-- | src/emu/cpu/sh4/sh4comn.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c index 1e31bd9ede5..18cf77fc8a3 100644 --- a/src/emu/cpu/sh4/sh4comn.c +++ b/src/emu/cpu/sh4/sh4comn.c @@ -179,7 +179,7 @@ void sh4_exception(SH4 *sh4, const char *message, int exception) // handle excep sh4->m[INTEVT] = 0x1c0; vector = 0x600; sh4->irq_callback(sh4->device, INPUT_LINE_NMI); - LOG(("SH-4 '%s' nmi exception after [%s]\n", sh4->device->tag.cstr(), message)); + LOG(("SH-4 '%s' nmi exception after [%s]\n", sh4->device->tag(), message)); } else { // if ((sh4->m[ICR] & 0x4000) && (sh4->nmi_line_state == ASSERT_LINE)) // return; @@ -193,7 +193,7 @@ void sh4_exception(SH4 *sh4, const char *message, int exception) // handle excep sh4->irq_callback(sh4->device, SH4_INTC_IRL0-exception+SH4_IRL0); else sh4->irq_callback(sh4->device, SH4_IRL3+1); - LOG(("SH-4 '%s' interrupt exception #%d after [%s]\n", sh4->device->tag.cstr(), exception, message)); + LOG(("SH-4 '%s' interrupt exception #%d after [%s]\n", sh4->device->tag(), exception, message)); } sh4_exception_checkunrequest(sh4, exception); @@ -407,7 +407,7 @@ static TIMER_CALLBACK( sh4_dmac_callback ) SH4 *sh4 = (SH4 *)ptr; int channel = param; - LOG(("SH4 '%s': DMA %d complete\n", sh4->device->tag.cstr(), channel)); + LOG(("SH4 '%s': DMA %d complete\n", sh4->device->tag(), channel)); sh4->dma_timer_active[channel] = 0; switch (channel) { @@ -1028,7 +1028,7 @@ void sh4_set_frt_input(running_device *device, int state) sh4_timer_resync(); sh4->icr = sh4->frc; sh4->m[4] |= ICF; - logerror("SH4 '%s': ICF activated (%x)\n", sh4->device->tag.cstr(), sh4->pc & AM); + logerror("SH4 '%s': ICF activated (%x)\n", sh4->device->tag(), sh4->pc & AM); sh4_recalc_irq(); #endif } @@ -1056,7 +1056,7 @@ void sh4_set_irq_line(SH4 *sh4, int irqline, int state) // set state of external { if ((state == CLEAR_LINE) && (sh4->nmi_line_state == ASSERT_LINE)) // rising { - LOG(("SH-4 '%s' assert nmi\n", sh4->device->tag.cstr())); + LOG(("SH-4 '%s' assert nmi\n", sh4->device->tag())); sh4_exception_request(sh4, SH4_INTC_NMI); sh4_dmac_nmi(sh4); } @@ -1065,7 +1065,7 @@ void sh4_set_irq_line(SH4 *sh4, int irqline, int state) // set state of external { if ((state == ASSERT_LINE) && (sh4->nmi_line_state == CLEAR_LINE)) // falling { - LOG(("SH-4 '%s' assert nmi\n", sh4->device->tag.cstr())); + LOG(("SH-4 '%s' assert nmi\n", sh4->device->tag())); sh4_exception_request(sh4, SH4_INTC_NMI); sh4_dmac_nmi(sh4); } @@ -1088,12 +1088,12 @@ void sh4_set_irq_line(SH4 *sh4, int irqline, int state) // set state of external if( state == CLEAR_LINE ) { - LOG(("SH-4 '%s' cleared external irq IRL%d\n", sh4->device->tag.cstr(), irqline)); + LOG(("SH-4 '%s' cleared external irq IRL%d\n", sh4->device->tag(), irqline)); sh4_exception_unrequest(sh4, SH4_INTC_IRL0+irqline-SH4_IRL0); } else { - LOG(("SH-4 '%s' assert external irq IRL%d\n", sh4->device->tag.cstr(), irqline)); + LOG(("SH-4 '%s' assert external irq IRL%d\n", sh4->device->tag(), irqline)); sh4_exception_request(sh4, SH4_INTC_IRL0+irqline-SH4_IRL0); } } @@ -1107,7 +1107,7 @@ void sh4_set_irq_line(SH4 *sh4, int irqline, int state) // set state of external sh4_exception_unrequest(sh4, SH4_INTC_IRLn0+s); if (sh4->irln < 15) sh4_exception_request(sh4, SH4_INTC_IRLn0+sh4->irln); - LOG(("SH-4 '%s' IRLn0-IRLn3 level #%d\n", sh4->device->tag.cstr(), sh4->irln)); + LOG(("SH-4 '%s' IRLn0-IRLn3 level #%d\n", sh4->device->tag(), sh4->irln)); } } if (sh4->test_irq && (!sh4->delay)) |