diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 639942afbad..54712e37766 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-05-03 Simon Marchi + + * armdefs.h (ARMul_ConsolePrint): Use format attribute. + * wrapper.c (op_printf): Likewise. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h index 2b5ff9b2dfa..68cf199db6b 100644 --- a/sim/arm/armdefs.h +++ b/sim/arm/armdefs.h @@ -18,6 +18,7 @@ #include #include #include +#include #define FALSE 0 #define TRUE 1 @@ -415,5 +416,6 @@ extern unsigned ARMul_OSHandleSWI (ARMul_State * state, ARMword number); extern void ARMul_UndefInstr (ARMul_State *, ARMword); extern void ARMul_FixCPSR (ARMul_State *, ARMword, ARMword); extern void ARMul_FixSPSR (ARMul_State *, ARMword, ARMword); -extern void ARMul_ConsolePrint (ARMul_State *, const char *, ...); +extern void ARMul_ConsolePrint (ARMul_State *, const char *, ...) + ATTRIBUTE_PRINTF (2, 3); extern void ARMul_SelectProcessor (ARMul_State *, unsigned); diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c index c89efe4ee97..54a04f42428 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -62,8 +62,8 @@ int trace_funcs = 0; static struct disassemble_info info; static char opbuf[1000]; -static int -op_printf (char *buf, char *fmt, ...) +static int ATTRIBUTE_PRINTF (2, 3) +op_printf (char *buf, const char *fmt, ...) { int ret; va_list ap; diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 98d8e668eca..832effc2d0b 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-05-03 Simon Marchi + + * interp.c (sim_open): Adjust format string specifier. + 2021-05-02 Mike Frysinger * bfin-sim.c: Include ansidecl.h. diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index 2aa9279aef8..a4333daa44d 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -747,7 +747,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, if (sim_core_read_buffer (sd, NULL, read_map, &c, 4, 1) == 0) { bu16 emuexcpt = 0x25; - sim_do_commandf (sd, "memory-size 0x%lx", BFIN_DEFAULT_MEM_SIZE); + sim_do_commandf (sd, "memory-size 0x%x", BFIN_DEFAULT_MEM_SIZE); sim_write (sd, 0, (void *)&emuexcpt, 2); } diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index fd9a5dd70ff..17b711c965e 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,16 @@ +2021-05-03 Simon Marchi + + * hw-events.h (hw_event_queue_schedule_tracef): Use format attribute. + (hw_event_queue_schedule_vtracef): Likewise. + * hw-tree.h (hw_tree_vparse): Likewise. + * sim-profile.c (profile_vprintf): Likewise. + * sim-trace.c (dis_printf): Likewise. + * sim-trace.h (trace_printf): Likewise. + (trace_vprintf): Likewise. + * sim-utils.h (sim_do_commandf): Likewise. + * hw-events.c (hw_event_queue_schedule): Use + hw_event_queue_schedule_tracef. + 2021-05-02 Simon Marchi * sim-options.c (standard_option_handler): Add default cases to diff --git a/sim/common/hw-events.c b/sim/common/hw-events.c index 1c749dd8c27..81628f0b642 100644 --- a/sim/common/hw-events.c +++ b/sim/common/hw-events.c @@ -88,12 +88,7 @@ hw_event_queue_schedule (struct hw *me, hw_event_callback *callback, void *data) { - struct hw_event *event; - va_list dummy; - memset (&dummy, 0, sizeof dummy); - event = hw_event_queue_schedule_vtracef (me, delta_time, callback, data, - NULL, dummy); - return event; + return hw_event_queue_schedule_tracef (me, delta_time, callback, data, NULL); } struct hw_event * diff --git a/sim/common/hw-events.h b/sim/common/hw-events.h index 901063b73da..51ca5bdb2f0 100644 --- a/sim/common/hw-events.h +++ b/sim/common/hw-events.h @@ -39,7 +39,7 @@ struct hw_event *hw_event_queue_schedule_tracef hw_event_callback *handler, void *data, const char *fmt, - ...) ATTRIBUTE_PRINTF (5, 6); + ...) ATTRIBUTE_NULL_PRINTF (5, 6); struct hw_event *hw_event_queue_schedule_vtracef (struct hw *me, @@ -47,7 +47,7 @@ struct hw_event *hw_event_queue_schedule_vtracef hw_event_callback *handler, void *data, const char *fmt, - va_list ap); + va_list ap) ATTRIBUTE_NULL_PRINTF (5, 0); void hw_event_queue_deschedule diff --git a/sim/common/hw-tree.h b/sim/common/hw-tree.h index 86ebf1709ca..85c91ad9652 100644 --- a/sim/common/hw-tree.h +++ b/sim/common/hw-tree.h @@ -39,7 +39,7 @@ struct hw *hw_tree_parse struct hw *hw_tree_vparse (struct hw *root, const char *fmt, - va_list ap); + va_list ap) ATTRIBUTE_PRINTF (2, 0); void hw_tree_finish diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c index 75bdc70298c..455e1a246d9 100644 --- a/sim/common/sim-profile.c +++ b/sim/common/sim-profile.c @@ -454,7 +454,7 @@ profile_option_handler (SIM_DESC sd, /* Profiling output hooks. */ -static void +static void ATTRIBUTE_PRINTF (3, 0) profile_vprintf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, va_list ap) { FILE *fp = PROFILE_FILE (CPU_PROFILE_DATA (cpu)); diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c index 5f161da630b..26d9556322c 100644 --- a/sim/common/sim-trace.c +++ b/sim/common/sim-trace.c @@ -889,7 +889,7 @@ dis_read (bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, return 0; } -static int +static int ATTRIBUTE_PRINTF (2, 3) dis_printf (SIM_CPU *cpu, const char *fmt, ...) { SIM_DESC sd = CPU_STATE (cpu); diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h index 7ff7b021b33..c89084e9440 100644 --- a/sim/common/sim-trace.h +++ b/sim/common/sim-trace.h @@ -653,9 +653,10 @@ do { \ extern void trace_printf (SIM_DESC, sim_cpu *, const char *, ...) - ATTRIBUTE_PRINTF (3, 4); + ATTRIBUTE_PRINTF (3, 4); -extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list); +extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list) + ATTRIBUTE_PRINTF (3, 0); /* Debug support. This is included here because there isn't enough of it to justify diff --git a/sim/common/sim-utils.h b/sim/common/sim-utils.h index f089245f25e..9cc19f5567b 100644 --- a/sim/common/sim-utils.h +++ b/sim/common/sim-utils.h @@ -68,7 +68,8 @@ struct bfd *sim_load_file (SIM_DESC sd, const char *myname, int lma_p, sim_write_fn do_load); /* Internal version of sim_do_command, include formatting */ -void sim_do_commandf (SIM_DESC sd, const char *fmt, ...); +void sim_do_commandf (SIM_DESC sd, const char *fmt, ...) + ATTRIBUTE_PRINTF (2, 3); /* These are defined in callback.c as cover functions to the vprintf diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index d49ff89c57b..4d7e93dabe9 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,7 @@ +2021-05-03 Simon Marchi + + * trace.c (op_printf): Likewise. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/rx/trace.c b/sim/rx/trace.c index caa51b794df..a005797b4ec 100644 --- a/sim/rx/trace.c +++ b/sim/rx/trace.c @@ -96,7 +96,7 @@ compare_symbols (const PTR ap, const PTR bp) static char opbuf[1000]; -static int +static int ATTRIBUTE_PRINTF (2, 3) op_printf (char *buf, char *fmt, ...) { int ret; diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 643d28b017a..9e5f770e48b 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2021-05-03 Simon Marchi + + * interp.c (sim_open): Adjust format string specifier. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/v850/interp.c b/sim/v850/interp.c index e72dab645dd..ff2f6a23e56 100644 --- a/sim/v850/interp.c +++ b/sim/v850/interp.c @@ -215,9 +215,9 @@ sim_open (SIM_OPEN_KIND kind, /* Allocate core managed memory */ /* "Mirror" the ROM addresses below 1MB. */ - sim_do_commandf (sd, "memory region 0,0x100000,0x%lx", V850_ROM_SIZE); + sim_do_commandf (sd, "memory region 0,0x100000,0x%x", V850_ROM_SIZE); /* Chunk of ram adjacent to rom */ - sim_do_commandf (sd, "memory region 0x100000,0x%lx", V850_LOW_END-0x100000); + sim_do_commandf (sd, "memory region 0x100000,0x%x", V850_LOW_END-0x100000); /* peripheral I/O region - mirror 1K across 4k (0x1000) */ sim_do_command (sd, "memory region 0xfff000,0x1000,1024"); /* similarly if in the internal RAM region */