Fixed up some error logging messages to output the correct number of characters

for addresses and data, using the new core_i64_hex_format function.
This commit is contained in:
Aaron Giles 2009-09-10 08:24:15 +00:00
parent 834ef9bf47
commit 8eeb0f1d20
2 changed files with 13 additions and 10 deletions

View File

@ -422,7 +422,10 @@ const char *cpuexec_describe_context(running_machine *machine)
/* if we have an executing CPU, output data */ /* if we have an executing CPU, output data */
if (executingcpu != NULL) if (executingcpu != NULL)
sprintf(global->statebuf, "'%s' (%08X)", executingcpu->tag, cpu_get_pc(executingcpu)); {
const address_space *space = cpu_get_address_space(executingcpu, ADDRESS_SPACE_PROGRAM);
sprintf(global->statebuf, "'%s' (%s)", executingcpu->tag, core_i64_hex_format(cpu_get_pc(executingcpu), space->logaddrchars));
}
else else
strcpy(global->statebuf, "(no context)"); strcpy(global->statebuf, "(no context)");

View File

@ -921,7 +921,7 @@ int memory_set_direct_region(const address_space *space, offs_t *byteaddress)
spacerw->direct.byteend = 0; spacerw->direct.byteend = 0;
spacerw->direct.bytestart = 1; spacerw->direct.bytestart = 1;
if (!spacerw->debugger_access) if (!spacerw->debugger_access)
logerror("Device '%s': warning - attempt to direct-map address %08X in %s space\n", space->cpu->tag, overrideaddress, space->name); logerror("Device '%s': warning - attempt to direct-map address %s in %s space\n", space->cpu->tag, core_i64_hex_format(overrideaddress, space->addrchars), space->name);
return FALSE; return FALSE;
} }
@ -3211,40 +3211,40 @@ static address_map_entry *block_assign_intersecting(address_space *space, offs_t
static READ8_HANDLER( unmap_read8 ) static READ8_HANDLER( unmap_read8 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte read from %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset)); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte read from %s\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset), space->addrchars));
return space->unmap; return space->unmap;
} }
static READ16_HANDLER( unmap_read16 ) static READ16_HANDLER( unmap_read16 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word read from %08X & %04X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*2), mem_mask); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word read from %s & %04X\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*2), space->addrchars), mem_mask);
return space->unmap; return space->unmap;
} }
static READ32_HANDLER( unmap_read32 ) static READ32_HANDLER( unmap_read32 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword read from %08X & %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*4), mem_mask); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword read from %s & %08X\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*4), space->addrchars), mem_mask);
return space->unmap; return space->unmap;
} }
static READ64_HANDLER( unmap_read64 ) static READ64_HANDLER( unmap_read64 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword read from %08X & %08X%08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword read from %s & %s\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*8), space->addrchars), core_i64_hex_format(mem_mask, 16));
return space->unmap; return space->unmap;
} }
static WRITE8_HANDLER( unmap_write8 ) static WRITE8_HANDLER( unmap_write8 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte write to %08X = %02X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset), data); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte write to %s = %02X\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset), space->addrchars), data);
} }
static WRITE16_HANDLER( unmap_write16 ) static WRITE16_HANDLER( unmap_write16 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word write to %08X = %04X & %04X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*2), data, mem_mask); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word write to %s = %04X & %04X\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*2), space->addrchars), data, mem_mask);
} }
static WRITE32_HANDLER( unmap_write32 ) static WRITE32_HANDLER( unmap_write32 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword write to %08X = %08X & %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*4), data, mem_mask); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword write to %s = %08X & %08X\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*4), space->addrchars), data, mem_mask);
} }
static WRITE64_HANDLER( unmap_write64 ) static WRITE64_HANDLER( unmap_write64 )
{ {
if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword write to %08X = %08X%08X & %08X%08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword write to %s = %s & %s\n", cpuexec_describe_context(space->machine), space->name, core_i64_hex_format(memory_byte_to_address(space, offset*8), space->addrchars), core_i64_hex_format(data, 16), core_i64_hex_format(mem_mask, 16));
} }