2003-08-21 Michael Snyder <msnyder@redhat.com>

        * tracepoint.c (trace_dump_command): Trace break address
	is subject to DECR_PC_AFTER_BREAK.
        (set_traceframe_context): Make "trace_line" an int.
        Fixes suggested	by Mark	Newman	 <mark.newman@lmco.com>

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eedfad0c56e5b48e9a6b3494e0f8f65418162e06..2d82dc9e7205c392c673375f575db111a6866a22 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-21  Michael Snyder  <msnyder@redhat.com>
+
+       * tracepoint.c (trace_dump_command): Trace break address
+       is subject to DECR_PC_AFTER_BREAK.
+       (set_traceframe_context): Make "trace_line" an int.
+       Fixes suggested by Mark Newman  <mark.newman@lmco.com>
+       
 2003-08-20  Michael Snyder  <msnyder@redhat.com>
 
        * sh-tdep.h (struct gdbarch_tdep): New member FLOAT_ARGLAST_REG.

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 3b1cfd544247d30f9153f0c0732bdddf5772d672..7d09ff332efb2a14e6fe49df98edc95aff02c084 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -266,7 +266,7 @@ set_traceframe_context (CORE_ADDR trace_pc)
       set_internalvar (lookup_internalvar ("trace_file"),
                       value_from_pointer (charstar, (LONGEST) 0));
       set_internalvar (lookup_internalvar ("trace_line"),
-                      value_from_pointer (builtin_type_int, (LONGEST) - 1));
+                      value_from_longest (builtin_type_int, (LONGEST) - 1));
       return;
     }
 
@@ -2511,7 +2511,7 @@ trace_dump_command (char *args, int from_tty)
      to the tracepoint PC.  If not, then the current frame was
      collected during single-stepping.  */
 
-  stepping_frame = (t->address != read_pc ());
+  stepping_frame = (t->address != (read_pc () - DECR_PC_AFTER_BREAK));
 
   for (action = t->actions; action; action = action->next)
     {