diff options
Diffstat (limited to 'sim/ppc')
| -rw-r--r-- | sim/ppc/corefile.c | 4 | ||||
| -rw-r--r-- | sim/ppc/emul_bugapi.c | 2 | ||||
| -rw-r--r-- | sim/ppc/emul_chirp.c | 4 | ||||
| -rw-r--r-- | sim/ppc/interrupts.c | 2 | ||||
| -rw-r--r-- | sim/ppc/psim.c | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/sim/ppc/corefile.c b/sim/ppc/corefile.c index 1b3eeef..b2faef5 100644 --- a/sim/ppc/corefile.c +++ b/sim/ppc/corefile.c @@ -292,8 +292,8 @@ core_map_find_mapping(core_map *map, mapping = mapping->next; } if (abort) - error("core_find_mapping() - access to unmaped address, attach a default map to handle this - addr=0x%x nr_bytes=0x%x processor=0x%x cia=0x%x\n", - addr, nr_bytes, processor, cia); + error("core_find_mapping() - access to unmaped address, attach a default map to handle this - addr=0x%x nr_bytes=0x%x processor=0x%p cia=0x%x\n", + addr, nr_bytes, (void *) processor, cia); return NULL; } diff --git a/sim/ppc/emul_bugapi.c b/sim/ppc/emul_bugapi.c index c3c607b..f4eed44 100644 --- a/sim/ppc/emul_bugapi.c +++ b/sim/ppc/emul_bugapi.c @@ -493,7 +493,7 @@ emul_bugapi_instruction_call(cpu *processor, switch (call_id) { default: error("emul-bugapi: unimplemented bugapi %s from address 0x%lx\n", - emul_bugapi_instruction_name (call_id), SRR0); + emul_bugapi_instruction_name (call_id), (unsigned long) SRR0); break; /* read a single character, output r3 = byte */ diff --git a/sim/ppc/emul_chirp.c b/sim/ppc/emul_chirp.c index 7a58538..116f373 100644 --- a/sim/ppc/emul_chirp.c +++ b/sim/ppc/emul_chirp.c @@ -1509,7 +1509,7 @@ map_over_chirp_note(bfd *image, return; /* check the name field */ if (head.namesz > sizeof(name)) { - error("chirp: note name too long (%d > %d)\n", (int)head.namesz, sizeof(name)); + error("chirp: note name too long (%d > %d)\n", (int)head.namesz, (int)sizeof(name)); } if (!bfd_get_section_contents(image, sect, name, sizeof(head), head.namesz)) { @@ -1971,12 +1971,14 @@ emul_chirp_instruction_call(cpu *processor, } if (emul_data->n_args > 6) { /* See iee1275 requirements on nr returns */ error("OpenFirmware service %s called from 0x%lx with args 0x%lx, too many args (%d)\n", + service_name, (unsigned long)emul_data->return_address, (unsigned long)emul_data->arguments, emul_data->n_returns); } if (emul_data->n_returns > 6) { error("OpenFirmware service %s called from 0x%lx with args 0x%lx, with too many returns (%d)\n", + service_name, (unsigned long)emul_data->return_address, (unsigned long)emul_data->arguments, emul_data->n_args); diff --git a/sim/ppc/interrupts.c b/sim/ppc/interrupts.c index 133638f..a33274a 100644 --- a/sim/ppc/interrupts.c +++ b/sim/ppc/interrupts.c @@ -234,7 +234,7 @@ instruction_storage_interrupt(cpu *processor, break; default: srr1_set = 0; - error("internal error - instruction_storage_interrupt - reason %d not implemented"); + error("internal error - instruction_storage_interrupt - reason %d not implemented", reason); break; } TRACE(trace_interrupts, ("instruction storage interrupt - cia=0x%lx SRR1|=0x%lx\n", diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c index 9f1db67..acc40ed 100644 --- a/sim/ppc/psim.c +++ b/sim/ppc/psim.c @@ -99,7 +99,7 @@ find_arg(const char *err_msg, { *ptr_to_argp += 1; if (argv[*ptr_to_argp] == NULL) - error(err_msg); + error("%s", err_msg); return argv[*ptr_to_argp]; } @@ -535,7 +535,7 @@ psim_create(const char *file_name, if (ppc_trace[trace_print_device_tree] || ppc_trace[trace_dump_device_tree]) tree_print(root); if (ppc_trace[trace_dump_device_tree]) - error(""); + error("%s", ""); return system; } @@ -1186,7 +1186,7 @@ psim_merge_device_file(device *root, /* append the next line */ if (!fgets(device_path + curlen, sizeof(device_path) - curlen, description)) { fclose(description); - error("%s:%s: unexpected eof in line continuation - %s", + error("%s:%d: unexpected eof in line continuation - %s", file_name, line_nr, device_path); } if (strchr(device_path, '\n') == NULL) { |