breakpoint_t *breakpoint = target->breakpoints;
breakpoint_t **breakpoint_p = &target->breakpoints;
int retval;
-
+
while (breakpoint)
{
if (breakpoint->address == address)
breakpoint_p = &breakpoint->next;
breakpoint = breakpoint->next;
}
+
+ (*breakpoint_p) = malloc(sizeof(breakpoint_t));
+ (*breakpoint_p)->address = address;
+ (*breakpoint_p)->length = length;
+ (*breakpoint_p)->type = type;
+ (*breakpoint_p)->set = 0;
+ (*breakpoint_p)->orig_instr = malloc(length);
+ (*breakpoint_p)->next = NULL;
- if ((retval = target->type->add_breakpoint(target, address, length, type)) != ERROR_OK)
+ if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
{
switch (retval)
{
case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
- INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[type]);
+ LOG_INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->type]);
+ free((*breakpoint_p)->orig_instr);
+ free(*breakpoint_p);
+ *breakpoint_p = NULL;
return retval;
break;
case ERROR_TARGET_NOT_HALTED:
- INFO("can't add breakpoint while target is running");
+ LOG_INFO("can't add breakpoint while target is running");
+ free((*breakpoint_p)->orig_instr);
+ free(*breakpoint_p);
+ *breakpoint_p = NULL;
return retval;
break;
default:
- ERROR("unknown error");
- exit(-1);
break;
}
}
- (*breakpoint_p) = malloc(sizeof(breakpoint_t));
- (*breakpoint_p)->address = address;
- (*breakpoint_p)->length = length;
- (*breakpoint_p)->type = type;
- (*breakpoint_p)->set = 0;
- (*breakpoint_p)->orig_instr = malloc(CEIL(length, 8));
- (*breakpoint_p)->next = NULL;
-
- DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", breakpoint_type_strings[type], address, length);
+ LOG_DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x",
+ breakpoint_type_strings[(*breakpoint_p)->type],
+ (*breakpoint_p)->address, (*breakpoint_p)->length);
return ERROR_OK;
}
+/* free up a breakpoint */
+static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove)
+{
+ breakpoint_t *breakpoint = target->breakpoints;
+ breakpoint_t **breakpoint_p = &target->breakpoints;
+
+ while (breakpoint)
+ {
+ if (breakpoint==breakpoint_remove)
+ break;
+ breakpoint_p = &breakpoint->next;
+ breakpoint = breakpoint->next;
+ }
+
+ if (breakpoint==NULL)
+ return;
+
+ target->type->remove_breakpoint(target, breakpoint);
+
+ (*breakpoint_p) = breakpoint->next;
+ free(breakpoint->orig_instr);
+ free(breakpoint);
+}
+
int breakpoint_remove(target_t *target, u32 address)
{
breakpoint_t *breakpoint = target->breakpoints;
breakpoint_t **breakpoint_p = &target->breakpoints;
- int retval;
while (breakpoint)
{
if (breakpoint)
{
- if ((retval = target->type->remove_breakpoint(target, breakpoint)) != ERROR_OK)
- {
- switch (retval)
- {
- case ERROR_TARGET_NOT_HALTED:
- INFO("can't remove breakpoint while target is running");
- return retval;
- break;
- default:
- ERROR("unknown error");
- exit(-1);
- break;
- }
- }
- (*breakpoint_p) = breakpoint->next;
- free(breakpoint->orig_instr);
- free(breakpoint);
+ breakpoint_free(target, breakpoint);
}
else
{
- ERROR("no breakpoint at address 0x%8.8x found", address);
+ LOG_ERROR("no breakpoint at address 0x%8.8x found", address);
}
return ERROR_OK;
}
+void breakpoint_clear_target(target_t *target)
+{
+ breakpoint_t *breakpoint;
+ while ((breakpoint = target->breakpoints)!=NULL)
+ {
+ breakpoint_free(target, breakpoint);
+ }
+}
+
breakpoint_t* breakpoint_find(target_t *target, u32 address)
{
breakpoint_t *breakpoint = target->breakpoints;
watchpoint = watchpoint->next;
}
- if ((retval = target->type->add_watchpoint(target, address, length, rw)) != ERROR_OK)
+ (*watchpoint_p) = malloc(sizeof(watchpoint_t));
+ (*watchpoint_p)->address = address;
+ (*watchpoint_p)->length = length;
+ (*watchpoint_p)->value = value;
+ (*watchpoint_p)->mask = mask;
+ (*watchpoint_p)->rw = rw;
+ (*watchpoint_p)->set = 0;
+ (*watchpoint_p)->next = NULL;
+
+ if ((retval = target->type->add_watchpoint(target, *watchpoint_p)) != ERROR_OK)
{
switch (retval)
{
case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
- INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[rw]);
+ LOG_INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
+ free (*watchpoint_p);
+ *watchpoint_p = NULL;
+ return retval;
+ break;
+ case ERROR_TARGET_NOT_HALTED:
+ LOG_INFO("can't add watchpoint while target is running");
+ free (*watchpoint_p);
+ *watchpoint_p = NULL;
return retval;
break;
default:
- ERROR("unknown error");
+ LOG_ERROR("unknown error");
exit(-1);
break;
}
}
- (*watchpoint_p) = malloc(sizeof(watchpoint_t));
- (*watchpoint_p)->address = address;
- (*watchpoint_p)->length = length;
- (*watchpoint_p)->value = value;
- (*watchpoint_p)->mask = mask;
- (*watchpoint_p)->rw = rw;
- (*watchpoint_p)->set = 0;
- (*watchpoint_p)->next = NULL;
-
- DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x", watchpoint_rw_strings[rw], address, length);
+ LOG_DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x",
+ watchpoint_rw_strings[(*watchpoint_p)->rw],
+ (*watchpoint_p)->address, (*watchpoint_p)->length);
return ERROR_OK;
}
+static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
+{
+ watchpoint_t *watchpoint = target->watchpoints;
+ watchpoint_t **watchpoint_p = &target->watchpoints;
+
+ while (watchpoint)
+ {
+ if (watchpoint == watchpoint_remove)
+ break;
+ watchpoint_p = &watchpoint->next;
+ watchpoint = watchpoint->next;
+ }
+
+ if (watchpoint==NULL)
+ return;
+ target->type->remove_watchpoint(target, watchpoint);
+ (*watchpoint_p) = watchpoint->next;
+ free(watchpoint);
+}
+
+
+
int watchpoint_remove(target_t *target, u32 address)
{
watchpoint_t *watchpoint = target->watchpoints;
watchpoint_t **watchpoint_p = &target->watchpoints;
- int retval;
while (watchpoint)
{
if (watchpoint)
{
- if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK)
- {
- ERROR("BUG: can't remove watchpoint");
- exit(-1);
- }
- (*watchpoint_p) = watchpoint->next;
- free(watchpoint);
+ watchpoint_free(target, watchpoint);
}
else
{
- ERROR("no watchpoint at address 0x%8.8x found", address);
+ LOG_ERROR("no watchpoint at address 0x%8.8x found", address);
}
return ERROR_OK;
}
+
+
+void watchpoint_clear_target(target_t *target)
+{
+ watchpoint_t *watchpoint;
+ while ((watchpoint = target->watchpoints)!=NULL)
+ {
+ watchpoint_free(target, watchpoint);
+ }
+}
projects / fw / openocd / blobdiff