auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/smp: use a struct list_head to hold the smp targets

Browse Source 
Instead of reinventing a simply linked list, reuse the list helper
for the list of targets in a smp cluster.
Using the existing helper, that implements a double linked list,
makes trivial going through the list in reverse order.

Change-Id: Ib36ad2955f15cd2a601b0b9e36ca6d948b12d00f
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6783
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2021-12-16 01:59:14 +01:00
parent 5ab74bde06
commit 16cc853bcf
16 changed files with 136 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/target/breakpoints.c
View File

@@ -26,6 +26,7 @@
#include "target.h"
#include <helper/log.h>
#include "breakpoints.h"
#include "smp.h"
static const char * const breakpoint_type_strings[] = {
"hardware",
@@ -216,22 +217,22 @@ int breakpoint_add(struct target *target,
uint32_t length,
enum breakpoint_type type)
{
int retval = ERROR_OK;
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
if (type == BKPT_SOFT)
return breakpoint_add_internal(head->target, address, length, type);
while (head) {
curr = head->target;
retval = breakpoint_add_internal(curr, address, length, type);
if (type == BKPT_SOFT) {
head = list_first_entry(target->smp_targets, struct target_list, lh);
return breakpoint_add_internal(head->target, address, length, type);
}
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
int retval = breakpoint_add_internal(curr, address, length, type);
if (retval != ERROR_OK)
return retval;
head = head->next;
}
return retval;
return ERROR_OK;
} else {
return breakpoint_add_internal(target, address, length, type);
}
@@ -242,19 +243,17 @@ int context_breakpoint_add(struct target *target,
uint32_t length,
enum breakpoint_type type)
{
int retval = ERROR_OK;
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
retval = context_breakpoint_add_internal(curr, asid, length, type);
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
int retval = context_breakpoint_add_internal(curr, asid, length, type);
if (retval != ERROR_OK)
return retval;
head = head->next;
}
return retval;
return ERROR_OK;
} else {
return context_breakpoint_add_internal(target, asid, length, type);
}
@@ -266,19 +265,17 @@ int hybrid_breakpoint_add(struct target *target,
uint32_t length,
enum breakpoint_type type)
{
int retval = ERROR_OK;
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
retval = hybrid_breakpoint_add_internal(curr, address, asid, length, type);
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
int retval = hybrid_breakpoint_add_internal(curr, address, asid, length, type);
if (retval != ERROR_OK)
return retval;
head = head->next;
}
return retval;
return ERROR_OK;
} else
return hybrid_breakpoint_add_internal(target, address, asid, length, type);
}
@@ -345,12 +342,10 @@ void breakpoint_remove(struct target *target, target_addr_t address)
if (target->smp) {
unsigned int num_breakpoints = 0;
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
num_breakpoints += breakpoint_remove_internal(curr, address);
head = head->next;
}
if (!num_breakpoints)
LOG_ERROR("no breakpoint at address " TARGET_ADDR_FMT " found", address);
@@ -363,12 +358,10 @@ void breakpoint_remove_all(struct target *target)
{
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
breakpoint_remove_all_internal(curr);
head = head->next;
}
} else {
breakpoint_remove_all_internal(target);
@@ -387,12 +380,10 @@ void breakpoint_clear_target(struct target *target)
{
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
breakpoint_clear_target_internal(curr);
head = head->next;
}
} else {
breakpoint_clear_target_internal(target);
@@ -482,21 +473,17 @@ bye:
int watchpoint_add(struct target *target, target_addr_t address,
uint32_t length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
{
int retval = ERROR_OK;
if (target->smp) {
struct target_list *head;
struct target *curr;
head = target->head;
while (head != (struct target_list *)NULL) {
curr = head->target;
retval = watchpoint_add_internal(curr, address, length, rw, value,
mask);
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
int retval = watchpoint_add_internal(curr, address, length, rw, value, mask);
if (retval != ERROR_OK)
return retval;
head = head->next;
}
return retval;
return ERROR_OK;
} else {
return watchpoint_add_internal(target, address, length, rw, value,
mask);
@@ -549,12 +536,10 @@ void watchpoint_remove(struct target *target, target_addr_t address)
if (target->smp) {
unsigned int num_watchpoints = 0;
struct target_list *head;
struct target *curr;
head = target->head;
while (head) {
curr = head->target;
foreach_smp_target(head, target->smp_targets) {
struct target *curr = head->target;
num_watchpoints += watchpoint_remove_internal(curr, address);
head = head->next;
}
if (num_watchpoints == 0)
LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " num_watchpoints", address);