espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 13:27:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: events: clean up trace casts

Browse Source 
Don't blindly cast every possible type to (long).  Change to the right
printf format specifier whether it be a 64-bit type or a pointer.
This commit is contained in:
Mike Frysinger
2021-10-31 22:57:42 -04:00
parent f098231806
commit c704d6e7ee
1 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
sim/common/sim-events.c
View File

@ -409,14 +409,17 @@ update_time_from_event (SIM_DESC sd)
event = event->next, i++) event = event->next, i++)
{ {
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event time-from-event - time %ld, delta %ld - event %d, tag 0x%lx, time %ld, handler 0x%lx, data 0x%lx%s%s\n", "event time-from-event - "
(long)current_time, "time %" PRIi64 ", delta %" PRIi64 " - "
(long)events->time_from_event, "event %i, tag %p, time %" PRIi64 ", handler %p, data "
"%p%s%s\n",
current_time,
events->time_from_event,
i, i,
(long)event, event,
(long)event->time_of_event, event->time_of_event,
(long)event->handler, event->handler,
(long)event->data, event->data,
(event->trace != NULL) ? ", " : "", (event->trace != NULL) ? ", " : "",
(event->trace != NULL) ? event->trace : "")); (event->trace != NULL) ? event->trace : ""));
} }
@ -513,12 +516,13 @@ sim_events_schedule_vtracef (SIM_DESC sd,
new_event->trace = NULL; new_event->trace = NULL;
insert_sim_event (sd, new_event, delta_time); insert_sim_event (sd, new_event, delta_time);
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n", "event scheduled at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - time %" PRIi64 ", handler %p, data %p%s%s\n",
(long)new_event, sim_events_time (sd),
(long)new_event->time_of_event, new_event,
(long)new_event->handler, new_event->time_of_event,
(long)new_event->data, new_event->handler,
new_event->data,
(new_event->trace != NULL) ? ", " : "", (new_event->trace != NULL) ? ", " : "",
(new_event->trace != NULL) ? new_event->trace : "")); (new_event->trace != NULL) ? new_event->trace : ""));
return new_event; return new_event;
@ -565,12 +569,13 @@ sim_events_schedule_after_signal (SIM_DESC sd,
#endif #endif
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"signal scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx\n", "signal scheduled at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - time %" PRIi64 ", handler %p, data %p\n",
(long)new_event, sim_events_time (sd),
(long)new_event->time_of_event, new_event,
(long)new_event->handler, new_event->time_of_event,
(long)new_event->data)); new_event->handler,
new_event->data));
} }
#endif #endif
@ -601,12 +606,13 @@ sim_events_watch_clock (SIM_DESC sd,
events->watchpoints = new_event; events->watchpoints = new_event;
events->work_pending = 1; events->work_pending = 1;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event watching clock at %ld - tag 0x%lx - wallclock %ld, handler 0x%lx, data 0x%lx\n", "event watching clock at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - wallclock %u, handler %p, data %p\n",
(long)new_event, sim_events_time (sd),
(long)new_event->wallclock, new_event,
(long)new_event->handler, new_event->wallclock,
(long)new_event->data)); new_event->handler,
new_event->data));
return new_event; return new_event;
} }
#endif #endif
@ -615,11 +621,11 @@ sim_events_watch_clock (SIM_DESC sd,
#if EXTERN_SIM_EVENTS_P #if EXTERN_SIM_EVENTS_P
sim_event * sim_event *
sim_events_watch_pc (SIM_DESC sd, sim_events_watch_pc (SIM_DESC sd,
int is_within, int is_within,
unsigned64 lb, unsigned64 lb,
unsigned64 ub, unsigned64 ub,
sim_event_handler *handler, sim_event_handler *handler,
void *data) void *data)
{ {
sim_events *events = STATE_EVENTS (sd); sim_events *events = STATE_EVENTS (sd);
sim_event *new_event = sim_events_zalloc (sd); sim_event *new_event = sim_events_zalloc (sd);
@ -639,13 +645,14 @@ sim_events_watch_pc (SIM_DESC sd,
events->watchpoints = new_event; events->watchpoints = new_event;
events->work_pending = 1; events->work_pending = 1;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event watching pc at %ld - tag 0x%lx - pc 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n", "event watching pc at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - pc 0x%x..0x%x, handler %p, data %p\n",
(long)new_event, sim_events_time (sd),
(long)new_event->lb, new_event,
(long)new_event->ub, new_event->lb,
(long)new_event->handler, new_event->ub,
(long)new_event->data)); new_event->handler,
new_event->data));
return new_event; return new_event;
} }
#endif #endif
@ -716,14 +723,15 @@ sim_events_watch_sim (SIM_DESC sd,
events->watchpoints = new_event; events->watchpoints = new_event;
events->work_pending = 1; events->work_pending = 1;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n", "event watching host at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - host-addr %p, 0x%x..0x%x, handler %p, data %p\n",
(long)new_event, sim_events_time (sd),
(long)new_event->host_addr, new_event,
(long)new_event->lb, new_event->host_addr,
(long)new_event->ub, new_event->lb,
(long)new_event->handler, new_event->ub,
(long)new_event->data)); new_event->handler,
new_event->data));
return new_event; return new_event;
} }
#endif #endif
@ -796,14 +804,15 @@ sim_events_watch_core (SIM_DESC sd,
events->watchpoints = new_event; events->watchpoints = new_event;
events->work_pending = 1; events->work_pending = 1;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n", "event watching host at %" PRIi64 " - "
(long)sim_events_time (sd), "tag %p - host-addr %p, 0x%x..0x%x, handler %p, data %p\n",
(long)new_event, sim_events_time (sd),
(long)new_event->host_addr, new_event,
(long)new_event->lb, new_event->host_addr,
(long)new_event->ub, new_event->lb,
(long)new_event->handler, new_event->ub,
(long)new_event->data)); new_event->handler,
new_event->data));
return new_event; return new_event;
} }
#endif #endif
@ -830,12 +839,13 @@ sim_events_deschedule (SIM_DESC sd,
sim_event *dead = *ptr_to_current; sim_event *dead = *ptr_to_current;
*ptr_to_current = dead->next; *ptr_to_current = dead->next;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event/watch descheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n", "event/watch descheduled at %" PRIi64 " - "
(long) sim_events_time (sd), "tag %p - time %" PRIi64 ", handler %p, data %p%s%s\n",
(long) event_to_remove, sim_events_time (sd),
(long) dead->time_of_event, event_to_remove,
(long) dead->handler, dead->time_of_event,
(long) dead->data, dead->handler,
dead->data,
(dead->trace != NULL) ? ", " : "", (dead->trace != NULL) ? ", " : "",
(dead->trace != NULL) ? dead->trace : "")); (dead->trace != NULL) ? dead->trace : ""));
sim_events_free (sd, dead); sim_events_free (sd, dead);
@ -846,9 +856,9 @@ sim_events_deschedule (SIM_DESC sd,
} }
} }
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event/watch descheduled at %ld - tag 0x%lx - not found\n", "event/watch descheduled at %" PRIi64 " - tag %p - not found\n",
(long) sim_events_time (sd), sim_events_time (sd),
(long) event_to_remove)); event_to_remove));
} }
#endif #endif
@ -1188,11 +1198,12 @@ sim_events_process (SIM_DESC sd)
sim_event_handler *handler = to_do->handler; sim_event_handler *handler = to_do->handler;
void *data = to_do->data; void *data = to_do->data;
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n", "event issued at %" PRIi64 " - "
(long) event_time, "tag %p - handler %p, data %p%s%s\n",
(long) to_do, event_time,
(long) handler, to_do,
(long) data, handler,
data,
(to_do->trace != NULL) ? ", " : "", (to_do->trace != NULL) ? ", " : "",
(to_do->trace != NULL) ? to_do->trace : "")); (to_do->trace != NULL) ? to_do->trace : ""));
sim_events_free (sd, to_do); sim_events_free (sd, to_do);
@ -1216,11 +1227,11 @@ sim_events_process (SIM_DESC sd)
events->queue = to_do->next; events->queue = to_do->next;
update_time_from_event (sd); update_time_from_event (sd);
ETRACE ((_ETRACE, ETRACE ((_ETRACE,
"event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n", "event issued at %" PRIi64 " - tag %p - handler %p, data %p%s%s\n",
(long) event_time, event_time,
(long) to_do, to_do,
(long) handler, handler,
(long) data, data,
(to_do->trace != NULL) ? ", " : "", (to_do->trace != NULL) ? ", " : "",
(to_do->trace != NULL) ? to_do->trace : "")); (to_do->trace != NULL) ? to_do->trace : ""));
sim_events_free (sd, to_do); sim_events_free (sd, to_do);