Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
ipdbg: fix double free of virtual-ir data
[openocd.git] / src / target / arm11.c
diff --git a/src/target/arm11.c b/src/target/arm11.c
index ff125d0eaa956da1b36859e729f04e947da6f625..50aaa86f12873eafdf8f0511799a108d3651f9de 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2008 digenius technology GmbH.                          *
  *   Michael Bruck                                                         *
@@ -7,19 +9,6 @@
  *   Copyright (C) 2008 Georg Acher <acher@in.tum.de>                      *
  *                                                                         *
  *   Copyright (C) 2009 David Brownell                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -51,14 +40,14 @@ static int arm11_step(struct target *target, int current,
  */
 static int arm11_check_init(struct arm11_common *arm11)
 {
-       CHECK_RETVAL(arm11_read_DSCR(arm11));
+       CHECK_RETVAL(arm11_read_dscr(arm11));
 
        if (!(arm11->dscr & DSCR_HALT_DBG_MODE)) {
                LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
                LOG_DEBUG("Bringing target into debug mode");
 
                arm11->dscr |= DSCR_HALT_DBG_MODE;
-               CHECK_RETVAL(arm11_write_DSCR(arm11, arm11->dscr));
+               CHECK_RETVAL(arm11_write_dscr(arm11, arm11->dscr));
 
                /* add further reset initialization here */
 
@@ -104,9 +93,9 @@ static int arm11_debug_entry(struct arm11_common *arm11)
        /* maybe save wDTR (pending DCC write to debug SW, e.g. libdcc) */
        arm11->is_wdtr_saved = !!(arm11->dscr & DSCR_DTR_TX_FULL);
        if (arm11->is_wdtr_saved) {
-               arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
+               arm11_add_debug_scan_n(arm11, 0x05, ARM11_TAP_DEFAULT);
 
-               arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
+               arm11_add_ir(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
 
                struct scan_field chain5_fields[3];
 
@@ -126,7 +115,7 @@ static int arm11_debug_entry(struct arm11_common *arm11)
         * but not to issue ITRs(?).  The ARMv7 arch spec says it's required
         * for executing instructions via ITR.
         */
-       CHECK_RETVAL(arm11_write_DSCR(arm11, DSCR_ITR_EN | arm11->dscr));
+       CHECK_RETVAL(arm11_write_dscr(arm11, DSCR_ITR_EN | arm11->dscr));
 
 
        /* From the spec:
@@ -143,14 +132,14 @@ static int arm11_debug_entry(struct arm11_common *arm11)
                /* mcr     15, 0, r0, cr7, cr10, {4} */
                arm11_run_instr_no_data1(arm11, 0xee070f9a);
 
-               uint32_t dscr = arm11_read_DSCR(arm11);
+               uint32_t dscr = arm11_read_dscr(arm11);
 
                LOG_DEBUG("DRAIN, DSCR %08x", dscr);
 
                if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT) {
                        arm11_run_instr_no_data1(arm11, 0xe320f000);
 
-                       dscr = arm11_read_DSCR(arm11);
+                       dscr = arm11_read_dscr(arm11);
 
                        LOG_DEBUG("DRAIN, DSCR %08x (DONE)", dscr);
 
@@ -242,7 +231,7 @@ static int arm11_leave_debug_state(struct arm11_common *arm11, bool bpwp)
        /* spec says clear wDTR and rDTR; we assume they are clear as
           otherwise our programming would be sloppy */
        {
-               CHECK_RETVAL(arm11_read_DSCR(arm11));
+               CHECK_RETVAL(arm11_read_dscr(arm11));
 
                if (arm11->dscr & (DSCR_DTR_RX_FULL | DSCR_DTR_TX_FULL)) {
                        /*
@@ -285,23 +274,23 @@ static int arm11_leave_debug_state(struct arm11_common *arm11, bool bpwp)
        register_cache_invalidate(arm11->arm.core_cache);
 
        /* restore DSCR */
-       CHECK_RETVAL(arm11_write_DSCR(arm11, arm11->dscr));
+       CHECK_RETVAL(arm11_write_dscr(arm11, arm11->dscr));
 
        /* maybe restore rDTR */
        if (arm11->is_rdtr_saved) {
-               arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
+               arm11_add_debug_scan_n(arm11, 0x05, ARM11_TAP_DEFAULT);
 
-               arm11_add_IR(arm11, ARM11_EXTEST, ARM11_TAP_DEFAULT);
+               arm11_add_ir(arm11, ARM11_EXTEST, ARM11_TAP_DEFAULT);
 
                struct scan_field chain5_fields[3];
 
-               uint8_t Ready           = 0;                    /* ignored */
-               uint8_t Valid           = 0;                    /* ignored */
+               uint8_t ready           = 0;                    /* ignored */
+               uint8_t valid           = 0;                    /* ignored */
 
                arm11_setup_field(arm11, 32, &arm11->saved_rdtr,
                        NULL, chain5_fields + 0);
-               arm11_setup_field(arm11,  1, &Ready,    NULL, chain5_fields + 1);
-               arm11_setup_field(arm11,  1, &Valid,    NULL, chain5_fields + 2);
+               arm11_setup_field(arm11,  1, &ready,    NULL, chain5_fields + 1);
+               arm11_setup_field(arm11,  1, &valid,    NULL, chain5_fields + 2);
 
                arm11_add_dr_scan_vc(arm11->arm.target->tap, ARRAY_SIZE(
                                chain5_fields), chain5_fields, TAP_DRPAUSE);
@@ -376,14 +365,14 @@ static int arm11_halt(struct target *target)
                return ERROR_OK;
        }
 
-       arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE);
+       arm11_add_ir(arm11, ARM11_HALT, TAP_IDLE);
 
        CHECK_RETVAL(jtag_execute_queue());
 
        int i = 0;
 
        while (1) {
-               CHECK_RETVAL(arm11_read_DSCR(arm11));
+               CHECK_RETVAL(arm11_read_dscr(arm11));
 
                if (arm11->dscr & DSCR_CORE_HALTED)
                        break;
@@ -460,7 +449,7 @@ static int arm11_resume(struct target *target, int current,
 
 
        if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
+               LOG_TARGET_ERROR(target, "not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -519,13 +508,13 @@ static int arm11_resume(struct target *target, int current,
        /* activate all watchpoints and breakpoints */
        CHECK_RETVAL(arm11_leave_debug_state(arm11, true));
 
-       arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
+       arm11_add_ir(arm11, ARM11_RESTART, TAP_IDLE);
 
        CHECK_RETVAL(jtag_execute_queue());
 
        int i = 0;
        while (1) {
-               CHECK_RETVAL(arm11_read_DSCR(arm11));
+               CHECK_RETVAL(arm11_read_dscr(arm11));
 
                LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
 
@@ -562,7 +551,7 @@ static int arm11_step(struct target *target, int current,
                target_state_name(target));
 
        if (target->state != TARGET_HALTED) {
-               LOG_WARNING("target was not halted");
+               LOG_TARGET_ERROR(target, "not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -661,7 +650,7 @@ static int arm11_step(struct target *target, int current,
 
                CHECK_RETVAL(arm11_leave_debug_state(arm11, handle_breakpoints));
 
-               arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
+               arm11_add_ir(arm11, ARM11_RESTART, TAP_IDLE);
 
                CHECK_RETVAL(jtag_execute_queue());
 
@@ -672,7 +661,7 @@ static int arm11_step(struct target *target, int current,
                        const uint32_t mask = DSCR_CORE_RESTARTED
                                | DSCR_CORE_HALTED;
 
-                       CHECK_RETVAL(arm11_read_DSCR(arm11));
+                       CHECK_RETVAL(arm11_read_dscr(arm11));
                        LOG_DEBUG("DSCR %08x e", (unsigned) arm11->dscr);
 
                        if ((arm11->dscr & mask) == mask)
@@ -809,7 +798,7 @@ static int arm11_read_memory_inner(struct target *target,
        int retval;
 
        if (target->state != TARGET_HALTED) {
-               LOG_WARNING("target was not halted");
+               LOG_TARGET_ERROR(target, "not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -907,7 +896,7 @@ static int arm11_write_memory_inner(struct target *target,
        int retval;
 
        if (target->state != TARGET_HALTED) {
-               LOG_WARNING("target was not halted");
+               LOG_TARGET_ERROR(target, "not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -1096,7 +1085,7 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
 {
        struct arm11_common *arm11;
 
-       if (target->tap == NULL)
+       if (!target->tap)
                return ERROR_FAIL;
 
        if (target->tap->ir_length != 5) {
@@ -1151,7 +1140,7 @@ static int arm11_examine(struct target *target)
 
        /* check IDCODE */
 
-       arm11_add_IR(arm11, ARM11_IDCODE, ARM11_TAP_DEFAULT);
+       arm11_add_ir(arm11, ARM11_IDCODE, ARM11_TAP_DEFAULT);
 
        struct scan_field idcode_field;
 
@@ -1161,9 +1150,9 @@ static int arm11_examine(struct target *target)
 
        /* check DIDR */
 
-       arm11_add_debug_SCAN_N(arm11, 0x00, ARM11_TAP_DEFAULT);
+       arm11_add_debug_scan_n(arm11, 0x00, ARM11_TAP_DEFAULT);
 
-       arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
+       arm11_add_ir(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
 
        struct scan_field chain0_fields[2];
 
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)