From 1ccd06e498586b39f06447cbf3f2fad50120fde6 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 7 Apr 2016 16:47:26 +0100 Subject: [PATCH] Set bp_tgt->reqstd_address and bp_tgt->placed_size in record_full_insert_breakpoint 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 * record-full.c (record_full_insert_breakpoint): Set bp_tgt->reqstd_address and bp_tgt->placed_size. --- gdb/ChangeLog | 5 +++++ gdb/record-full.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b9d342f115..39f77f8844a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-04-07 Yao Qi + + * record-full.c (record_full_insert_breakpoint): Set + bp_tgt->reqstd_address and bp_tgt->placed_size. + 2016-04-06 Don Breazeal * value.c (value_actual_type): Don't try to get rtti type diff --git a/gdb/record-full.c b/gdb/record-full.c index f6023bf0e3e..066a8e73b35 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -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; -- 2.30.2