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/saturn | |
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/saturn')
-rw-r--r-- | src/emu/cpu/saturn/satops.c | 24 | ||||
-rw-r--r-- | src/emu/cpu/saturn/sattable.c | 8 | ||||
-rw-r--r-- | src/emu/cpu/saturn/saturn.c | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/emu/cpu/saturn/satops.c b/src/emu/cpu/saturn/satops.c index 69d3daf321e..b42a23171b3 100644 --- a/src/emu/cpu/saturn/satops.c +++ b/src/emu/cpu/saturn/satops.c @@ -1,7 +1,7 @@ #define IRQ_ADDRESS 0xf #define saturn_assert(x) \ - do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", cpustate->device->tag.cstr(), #x, __FILE__, __LINE__, cpustate->pc); } while (0) + do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", cpustate->device->tag(), #x, __FILE__, __LINE__, cpustate->pc); } while (0) INLINE int READ_OP(saturn_state *cpustate) { @@ -186,24 +186,24 @@ INLINE void saturn_push(saturn_state *cpustate, SaturnAdr adr) INLINE void saturn_interrupt_on(saturn_state *cpustate) { - LOG(( "SATURN '%s' at %05x: INTON\n", cpustate->device->tag.cstr(), cpustate->pc-4 )); + LOG(( "SATURN '%s' at %05x: INTON\n", cpustate->device->tag(), cpustate->pc-4 )); cpustate->irq_enable=1; if (cpustate->irq_state) { - LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", cpustate->device->tag.cstr())); + LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", cpustate->device->tag())); cpustate->pending_irq=1; } } INLINE void saturn_interrupt_off(saturn_state *cpustate) { - LOG(( "SATURN '%s' at %05x: INTOFF\n", cpustate->device->tag.cstr(), cpustate->pc-4 )); + LOG(( "SATURN '%s' at %05x: INTOFF\n", cpustate->device->tag(), cpustate->pc-4 )); cpustate->irq_enable=0; } INLINE void saturn_reset_interrupt(saturn_state *cpustate) { - LOG(( "SATURN '%s' at %05x: RSI\n", cpustate->device->tag.cstr(), cpustate->pc-5 )); + LOG(( "SATURN '%s' at %05x: RSI\n", cpustate->device->tag(), cpustate->pc-5 )); if (cpustate->config&&cpustate->config->rsi) cpustate->config->rsi(cpustate->device); } @@ -234,27 +234,27 @@ INLINE void saturn_shutdown(saturn_state *cpustate) { cpustate->sleeping=1; cpustate->irq_enable=1; - LOG(( "SATURN '%s' at %05x: SHUTDN\n", cpustate->device->tag.cstr(), cpustate->pc-3 )); + LOG(( "SATURN '%s' at %05x: SHUTDN\n", cpustate->device->tag(), cpustate->pc-3 )); } INLINE void saturn_bus_command_b(saturn_state *cpustate) { - logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", cpustate->device->tag.cstr(), cpustate->pc-4 ); + logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", cpustate->device->tag(), cpustate->pc-4 ); } INLINE void saturn_bus_command_c(saturn_state *cpustate) { - logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", cpustate->device->tag.cstr(), cpustate->pc-3 ); + logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", cpustate->device->tag(), cpustate->pc-3 ); } INLINE void saturn_bus_command_d(saturn_state *cpustate) { - logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", cpustate->device->tag.cstr(), cpustate->pc-4 ); + logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", cpustate->device->tag(), cpustate->pc-4 ); } INLINE void saturn_serial_request(saturn_state *cpustate) { - logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", cpustate->device->tag.cstr(), cpustate->pc-3 ); + logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", cpustate->device->tag(), cpustate->pc-3 ); } INLINE void saturn_out_c(saturn_state *cpustate) @@ -275,7 +275,7 @@ INLINE void saturn_in(saturn_state *cpustate, int reg) saturn_assert(reg>=0 && reg<9); if (!(cpustate->pc&1)) logerror( "SATURN '%s' at %05x: reg=IN opcode at odd addresse\n", - cpustate->device->tag.cstr(), cpustate->pc-3 ); + cpustate->device->tag(), cpustate->pc-3 ); if (cpustate->config&&cpustate->config->in) in = cpustate->config->in(cpustate->device); S64_WRITE_WORD(cpustate, reg,in); cpustate->monitor_in = in; @@ -459,7 +459,7 @@ INLINE void saturn_return_carry_clear(saturn_state *cpustate) INLINE void saturn_return_interrupt(saturn_state *cpustate) { - LOG(( "SATURN '%s' at %05x: RTI\n", cpustate->device->tag.cstr(), cpustate->pc-2 )); + LOG(( "SATURN '%s' at %05x: RTI\n", cpustate->device->tag(), cpustate->pc-2 )); cpustate->in_irq=0; /* set to 1 when an IRQ is taken */ cpustate->pc=saturn_pop(cpustate); // cpustate->icount-=10; diff --git a/src/emu/cpu/saturn/sattable.c b/src/emu/cpu/saturn/sattable.c index 94b9faa5bbb..902a698aad7 100644 --- a/src/emu/cpu/saturn/sattable.c +++ b/src/emu/cpu/saturn/sattable.c @@ -38,25 +38,25 @@ static const int sub_right[]={B,C,A,C, I,I,I,I, A,B,C,D, B,C,A,C}; static void saturn_invalid3( saturn_state *cpustate, int op1, int op2, int op3 ) { logerror( "SATURN '%s' invalid opcode %x%x%x at %05x\n", - cpustate->device->tag.cstr(), op1, op2, op3, cpustate->pc-3 ); + cpustate->device->tag(), op1, op2, op3, cpustate->pc-3 ); } static void saturn_invalid4( saturn_state *cpustate, int op1, int op2, int op3, int op4 ) { logerror( "SATURN '%s' invalid opcode %x%x%x%x at %05x\n", - cpustate->device->tag.cstr(), op1, op2, op3, op4, cpustate->pc-4 ); + cpustate->device->tag(), op1, op2, op3, op4, cpustate->pc-4 ); } static void saturn_invalid5( saturn_state *cpustate, int op1, int op2, int op3, int op4, int op5 ) { logerror( "SATURN '%s' invalid opcode %x%x%x%x%x at %05x\n", - cpustate->device->tag.cstr(), op1, op2, op3, op4, op5, cpustate->pc-5 ); + cpustate->device->tag(), op1, op2, op3, op4, op5, cpustate->pc-5 ); } static void saturn_invalid6( saturn_state *cpustate, int op1, int op2, int op3, int op4, int op5, int op6 ) { logerror( "SATURN '%s' invalid opcode %x%x%x%x%x%x at %05x\n", - cpustate->device->tag.cstr(), op1, op2, op3, op4, op5, op6, cpustate->pc-6 ); + cpustate->device->tag(), op1, op2, op3, op4, op5, op6, cpustate->pc-6 ); } diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 7474e2c65cf..3b739e77850 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -162,7 +162,7 @@ INLINE void saturn_take_irq(saturn_state *cpustate) saturn_push(cpustate, cpustate->pc); cpustate->pc=IRQ_ADDRESS; - LOG(("Saturn '%s' takes IRQ ($%04x)\n", cpustate->device->tag.cstr(), cpustate->pc)); + LOG(("Saturn '%s' takes IRQ ($%04x)\n", cpustate->device->tag(), cpustate->pc)); if (cpustate->irq_callback) (*cpustate->irq_callback)(cpustate->device, SATURN_IRQ_LINE); } @@ -206,7 +206,7 @@ static void saturn_set_nmi_line(saturn_state *cpustate, int state) cpustate->nmi_state = state; if ( state != CLEAR_LINE ) { - LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", cpustate->device->tag.cstr())); + LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", cpustate->device->tag())); cpustate->pending_irq = 1; } } @@ -217,7 +217,7 @@ static void saturn_set_irq_line(saturn_state *cpustate, int state) cpustate->irq_state = state; if ( state != CLEAR_LINE && cpustate->irq_enable ) { - LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", cpustate->device->tag.cstr())); + LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", cpustate->device->tag())); cpustate->pending_irq = 1; } } @@ -226,7 +226,7 @@ static void saturn_set_wakeup_line(saturn_state *cpustate, int state) { if (cpustate->sleeping && state==1) { - LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", cpustate->device->tag.cstr())); + LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", cpustate->device->tag())); if (cpustate->irq_callback) (*cpustate->irq_callback)(cpustate->device, SATURN_WAKEUP_LINE); cpustate->sleeping = 0; } |