diff options
| author | 2010-08-19 07:26:14 +0000 | |
|---|---|---|
| committer | 2010-08-19 07:26:14 +0000 | |
| commit | 3598b772bc80b2efb6396c65996462b38eedc593 (patch) | |
| tree | e975a31f1f8599b8a947b11675b674fd993accf2 /src/emu/debug | |
| parent | dd19e512c03c58a100ae5025c9fd7624387667fd (diff) | |
Replace "const address_space" with "address_space" throughout the system.
The purpose of making it const before was to discourage direct tampering,
but private/protected does a better job of that now anyhow, and it is
annoying now.
s/const[ \t]+address_space\b/address_space/g;
Is basically what I did.
Diffstat (limited to 'src/emu/debug')
| -rw-r--r-- | src/emu/debug/debugcmd.c | 26 | ||||
| -rw-r--r-- | src/emu/debug/debugcmd.h | 2 | ||||
| -rw-r--r-- | src/emu/debug/debugcmt.c | 2 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.c | 58 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.h | 44 | ||||
| -rw-r--r-- | src/emu/debug/dvdisasm.h | 4 | ||||
| -rw-r--r-- | src/emu/debug/dvmemory.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/dvmemory.h | 6 |
8 files changed, 73 insertions, 73 deletions
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index c639226240d..03b7b038bb3 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -161,7 +161,7 @@ static void execute_hardreset(running_machine *machine, int ref, int params, con given address is valid for cheating -------------------------------------------------*/ -INLINE int cheat_address_is_valid(const address_space *space, offs_t address) +INLINE int cheat_address_is_valid(address_space *space, offs_t address) { return debug_cpu_translate(space, TRANSLATE_READ, &address) && (memory_get_write_ptr(space, address) != NULL); } @@ -210,7 +210,7 @@ INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value) and swapping if necessary -------------------------------------------------*/ -INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, const address_space *space, offs_t address) +INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space *space, offs_t address) { return cheat_sign_extend(cheatsys, cheat_byte_swap(cheatsys, debug_read_memory(space, address, cheatsys->width, TRUE))); } @@ -554,7 +554,7 @@ int debug_command_parameter_cpu(running_machine *machine, const char *param, dev address space -------------------------------------------------*/ -int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, const address_space **result) +int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, address_space **result) { device_t *cpu; @@ -1305,7 +1305,7 @@ static void execute_bplist(running_machine *machine, int ref, int params, const static void execute_wpset(running_machine *machine, int ref, int params, const char *param[]) { parsed_expression *condition = NULL; - const address_space *space; + address_space *space; const char *action = NULL; UINT64 address, length; int type = 0; @@ -1511,7 +1511,7 @@ static void execute_hotspot(running_machine *machine, int ref, int params, const static void execute_save(running_machine *machine, int ref, int params, const char *param[]) { UINT64 offset, endoffset, length; - const address_space *space; + address_space *space; FILE *f; UINT64 i; @@ -1555,7 +1555,7 @@ static void execute_save(running_machine *machine, int ref, int params, const ch static void execute_dump(running_machine *machine, int ref, int params, const char *param[]) { UINT64 offset, endoffset, length, width = 0, ascii = 1; - const address_space *space; + address_space *space; FILE *f = NULL; UINT64 i, j; @@ -1653,7 +1653,7 @@ static void execute_dump(running_machine *machine, int ref, int params, const ch static void execute_cheatinit(running_machine *machine, int ref, int params, const char *param[]) { UINT64 offset, length = 0, real_length = 0; - const address_space *space; + address_space *space; UINT32 active_cheat = 0; UINT64 curaddr; UINT8 i, region_count = 0; @@ -1815,7 +1815,7 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con static void execute_cheatnext(running_machine *machine, int ref, int params, const char *param[]) { - const address_space *space; + address_space *space; UINT64 cheatindex; UINT32 active_cheat = 0; UINT8 condition; @@ -1984,7 +1984,7 @@ static void execute_cheatnext(running_machine *machine, int ref, int params, con static void execute_cheatlist(running_machine *machine, int ref, int params, const char *param[]) { char spaceletter, sizeletter; - const address_space *space; + address_space *space; device_t *cpu; UINT32 active_cheat = 0; UINT64 cheatindex; @@ -2079,7 +2079,7 @@ static void execute_cheatundo(running_machine *machine, int ref, int params, con static void execute_find(running_machine *machine, int ref, int params, const char *param[]) { UINT64 offset, endoffset, length; - const address_space *space; + address_space *space; UINT64 data_to_find[256]; UINT8 data_size[256]; int cur_data_size; @@ -2179,7 +2179,7 @@ static void execute_dasm(running_machine *machine, int ref, int params, const ch { UINT64 offset, length, bytes = 1; int minbytes, maxbytes, byteswidth; - const address_space *space; + address_space *space; FILE *f = NULL; int i, j; @@ -2373,7 +2373,7 @@ static void execute_traceflush(running_machine *machine, int ref, int params, co static void execute_history(running_machine *machine, int ref, int params, const char *param[]) { /* validate parameters */ - const address_space *space; + address_space *space; if (!debug_command_parameter_cpu_space(machine, (params > 0) ? param[0] : NULL, ADDRESS_SPACE_PROGRAM, &space)) return; @@ -2473,7 +2473,7 @@ static void execute_source(running_machine *machine, int ref, int params, const static void execute_map(running_machine *machine, int ref, int params, const char *param[]) { - const address_space *space; + address_space *space; offs_t taddress; UINT64 address; int intention; diff --git a/src/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h index 6a68dfd96b6..7e43b784786 100644 --- a/src/emu/debug/debugcmd.h +++ b/src/emu/debug/debugcmd.h @@ -33,6 +33,6 @@ int debug_command_parameter_number(running_machine *machine, const char *param, int debug_command_parameter_cpu(running_machine *machine, const char *param, device_t **result); /* validates a parameter as a cpu and retrieves the given address space */ -int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, const address_space **result); +int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, address_space **result); #endif diff --git a/src/emu/debug/debugcmt.c b/src/emu/debug/debugcmt.c index b2e2edb3b17..3b9c1a3ef46 100644 --- a/src/emu/debug/debugcmt.c +++ b/src/emu/debug/debugcmt.c @@ -281,7 +281,7 @@ UINT32 debug_comment_all_change_count(running_machine *machine) UINT32 debug_comment_get_opcode_crc32(device_t *device, offs_t address) { - const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); + address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); int i; UINT32 crc; UINT8 opbuf[64], argbuf[64]; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 31c0d3a9195..c70ce62337b 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -112,10 +112,10 @@ static void process_source_file(running_machine *machine); /* expression handlers */ static UINT64 expression_read_memory(void *param, const char *name, int space, UINT32 address, int size); -static UINT64 expression_read_program_direct(const address_space *space, int opcode, offs_t address, int size); +static UINT64 expression_read_program_direct(address_space *space, int opcode, offs_t address, int size); static UINT64 expression_read_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size); static void expression_write_memory(void *param, const char *name, int space, UINT32 address, int size, UINT64 data); -static void expression_write_program_direct(const address_space *space, int opcode, offs_t address, int size, UINT64 data); +static void expression_write_program_direct(address_space *space, int opcode, offs_t address, int size, UINT64 data); static void expression_write_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size, UINT64 data); static EXPRERR expression_validate(void *param, const char *name, int space); @@ -323,7 +323,7 @@ void debug_cpu_source_script(running_machine *machine, const char *file) address -------------------------------------------------*/ -int debug_cpu_translate(const address_space *space, int intention, offs_t *address) +int debug_cpu_translate(address_space *space, int intention, offs_t *address) { device_memory_interface *memory; if (space->cpu->interface(memory)) @@ -341,7 +341,7 @@ int debug_cpu_translate(const address_space *space, int intention, offs_t *addre the specified memory space -------------------------------------------------*/ -UINT8 debug_read_byte(const address_space *_space, offs_t address, int apply_translation) +UINT8 debug_read_byte(address_space *_space, offs_t address, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -377,7 +377,7 @@ UINT8 debug_read_byte(const address_space *_space, offs_t address, int apply_tra specified memory space -------------------------------------------------*/ -UINT16 debug_read_word(const address_space *_space, offs_t address, int apply_translation) +UINT16 debug_read_word(address_space *_space, offs_t address, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -432,7 +432,7 @@ UINT16 debug_read_word(const address_space *_space, offs_t address, int apply_tr specified memory space -------------------------------------------------*/ -UINT32 debug_read_dword(const address_space *_space, offs_t address, int apply_translation) +UINT32 debug_read_dword(address_space *_space, offs_t address, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -487,7 +487,7 @@ UINT32 debug_read_dword(const address_space *_space, offs_t address, int apply_t specified memory space -------------------------------------------------*/ -UINT64 debug_read_qword(const address_space *_space, offs_t address, int apply_translation) +UINT64 debug_read_qword(address_space *_space, offs_t address, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -542,7 +542,7 @@ UINT64 debug_read_qword(const address_space *_space, offs_t address, int apply_t from the specified memory space -------------------------------------------------*/ -UINT64 debug_read_memory(const address_space *space, offs_t address, int size, int apply_translation) +UINT64 debug_read_memory(address_space *space, offs_t address, int size, int apply_translation) { UINT64 result = ~(UINT64)0 >> (64 - 8*size); switch (size) @@ -561,7 +561,7 @@ UINT64 debug_read_memory(const address_space *space, offs_t address, int size, i specified memory space -------------------------------------------------*/ -void debug_write_byte(const address_space *_space, offs_t address, UINT8 data, int apply_translation) +void debug_write_byte(address_space *_space, offs_t address, UINT8 data, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -595,7 +595,7 @@ void debug_write_byte(const address_space *_space, offs_t address, UINT8 data, i specified memory space -------------------------------------------------*/ -void debug_write_word(const address_space *_space, offs_t address, UINT16 data, int apply_translation) +void debug_write_word(address_space *_space, offs_t address, UINT16 data, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -648,7 +648,7 @@ void debug_write_word(const address_space *_space, offs_t address, UINT16 data, specified memory space -------------------------------------------------*/ -void debug_write_dword(const address_space *_space, offs_t address, UINT32 data, int apply_translation) +void debug_write_dword(address_space *_space, offs_t address, UINT32 data, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -701,7 +701,7 @@ void debug_write_dword(const address_space *_space, offs_t address, UINT32 data, specified memory space -------------------------------------------------*/ -void debug_write_qword(const address_space *_space, offs_t address, UINT64 data, int apply_translation) +void debug_write_qword(address_space *_space, offs_t address, UINT64 data, int apply_translation) { address_space *space = const_cast<address_space *>(_space); debugcpu_private *global = space->machine->debugcpu_data; @@ -754,7 +754,7 @@ void debug_write_qword(const address_space *_space, offs_t address, UINT64 data, to the specified memory space -------------------------------------------------*/ -void debug_write_memory(const address_space *space, offs_t address, UINT64 data, int size, int apply_translation) +void debug_write_memory(address_space *space, offs_t address, UINT64 data, int size, int apply_translation) { switch (size) { @@ -771,7 +771,7 @@ void debug_write_memory(const address_space *space, offs_t address, UINT64 data, the given offset from opcode space -------------------------------------------------*/ -UINT64 debug_read_opcode(const address_space *_space, offs_t address, int size, int arg) +UINT64 debug_read_opcode(address_space *_space, offs_t address, int size, int arg) { address_space *space = const_cast<address_space *>(_space); UINT64 result = ~(UINT64)0 & (~(UINT64)0 >> (64 - 8*size)), result2; @@ -1039,7 +1039,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum running_machine *machine = (running_machine *)param; UINT64 result = ~(UINT64)0 >> (64 - 8*size); device_t *device = NULL; - const address_space *space; + address_space *space; switch (spacenum) { @@ -1093,7 +1093,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum directly from an opcode or RAM pointer -------------------------------------------------*/ -static UINT64 expression_read_program_direct(const address_space *_space, int opcode, offs_t address, int size) +static UINT64 expression_read_program_direct(address_space *_space, int opcode, offs_t address, int size) { address_space *space = const_cast<address_space *>(_space); UINT64 result = ~(UINT64)0 >> (64 - 8*size); @@ -1207,7 +1207,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum, { running_machine *machine = (running_machine *)param; device_t *device = NULL; - const address_space *space; + address_space *space; switch (spacenum) { @@ -1260,7 +1260,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum, directly to an opcode or RAM pointer -------------------------------------------------*/ -static void expression_write_program_direct(const address_space *_space, int opcode, offs_t address, int size, UINT64 data) +static void expression_write_program_direct(address_space *_space, int opcode, offs_t address, int size, UINT64 data) { address_space *space = const_cast<address_space *>(_space); if (space != NULL) @@ -1905,7 +1905,7 @@ void device_debug::instruction_hook(offs_t curpc) // memory read happens //------------------------------------------------- -void device_debug::memory_read_hook(const address_space &space, offs_t address, UINT64 mem_mask) +void device_debug::memory_read_hook(address_space &space, offs_t address, UINT64 mem_mask) { // check watchpoints watchpoint_check(space, WATCHPOINT_READ, address, 0, mem_mask); @@ -1922,7 +1922,7 @@ void device_debug::memory_read_hook(const address_space &space, offs_t address, // memory write happens //------------------------------------------------- -void device_debug::memory_write_hook(const address_space &space, offs_t address, UINT64 data, UINT64 mem_mask) +void device_debug::memory_write_hook(address_space &space, offs_t address, UINT64 data, UINT64 mem_mask) { watchpoint_check(space, WATCHPOINT_WRITE, address, data, mem_mask); } @@ -1966,7 +1966,7 @@ offs_t device_debug::disassemble(char *buffer, offs_t pc, const UINT8 *oprom, co #ifdef MAME_DEBUG if (m_memory != NULL && m_disasm != NULL) { - const address_space *space = m_memory->space(AS_PROGRAM); + address_space *space = m_memory->space(AS_PROGRAM); int bytes = space->address_to_byte(result & DASMFLAG_LENGTHMASK); assert(bytes >= m_disasm->min_opcode_bytes()); assert(bytes <= m_disasm->max_opcode_bytes()); @@ -2279,7 +2279,7 @@ void device_debug::breakpoint_enable_all(bool enable) // returning its index //------------------------------------------------- -int device_debug::watchpoint_set(const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action) +int device_debug::watchpoint_set(address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action) { assert(space.spacenum() < ARRAY_LENGTH(m_wplist)); @@ -2309,7 +2309,7 @@ bool device_debug::watchpoint_clear(int index) if ((*wp)->m_index == index) { watchpoint *deleteme = *wp; - const address_space &space = deleteme->m_space; + address_space &space = deleteme->m_space; *wp = deleteme->m_next; auto_free(m_device.machine, deleteme); watchpoint_update_flags(space); @@ -2573,7 +2573,7 @@ void device_debug::breakpoint_check(offs_t pc) // watchpoint flags //------------------------------------------------- -void device_debug::watchpoint_update_flags(const address_space &space) +void device_debug::watchpoint_update_flags(address_space &space) { // if hotspots are enabled, turn on all reads bool enableread = false; @@ -2602,7 +2602,7 @@ void device_debug::watchpoint_update_flags(const address_space &space) // for a given CPU and address space //------------------------------------------------- -void device_debug::watchpoint_check(const address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask) +void device_debug::watchpoint_check(address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask) { debugcpu_private *global = space.machine->debugcpu_data; @@ -2688,7 +2688,7 @@ void device_debug::watchpoint_check(const address_space &space, int type, offs_t // memory read access //------------------------------------------------- -void device_debug::hotspot_check(const address_space &space, offs_t address) +void device_debug::hotspot_check(address_space &space, offs_t address) { offs_t curpc = pc(); @@ -2739,7 +2739,7 @@ UINT32 device_debug::dasm_wrapped(astring &buffer, offs_t pc) assert(m_memory != NULL && m_disasm != NULL); // determine the adjusted PC - const address_space *space = m_memory->space(AS_PROGRAM); + address_space *space = m_memory->space(AS_PROGRAM); offs_t pcbyte = space->address_to_byte(pc) & space->bytemask(); // fetch the bytes up to the maximum @@ -2788,7 +2788,7 @@ UINT64 device_debug::get_cycles(void *globalref, void *ref) UINT64 device_debug::get_logunmap(void *globalref, void *ref) { - const address_space *space = reinterpret_cast<const address_space *>(ref); + address_space *space = reinterpret_cast<address_space *>(ref); return memory_get_log_unmap(space); } @@ -2892,7 +2892,7 @@ bool device_debug::breakpoint::hit(offs_t pc) // watchpoint - constructor //------------------------------------------------- -device_debug::watchpoint::watchpoint(int index, const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action) +device_debug::watchpoint::watchpoint(int index, address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action) : m_next(NULL), m_space(space), m_index(index), diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h index 1373aaabfdf..4598afbdde4 100644 --- a/src/emu/debug/debugcpu.h +++ b/src/emu/debug/debugcpu.h @@ -107,12 +107,12 @@ public: public: // construction/destruction - watchpoint(int index, const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition = NULL, const char *action = NULL); + watchpoint(int index, address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition = NULL, const char *action = NULL); ~watchpoint(); // getters watchpoint *next() const { return m_next; } - const address_space &space() const { return m_space; } + address_space &space() const { return m_space; } int index() const { return m_index; } int type() const { return m_type; } bool enabled() const { return m_enabled; } @@ -126,7 +126,7 @@ public: bool hit(int type, offs_t address, int size); watchpoint * m_next; // next in the list - const address_space &m_space; // address space + address_space &m_space; // address space int m_index; // user reported index bool m_enabled; // enabled? UINT8 m_type; // type (read/write) @@ -156,8 +156,8 @@ public: void interrupt_hook(int irqline); void exception_hook(int exception); void instruction_hook(offs_t curpc); - void memory_read_hook(const address_space &space, offs_t address, UINT64 mem_mask); - void memory_write_hook(const address_space &space, offs_t address, UINT64 data, UINT64 mem_mask); + void memory_read_hook(address_space &space, offs_t address, UINT64 mem_mask); + void memory_write_hook(address_space &space, offs_t address, UINT64 data, UINT64 mem_mask); // hooks into our operations void set_instruction_hook(debug_instruction_hook_func hook); @@ -194,7 +194,7 @@ public: // watchpoints watchpoint *watchpoint_first(int spacenum) const { return m_wplist[spacenum]; } - int watchpoint_set(const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action); + int watchpoint_set(address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action); bool watchpoint_clear(int wpnum); void watchpoint_clear_all(); bool watchpoint_enable(int index, bool enable = true); @@ -225,9 +225,9 @@ private: // breakpoint and watchpoint helpers void breakpoint_update_flags(); void breakpoint_check(offs_t pc); - void watchpoint_update_flags(const address_space &space); - void watchpoint_check(const address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask); - void hotspot_check(const address_space &space, offs_t address); + void watchpoint_update_flags(address_space &space); + void watchpoint_check(address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask); + void hotspot_check(address_space &space, offs_t address); // symbol get/set callbacks static UINT64 get_current_pc(void *globalref, void *ref); @@ -304,7 +304,7 @@ private: { offs_t m_access; // access address offs_t m_pc; // PC of the access - const address_space *m_space; // space where the access occurred + address_space *m_space; // space where the access occurred UINT32 m_count; // number of hits }; hotspot_entry * m_hotspots; // hotspot list @@ -394,40 +394,40 @@ void debug_cpu_source_script(running_machine *machine, const char *file); /* ----- debugger memory accessors ----- */ /* return the physical address corresponding to the given logical address */ -int debug_cpu_translate(const address_space *space, int intention, offs_t *address); +int debug_cpu_translate(address_space *space, int intention, offs_t *address); /* return a byte from the the specified memory space */ -UINT8 debug_read_byte(const address_space *space, offs_t address, int apply_translation); +UINT8 debug_read_byte(address_space *space, offs_t address, int apply_translation); /* return a word from the the specified memory space */ -UINT16 debug_read_word(const address_space *space, offs_t address, int apply_translation); +UINT16 debug_read_word(address_space *space, offs_t address, int apply_translation); /* return a dword from the the specified memory space */ -UINT32 debug_read_dword(const address_space *space, offs_t address, int apply_translation); +UINT32 debug_read_dword(address_space *space, offs_t address, int apply_translation); /* return a qword from the the specified memory space */ -UINT64 debug_read_qword(const address_space *space, offs_t address, int apply_translation); +UINT64 debug_read_qword(address_space *space, offs_t address, int apply_translation); /* return 1,2,4 or 8 bytes from the specified memory space */ -UINT64 debug_read_memory(const address_space *space, offs_t address, int size, int apply_translation); +UINT64 debug_read_memory(address_space *space, offs_t address, int size, int apply_translation); /* write a byte to the specified memory space */ -void debug_write_byte(const address_space *space, offs_t address, UINT8 data, int apply_translation); +void debug_write_byte(address_space *space, offs_t address, UINT8 data, int apply_translation); /* write a word to the specified memory space */ -void debug_write_word(const address_space *space, offs_t address, UINT16 data, int apply_translation); +void debug_write_word(address_space *space, offs_t address, UINT16 data, int apply_translation); /* write a dword to the specified memory space */ -void debug_write_dword(const address_space *space, offs_t address, UINT32 data, int apply_translation); +void debug_write_dword(address_space *space, offs_t address, UINT32 data, int apply_translation); /* write a qword to the specified memory space */ -void debug_write_qword(const address_space *space, offs_t address, UINT64 data, int apply_translation); +void debug_write_qword(address_space *space, offs_t address, UINT64 data, int apply_translation); /* write 1,2,4 or 8 bytes to the specified memory space */ -void debug_write_memory(const address_space *space, offs_t address, UINT64 data, int size, int apply_translation); +void debug_write_memory(address_space *space, offs_t address, UINT64 data, int size, int apply_translation); /* read 1,2,4 or 8 bytes at the given offset from opcode space */ -UINT64 debug_read_opcode(const address_space *space, offs_t offset, int size, int arg); +UINT64 debug_read_opcode(address_space *space, offs_t offset, int size, int arg); #endif diff --git a/src/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h index aed35f3724b..16f0fff1a5f 100644 --- a/src/emu/debug/dvdisasm.h +++ b/src/emu/debug/dvdisasm.h @@ -73,13 +73,13 @@ class debug_view_disasm_source : public debug_view_source public: // getters device_t &device() const { return m_device; } - const address_space *space() const { return m_space; } + address_space *space() const { return m_space; } private: // internal state device_t & m_device; // underlying device device_disasm_interface *m_disasmintf; // disassembly interface - const address_space *m_space; // address space to display + address_space *m_space; // address space to display }; diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c index 4399565929e..2073cbc5492 100644 --- a/src/emu/debug/dvmemory.c +++ b/src/emu/debug/dvmemory.c @@ -72,7 +72,7 @@ const debug_view_memory::memory_view_pos debug_view_memory::s_memory_pos_table[9 // debug_view_memory_source - constructors //------------------------------------------------- -debug_view_memory_source::debug_view_memory_source(const char *name, const address_space &space) +debug_view_memory_source::debug_view_memory_source(const char *name, address_space &space) : debug_view_source(name, space.cpu), m_space(&space), m_memintf(dynamic_cast<device_memory_interface *>(space.cpu)), @@ -156,7 +156,7 @@ void debug_view_memory::enumerate_sources() for (bool gotone = m_machine.m_devicelist.first(memintf); gotone; gotone = memintf->next(memintf)) for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) { - const address_space *space = memintf->space(spacenum); + address_space *space = memintf->space(spacenum); if (space != NULL) { name.printf("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space->name()); diff --git a/src/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h index 3775885ff7e..dc27de2bd87 100644 --- a/src/emu/debug/dvmemory.h +++ b/src/emu/debug/dvmemory.h @@ -52,15 +52,15 @@ class debug_view_memory_source : public debug_view_source { friend class debug_view_memory; - debug_view_memory_source(const char *name, const address_space &space); + debug_view_memory_source(const char *name, address_space &space); debug_view_memory_source(const char *name, const region_info ®ion); debug_view_memory_source(const char *name, void *base, int element_size, int num_elements); public: - const address_space *space() const { return m_space; } + address_space *space() const { return m_space; } private: - const address_space *m_space; // address space we reference (if any) + address_space *m_space; // address space we reference (if any) device_memory_interface *m_memintf; // pointer to the memory interface of the device void * m_base; // pointer to memory base offs_t m_length; // length of memory |
