This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] sim: trace: rename debug_printf fully


Rather than redirect using a define, just rename the symbol fully.

Committed.
---
 sim/common/ChangeLog   | 8 ++++++++
 sim/common/sim-trace.c | 2 +-
 sim/common/sim-trace.h | 5 +----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 7a224bc..37f97dc 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,13 @@
 2015-06-24  Mike Frysinger  <vapier@gentoo.org>
 
+	* sim-trace.c (debug_printf): Rename to ...
+	(sim_debug_printf): ... this.
+	* sim-trace.h (debug_printf): Delete define.
+	(debug_printf): Rename to ...
+	(sim_debug_printf): ... this.
+
+2015-06-24  Mike Frysinger  <vapier@gentoo.org>
+
 	* sim-trace.c (OPTION_TRACE_REGISTER): New enum.
 	(trace_options): Add trace-register option.
 	(trace_option_handler): Handle OPTION_TRACE_REGISTER case.
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index 6e11cce..40286e1 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1316,7 +1316,7 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
 }
 
 void
-debug_printf (sim_cpu *cpu, const char *fmt, ...)
+sim_debug_printf (sim_cpu *cpu, const char *fmt, ...)
 {
   va_list ap;
 
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 54a2824..580cd4e 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -648,10 +648,7 @@ extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
 /* Non-zero if "--debug-insn" specified.  */
 #define DEBUG_INSN_P(cpu) DEBUG_P (cpu, DEBUG_INSN_IDX)
 
-/* GDB also has a debug_printf, so we shadow ours.  */
-#define debug_printf sim_debug_printf
-
-extern void debug_printf (sim_cpu *, const char *, ...)
+extern void sim_debug_printf (sim_cpu *, const char *, ...)
      __attribute__((format (printf, 2, 3)));
 
 #endif /* SIM_TRACE_H */
-- 
2.4.4


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]