Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- reworked presto.c to allow use of either FTD2XX or libftdi (libftdi not functional...
[openocd.git] / src / target / armv7m.c
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index d77eb0bdef87251d96bc1fbcbe095ec604353015..5ab9c1048dcd76d7bfca557387b6d67af261e42e 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -57,22 +57,22 @@ char* armv7m_exception_strings[] =
 
 char* armv7m_core_reg_list[] =
 {
-/* Registers accessed through core debug */
+       /* Registers accessed through core debug */
        "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12",
        "sp", "lr", "pc",
        "xPSR", "msp", "psp",
-/* Registers accessed through MSR instructions */
+       /* Registers accessed through MSR instructions */
 //     "apsr", "iapsr", "ipsr", "epsr",
        "primask", "basepri", "faultmask", "control"
 };
 
 char* armv7m_core_dbgreg_list[] =
 {
-/* Registers accessed through core debug */
+       /* Registers accessed through core debug */
        "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12",
        "sp", "lr", "pc",
        "xPSR", "msp", "psp",
-/* Registers accessed through MSR instructions */
+       /* Registers accessed through MSR instructions */
 //     "dbg_apsr", "iapsr", "ipsr", "epsr",
        "primask", "basepri", "faultmask", "dbg_control"
 };
@@ -122,15 +122,16 @@ armv7m_core_reg_t armv7m_core_reg_list_arch_info[] =
 
 int armv7m_core_reg_arch_type = -1;
 
-
 /* Keep different contexts for the process being debugged and debug algorithms */
 enum armv7m_runcontext armv7m_get_context(target_t *target)
 {
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
        
-       if (armv7m->process_context == armv7m->core_cache) return ARMV7M_PROCESS_CONTEXT;
-       if (armv7m->debug_context == armv7m->core_cache) return ARMV7M_DEBUG_CONTEXT;
+       if (armv7m->process_context == armv7m->core_cache)
+               return ARMV7M_PROCESS_CONTEXT;
+       if (armv7m->debug_context == armv7m->core_cache)
+               return ARMV7M_DEBUG_CONTEXT;
        
        ERROR("Invalid runcontext");
        exit(-1);
@@ -177,9 +178,11 @@ int armv7m_use_context(target_t *target, enum armv7m_runcontext new_ctx)
 char enamebuf[32];
 char *armv7m_exception_string(int number)
 {
-       if ((number<0)|(number>511)) return "Invalid exception";
-       if (number<16) return armv7m_exception_strings[number];
-       sprintf(enamebuf,"External Interrupt(%i)",number-16);
+       if ((number < 0) | (number > 511))
+               return "Invalid exception";
+       if (number < 16)
+               return armv7m_exception_strings[number];
+       sprintf(enamebuf, "External Interrupt(%i)", number - 16);
        return enamebuf;
 }
 
@@ -234,8 +237,8 @@ int armv7m_read_core_reg(struct target_s *target, int num)
        armv7m_core_reg = armv7m->core_cache->reg_list[num].arch_info;
        retval = armv7m->load_core_reg_u32(target, armv7m_core_reg->type, armv7m_core_reg->num, &reg_value);
        buf_set_u32(armv7m->core_cache->reg_list[num].value, 0, 32, reg_value);
-       armv7m->core_cache->reg_list[num].valid=1;
-       armv7m->core_cache->reg_list[num].dirty=0;
+       armv7m->core_cache->reg_list[num].valid = 1;
+       armv7m->core_cache->reg_list[num].dirty = 0;
                
        return ERROR_OK;        
 }
@@ -244,7 +247,7 @@ int armv7m_write_core_reg(struct target_s *target, int num)
 {
        int retval;
        u32 reg_value;
-       armv7m_core_reg_t * armv7m_core_reg;
+       armv7m_core_reg_t *armv7m_core_reg;
        
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
@@ -252,26 +255,22 @@ int armv7m_write_core_reg(struct target_s *target, int num)
        if ((num < 0) || (num >= ARMV7NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
        
-       
        reg_value = buf_get_u32(armv7m->core_cache->reg_list[num].value, 0, 32);
        armv7m_core_reg = armv7m->core_cache->reg_list[num].arch_info;
        retval = armv7m->store_core_reg_u32(target, armv7m_core_reg->type, armv7m_core_reg->num, reg_value);
        if (retval != ERROR_OK)
        {
-                       ERROR("JTAG failure");
-                       armv7m->core_cache->reg_list[num].dirty=1;
-                       return ERROR_JTAG_DEVICE_ERROR;
+               ERROR("JTAG failure");
+               armv7m->core_cache->reg_list[num].dirty = 1;
+               return ERROR_JTAG_DEVICE_ERROR;
        }
-       DEBUG("write core reg %i value 0x%x",num ,reg_value);
-       armv7m->core_cache->reg_list[num].valid=1;
-       armv7m->core_cache->reg_list[num].dirty=0;
+       DEBUG("write core reg %i value 0x%x", num , reg_value);
+       armv7m->core_cache->reg_list[num].valid = 1;
+       armv7m->core_cache->reg_list[num].dirty = 0;
        
        return ERROR_OK;
-       
 }
 
-
-
 int armv7m_invalidate_core_regs(target_t *target)
 {
        /* get pointers to arch-specific information */
@@ -287,14 +286,12 @@ int armv7m_invalidate_core_regs(target_t *target)
        return ERROR_OK;
 }
 
-
 int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size)
 {
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
        int i;
        
-       
        if (target->state != TARGET_HALTED)
        {
                return ERROR_TARGET_NOT_HALTED;
@@ -306,7 +303,7 @@ int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_
        /* TODOLATER correct list of registers, names ? */
        for (i = 0; i < *reg_list_size; i++)
        {
-               if (i<ARMV7NUMCOREREGS)
+               if (i < ARMV7NUMCOREREGS)
                        (*reg_list)[i] = &armv7m->process_context->reg_list[i];
                        //(*reg_list)[i] = &armv7m->core_cache->reg_list[i];
                else
@@ -382,7 +379,7 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                armv7m_set_core_reg(reg, reg_params[i].value);
        }
        
-       /* ARMV7M always runs in Tumb state */
+       /* ARMV7M always runs in Thumb state */
        exit_breakpoint_size = 2;
        if ((retval = breakpoint_add(target, exit_point, exit_breakpoint_size, BKPT_SOFT)) != ERROR_OK)
        {
@@ -415,7 +412,7 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                                }
                        }
                        armv7m->load_core_reg_u32(target, ARMV7M_REGISTER_CORE_GP, 15, &pc);
-                       DEBUG("failed algoritm halted at 0x%x ",pc); 
+                       DEBUG("failed algoritm halted at 0x%x ", pc); 
                        retval = ERROR_TARGET_TIMEOUT;
                }
        }
@@ -450,7 +447,7 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                                exit(-1);
                        }
                        
