diff options
author | 2015-04-12 16:54:10 +0200 | |
---|---|---|
committer | 2015-04-12 16:54:10 +0200 | |
commit | 87f705b984df084f2a6658d838d6b56eee576e13 (patch) | |
tree | bee6c295b35db2143b130f1780bdb94a000ba96a /src/emu/cpu/m6502 | |
parent | f2243d602081b2f5ccf5b1dfe0e9530e30567a2a (diff) |
string -> str rename due to future conflicts (nw)
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r-- | src/emu/cpu/m6502/m6502.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6502.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m65ce02.c | 6 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m65ce02.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m740.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m740.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 9c35ec6da61..90e738cf844 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -456,12 +456,12 @@ void m6502_device::state_export(const device_state_entry &entry) { } -void m6502_device::state_string_export(const device_state_entry &entry, astring &string) +void m6502_device::state_string_export(const device_state_entry &entry, astring &str) { switch(entry.index()) { case STATE_GENFLAGS: case M6502_P: - string.printf("%c%c%c%c%c%c", + str.printf("%c%c%c%c%c%c", P & F_N ? 'N' : '.', P & F_V ? 'V' : '.', P & F_D ? 'D' : '.', diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index f77a33f6ae8..2fe03782d29 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -173,7 +173,7 @@ protected: // device_state_interface overrides virtual void state_import(const device_state_entry &entry); virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, astring &string); + virtual void state_string_export(const device_state_entry &entry, astring &str); // device_disasm_interface overrides virtual UINT32 disasm_min_opcode_bytes() const; diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 2a1365bc010..cb3bb9a1651 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -104,12 +104,12 @@ void m65ce02_device::state_export(const device_state_entry &entry) { } -void m65ce02_device::state_string_export(const device_state_entry &entry, astring &string) +void m65ce02_device::state_string_export(const device_state_entry &entry, astring &str) { switch(entry.index()) { case STATE_GENFLAGS: case M6502_P: - string.printf("%c%c%c%c%c%c%c", + str.printf("%c%c%c%c%c%c%c", P & F_N ? 'N' : '.', P & F_V ? 'V' : '.', P & F_E ? 'E' : '.', @@ -119,7 +119,7 @@ void m65ce02_device::state_string_export(const device_state_entry &entry, astrin P & F_C ? 'C' : '.'); break; case M65CE02_B: - string.printf("%02x", B >> 8); + str.printf("%02x", B >> 8); break; } } diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h index 20dbef91e07..df715d72e9c 100644 --- a/src/emu/cpu/m6502/m65ce02.h +++ b/src/emu/cpu/m6502/m65ce02.h @@ -63,7 +63,7 @@ protected: virtual void device_reset(); virtual void state_import(const device_state_entry &entry); virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, astring &string); + virtual void state_string_export(const device_state_entry &entry, astring &str); inline void dec_SP_ce() { if(P & F_E) SP = set_l(SP, SP-1); else SP--; } inline void inc_SP_ce() { if(P & F_E) SP = set_l(SP, SP+1); else SP++; } diff --git a/src/emu/cpu/m6502/m740.c b/src/emu/cpu/m6502/m740.c index fb1662b49ef..330eff9f378 100644 --- a/src/emu/cpu/m6502/m740.c +++ b/src/emu/cpu/m6502/m740.c @@ -82,12 +82,12 @@ void m740_device::device_reset() SP = 0x00ff; } -void m740_device::state_string_export(const device_state_entry &entry, astring &string) +void m740_device::state_string_export(const device_state_entry &entry, astring &str) { switch(entry.index()) { case STATE_GENFLAGS: case M6502_P: - string.printf("%c%c%c%c%c%c%c", + str.printf("%c%c%c%c%c%c%c", P & F_N ? 'N' : '.', P & F_V ? 'V' : '.', P & F_T ? 'T' : '.', diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h index 491d0418059..29e690018db 100644 --- a/src/emu/cpu/m6502/m740.h +++ b/src/emu/cpu/m6502/m740.h @@ -73,7 +73,7 @@ public: static const disasm_entry disasm_entries[0x200]; - virtual void state_string_export(const device_state_entry &entry, astring &string); + virtual void state_string_export(const device_state_entry &entry, astring &str); virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); virtual void do_exec_full(); |