zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propagate return status of set_breakpoint() up call chain 

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 <mikedunn@newsguy.com>
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
__archive__
Mike Dunn 2010-09-12 12:05:07 -07:00 committed by Øyvind Harboe
parent 8afd2309a4
commit 81e0d4438e
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/target/cortex_a8.c
View File

@ -1230,7 +1230,7 @@ static int cortex_a8_set_breakpoint(struct target *target,
if (brp_i >= cortex_a8->brp_num) if (brp_i >= cortex_a8->brp_num)
{ {
LOG_ERROR("ERROR Can not find free Breakpoint Register Pair"); LOG_ERROR("ERROR Can not find free Breakpoint Register Pair");
return ERROR_FAIL; return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
} }
breakpoint->set = brp_i + 1; breakpoint->set = brp_i + 1;
if (breakpoint->length == 2) if (breakpoint->length == 2)
@ -1360,9 +1360,8 @@ static int cortex_a8_add_breakpoint(struct target *target,
if (breakpoint->type == BKPT_HARD) if (breakpoint->type == BKPT_HARD)
cortex_a8->brp_num_available--; 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) static int cortex_a8_remove_breakpoint(struct target *target, struct breakpoint *breakpoint)

3
src/target/cortex_m3.c
View File

@ -1221,9 +1221,8 @@ cortex_m3_add_breakpoint(struct target *target, struct breakpoint *breakpoint)
if (breakpoint->type == BKPT_HARD) if (breakpoint->type == BKPT_HARD)
cortex_m3->fp_code_available--; cortex_m3->fp_code_available--;
cortex_m3_set_breakpoint(target, breakpoint);
return ERROR_OK; return cortex_m3_set_breakpoint(target, breakpoint);
} }
static int static int

6
src/target/mips_m4k.c
View File

@ -497,7 +497,7 @@ static int mips_m4k_set_breakpoint(struct target *target,
{ {
LOG_ERROR("Can not find free FP Comparator(bpid: %d)", LOG_ERROR("Can not find free FP Comparator(bpid: %d)",
breakpoint->unique_id ); breakpoint->unique_id );
return ERROR_FAIL; return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
} }
breakpoint->set = bp_num + 1; breakpoint->set = bp_num + 1;
comparator_list[bp_num].used = 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--; mips32->num_inst_bpoints_avail--;
} }
mips_m4k_set_breakpoint(target, breakpoint); return mips_m4k_set_breakpoint(target, breakpoint);
return ERROR_OK;
} }
static int mips_m4k_remove_breakpoint(struct target *target, static int mips_m4k_remove_breakpoint(struct target *target,