Hi everyone,
I figured since I was poking around in the breakpoint code on other arches, I'd
add this change to those arches that don't do it already. This patch propagates
the return code of <arch>_set_breakpoint() up the call stack. This ensures that
the higher layer breakpoint infrastructure is aware that an error ocurred, in
which case the breakpoint is not recorded.
Normally I wouldn't touch code that I can't test, but the code is very
uniform across architectures, and the change is rather benign, so I figured
after careful inspection that it is safe. If the maintainers or others think
this is imprudent, the patch can be dropped.
Also changed the error code to something more appropriate in two cases where
hardware resources are unavailable.
Comments and criticisms of course gratefully received.
Mike
Signed-off-by: Mike Dunn <miked...@newsguy.com>
---
src/target/cortex_a8.c | 5 ++---
src/target/cortex_m3.c | 3 +--
src/target/mips_m4k.c | 6 ++----
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 9b3521a..8b4ced5 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1230,7 +1230,7 @@ static int cortex_a8_set_breakpoint(struct target *target,
if (brp_i >= cortex_a8->brp_num)
{
LOG_ERROR("ERROR Can not find free Breakpoint Register
Pair");
- return ERROR_FAIL;
+ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
breakpoint->set = brp_i + 1;
if (breakpoint->length == 2)
@@ -1360,9 +1360,8 @@ static int cortex_a8_add_breakpoint(struct target *target,
if (breakpoint->type == BKPT_HARD)
cortex_a8->brp_num_available--;
- cortex_a8_set_breakpoint(target, breakpoint, 0x00); /* Exact match */
- return ERROR_OK;
+ return cortex_a8_set_breakpoint(target, breakpoint, 0x00); /* Exact
match */
}
static int cortex_a8_remove_breakpoint(struct target *target, struct
breakpoint *breakpoint)
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index f87c3e0..3011b59 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1221,9 +1221,8 @@ cortex_m3_add_breakpoint(struct target *target, struct
breakpoint *breakpoint)
if (breakpoint->type == BKPT_HARD)
cortex_m3->fp_code_available--;
- cortex_m3_set_breakpoint(target, breakpoint);
- return ERROR_OK;
+ return cortex_m3_set_breakpoint(target, breakpoint);
}
static int
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 21ff0ba..62c484a 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -497,7 +497,7 @@ static int mips_m4k_set_breakpoint(struct target *target,
{
LOG_ERROR("Can not find free FP Comparator(bpid: %d)",
breakpoint->unique_id );
- return ERROR_FAIL;
+ return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
breakpoint->set = bp_num + 1;
comparator_list[bp_num].used = 1;
@@ -662,9 +662,7 @@ static int mips_m4k_add_breakpoint(struct target *target,
struct breakpoint *bre
mips32->num_inst_bpoints_avail--;
}
- mips_m4k_set_breakpoint(target, breakpoint);
-
- return ERROR_OK;
+ return mips_m4k_set_breakpoint(target, breakpoint);
}
static int mips_m4k_remove_breakpoint(struct target *target,
--
1.7.1
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
