2002-12-13 Jeff Johnston <jjohnstn@redhat.com>

[deliverable/binutils-gdb.git] / gdb / tracepoint.c

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 19f290656e2d56088bdce95032a5bba65d0fc22b..e8cf5696a6f1df9971bb3a14790390931637df1a 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -73,10 +73,6 @@ extern int addressprint;     /* Print machine addresses? */
  */  
 
 extern void output_command (char *, int);
-extern void registers_info (char *, int);
-extern void args_info (char *, int);
-extern void locals_info (char *, int);
-
 
 /* If this definition isn't overridden by the header files, assume
    that isatty and fileno exist on this system.  */
@@ -854,7 +850,7 @@ read_actions (struct tracepoint *t)
        line = (*readline_hook) (prompt);
       else if (instream == stdin && ISATTY (instream))
        {
-         line = readline (prompt);
+         line = gdb_readline_wrapper (prompt);
          if (line && *line)    /* add it to command history */
            add_history (line);
        }
@@ -1866,7 +1862,7 @@ finish_tfind_command (char *msg,
   struct symbol *old_func;
   char *reply;
 
-  old_frame_addr = FRAME_FP (get_current_frame ());
+  old_frame_addr = get_frame_base (get_current_frame ());
   old_func = find_pc_function (read_pc ());
 
   putpkt (msg);
@@ -1952,13 +1948,14 @@ finish_tfind_command (char *msg,
 
       if (old_func == find_pc_function (read_pc ()) &&
          (old_frame_addr == 0 ||
-          FRAME_FP (get_current_frame ()) == 0 ||
-          old_frame_addr == FRAME_FP (get_current_frame ())))
+          get_frame_base (get_current_frame ()) == 0 ||
+          old_frame_addr == get_frame_base (get_current_frame ())))
        source_only = -1;
       else
        source_only = 1;
 
-      print_stack_frame (selected_frame, frame_relative_level (selected_frame),
+      print_stack_frame (deprecated_selected_frame,
+                        frame_relative_level (deprecated_selected_frame),
                         source_only);
       do_displays ();
     }
@@ -2071,10 +2068,12 @@ trace_find_tracepoint_command (char *args, int from_tty)
   if (target_is_remote ())
     {
       if (args == 0 || *args == 0)
-       if (tracepoint_number == -1)
-         error ("No current tracepoint -- please supply an argument.");
-       else
-         tdp = tracepoint_number;      /* default is current TDP */
+       {
+         if (tracepoint_number == -1)
+           error ("No current tracepoint -- please supply an argument.");
+         else
+           tdp = tracepoint_number;    /* default is current TDP */
+       }
       else
        tdp = parse_and_eval_long (args);
 
@@ -2106,7 +2105,7 @@ trace_find_line_command (char *args, int from_tty)
     {
       if (args == 0 || *args == 0)
        {
-         sal = find_pc_line ((get_current_frame ())->pc, 0);
+         sal = find_pc_line (get_frame_pc (get_current_frame ()), 0);
          sals.nelts = 1;
          sals.sals = (struct symtab_and_line *)
            xmalloc (sizeof (struct symtab_and_line));