-                       armv7m_core_reg_t * armv7m_core_reg = reg->arch_info;
+                       armv7m_core_reg_t *armv7m_core_reg = reg->arch_info;
                        //armv7m->load_core_reg_u32(target, armv7m_core_reg->type, armv7m_core_reg->num, &regvalue);
                        //buf_set_u32(reg_params[i].value, 0, 32, regvalue);
                        buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32));
@@ -464,11 +461,9 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
        //      armv7m->core_cache->reg_list[i].dirty = 1;
        //}
 
-       
        // ????armv7m->core_state = core_state;
        // ????armv7m->core_mode = core_mode;
 
-
        return retval;
 }
 
@@ -478,20 +473,19 @@ int armv7m_arch_state(struct target_s *target, char *buf, int buf_size)
        armv7m_common_t *armv7m = target->arch_info;
        
        snprintf(buf, buf_size,
-                        "target halted in %s state due to %s, current mode: %s %s\nxPSR: 0x%8.8x pc: 0x%8.8x",
-                        armv7m_state_strings[armv7m->core_state],
-                        target_debug_reason_strings[target->debug_reason],
-                        armv7m_mode_strings[armv7m->core_mode],
-                        armv7m_exception_string(armv7m->exception_number),
-                        buf_get_u32(armv7m->core_cache->reg_list[ARMV7M_xPSR].value, 0, 32),
-                        buf_get_u32(armv7m->core_cache->reg_list[15].value, 0, 32));
+                "target halted in %s state due to %s, current mode: %s %s\nxPSR: 0x%8.8x pc: 0x%8.8x",
+                armv7m_state_strings[armv7m->core_state],
+                target_debug_reason_strings[target->debug_reason],
+                armv7m_mode_strings[armv7m->core_mode],
+                armv7m_exception_string(armv7m->exception_number),
+                buf_get_u32(armv7m->core_cache->reg_list[ARMV7M_xPSR].value, 0, 32),
+                buf_get_u32(armv7m->core_cache->reg_list[15].value, 0, 32));
        
        return ERROR_OK;
 }
 
 reg_cache_t *armv7m_build_reg_cache(target_t *target)
 {
-
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
        arm_jtag_t *jtag_info = &armv7m->jtag_info;
@@ -554,22 +548,19 @@ reg_cache_t *armv7m_build_reg_cache(target_t *target)
                reg_list[i].arch_type = armv7m_core_reg_arch_type;
                reg_list[i].arch_info = &arch_info[i];
        }
- 
+       
     return cache;
 }
 
 int armv7m_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
 {
-       
        armv7m_build_reg_cache(target);
        
        return ERROR_OK;
-       
 }
 
 int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m)
 {
-
        /* register arch-specific functions */
        
        target->arch_info = armv7m;
@@ -580,11 +571,9 @@ int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m)
        return ERROR_OK;
 }
 
-
 int armv7m_register_commands(struct command_context_s *cmd_ctx)
 {
        int retval;
        
        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)