ARMv7-A: use standard ARM core states
[openocd.git] / src / target / armv4_5.c
index 4c2a6e5422189d42fe3cc8da4ddf98fbb8eec02d..5e882e67fb76406eaf5956edff49c54ea0df0bd4 100644 (file)
 #include "register.h"
 
 
-char* armv4_5_core_reg_list[] =
+static const char *armv4_5_core_reg_list[] =
 {
-       "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13_usr", "lr_usr", "pc",
+       "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
+       "r8", "r9", "r10", "r11", "r12", "sp_usr", "lr_usr", "pc",
 
-       "r8_fiq", "r9_fiq", "r10_fiq", "r11_fiq", "r12_fiq", "r13_fiq", "lr_fiq",
+       "r8_fiq", "r9_fiq", "r10_fiq", "r11_fiq", "r12_fiq", "sp_fiq", "lr_fiq",
 
-       "r13_irq", "lr_irq",
+       "sp_irq", "lr_irq",
 
-       "r13_svc", "lr_svc",
+       "sp_svc", "lr_svc",
 
-       "r13_abt", "lr_abt",
+       "sp_abt", "lr_abt",
 
-       "r13_und", "lr_und",
+       "sp_und", "lr_und",
 
-       "cpsr", "spsr_fiq", "spsr_irq", "spsr_svc", "spsr_abt", "spsr_und"
+       "cpsr", "spsr_fiq", "spsr_irq", "spsr_svc", "spsr_abt", "spsr_und",
+
+       "sp_mon", "lr_mon", "spsr_mon",
 };
 
