Add trace file support.

	* tracepoint.h (enum trace_stop_reason): New enum.
	(struct trace_status): New struct.
	(parse_trace_status): Declare.
	(struct uploaded_tp): Move here from remote.c,
	add fields for actions.
	(struct uploaded_tsv): New struct.
	* tracepoint.c (tfile_ops): New target vector.
	(trace_fd): New global.
	(tfile_open): New function.
	(tfile_close): New function.
	(tfile_files_info): New function.
	(tfile_get_trace_status): New function.
	(tfile_get_traceframe_address): New function.
	(tfile_trace_find): New function.
	(tfile_fetch_registers): New function.
	(tfile_xfer_partial): New function.
	(tfile_get_trace_state_variable_value): New function.
	(init_tfile_ops): New function.
	(_initialize_tracepoint): Call it, add tfile target.
	(trace_status): New global.
	(current_trace_status): New function.
	(trace_running_p): Remove, change all users to get from
	current_trace_status()->running.
	(get_trace_status): Remove.
	(trace_status_command): Call target_get_trace_status directly,
	report more detail including tracing stop reasons.
	(trace_find_command): Always allow tfind on a file.
	(trace_find_pc_command): Ditto.
	(trace_find_tracepoint_command): Ditto.
	(trace_find_line_command): Ditto.
	(trace_find_range_command): Ditto.
	(trace_find_outside_command): Ditto.
	(trace_frames_offset, cur_offset): Declare as off_t.
	(trace_regblock_size): Rename from reg_size, update users.
	(parse_trace_status): New function.
	(tfile_interp_line): New function.
	(disconnect_or_stop_tracing): Ensure current trace
	status before asking what to do.
	(stop_reason_names): New global.
	(trace_save_command): New command.
	(get_uploaded_tp): Move here from remote.c.
	(find_matching_tracepoint): Ditto.
	(merge_uploaded_tracepoints): New function.
	(parse_trace_status): Use stop_reason_names.
	(_initialize_tracepoint): Define tsave command.
	* target.h (target_ops): New fields to_save_trace_data,
	to_upload_tracepoints, to_upload_trace_state_variables,
	to_get_raw_trace_data, change to_get_trace_status
	to take a pointer to a status struct.
	(target_save_trace_data): New macro.
	(target_upload_tracepoints): New macro.
	(target_upload_trace_state_variables): New macro.
	(target_get_raw_trace_data): New macro.
	* target.c (update_current_target): Add new methods, change
	signature of to_get_trace_status.
	* remote.c (hex2bin): Make globally visible.
	(bin2hex): Ditto.
	(remote_download_trace_state_variable): Download name also.
	(remote_get_trace_status): Update parameter, use
	parse_trace_status.
	(remote_save_trace_data): New function.
	(remote_upload_tracepoints): New function.
	(remote_upload_trace_state_variables): New function.
	(remote_get_raw_trace_data): New function.
	(remote_start_remote): Use them.
	(_initialize_remote_ops): Add operations.
	* ax-gdb.c: Include breakpoint.h.
	* breakpoint.c (create_tracepoint_from_upload): Use
	break_command_really, return tracepoint, warn about unimplemented
	parts.
	* NEWS: Mention trace file addition.

	* gdb.texinfo (Trace Files): New section.
	(Tracepoint Packets): Document QTSave and qTBuffer.
	(Trace File Format): New appendix.

	* generic/gdbtk-bp.c (gdb_trace_status): Use current_trace_status.

	* gdb.trace/tfile.c: New file.
	* gdb.trace/tfile.exp: New file.

3 files changed, 210 insertions, 0 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e81c4e9..79b5759 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-15  Stan Shebs  <stan@codesourcery.com>
+
+	* gdb.trace/tfile.c: New file.
+	* gdb.trace/tfile.exp: New file.
+	
 2010-01-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/pie-support.exp, gdb.base/pie-support.c: Remove.
