[PATCH 5/7] [GDBserver] Don't error in reinsert_raw_breakpoint if bp->inserted

Yao Qi
2016-03-23T16:10:03Z

GDBserver steps over a breakpoint while the single step breakpoint
is inserted at the same address, there are two breakpoint objects
using single raw breakpoint, which is inserted (for single step).
When step over is finished, GDBserver reinsert the breakpoint, but
it finds the raw breakpoint is already inserted, and error out
"Breakpoint already inserted at reinsert time." Even if I change the
order to delete reinsert breakpoints first (which only decreases the
refcount, but leave inserted flag unchanged), the error is still
there.

The fix is to remove the error and return instead.

gdb/gdbserver:

2016-03-23 Yao Qi <yao.qi@linaro.org>

* linux-low.c (reinsert_raw_breakpoint): If bp->inserted is true
return instead of error.
---
gdb/gdbserver/mem-break.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index af01288..a85128e 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -1522,7 +1522,7 @@ reinsert_raw_breakpoint (struct raw_breakpoint *bp)
int err;

if (bp->inserted)
- error ("Breakpoint already inserted at reinsert time.");
+ return;

err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
if (err == 0)
--
1.9.1