#endif
#include "target.h"
-#include "log.h"
+#include <helper/log.h>
#include "breakpoints.h"
{
struct breakpoint *breakpoint = target->breakpoints;
struct breakpoint **breakpoint_p = &target->breakpoints;
- char *reason;
int retval;
int n;
(*breakpoint_p)->unique_id = bpwp_unique_id++;
retval = target_add_breakpoint(target, *breakpoint_p);
- switch (retval) {
- case ERROR_OK:
- break;
- case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
- reason = "resource not available";
- goto fail;
- case ERROR_TARGET_NOT_HALTED:
- reason = "target running";
- goto fail;
- default:
- reason = "unknown reason";
-fail:
- LOG_ERROR("can't add breakpoint: %s", reason);
+ if (retval != ERROR_OK)
+ {
+ LOG_ERROR("could not add breakpoint");
free((*breakpoint_p)->orig_instr);
free(*breakpoint_p);
*breakpoint_p = NULL;
}
/* free up a breakpoint */
-static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_remove)
+static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_to_remove)
{
struct breakpoint *breakpoint = target->breakpoints;
struct breakpoint **breakpoint_p = &target->breakpoints;
+ int retval;
while (breakpoint)
{
- if (breakpoint == breakpoint_remove)
+ if (breakpoint == breakpoint_to_remove)
break;
breakpoint_p = &breakpoint->next;
breakpoint = breakpoint->next;
if (breakpoint == NULL)
return;
- target_remove_breakpoint(target, breakpoint);
+ retval = target_remove_breakpoint(target, breakpoint);
- LOG_DEBUG("BPID: %d", breakpoint->unique_id );
+ LOG_DEBUG("free BPID: %d --> %d", breakpoint->unique_id, retval);
(*breakpoint_p) = breakpoint->next;
free(breakpoint->orig_instr);
free(breakpoint);
struct watchpoint *watchpoint = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints;
int retval;
- char *reason;
while (watchpoint)
{
(*watchpoint_p)->unique_id = bpwp_unique_id++;
retval = target_add_watchpoint(target, *watchpoint_p);
- switch (retval) {
- case ERROR_OK:
- break;
- case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
- reason = "resource not available";
- goto bye;
- case ERROR_TARGET_NOT_HALTED:
- reason = "target running";
- goto bye;
- default:
- reason = "unrecognized error";
-bye:
- LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s",
+ if (retval != ERROR_OK)
+ {
+ LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32,
watchpoint_rw_strings[(*watchpoint_p)->rw],
- address, reason);
+ address);
free (*watchpoint_p);
*watchpoint_p = NULL;
return retval;
return ERROR_OK;
}
-static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_remove)
+static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
{
struct watchpoint *watchpoint = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints;
+ int retval;
while (watchpoint)
{
- if (watchpoint == watchpoint_remove)
+ if (watchpoint == watchpoint_to_remove)
break;
watchpoint_p = &watchpoint->next;
watchpoint = watchpoint->next;
if (watchpoint == NULL)
return;
- target_remove_watchpoint(target, watchpoint);
- LOG_DEBUG("WPID: %d", watchpoint->unique_id );
+ retval = target_remove_watchpoint(target, watchpoint);
+ LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);
(*watchpoint_p) = watchpoint->next;
free(watchpoint);
}