diff --git a/gdb/testsuite/gdb.trace/tfile.c b/gdb/testsuite/gdb.trace/tfile.c
new file mode 100644
index 0000000..9ffc371
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/tfile.c
@@ -0,0 +1,116 @@
+/* This program does two things; it generates valid trace files, and
+   it can also be traced so as to test trace file creation from
+   GDB.  */
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+char spbuf[200];
+
+char trbuf[1000];
+char *trptr;
+char *tfsizeptr;
+
+int testglob = 31415;
+
+int
+start_trace_file (char *filename)
+{
+  int fd;
+
+  fd = open (filename, O_WRONLY|O_CREAT|O_APPEND,
+	     S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+
+  if (fd < 0)
+    return fd;
+
+  /* Write a file header, with a high-bit-set char to indicate a
+     binary file, plus a hint as what this file is, and a version
+     number in case of future needs.  */
+  write (fd, "\x7fTRACE0\n", 8);
+
+  return fd;
+}
+
+void
+finish_trace_file (int fd)
+{
+  close (fd);
+}
+
+void
+write_basic_trace_file ()
+{
+  int fd;
+
+  fd = start_trace_file ("basic.tf");
+
+  /* The next part of the file consists of newline-separated lines
+     defining status, tracepoints, etc.  The section is terminated by
+     an empty line.  */
+
+  /* Dump the size of the R (register) blocks in traceframes.  */
+  snprintf (spbuf, sizeof spbuf, "R %x\n", 500 /* FIXME get from arch */);
+  write (fd, spbuf, strlen (spbuf));
+
+  /* Dump trace status, in the general form of the qTstatus reply.  */
+  snprintf (spbuf, sizeof spbuf, "status 0;tstop:0;tframes:1;tcreated:1;tfree:100;tsize:1000\n");
+  write (fd, spbuf, strlen (spbuf));
+
+  /* Dump tracepoint definitions, in syntax similar to that used
+     for reconnection uploads.  */
+  snprintf (spbuf, sizeof spbuf, "tp T1:%lx:E:0:0\n",
+	    (long) &write_basic_trace_file);
+  write (fd, spbuf, strlen (spbuf));
+  /* (Note that we would only need actions defined if we wanted to
+     test tdump.) */
+
+  /* Empty line marks the end of the definition section.  */
+  write (fd, "\n", 1);
+
+  /* Make up a simulated trace buffer.  */
+  /* (Encapsulate better if we're going to do lots of this.) */
+  trptr = trbuf;
+  *((short *) trptr) = 1;
+  trptr += sizeof (short);
+  tfsizeptr = trptr;
+  trptr += sizeof (int);
+  *((char *) trptr) = 'M';
+  trptr += 1;
+  *((long long *) trptr) = (long) &testglob;
+  trptr += sizeof (long long);
+  *((short *) trptr) = sizeof (testglob);
+  trptr += sizeof (short);
+  *((int *) trptr) = testglob;
+  trptr += sizeof (testglob);
+  /* Go back and patch in the frame size.  */
+  *((int *) tfsizeptr) = trptr - tfsizeptr - sizeof (int);
+
+  /* Write end of tracebuffer marker.  */
+  *((short *) trptr) = 0;
+  trptr += sizeof (short);
+  *((int *) trptr) = 0;
+  trptr += sizeof (int);
+
+  write (fd, trbuf, trptr - trbuf);
+
+  finish_trace_file (fd);
+}
+
+void
+done_making_trace_files (void)
+{
+}
+
+int
+main (int argc, char **argv, char **envp)
+{
+  write_basic_trace_file ();
+
+  done_making_trace_files ();
+
+  return 0;
+}
+
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
new file mode 100644
index 0000000..398b5ef
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -0,0 +1,89 @@
+#   Copyright 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test of trace file support.
+
+# Note that unlike most of the tracing tests, this can be run on
+# targets lacking tracepoint support; the program tfile.c has the
+# ability to generate synthetic trace files directly, and the tfile
+# target is available to all GDB configs.
+
+load_lib "trace-support.exp";
+
+if [target_info exists gdb,nofileio] {
+    verbose "Skipping tfile.exp because of no fileio capabilities."
+    continue
+}
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+gdb_exit
+gdb_start
+set testfile "tfile"
+set srcfile ${testfile}.c
+set binfile $objdir/$subdir/$testfile
+if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
+	  executable {debug nowarnings}] != "" } {
+    untested file.exp
+    return -1
+}
+gdb_reinitialize_dir $srcdir/$subdir
+
+# Make sure we are starting fresh.
+remote_exec build {sh -xc rm\ -f\ basic.tf}
+
+gdb_load $binfile
+
+runto_main
+
+gdb_test "break done_making_trace_files" "" ""
+
+gdb_test "continue" "" ""
+
+# tsave command would be tested here...
+
+gdb_test "continue" "" ""
+
+# Program has presumably exited, now target a trace file it created.
+
+gdb_test "target tfile basic.tf" "Created tracepoint.*" "target tfile"
+
+gdb_test "info trace" ".*tracepoint.*in write_basic_trace_file.*" \
+    "info tracepoints on trace file"
+
+gdb_test "tfind 0" "Found traceframe 0.*" "tfind 0 on trace file"
+
+gdb_test "print testglob" " = 31415" "print testglob on trace file"
+
+gdb_test "tfind" "Target failed to find requested trace frame." \
+    "tfind does not find a second frame in trace file"
+
+gdb_test "tstatus" \
+    "Using a trace file.*
+Trace stopped by a tstop command.*
+Collected 1 trace frames.*
+Trace buffer has 256 bytes free.*
+Looking at trace frame 0, tracepoint .*" \
+    "tstatus on trace file"
+
+
+
+
+