Not part of the sources

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

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 3b911a8f55c89800e07d059fee44764c3367be97..9f036178bd1c9e18949ef25e215ddcd31a7abe5a 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -33,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "ax-gdb.h"
 
 /* readline include files */
-#include "readline.h"
-#include "history.h"
+#include <readline/readline.h>
+#include <readline/history.h>
 
 /* readline defines this.  */
 #undef savestring
@@ -970,7 +970,7 @@ validate_actionline (line, t)
 
        /* we have something to collect, make sure that the expr to
           bytecode translator can handle it and that it's not too long */
-       aexpr = gen_trace_for_expr(exp);
+       aexpr = gen_trace_for_expr (t->address, exp);
        (void) make_cleanup ((make_cleanup_func) free_agent_expr, aexpr);
 
        if (aexpr->len > MAX_AGENT_EXPR_LEN)
@@ -1438,18 +1438,6 @@ free_actions_list(actions_list)
   free(actions_list);
 }
 
-#ifndef TARGET_VIRTUAL_FRAME_POINTER
-/* If anybody else ever uses this macro, then move this 
-   default definition into some global header file such as defs.h.
-
-   FIXME: GDB's whole scheme for dealing with "frames" and
-   "frame pointers" needs a serious shakedown.
- */
-
-#define TARGET_VIRTUAL_FRAME_POINTER(ADDR, REGP, OFFP) \
-  do { *(REGP) = FP_REGNUM; *(OFFP) =  0; } while (0)
-#endif
-
 /* render all actions into gdb protocol */
 static void
 encode_actions (t, tdp_actions, stepping_actions)
@@ -1559,7 +1547,7 @@ encode_actions (t, tdp_actions, stepping_actions)
                  break;
 
                default:        /* full-fledged expression */
-                 aexpr = gen_trace_for_expr (exp);
+                 aexpr = gen_trace_for_expr (t->address, exp);
 
                  old_chain1 = make_cleanup ((make_cleanup_func) 
                                              free_agent_expr, aexpr);
@@ -2322,7 +2310,7 @@ scope_info (args, from_tty)
   struct minimal_symbol *msym;
   struct block *block;
   char **canonical, *symname, *save_args = args;
-  int i, nsyms, count = 0;
+  int i, j, nsyms, count = 0;
 
   if (args == 0 || *args == 0)
     error ("requires an argument (function, line or *addr) to define a scope");
@@ -2365,9 +2353,9 @@ scope_info (args, from_tty)
          case LOC_CONST_BYTES:
            printf_filtered ("constant bytes: ");
            if (SYMBOL_TYPE (sym))
-             for (i = 0; i < TYPE_LENGTH (SYMBOL_TYPE (sym)); i++)
+             for (j = 0; j < TYPE_LENGTH (SYMBOL_TYPE (sym)); j++)
                fprintf_filtered (gdb_stdout, " %02x",
-                                 (unsigned) SYMBOL_VALUE_BYTES (sym) [i]);
+                                 (unsigned) SYMBOL_VALUE_BYTES (sym) [j]);
            break;
          case LOC_STATIC:
            printf_filtered ("in static storage at address ");
@@ -2375,7 +2363,7 @@ scope_info (args, from_tty)
            break;
          case LOC_REGISTER:
            printf_filtered ("a local variable in register $%s",
-                            reg_names [SYMBOL_VALUE (sym)]);
+                            REGISTER_NAME (SYMBOL_VALUE (sym)));
            break;
          case LOC_ARG:
          case LOC_LOCAL_ARG:
@@ -2392,11 +2380,11 @@ scope_info (args, from_tty)
            break;
          case LOC_REGPARM:
            printf_filtered ("an argument in register $%s",
-                            reg_names[SYMBOL_VALUE (sym)]);
+                            REGISTER_NAME (SYMBOL_VALUE (sym)));
            break;
          case LOC_REGPARM_ADDR:
            printf_filtered ("the address of an argument, in register $%s",
-                            reg_names[SYMBOL_VALUE (sym)]);
+                            REGISTER_NAME (SYMBOL_VALUE (sym)));
            break;
          case LOC_TYPEDEF:
            printf_filtered ("a typedef.\n");
@@ -2413,12 +2401,12 @@ scope_info (args, from_tty)
          case LOC_BASEREG:
            printf_filtered ("a variable at offset %d from register $%s",
                             SYMBOL_VALUE (sym),
-                            reg_names [SYMBOL_BASEREG (sym)]);
+                            REGISTER_NAME  (SYMBOL_BASEREG (sym)));
            break;
          case LOC_BASEREG_ARG:
            printf_filtered ("an argument at offset %d from register $%s",
                             SYMBOL_VALUE (sym),
-                            reg_names [SYMBOL_BASEREG (sym)]);
+                            REGISTER_NAME  (SYMBOL_BASEREG (sym)));
            break;
          case LOC_UNRESOLVED:
            msym = lookup_minimal_symbol (SYMBOL_NAME (sym), NULL, NULL);