summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-11 15:16:43 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-11 15:16:43 +0000
commit6d8c3c9f2d5d30848751a12c2925fbe53ac8bfec (patch)
tree5be66bb26a139af5ab375ac1fc48a3dd5c1f6c58 /src/emu
parent1df58104fedb600014fa1c1908bf8ee7972b48d4 (diff)
Don't use safe_pc[base] when you already have a
resolved device_state_interface. Added redundant methods to device_state_interface to generate errors when this is done.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/m6502/opsce02.h2
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c2
-rw-r--r--src/emu/cpu/tms34010/34010gfx.c2
-rw-r--r--src/emu/distate.h5
4 files changed, 8 insertions, 3 deletions
diff --git a/src/emu/cpu/m6502/opsce02.h b/src/emu/cpu/m6502/opsce02.h
index 28f00a791fd..33d6b996b97 100644
--- a/src/emu/cpu/m6502/opsce02.h
+++ b/src/emu/cpu/m6502/opsce02.h
@@ -291,7 +291,7 @@
t1=RDOPARG(); \
t2=RDOPARG(); \
t3=RDOPARG(); \
- logerror("m65ce02 at pc:%.4x reserved op aug %.2x %.2x %.2x\n", cpustate->device->safe_pc(),t1,t2,t3);
+ logerror("m65ce02 at pc:%.4x reserved op aug %.2x %.2x %.2x\n", cpustate->device->pc(),t1,t2,t3);
/* 65ce02 ******************************************************
* BBR Branch if bit is reset
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 71033a66866..26b4cfbd010 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -1967,7 +1967,7 @@ static CPU_EXECUTE( t90 )
break;
default:
- fatalerror("%04x: unimplemented opcode, op=%02x\n",device->safe_pc(),cpustate->op);
+ fatalerror("%04x: unimplemented opcode, op=%02x\n",device->pc(),cpustate->op);
}
if ( cpustate->op != EI )
diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c
index 6afda3e2be6..fa3be3134ae 100644
--- a/src/emu/cpu/tms34010/34010gfx.c
+++ b/src/emu/cpu/tms34010/34010gfx.c
@@ -84,7 +84,7 @@ static int apply_window(tms34010_state *tms, const char *inst_name,int srcbpp, U
int diff, cycles = 3;
if (WINDOW_CHECKING(tms) == 2)
- logerror("%08x: %s apply_window window mode %d not supported!\n", tms->device->safe_pc(), inst_name, WINDOW_CHECKING(tms));
+ logerror("%08x: %s apply_window window mode %d not supported!\n", tms->device->pc(), inst_name, WINDOW_CHECKING(tms));
CLR_V(tms);
if (WINDOW_CHECKING(tms) == 1)
diff --git a/src/emu/distate.h b/src/emu/distate.h
index b64a10f1348..29470cd707a 100644
--- a/src/emu/distate.h
+++ b/src/emu/distate.h
@@ -162,6 +162,11 @@ public:
// state setters
void set_state(int index, UINT64 value);
void set_state_string(int index, const char *string);
+
+ // deliberately ambiguous functions; if you have the state interface
+ // just use pc() and pcbase() directly
+ offs_t safe_pc() { return pc(); }
+ offs_t safe_pcbase() { return pcbase(); }
public: // protected eventually