-static const char *armv4_5_mode_strings_list[] =
-{
-       "Illegal mode value", "User", "FIQ", "IRQ", "Supervisor", "Abort", "Undefined", "System"
+static const uint8_t arm_usr_indices[17] = {
+       0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ARMV4_5_CPSR,
+};
+
+static const uint8_t arm_fiq_indices[8] = {
+       16, 17, 18, 19, 20, 21, 22, ARMV4_5_SPSR_FIQ,
+};
+
+static const uint8_t arm_irq_indices[3] = {
+       23, 24, ARMV4_5_SPSR_IRQ,
+};
+
+static const uint8_t arm_svc_indices[3] = {
+       25, 26, ARMV4_5_SPSR_SVC,
+};
+
+static const uint8_t arm_abt_indices[3] = {
+       27, 28, ARMV4_5_SPSR_ABT,
+};
+
+static const uint8_t arm_und_indices[3] = {
+       29, 30, ARMV4_5_SPSR_UND,
+};
+
+static const uint8_t arm_mon_indices[3] = {
+       37, 38, ARM_SPSR_MON,
+};
+
+static const struct {
+       const char *name;
+       unsigned short psr;
+       /* For user and system modes, these list indices for all registers.
+        * otherwise they're just indices for the shadow registers and SPSR.
+        */
+       unsigned short n_indices;
+       const uint8_t *indices;
+} arm_mode_data[] = {
+       /* Seven modes are standard from ARM7 on. "System" and "User" share
+        * the same registers; other modes shadow from 3 to 8 registers.
+        */
+       {
+               .name = "User",
+               .psr = ARMV4_5_MODE_USR,
+               .n_indices = ARRAY_SIZE(arm_usr_indices),
+               .indices = arm_usr_indices,
+       },
+       {
+               .name = "FIQ",
+               .psr = ARMV4_5_MODE_FIQ,
+               .n_indices = ARRAY_SIZE(arm_fiq_indices),
+               .indices = arm_fiq_indices,
+       },
+       {
+               .name = "Supervisor",
+               .psr = ARMV4_5_MODE_SVC,
+               .n_indices = ARRAY_SIZE(arm_svc_indices),
+               .indices = arm_svc_indices,
+       },
+       {
+               .name = "Abort",
+               .psr = ARMV4_5_MODE_ABT,
+               .n_indices = ARRAY_SIZE(arm_abt_indices),
+               .indices = arm_abt_indices,
+       },
+       {
+               .name = "IRQ",
+               .psr = ARMV4_5_MODE_IRQ,
+               .n_indices = ARRAY_SIZE(arm_irq_indices),
+               .indices = arm_irq_indices,
+       },
+       {
+               .name = "Undefined instruction",
+               .psr = ARMV4_5_MODE_UND,
+               .n_indices = ARRAY_SIZE(arm_und_indices),
+               .indices = arm_und_indices,
+       },
+       {
+               .name = "System",
+               .psr = ARMV4_5_MODE_SYS,
+               .n_indices = ARRAY_SIZE(arm_usr_indices),
+               .indices = arm_usr_indices,
+       },
+       /* TrustZone "Security Extensions" add a secure monitor mode.
+        * This is distinct from a "debug monitor" which can support
+        * non-halting debug, in conjunction with some debuggers.
+        */
+       {
+               .name = "Secure Monitor",
+               .psr = ARM_MODE_MON,
+               .n_indices = ARRAY_SIZE(arm_mon_indices),
+               .indices = arm_mon_indices,
+       },
 };
 
-/* Hack! Yuk! allow -1 index, which simplifies codepaths elsewhere in the code */
-const char **armv4_5_mode_strings = armv4_5_mode_strings_list + 1;
+/** Map PSR mode bits to the name of an ARM processor operating mode. */
+const char *arm_mode_name(unsigned psr_mode)
+{
+       for (unsigned i = 0; i < ARRAY_SIZE(arm_mode_data); i++) {
+               if (arm_mode_data[i].psr == psr_mode)
+                       return arm_mode_data[i].name;
+       }
+       LOG_ERROR("unrecognized psr mode: %#02x", psr_mode);
+       return "UNRECOGNIZED";
+}
+
+/** Return true iff the parameter denotes a valid ARM processor mode. */
+bool is_arm_mode(unsigned psr_mode)
+{
+       for (unsigned i = 0; i < ARRAY_SIZE(arm_mode_data); i++) {
+               if (arm_mode_data[i].psr == psr_mode)
+                       return true;
+       }
+       return false;
+}
 
-/** Map PSR mode bits to linear number */
+/** Map PSR mode bits to linear number indexing armv4_5_core_reg_map */
 int armv4_5_mode_to_number(enum armv4_5_mode mode)
 {
        switch (mode) {
@@ -81,13 +191,15 @@ int armv4_5_mode_to_number(enum armv4_5_mode mode)
                return 5;
        case ARMV4_5_MODE_SYS:
                return 6;
+       case ARM_MODE_MON:
+               return 7;
        default:
                LOG_ERROR("invalid mode value encountered %d", mode);
                return -1;
        }
 }
 
-/** Map linear number to PSR mode bits. */
+/** Map linear number indexing armv4_5_core_reg_map to PSR mode bits. */
 enum armv4_5_mode armv4_5_number_to_mode(int number)
 {
        switch (number) {
@@ -105,6 +217,8 @@ enum armv4_5_mode armv4_5_number_to_mode(int number)
                return ARMV4_5_MODE_UND;
        case 6:
                return ARMV4_5_MODE_SYS;
+       case 7:
+               return ARM_MODE_MON;
        default:
                LOG_ERROR("mode index out of bounds %d", number);
                return ARMV4_5_MODE_ANY;
@@ -113,10 +227,10 @@ enum armv4_5_mode armv4_5_number_to_mode(int number)
 
 char* armv4_5_state_strings[] =
 {
-       "ARM", "Thumb", "Jazelle"
+       "ARM", "Thumb", "Jazelle", "ThumbEE",
 };
 
-struct armv4_5_core_reg armv4_5_core_reg_list_arch_info[] =
+static const struct armv4_5_core_reg armv4_5_core_reg_list_arch_info[] =
 {
        {0, ARMV4_5_MODE_ANY, NULL, NULL},
        {1, ARMV4_5_MODE_ANY, NULL, NULL},
@@ -160,16 +274,20 @@ struct armv4_5_core_reg armv4_5_core_reg_list_arch_info[] =
        {16, ARMV4_5_MODE_IRQ, NULL, NULL},
        {16, ARMV4_5_MODE_SVC, NULL, NULL},
        {16, ARMV4_5_MODE_ABT, NULL, NULL},
-       {16, ARMV4_5_MODE_UND, NULL, NULL}
+       {16, ARMV4_5_MODE_UND, NULL, NULL},
+
+       {13, ARM_MODE_MON, NULL, NULL},
+       {14, ARM_MODE_MON, NULL, NULL},
+       {16, ARM_MODE_MON, NULL, NULL},
 };
 
 /* map core mode (USR, FIQ, ...) and register number to indizes into the register cache */
-int armv4_5_core_reg_map[7][17] =
+const int armv4_5_core_reg_map[8][17] =
 {
        {       /* USR */
                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 31
        },
-       {       /* FIQ */
+       {       /* FIQ (8 shadows of USR, vs normal 3) */
                0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 15, 32
        },
        {       /* IRQ */
@@ -184,36 +302,53 @@ int armv4_5_core_reg_map[7][17] =
        {       /* UND */
                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 29, 30, 15, 36
        },
-       {       /* SYS */
+       {       /* SYS (same registers as USR) */
                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 31
+       },
+       {       /* MON */
+               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 37, 38, 15, 39,
        }
 };
 
-uint8_t armv4_5_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const uint8_t arm_gdb_dummy_fp_value[12];
 
-struct reg armv4_5_gdb_dummy_fp_reg =
+/**
+ * Dummy FPA registers are required to support GDB on ARM.
+ * Register packets require eight obsolete FPA register values.
+ * Modern ARM cores use Vector Floating Point (VFP), if they
+ * have any floating point support.  VFP is not FPA-compatible.
+ */
+struct reg arm_gdb_dummy_fp_reg =
 {
-       .name = "GDB dummy floating-point register",
-       .value = armv4_5_gdb_dummy_fp_value,
-       .dirty = 0,
+       .name = "GDB dummy FPA register",
+       .value = (uint8_t *) arm_gdb_dummy_fp_value,
        .valid = 1,
        .size = 96,
-       .arch_info = NULL,
 };
 
-uint8_t armv4_5_gdb_dummy_fps_value[] = {0, 0, 0, 0};
+static const uint8_t arm_gdb_dummy_fps_value[4];
 
-struct reg armv4_5_gdb_dummy_fps_reg =
+/**
+ * Dummy FPA status registers are required to support GDB on ARM.
+ * Register packets require an obsolete FPA status register.
+ */
+struct reg arm_gdb_dummy_fps_reg =
 {
-       .name = "GDB dummy floating-point status register",
-       .value = armv4_5_gdb_dummy_fps_value,
-       .dirty = 0,
+       .name = "GDB dummy FPA status register",
+       .value = (uint8_t *) arm_gdb_dummy_fps_value,
        .valid = 1,
        .size = 32,
-       .arch_info = NULL,
 };
 
-int armv4_5_get_core_reg(struct reg *reg)
+static void arm_gdb_dummy_init(void) __attribute__ ((constructor));
+
+static void arm_gdb_dummy_init(void)
+{
+       register_init_dummy(&arm_gdb_dummy_fp_reg);
+       register_init_dummy(&arm_gdb_dummy_fps_reg);
+}
+
+static int armv4_5_get_core_reg(struct reg *reg)
 {
        int retval;
        struct armv4_5_core_reg *armv4_5 = reg->arch_info;
@@ -225,13 +360,14 @@ int armv4_5_get_core_reg(struct reg *reg)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* retval = armv4_5->armv4_5_common->full_context(target); */
        retval = armv4_5->armv4_5_common->read_core_reg(target, armv4_5->num, armv4_5->mode);
+       if (retval == ERROR_OK)
+               reg->valid = 1;
 
        return retval;
 }
 
-int armv4_5_set_core_reg(struct reg *reg, uint8_t *buf)
+static int armv4_5_set_core_reg(struct reg *reg, uint8_t *buf)
 {
        struct armv4_5_core_reg *armv4_5 = reg->arch_info;
        struct target *target = armv4_5->target;
@@ -240,6 +376,7 @@ int armv4_5_set_core_reg(struct reg *reg, uint8_t *buf)
 
        if (target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -268,7 +405,8 @@ int armv4_5_set_core_reg(struct reg *reg, uint8_t *buf)
 
                if (armv4_5_target->core_mode != (enum armv4_5_mode)(value & 0x1f))
                {
-                       LOG_DEBUG("changing ARM core mode to '%s'", armv4_5_mode_strings[armv4_5_mode_to_number(value & 0x1f)]);
+                       LOG_DEBUG("changing ARM core mode to '%s'",
+                                       arm_mode_name(value & 0x1f));
                        armv4_5_target->core_mode = value & 0x1f;
                        armv4_5_target->write_core_reg(target, 16, ARMV4_5_MODE_ANY, value);
                }
@@ -286,48 +424,62 @@ static const struct reg_arch_type arm_reg_type = {
        .set = armv4_5_set_core_reg,
 };
 
+/** Marks the contents of the register cache as invalid (and clean). */
 int armv4_5_invalidate_core_regs(struct target *target)
 {
        struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
-       int i;
+       unsigned num_regs = armv4_5->core_cache->num_regs;
+       struct reg *reg = armv4_5->core_cache->reg_list;
 
-       for (i = 0; i < 37; i++)
-       {
-               armv4_5->core_cache->reg_list[i].valid = 0;
-               armv4_5->core_cache->reg_list[i].dirty = 0;
+       for (unsigned i = 0; i < num_regs; i++, reg++) {
+               reg->valid = 0;
+               reg->dirty = 0;
        }
 
+       /* FIXME don't bother returning a value then */
        return ERROR_OK;
 }
 
 struct reg_cache* armv4_5_build_reg_cache(struct target *target, struct arm *armv4_5_common)
 {
-       int num_regs = 37;
+       int num_regs = ARRAY_SIZE(armv4_5_core_reg_list_arch_info);
        struct reg_cache *cache = malloc(sizeof(struct reg_cache));
-       struct reg *reg_list = malloc(sizeof(struct reg) * num_regs);
-       struct armv4_5_core_reg *arch_info = malloc(sizeof(struct armv4_5_core_reg) * num_regs);
+       struct reg *reg_list = calloc(num_regs, sizeof(struct reg));
+       struct armv4_5_core_reg *arch_info = calloc(num_regs,
+                                       sizeof(struct armv4_5_core_reg));
        int i;
 
-       cache->name = "arm v4/5 registers";
+       if (!cache || !reg_list || !arch_info) {
+               free(cache);
+               free(reg_list);
+               free(arch_info);
+               return NULL;
+       }
+
+       cache->name = "ARM registers";
        cache->next = NULL;
        cache->reg_list = reg_list;
-       cache->num_regs = num_regs;
-
-       register_init_dummy(&armv4_5_gdb_dummy_fp_reg);
-       register_init_dummy(&armv4_5_gdb_dummy_fps_reg);
+       cache->num_regs = 0;
 
-       for (i = 0; i < 37; i++)
+       for (i = 0; i < num_regs; i++)
        {
+               /* Skip registers this core doesn't expose */
+               if (armv4_5_core_reg_list_arch_info[i].mode == ARM_MODE_MON
+                               && armv4_5_common->core_type != ARM_MODE_MON)
+                       continue;
+
+               /* REVISIT handle Cortex-M, which only shadows R13/SP */
+
                arch_info[i] = armv4_5_core_reg_list_arch_info[i];
                arch_info[i].target = target;
                arch_info[i].armv4_5_common = armv4_5_common;
-               reg_list[i].name = armv4_5_core_reg_list[i];
+               reg_list[i].name = (char *) armv4_5_core_reg_list[i];
                reg_list[i].size = 32;
                reg_list[i].value = calloc(1, 4);
-               reg_list[i].dirty = 0;
-               reg_list[i].valid = 0;
                reg_list[i].type = &arm_reg_type;
                reg_list[i].arch_info = &arch_info[i];
+
+               cache->num_regs++;
        }
 
        return cache;
@@ -346,95 +498,127 @@ int armv4_5_arch_state(struct target *target)
        LOG_USER("target halted in %s state due to %s, current mode: %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
                         armv4_5_state_strings[armv4_5->core_state],
                         Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name,
-                        armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
+                        arm_mode_name(armv4_5->core_mode),
                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
                         buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
 
        return ERROR_OK;
 }
 
+#define ARMV4_5_CORE_REG_MODENUM(cache, mode, num) \
+               cache->reg_list[armv4_5_core_reg_map[mode][num]]
+
 COMMAND_HANDLER(handle_armv4_5_reg_command)
 {
-       char output[128];
-       int output_len;
-       int mode, num;
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
+       unsigned num_regs;
+       struct reg *regs;
 
        if (!is_arm(armv4_5))
        {
-               command_print(cmd_ctx, "current target isn't an ARM");
+               command_print(CMD_CTX, "current target isn't an ARM");
                return ERROR_FAIL;
        }
 
        if (target->state != TARGET_HALTED)
        {
-               command_print(cmd_ctx, "error: target must be halted for register accesses");
-               return ERROR_OK;
+               command_print(CMD_CTX, "error: target must be halted for register accesses");
+               return ERROR_FAIL;
        }
 
-       if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+       if (!is_arm_mode(armv4_5->core_mode))
                return ERROR_FAIL;
 
        if (!armv4_5->full_context) {
-               command_print(cmd_ctx, "error: target doesn't support %s",
+               command_print(CMD_CTX, "error: target doesn't support %s",
                                CMD_NAME);
                return ERROR_FAIL;
        }
 
-       for (num = 0; num <= 15; num++)
-       {
-               output_len = 0;
-               for (mode = 0; mode < 6; mode++)
-               {
-                       if (!ARMV4_5_CORE_REG_MODENUM(armv4_5->core_cache, mode, num).valid)
-                       {
-                               armv4_5->full_context(target);
-                       }
-                       output_len += snprintf(output + output_len,
-                                              128 - output_len,
+       num_regs = armv4_5->core_cache->num_regs;
+       regs = armv4_5->core_cache->reg_list;
+
+       for (unsigned mode = 0; mode < ARRAY_SIZE(arm_mode_data); mode++) {
+               const char *name;
+               char *sep = "\n";
+               char *shadow = "";
+
+               /* label this bank of registers (or shadows) */
+               switch (arm_mode_data[mode].psr) {
+               case ARMV4_5_MODE_SYS:
+                       continue;
+               case ARMV4_5_MODE_USR:
+                       name = "System and User";
+                       sep = "";
+                       break;
+               case ARM_MODE_MON:
+                       if (armv4_5->core_type != ARM_MODE_MON)
+                               continue;
+                       /* FALLTHROUGH */
+               default:
+                       name = arm_mode_data[mode].name;
+                       shadow = "shadow ";
+                       break;
+               }
+               command_print(CMD_CTX, "%s%s mode %sregisters",
+                               sep, name, shadow);
+
+               /* display N rows of up to 4 registers each */
+               for (unsigned i = 0; i < arm_mode_data[mode].n_indices;) {
+                       char output[80];
+                       int output_len = 0;
+
+                       for (unsigned j = 0; j < 4; j++, i++) {
+                               uint32_t value;
+                               struct reg *reg = regs;
+
+                               if (i >= arm_mode_data[mode].n_indices)
+                                       break;
+
+                               reg += arm_mode_data[mode].indices[i];
+
+                               /* REVISIT be smarter about faults... */
+                               if (!reg->valid)
+                                       armv4_5->full_context(target);
+
+                               value = buf_get_u32(reg->value, 0, 32);
+                               output_len += snprintf(output + output_len,
+                                               sizeof(output) - output_len,
                                               "%8s: %8.8" PRIx32 " ",
-                                              ARMV4_5_CORE_REG_MODENUM(armv4_5->core_cache, mode, num).name,
-                                              buf_get_u32(ARMV4_5_CORE_REG_MODENUM(armv4_5->core_cache, mode, num).value, 0, 32));
+                                              reg->name, value);
+                       }
+                       command_print(CMD_CTX, "%s", output);
                }
-               command_print(cmd_ctx, "%s", output);
        }
-       command_print(cmd_ctx,
-                     "    cpsr: %8.8" PRIx32 " spsr_fiq: %8.8" PRIx32 " spsr_irq: %8.8" PRIx32 " spsr_svc: %8.8" PRIx32 " spsr_abt: %8.8" PRIx32 " spsr_und: %8.8" PRIx32 "",
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_SPSR_FIQ].value, 0, 32),
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_SPSR_IRQ].value, 0, 32),
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_SPSR_SVC].value, 0, 32),
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_SPSR_ABT].value, 0, 32),
-                         buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_SPSR_UND].value, 0, 32));
 
        return ERROR_OK;
 }
 
 COMMAND_HANDLER(handle_armv4_5_core_state_command)
 {
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
 
        if (!is_arm(armv4_5))
        {
-               command_print(cmd_ctx, "current target isn't an ARM");
+               command_print(CMD_CTX, "current target isn't an ARM");
                return ERROR_FAIL;
        }
 
        if (CMD_ARGC > 0)
        {
-               if (strcmp(args[0], "arm") == 0)
+               if (strcmp(CMD_ARGV[0], "arm") == 0)
                {
                        armv4_5->core_state = ARMV4_5_STATE_ARM;
                }
-               if (strcmp(args[0], "thumb") == 0)
+               if (strcmp(CMD_ARGV[0], "thumb") == 0)
                {
                        armv4_5->core_state = ARMV4_5_STATE_THUMB;
                }
        }
 
-       command_print(cmd_ctx, "core state: %s", armv4_5_state_strings[armv4_5->core_state]);
+       command_print(CMD_CTX, "core state: %s", armv4_5_state_strings[armv4_5->core_state]);
 
        return ERROR_OK;
 }
@@ -442,31 +626,31 @@ COMMAND_HANDLER(handle_armv4_5_core_state_command)
 COMMAND_HANDLER(handle_armv4_5_disassemble_command)
 {
        int retval = ERROR_OK;
-       struct target *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(CMD_CTX);
        struct arm *arm = target ? target_to_arm(target) : NULL;
        uint32_t address;
        int count = 1;
        int thumb = 0;
 
        if (!is_arm(arm)) {
-               command_print(cmd_ctx, "current target isn't an ARM");
+               command_print(CMD_CTX, "current target isn't an ARM");
                return ERROR_FAIL;
        }
 
        switch (CMD_ARGC) {
        case 3:
-               if (strcmp(args[2], "thumb") != 0)
+               if (strcmp(CMD_ARGV[2], "thumb") != 0)
                        goto usage;
                thumb = 1;
                /* FALL THROUGH */
        case 2:
-               COMMAND_PARSE_NUMBER(int, args[1], count);
+               COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], count);
                /* FALL THROUGH */
        case 1:
-               COMMAND_PARSE_NUMBER(u32, args[0], address);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
                if (address & 0x01) {
                        if (!thumb) {
-                               command_print(cmd_ctx, "Disassemble as Thumb");
+                               command_print(CMD_CTX, "Disassemble as Thumb");
                                thumb = 1;
                        }
                        address &= ~1;
@@ -474,7 +658,7 @@ COMMAND_HANDLER(handle_armv4_5_disassemble_command)
                break;
        default:
 usage:
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                        "usage: arm disassemble <address> [<count> ['thumb']]");
                count = 0;
                retval = ERROR_FAIL;
@@ -503,7 +687,7 @@ usage:
                        if (retval != ERROR_OK)
                                break;
                }
-               command_print(cmd_ctx, "%s", cur_instruction.text);
+               command_print(CMD_CTX, "%s", cur_instruction.text);
                address += cur_instruction.instruction_size;
        }
 
@@ -537,7 +721,7 @@ int armv4_5_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int
        struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
        int i;
 
-       if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+       if (!is_arm_mode(armv4_5->core_mode))
                return ERROR_FAIL;
 
        *reg_list_size = 26;
@@ -550,10 +734,10 @@ int armv4_5_get_gdb_reg_list(struct target *target, struct reg **reg_list[], int
 
        for (i = 16; i < 24; i++)
        {
-               (*reg_list)[i] = &armv4_5_gdb_dummy_fp_reg;
+               (*reg_list)[i] = &arm_gdb_dummy_fp_reg;
        }
 
-       (*reg_list)[24] = &armv4_5_gdb_dummy_fps_reg;
+       (*reg_list)[24] = &arm_gdb_dummy_fps_reg;
        (*reg_list)[25] = &armv4_5->core_cache->reg_list[ARMV4_5_CPSR];
 
        return ERROR_OK;
@@ -617,7 +801,7 @@ int armv4_5_run_algorithm_inner(struct target *target, int num_mem_params, struc
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+       if (!is_arm_mode(armv4_5->core_mode))
                return ERROR_FAIL;
 
        /* armv5 and later can terminate with BKPT instruction; less overhead */
@@ -934,6 +1118,21 @@ int arm_blank_check_memory(struct target *target,
        return ERROR_OK;
 }
 
+static int arm_full_context(struct target *target)
+{
+       struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
+       unsigned num_regs = armv4_5->core_cache->num_regs;
+       struct reg *reg = armv4_5->core_cache->reg_list;
+       int retval = ERROR_OK;
+
+       for (; num_regs && retval == ERROR_OK; num_regs--, reg++) {
+               if (reg->valid)
+                       continue;
+               retval = armv4_5_get_core_reg(reg);
+       }
+       return retval;
+}
+
 int armv4_5_init_arch_info(struct target *target, struct arm *armv4_5)
 {
        target->arch_info = armv4_5;
@@ -942,5 +1141,12 @@ int armv4_5_init_arch_info(struct target *target, struct arm *armv4_5)
        armv4_5->core_state = ARMV4_5_STATE_ARM;
        armv4_5->core_mode = ARMV4_5_MODE_USR;
 
+       /* core_type may be overridden by subtype logic */
+       armv4_5->core_type = ARMV4_5_MODE_ANY;
+
+       /* default full_context() has no core-specific optimizations */
+       if (!armv4_5->full_context && armv4_5->read_core_reg)
+               armv4_5->full_context = arm_full_context;
+
        return ERROR_OK;
 }

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)