Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target: add Espressif ESP32-S3 basic support
[openocd.git] / src / target / arc.c
diff --git a/src/target/arc.c b/src/target/arc.c
index 77c9090f09e678b8e6fac67436096ae51cd2c3f1..471f16a9898d7080c58278b1e175c4174a9b1dd5 100644 (file)
--- a/src/target/arc.c
+++ b/src/target/arc.c
@@ -931,8 +931,8 @@ exit:
 static int get_current_actionpoint(struct target *target,
                struct arc_actionpoint **actionpoint)
 {
-       assert(target != NULL);
-       assert(actionpoint != NULL);
+       assert(target);
+       assert(actionpoint);
 
        uint32_t debug_ah;
        /* Check if actionpoint caused halt */
@@ -981,7 +981,7 @@ static int arc_examine_debug_reason(struct target *target)
                struct arc_actionpoint *actionpoint = NULL;
                CHECK_RETVAL(get_current_actionpoint(target, &actionpoint));
 
-               if (actionpoint != NULL) {
+               if (actionpoint) {
                        if (!actionpoint->used)
                                LOG_WARNING("Target halted by an unused actionpoint.");
 
@@ -1500,7 +1500,7 @@ static int arc_configure_actionpoint(struct target *target, uint32_t ap_num,
 static int arc_set_breakpoint(struct target *target,
                struct breakpoint *breakpoint)
 {
-       if (breakpoint->set) {
+       if (breakpoint->is_set) {
                LOG_WARNING("breakpoint already set");
                return ERROR_OK;
        }
@@ -1542,7 +1542,7 @@ static int arc_set_breakpoint(struct target *target,
                        return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
-               breakpoint->set = 64; /* Any nice value but 0 */
+               breakpoint->is_set = true;
        } else if (breakpoint->type == BKPT_HARD) {
                struct arc_common *arc = target_to_arc(target);
                struct arc_actionpoint *ap_list = arc->actionpoints_list;
@@ -1563,7 +1563,7 @@ static int arc_set_breakpoint(struct target *target,
                                breakpoint->address, AP_AC_TT_READWRITE, AP_AC_AT_INST_ADDR);
 
                if (retval == ERROR_OK) {
-                       breakpoint->set = bp_num + 1;
+                       breakpoint_hw_set(breakpoint, bp_num);
                        ap_list[bp_num].used = 1;
                        ap_list[bp_num].bp_value = breakpoint->address;
                        ap_list[bp_num].type = ARC_AP_BREAKPOINT;
@@ -1588,7 +1588,7 @@ static int arc_unset_breakpoint(struct target *target,
 {
        int retval = ERROR_OK;
 
-       if (!breakpoint->set) {
+       if (!breakpoint->is_set) {
                LOG_WARNING("breakpoint not set");
                return ERROR_OK;
        }
@@ -1633,14 +1633,14 @@ static int arc_unset_breakpoint(struct target *target,
                        LOG_ERROR("Invalid breakpoint length: target supports only 2 or 4");
                        return ERROR_COMMAND_ARGUMENT_INVALID;
                }
-               breakpoint->set = 0;
+               breakpoint->is_set = false;
 
        }       else if (breakpoint->type == BKPT_HARD) {
                struct arc_common *arc = target_to_arc(target);
                struct arc_actionpoint *ap_list = arc->actionpoints_list;
-               unsigned int bp_num = breakpoint->set - 1;
+               unsigned int bp_num = breakpoint->number;
 
-               if ((breakpoint->set == 0) || (bp_num >= arc->actionpoints_num)) {
+               if (bp_num >= arc->actionpoints_num) {
                        LOG_DEBUG("Invalid actionpoint ID: %u in breakpoint: %" PRIu32,
                                          bp_num, breakpoint->unique_id);
                        return ERROR_OK;
@@ -1650,11 +1650,11 @@ static int arc_unset_breakpoint(struct target *target,
                                                breakpoint->address, AP_AC_TT_DISABLE, AP_AC_AT_INST_ADDR);
 
                if (retval == ERROR_OK) {
-                       breakpoint->set = 0;
+                       breakpoint->is_set = false;
                        ap_list[bp_num].used = 0;
                        ap_list[bp_num].bp_value = 0;
 
-                       LOG_DEBUG("bpid: %" PRIu32 " - released actionpoint ID: %i",
+                       LOG_DEBUG("bpid: %" PRIu32 " - released actionpoint ID: %u",
                                        breakpoint->unique_id, bp_num);
                }
        } else {
@@ -1684,7 +1684,7 @@ static int arc_remove_breakpoint(struct target *target,
        struct breakpoint *breakpoint)
 {
        if (target->state == TARGET_HALTED) {
-               if (breakpoint->set)
+               if (breakpoint->is_set)
                        CHECK_RETVAL(arc_unset_breakpoint(target, breakpoint));
        } else {
                LOG_WARNING("target not halted");
@@ -1818,7 +1818,7 @@ static int arc_set_watchpoint(struct target *target,
        struct arc_common *arc = target_to_arc(target);
        struct arc_actionpoint *ap_list = arc->actionpoints_list;
 
-       if (watchpoint->set) {
+       if (watchpoint->is_set) {
                LOG_WARNING("watchpoint already set");
                return ERROR_OK;
        }
@@ -1859,7 +1859,7 @@ static int arc_set_watchpoint(struct target *target,
                                        watchpoint->address, enable, AP_AC_AT_MEMORY_ADDR);
 
        if (retval == ERROR_OK) {
-               watchpoint->set = wp_num + 1;
+               watchpoint_set(watchpoint, wp_num);
                ap_list[wp_num].used = 1;
                ap_list[wp_num].bp_value = watchpoint->address;
                ap_list[wp_num].type = ARC_AP_WATCHPOINT;
@@ -1878,13 +1878,13 @@ static int arc_unset_watchpoint(struct target *target,
        struct arc_common *arc = target_to_arc(target);
        struct arc_actionpoint *ap_list = arc->actionpoints_list;
 
-       if (!watchpoint->set) {
+       if (!watchpoint->is_set) {
                LOG_WARNING("watchpoint not set");
                return ERROR_OK;
        }
 
-       unsigned int wp_num = watchpoint->set - 1;
-       if ((watchpoint->set == 0) || (wp_num >= arc->actionpoints_num)) {
+       unsigned int wp_num = watchpoint->number;
+       if (wp_num >= arc->actionpoints_num) {
                LOG_DEBUG("Invalid actionpoint ID: %u in watchpoint: %" PRIu32,
                                wp_num, watchpoint->unique_id);
                return ERROR_OK;
@@ -1894,7 +1894,7 @@ static int arc_unset_watchpoint(struct target *target,
                                watchpoint->address, AP_AC_TT_DISABLE, AP_AC_AT_MEMORY_ADDR);
 
        if (retval == ERROR_OK) {
-               watchpoint->set = 0;
+               watchpoint->is_set = false;
                ap_list[wp_num].used = 0;
                ap_list[wp_num].bp_value = 0;
 
@@ -1926,7 +1926,7 @@ static int arc_remove_watchpoint(struct target *target,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (watchpoint->set)
+       if (watchpoint->is_set)
                CHECK_RETVAL(arc_unset_watchpoint(target, watchpoint));
 
        return ERROR_OK;
@@ -1940,7 +1940,7 @@ static int arc_hit_watchpoint(struct target *target, struct watchpoint **hit_wat
        struct arc_actionpoint *actionpoint = NULL;
        CHECK_RETVAL(get_current_actionpoint(target, &actionpoint));
 
-       if (actionpoint != NULL) {
+       if (actionpoint) {
                if (!actionpoint->used)
                        LOG_WARNING("Target halted by unused actionpoint.");
 
@@ -1949,12 +1949,12 @@ static int arc_hit_watchpoint(struct target *target, struct watchpoint **hit_wat
                        LOG_WARNING("Target halted by breakpoint, but is treated as a watchpoint.");
 
                for (struct watchpoint *watchpoint = target->watchpoints;
-                               watchpoint != NULL;
+                               watchpoint;
                                watchpoint = watchpoint->next) {
                        if (actionpoint->bp_value == watchpoint->address) {
                                *hit_watchpoint = watchpoint;
-                               LOG_DEBUG("Hit watchpoint, wpid: %" PRIu32 ", watchpoint num: %i",
-                                                       watchpoint->unique_id, watchpoint->set - 1);
+                               LOG_DEBUG("Hit watchpoint, wpid: %" PRIu32 ", watchpoint num: %u",
+                                                       watchpoint->unique_id, watchpoint->number);
                                return ERROR_OK;
                        }
                }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)