Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target/arm920t: remove command 'arm920t cp15i' deprecated in v0.4.0
[openocd.git] / src / target / arm920t.c
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index b1579bca514cbae6724d03644936621db5ecb942..80f6d7045e398e1d70b57bcaa03225deeb83dfbe 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -14,9 +14,7 @@
  *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -285,8 +283,8 @@ static int arm920t_read_cp15_interpreted(struct target *target,
                return ERROR_FAIL;
        }
 
-       r[0].dirty = 1;
-       r[1].dirty = 1;
+       r[0].dirty = true;
+       r[1].dirty = true;
 
        return ERROR_OK;
 }
@@ -329,8 +327,8 @@ int arm920t_write_cp15_interpreted(struct target *target,
                return ERROR_FAIL;
        }
 
-       r[0].dirty = 1;
-       r[1].dirty = 1;
+       r[0].dirty = true;
+       r[1].dirty = true;
 
        return ERROR_OK;
 }
@@ -486,7 +484,7 @@ int arm920t_post_debug_entry(struct target *target)
 /* EXPORTED to FA256 */
 void arm920t_pre_restore_context(struct target *target)
 {
-       uint32_t cp15c15;
+       uint32_t cp15c15 = 0;
        struct arm920t_common *arm920t = target_to_arm920(target);
 
        /* restore i/d fault status and address register */
@@ -509,11 +507,11 @@ void arm920t_pre_restore_context(struct target *target)
 
 static const char arm920_not[] = "target is not an ARM920";
 
-static int arm920t_verify_pointer(struct command_context *cmd_ctx,
+static int arm920t_verify_pointer(struct command_invocation *cmd,
        struct arm920t_common *arm920t)
 {
        if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
-               command_print(cmd_ctx, arm920_not);
+               command_print(cmd, arm920_not);
                return ERROR_TARGET_INVALID;
        }
 
@@ -555,7 +553,7 @@ static int arm920_mmu(struct target *target, int *enabled)
 }
 
 static int arm920_virt2phys(struct target *target,
-       uint32_t virt, uint32_t *phys)
+       target_addr_t virt, target_addr_t *phys)
 {
        uint32_t cb;
        struct arm920t_common *arm920t = target_to_arm920(target);
@@ -570,7 +568,7 @@ static int arm920_virt2phys(struct target *target,
 }
 
 /** Reads a buffer, in the specified word size, with current MMU settings. */
-int arm920t_read_memory(struct target *target, uint32_t address,
+int arm920t_read_memory(struct target *target, target_addr_t address,
        uint32_t size, uint32_t count, uint8_t *buffer)
 {
        int retval;
@@ -582,7 +580,7 @@ int arm920t_read_memory(struct target *target, uint32_t address,
 
 
 static int arm920t_read_phys_memory(struct target *target,
-       uint32_t address, uint32_t size,
+       target_addr_t address, uint32_t size,
        uint32_t count, uint8_t *buffer)
 {
        struct arm920t_common *arm920t = target_to_arm920(target);
@@ -592,7 +590,7 @@ static int arm920t_read_phys_memory(struct target *target,
 }
 
 static int arm920t_write_phys_memory(struct target *target,
-       uint32_t address, uint32_t size,
+       target_addr_t address, uint32_t size,
        uint32_t count, const uint8_t *buffer)
 {
        struct arm920t_common *arm920t = target_to_arm920(target);
@@ -602,7 +600,7 @@ static int arm920t_write_phys_memory(struct target *target,
 }
 
 /** Writes a buffer, in the specified word size, with current MMU settings. */
-int arm920t_write_memory(struct target *target, uint32_t address,
+int arm920t_write_memory(struct target *target, target_addr_t address,
        uint32_t size, uint32_t count, const uint8_t *buffer)
 {
        int retval;
@@ -753,8 +751,8 @@ int arm920t_soft_reset_halt(struct target *target)
        if (retval != ERROR_OK)
                return retval;
 
-       long long then = timeval_ms();
-       int timeout;
+       int64_t then = timeval_ms();
+       bool timeout;
        while (!(timeout = ((timeval_ms()-then) > 1000))) {
                if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) == 0) {
                        embeddedice_read_reg(dbg_stat);
@@ -783,12 +781,12 @@ int arm920t_soft_reset_halt(struct target *target)
        cpsr &= ~0xff;
        cpsr |= 0xd3;
        arm_set_cpsr(arm, cpsr);
-       arm->cpsr->dirty = 1;
+       arm->cpsr->dirty = true;
 
        /* start fetching from 0x0 */
        buf_set_u32(arm->pc->value, 0, 32, 0x0);
-       arm->pc->dirty = 1;
-       arm->pc->valid = 1;
+       arm->pc->dirty = true;
+       arm->pc->valid = true;
 
        arm920t_disable_mmu_caches(target, 1, 1, 1);
        arm920t->armv4_5_mmu.mmu_enabled = 0;
@@ -854,6 +852,16 @@ static int arm920t_target_create(struct target *target, Jim_Interp *interp)
        return arm920t_init_arch_info(target, arm920t, target->tap);
 }
 
+static void arm920t_deinit_target(struct target *target)
+{
+       struct arm *arm = target_to_arm(target);
+       struct arm920t_common *arm920t = target_to_arm920(target);
+
+       arm7_9_deinit(target);
+       arm_free_reg_cache(arm);
+       free(arm920t);
+}
+
 COMMAND_HANDLER(arm920t_handle_read_cache_command)
 {
        int retval = ERROR_OK;
@@ -871,7 +879,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
        int segment, index_t;
        struct reg *r;
 
-       retval = arm920t_verify_pointer(CMD_CTX, arm920t);
+       retval = arm920t_verify_pointer(CMD, arm920t);
        if (retval != ERROR_OK)
                return retval;
 
@@ -1105,7 +1113,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
        /* restore CP15 MMU and Cache settings */
        arm920t_write_cp15_physical(target, CP15PHYS_CTRL, cp15_ctrl_saved);
 
-       command_print(CMD_CTX, "cache content successfully output to %s",
+       command_print(CMD, "cache content successfully output to %s",
                CMD_ARGV[0]);
 
        fclose(output);
@@ -1153,7 +1161,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
        int victim;
        struct reg *r;
 
-       retval = arm920t_verify_pointer(CMD_CTX, arm920t);
+       retval = arm920t_verify_pointer(CMD, arm920t);
        if (retval != ERROR_OK)
                return retval;
 
@@ -1417,7 +1425,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
                        (i_tlb[i].cam & 0x20) ? "(valid)" : "(invalid)");
        }
 
-       command_print(CMD_CTX, "mmu content successfully output to %s",
+       command_print(CMD, "mmu content successfully output to %s",
                CMD_ARGV[0]);
 
        fclose(output);
@@ -1453,12 +1461,12 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
        struct target *target = get_current_target(CMD_CTX);
        struct arm920t_common *arm920t = target_to_arm920(target);
 
-       retval = arm920t_verify_pointer(CMD_CTX, arm920t);
+       retval = arm920t_verify_pointer(CMD, arm920t);
        if (retval != ERROR_OK)
                return retval;
 
        if (target->state != TARGET_HALTED) {
-               command_print(CMD_CTX, "target must be stopped for "
+               command_print(CMD, "target must be stopped for "
                        "\"%s\" command", CMD_NAME);
                return ERROR_OK;
        }
@@ -1474,7 +1482,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        uint32_t value;
                        retval = arm920t_read_cp15_physical(target, address, &value);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't access reg %i", address);
                                return ERROR_OK;
                        }
@@ -1482,7 +1490,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        if (retval != ERROR_OK)
                                return retval;
 
-                       command_print(CMD_CTX, "%i: %8.8" PRIx32,
+                       command_print(CMD, "%i: %8.8" PRIx32,
                                address, value);
                } else if (CMD_ARGC == 2)   {
                        uint32_t value;
@@ -1490,12 +1498,12 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                        retval = arm920t_write_cp15_physical(target,
                                        address, value);
                        if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
+                               command_print(CMD,
                                        "couldn't access reg %i", address);
                                /* REVISIT why lie? "return retval"? */
                                return ERROR_OK;
                        }
-                       command_print(CMD_CTX, "%i: %8.8" PRIx32,
+                       command_print(CMD, "%i: %8.8" PRIx32,
                                address, value);
                }
        }
@@ -1503,91 +1511,17 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(arm920t_handle_cp15i_command)
-{
-       int retval;
-       struct target *target = get_current_target(CMD_CTX);
-       struct arm920t_common *arm920t = target_to_arm920(target);
-
-       retval = arm920t_verify_pointer(CMD_CTX, arm920t);
-       if (retval != ERROR_OK)
-               return retval;
-
-
-       if (target->state != TARGET_HALTED) {
-               command_print(CMD_CTX, "target must be stopped for "
-                       "\"%s\" command", CMD_NAME);
-               return ERROR_OK;
-       }
-
-       /* one argument, read a register.
-        * two arguments, write it.
-        */
-       if (CMD_ARGC >= 1) {
-               uint32_t opcode;
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], opcode);
-
-               if (CMD_ARGC == 1) {
-                       uint32_t value;
-                       retval = arm920t_read_cp15_interpreted(target,
-                                       opcode, 0x0, &value);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
-                                       "couldn't execute %8.8" PRIx32,
-                                       opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32,
-                               opcode, value);
-               } else if (CMD_ARGC == 2) {
-                       uint32_t value;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-                       retval = arm920t_write_cp15_interpreted(target,
-                                       opcode, value, 0);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
-                                       "couldn't execute %8.8" PRIx32,
-                                       opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32,
-                               opcode, value);
-               } else if (CMD_ARGC == 3) {
-                       uint32_t value;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-                       uint32_t address;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
-                       retval = arm920t_write_cp15_interpreted(target,
-                                       opcode, value, address);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD_CTX,
-                                       "couldn't execute %8.8" PRIx32, opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-                       command_print(CMD_CTX, "%8.8" PRIx32 ": %8.8" PRIx32
-                               " %8.8" PRIx32, opcode, value, address);
-               }
-       } else
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(arm920t_handle_cache_info_command)
 {
        int retval;
        struct target *target = get_current_target(CMD_CTX);
        struct arm920t_common *arm920t = target_to_arm920(target);
 
-       retval = arm920t_verify_pointer(CMD_CTX, arm920t);
+       retval = arm920t_verify_pointer(CMD, arm920t);
        if (retval != ERROR_OK)
                return retval;
 
-       return armv4_5_handle_cache_info_command(CMD_CTX,
+       return armv4_5_handle_cache_info_command(CMD,
                &arm920t->armv4_5_mmu.armv4_5_cache);
 }
 
@@ -1632,15 +1566,6 @@ static const struct command_registration arm920t_exec_command_handlers[] = {
                .help = "display/modify cp15 register",
                .usage = "regnum [value]",
        },
-       {
-               .name = "cp15i",
-               .handler = arm920t_handle_cp15i_command,
-               .mode = COMMAND_EXEC,
-               /* prefer using less error-prone "arm mcr" or "arm mrc" */
-               .help = "display/modify cp15 register using ARM opcode"
-                       " (DEPRECATED)",
-               .usage = "instruction [value [address]]",
-       },
        {
                .name = "cache_info",
                .handler = arm920t_handle_cache_info_command,
@@ -1695,6 +1620,7 @@ struct target_type arm920t_target = {
        .deassert_reset = arm7_9_deassert_reset,
        .soft_reset_halt = arm920t_soft_reset_halt,
 
+       .get_gdb_arch = arm_get_gdb_arch,
        .get_gdb_reg_list = arm_get_gdb_reg_list,
 
        .read_memory = arm920t_read_memory,
@@ -1717,6 +1643,7 @@ struct target_type arm920t_target = {
        .commands = arm920t_command_handlers,
        .target_create = arm920t_target_create,
        .init_target = arm9tdmi_init_target,
+       .deinit_target = arm920t_deinit_target,
        .examine = arm7_9_examine,
        .check_reset = arm7_9_check_reset,
 };
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)