Merge GDB 7.5.1

sim/common/sim-trace.h

Index: sim/common/sim-trace.h
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index e824fc3d7c6a0cc582702287202f754c7b52aa79..1ba6019248b3262829521c0e3725c5ba1fb60ef8 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -249,9 +249,26 @@ extern void trace_generic PARAMS ((SIM_DESC sd,
 				   ...))
      __attribute__((format (printf, 4, 5)));
 
+typedef enum {
+  trace_fmt_invalid,
+  trace_fmt_word,
+  trace_fmt_fp,
+  trace_fmt_fpu,
+  trace_fmt_string,
+  trace_fmt_bool,
+  trace_fmt_addr,
+  trace_fmt_instruction_incomplete,
+} data_fmt;
+
 /* Trace a varying number of word sized inputs/outputs.  trace_result*
    must be called to close the trace operation. */
 
+extern void save_data PARAMS ((SIM_DESC sd,
+                               TRACE_DATA *data,
+                               data_fmt fmt,
+                               long size,
+                               const void *buf));
+
 extern void trace_input0 PARAMS ((SIM_DESC sd,
 				  sim_cpu *cpu,
 				  int trace_idx));