* tracepoint.c (encode_actions_1): Use the location's gdbarch.

	(encode_actions): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3cbf7ea277004c21a7b61511467270598180eb1a..bfeecc7faeacfbd7a9736cdd654cde3d7c89c8d5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-14  Tom Tromey  <tromey@redhat.com>
+
+       * tracepoint.c (encode_actions_1): Use the location's gdbarch.
+       (encode_actions): Likewise.
+
 2011-11-14  Yao Qi  <yao@codesourcery.com>
 
        * remote.c (struct remote_state): <install_in_trace> new field.

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 82ca0b8ec9785165fa01d0426d0ddc8b1d7ad365..e1555158d6db17cac6522c722679c55dcbb25eda 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1370,14 +1370,14 @@ encode_actions_1 (struct command_line *action,
 
              if (0 == strncasecmp ("$reg", action_exp, 4))
                {
-                 for (i = 0; i < gdbarch_num_regs (t->gdbarch); i++)
+                 for (i = 0; i < gdbarch_num_regs (tloc->gdbarch); i++)
                    add_register (collect, i);
                  action_exp = strchr (action_exp, ',');        /* more? */
                }
              else if (0 == strncasecmp ("$arg", action_exp, 4))
                {
                  add_local_symbols (collect,
-                                    t->gdbarch,
+                                    tloc->gdbarch,
                                     tloc->address,
                                     frame_reg,
                                     frame_offset,
@@ -1387,7 +1387,7 @@ encode_actions_1 (struct command_line *action,
              else if (0 == strncasecmp ("$loc", action_exp, 4))
                {
                  add_local_symbols (collect,
-                                    t->gdbarch,
+                                    tloc->gdbarch,
                                     tloc->address,
                                     frame_reg,
                                     frame_offset,
@@ -1399,7 +1399,7 @@ encode_actions_1 (struct command_line *action,
                  struct cleanup *old_chain1 = NULL;
 
                  aexpr = gen_trace_for_return_address (tloc->address,
-                                                       t->gdbarch);
+                                                       tloc->gdbarch);
 
                  old_chain1 = make_cleanup_free_agent_expr (aexpr);
 
@@ -1452,7 +1452,7 @@ encode_actions_1 (struct command_line *action,
                      {
                        const char *name = &exp->elts[2].string;
 
-                       i = user_reg_map_name_to_regnum (t->gdbarch,
+                       i = user_reg_map_name_to_regnum (tloc->gdbarch,
                                                         name, strlen (name));
                        if (i == -1)
                          internal_error (__FILE__, __LINE__,
@@ -1475,7 +1475,7 @@ encode_actions_1 (struct command_line *action,
                    case OP_VAR_VALUE:
                      collect_symbol (collect,
                                      exp->elts[2].symbol,
-                                     t->gdbarch,
+                                     tloc->gdbarch,
                                      frame_reg,
                                      frame_offset,
                                      tloc->address);
@@ -1588,8 +1588,8 @@ encode_actions (struct breakpoint *t, struct bp_location *tloc,
   *tdp_actions = NULL;
   *stepping_actions = NULL;
 
-  gdbarch_virtual_frame_pointer (t->gdbarch,
-                                t->loc->address, &frame_reg, &frame_offset);
+  gdbarch_virtual_frame_pointer (tloc->gdbarch,
+                                tloc->address, &frame_reg, &frame_offset);
 
   actions = breakpoint_commands (t);