Set bp_tgt->reqstd_address and bp_tgt->placed_size in record_full_insert_breakpoint
authorYao Qi <yao.qi@linaro.org>
Thu, 7 Apr 2016 15:47:26 +0000 (16:47 +0100)
committerYao Qi <yao.qi@linaro.org>
Thu, 7 Apr 2016 15:51:30 +0000 (16:51 +0100)
I notice that bp_tgt won't be fully initialized if to_insert_breakpoint
isn't called in record_full_insert_breakpoint, and bp_tgt->reqstd_address
is zero, so an entry is added to record_full_breakpoints, but its address
is zero, which is wrong.  This patch is to call gdbarch_breakpoint_from_pc
in the else branch to set bp_tgt->reqstd_address and bp_tgt->placed_size.

gdb:

2016-04-07  Yao Qi  <yao.qi@linaro.org>

* record-full.c (record_full_insert_breakpoint): Set
bp_tgt->reqstd_address and bp_tgt->placed_size.

gdb/ChangeLog
gdb/record-full.c

index 6b9d342f1159b71dd23b4f1d8afc5a08a026997a..39f77f8844a0aba7ddf50d405f98c7d49e865cd7 100644 (file)
@@ -1,3 +1,8 @@
+2016-04-07  Yao Qi  <yao.qi@linaro.org>
+
+       * record-full.c (record_full_insert_breakpoint): Set
+       bp_tgt->reqstd_address and bp_tgt->placed_size.
+
 2016-04-06  Don Breazeal  <donb@codesourcery.com>
 
        * value.c (value_actual_type): Don't try to get rtti type
index f6023bf0e3e7e48ec5fc6dce23f12af1e4bcdeda..066a8e73b35a0b203a27e0bb7051a25d6bdb370e 100644 (file)
@@ -1670,6 +1670,16 @@ record_full_insert_breakpoint (struct target_ops *ops,
 
       in_target_beneath = 1;
     }
+  else
+    {
+      CORE_ADDR addr = bp_tgt->reqstd_address;
+      int bplen;
+
+      gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
+
+      bp_tgt->placed_address = addr;
+      bp_tgt->placed_size = bplen;
+    }
 
   bp = XNEW (struct record_full_breakpoint);
   bp->addr = bp_tgt->placed_address;