Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 18:08:04 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Device memory spaces are now visible in the debugger.

Browse Source
This commit is contained in:
Aaron Giles 2009-10-09 05:46:32 +00:00
parent a6c5893732
commit b921124c9e
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/emu/debug/debugcpu.c
View File

@ -368,11 +368,13 @@ symbol_table *debug_cpu_get_symtable(const device_config *device)
-------------------------------------------------*/ -------------------------------------------------*/
int debug_cpu_translate(const address_space *space, int intention, offs_t *address) int debug_cpu_translate(const address_space *space, int intention, offs_t *address)
{
if (space->cpu != NULL && space->cpu->type == CPU)
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = cpu_get_debug_data(space->cpu);
if (info->translate != NULL) if (info->translate != NULL)
return (*info->translate)(space->cpu, space->spacenum, intention, address); return (*info->translate)(space->cpu, space->spacenum, intention, address);
else }
return TRUE; return TRUE;
} }
@ -1334,8 +1336,8 @@ int debug_cpu_hotspot_track(const device_config *device, int numspots, int thres
UINT8 debug_read_byte(const address_space *space, offs_t address, int apply_translation) UINT8 debug_read_byte(const address_space *space, offs_t address, int apply_translation)
{ {
cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
debugcpu_private *global = space->machine->debugcpu_data; debugcpu_private *global = space->machine->debugcpu_data;
cpu_debug_data *info = cpu_get_debug_data(space->cpu);
UINT64 custom; UINT64 custom;
UINT8 result; UINT8 result;
@ -1350,7 +1352,7 @@ UINT8 debug_read_byte(const address_space *space, offs_t address, int apply_tran
result = 0xff; result = 0xff;
/* if there is a custom read handler, and it returns TRUE, use that value */ /* if there is a custom read handler, and it returns TRUE, use that value */
else if (info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 1, &custom)) else if (info != NULL && info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 1, &custom))
result = custom; result = custom;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1392,7 +1394,7 @@ UINT16 debug_read_word(const address_space *space, offs_t address, int apply_tra
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
UINT64 custom; UINT64 custom;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
@ -1403,7 +1405,7 @@ UINT16 debug_read_word(const address_space *space, offs_t address, int apply_tra
result = 0xffff; result = 0xffff;
/* if there is a custom read handler, and it returns TRUE, use that value */ /* if there is a custom read handler, and it returns TRUE, use that value */
else if (info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 2, &custom)) else if (info != NULL && info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 2, &custom))
result = custom; result = custom;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1447,7 +1449,7 @@ UINT32 debug_read_dword(const address_space *space, offs_t address, int apply_tr
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
UINT64 custom; UINT64 custom;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
@ -1458,7 +1460,7 @@ UINT32 debug_read_dword(const address_space *space, offs_t address, int apply_tr
result = 0xffffffff; result = 0xffffffff;
/* if there is a custom read handler, and it returns TRUE, use that value */ /* if there is a custom read handler, and it returns TRUE, use that value */
else if (info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 4, &custom)) else if (info != NULL && info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 4, &custom))
result = custom; result = custom;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1502,7 +1504,7 @@ UINT64 debug_read_qword(const address_space *space, offs_t address, int apply_tr
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
UINT64 custom; UINT64 custom;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
@ -1513,7 +1515,7 @@ UINT64 debug_read_qword(const address_space *space, offs_t address, int apply_tr
result = ~(UINT64)0; result = ~(UINT64)0;
/* if there is a custom read handler, and it returns TRUE, use that value */ /* if there is a custom read handler, and it returns TRUE, use that value */
else if (info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 8, &custom)) else if (info != NULL && info->read != NULL && (*info->read)(space->cpu, space->spacenum, address, 8, &custom))
result = custom; result = custom;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1554,8 +1556,8 @@ UINT64 debug_read_memory(const address_space *space, offs_t address, int size, i
void debug_write_byte(const address_space *space, offs_t address, UINT8 data, int apply_translation) void debug_write_byte(const address_space *space, offs_t address, UINT8 data, int apply_translation)
{ {
cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
debugcpu_private *global = space->machine->debugcpu_data; debugcpu_private *global = space->machine->debugcpu_data;
cpu_debug_data *info = cpu_get_debug_data(space->cpu);
/* mask against the logical byte mask */ /* mask against the logical byte mask */
address &= space->logbytemask; address &= space->logbytemask;
@ -1568,7 +1570,7 @@ void debug_write_byte(const address_space *space, offs_t address, UINT8 data, in
; ;
/* if there is a custom write handler, and it returns TRUE, use that */ /* if there is a custom write handler, and it returns TRUE, use that */
else if (info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 1, data)) else if (info != NULL && info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 1, data))
; ;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1611,7 +1613,7 @@ void debug_write_word(const address_space *space, offs_t address, UINT16 data, i
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
memory_set_debugger_access(space, global->debugger_access = TRUE); memory_set_debugger_access(space, global->debugger_access = TRUE);
@ -1621,7 +1623,7 @@ void debug_write_word(const address_space *space, offs_t address, UINT16 data, i
; ;
/* if there is a custom write handler, and it returns TRUE, use that */ /* if there is a custom write handler, and it returns TRUE, use that */
else if (info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 2, data)) else if (info != NULL && info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 2, data))
; ;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1665,7 +1667,7 @@ void debug_write_dword(const address_space *space, offs_t address, UINT32 data,
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
memory_set_debugger_access(space, global->debugger_access = TRUE); memory_set_debugger_access(space, global->debugger_access = TRUE);
@ -1675,7 +1677,7 @@ void debug_write_dword(const address_space *space, offs_t address, UINT32 data,
; ;
/* if there is a custom write handler, and it returns TRUE, use that */ /* if there is a custom write handler, and it returns TRUE, use that */
else if (info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 4, data)) else if (info != NULL && info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 4, data))
; ;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */
@ -1719,7 +1721,7 @@ void debug_write_qword(const address_space *space, offs_t address, UINT64 data,
/* otherwise, this proceeds like the byte case */ /* otherwise, this proceeds like the byte case */
else else
{ {
cpu_debug_data *info = cpu_get_debug_data(space->cpu); cpu_debug_data *info = (space->cpu->type == CPU) ? cpu_get_debug_data(space->cpu) : NULL;
/* all accesses from this point on are for the debugger */ /* all accesses from this point on are for the debugger */
memory_set_debugger_access(space, global->debugger_access = TRUE); memory_set_debugger_access(space, global->debugger_access = TRUE);
@ -1729,7 +1731,7 @@ void debug_write_qword(const address_space *space, offs_t address, UINT64 data,
; ;
/* if there is a custom write handler, and it returns TRUE, use that */ /* if there is a custom write handler, and it returns TRUE, use that */
else if (info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 8, data)) else if (info != NULL && info->write != NULL && (*info->write)(space->cpu, space->spacenum, address, 8, data))
; ;
/* otherwise, call the byte reading function for the translated address */ /* otherwise, call the byte reading function for the translated address */

15
src/emu/debug/debugvw.c
View File

@ -2392,23 +2392,26 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine
astring *tempstring = astring_alloc(); astring *tempstring = astring_alloc();
memory_subview_item *head = NULL; memory_subview_item *head = NULL;
memory_subview_item **tailptr = &head; memory_subview_item **tailptr = &head;
const device_config *cpu; const device_config *device;
int spacenum; int spacenum;
const char *rgntag; const char *rgntag;
int curindex = 0; int curindex = 0;
int itemnum; int itemnum;
/* first add all the CPUs' address spaces */ /* first add all the device's address spaces */
for (cpu = machine->firstcpu; cpu != NULL; cpu = cpu_next(cpu)) for (device = machine->config->devicelist; device != NULL; device = device->next)
for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
{ {
const address_space *space = cpu_get_address_space(cpu, spacenum); const address_space *space = memory_find_address_space(device, spacenum);
if (space != NULL) if (space != NULL)
{ {
memory_subview_item *subview; memory_subview_item *subview;
/* determine the string and allocate a subview large enough */ /* determine the string and allocate a subview large enough */
astring_printf(tempstring, "CPU '%s' (%s) %s memory", cpu->tag, cpu_get_name(cpu), space->name); if (device->type == CPU)
astring_printf(tempstring, "CPU '%s' (%s) %s memory", device->tag, device_get_name(device), space->name);
else
astring_printf(tempstring, "%s '%s' space #%d memory", device_get_name(device), device->tag, spacenum);
subview = (memory_subview_item *)auto_alloc_array_clear(machine, UINT8, sizeof(*subview) + astring_len(tempstring)); subview = (memory_subview_item *)auto_alloc_array_clear(machine, UINT8, sizeof(*subview) + astring_len(tempstring));
/* populate the subview */ /* populate the subview */
@ -2886,7 +2889,7 @@ static int memory_view_needs_recompute(debug_view *view)
int recompute = view->recompute; int recompute = view->recompute;
/* handle expression changes */ /* handle expression changes */
if (debug_view_expression_changed_value(view, &memdata->expression, (space != NULL) ? space->cpu : NULL)) if (debug_view_expression_changed_value(view, &memdata->expression, (space != NULL && space->cpu != NULL && space->cpu->type == CPU) ? space->cpu : NULL))
{ {
recompute = TRUE; recompute = TRUE;
view->topleft.y = (memdata->expression.result - memdata->byte_offset) / memdata->bytes_per_row; view->topleft.y = (memdata->expression.result - memdata->byte_offset) / memdata->bytes_per_row;