interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Differentiate "target not halted" messages. 

Change-Id: I8728fa007289d7af5c6791142e76eb5777c83ca4
Signed-off-by: Tim Newsome <tim@sifive.com>
Reviewed-on: http://openocd.zylin.com/4244
Tested-by: jenkins
Reviewed-by: Liviu Ionescu <ilg@livius.net>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Tim Newsome 2017-10-06 14:36:34 -07:00 committed by Andreas Fritiofson
parent 1356be121e
commit 1662508911
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/target/target.c
View File

@ -1098,7 +1098,7 @@ int target_add_breakpoint(struct target *target,
struct breakpoint *breakpoint) struct breakpoint *breakpoint)
{ {
if ((target->state != TARGET_HALTED) && (breakpoint->type != BKPT_HARD)) { if ((target->state != TARGET_HALTED) && (breakpoint->type != BKPT_HARD)) {
LOG_WARNING("target %s is not halted", target_name(target)); LOG_WARNING("target %s is not halted (add breakpoint)", target_name(target));
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->add_breakpoint(target, breakpoint); return target->type->add_breakpoint(target, breakpoint);
@ -1108,7 +1108,7 @@ int target_add_context_breakpoint(struct target *target,
struct breakpoint *breakpoint) struct breakpoint *breakpoint)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target_name(target)); LOG_WARNING("target %s is not halted (add context breakpoint)", target_name(target));
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->add_context_breakpoint(target, breakpoint); return target->type->add_context_breakpoint(target, breakpoint);
@ -1118,7 +1118,7 @@ int target_add_hybrid_breakpoint(struct target *target,
struct breakpoint *breakpoint) struct breakpoint *breakpoint)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target_name(target)); LOG_WARNING("target %s is not halted (add hybrid breakpoint)", target_name(target));
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->add_hybrid_breakpoint(target, breakpoint); return target->type->add_hybrid_breakpoint(target, breakpoint);
@ -1134,7 +1134,7 @@ int target_add_watchpoint(struct target *target,
struct watchpoint *watchpoint) struct watchpoint *watchpoint)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target_name(target)); LOG_WARNING("target %s is not halted (add watchpoint)", target_name(target));
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->add_watchpoint(target, watchpoint); return target->type->add_watchpoint(target, watchpoint);
@ -1148,7 +1148,7 @@ int target_hit_watchpoint(struct target *target,
struct watchpoint **hit_watchpoint) struct watchpoint **hit_watchpoint)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target->cmd_name); LOG_WARNING("target %s is not halted (hit watchpoint)", target->cmd_name);
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
@ -1177,7 +1177,7 @@ int target_step(struct target *target,
int target_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fileio_info) int target_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fileio_info)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target->cmd_name); LOG_WARNING("target %s is not halted (gdb fileio)", target->cmd_name);
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->get_gdb_fileio_info(target, fileio_info); return target->type->get_gdb_fileio_info(target, fileio_info);
@ -1186,7 +1186,7 @@ int target_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fi
int target_gdb_fileio_end(struct target *target, int retcode, int fileio_errno, bool ctrl_c) int target_gdb_fileio_end(struct target *target, int retcode, int fileio_errno, bool ctrl_c)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target->cmd_name); LOG_WARNING("target %s is not halted (gdb fileio end)", target->cmd_name);
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->gdb_fileio_end(target, retcode, fileio_errno, ctrl_c); return target->type->gdb_fileio_end(target, retcode, fileio_errno, ctrl_c);
@ -1196,7 +1196,7 @@ int target_profiling(struct target *target, uint32_t *samples,
uint32_t max_num_samples, uint32_t *num_samples, uint32_t seconds) uint32_t max_num_samples, uint32_t *num_samples, uint32_t seconds)
{ {
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_WARNING("target %s is not halted", target->cmd_name); LOG_WARNING("target %s is not halted (profiling)", target->cmd_name);
return ERROR_TARGET_NOT_HALTED; return ERROR_TARGET_NOT_HALTED;
} }
return target->type->profiling(target, samples, max_num_samples, return target->type->profiling(target, samples, max_num_samples,

1
src/target/target_type.h
View File

@ -53,6 +53,7 @@ struct target_type {
/* halt will log a warning, but return ERROR_OK if the target is already halted. */ /* halt will log a warning, but return ERROR_OK if the target is already halted. */
int (*halt)(struct target *target); int (*halt)(struct target *target);
/* See target.c target_resume() for documentation. */
int (*resume)(struct target *target, int current, target_addr_t address, int (*resume)(struct target *target, int current, target_addr_t address,
int handle_breakpoints, int debug_execution); int handle_breakpoints, int debug_execution);
int (*step)(struct target *target, int current, target_addr_t address, int (*step)(struct target *target, int current, target_addr_t address,