hontor <hontor@126.com> - ARMV7_GDB_HACKS compilation error fix
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 13 Oct 2008 12:17:11 +0000 (12:17 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 13 Oct 2008 12:17:11 +0000 (12:17 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1045 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/armv7m.c

index 8456754de95f9ac71059ff5095c6bce3a3800a20..ae4d82ba0b62312b6c2e8b76d69a0e10b2585b69 100644 (file)
@@ -48,7 +48,7 @@
 
 char* armv7m_mode_strings[] =
 {
-       "Thread", "Thread (User)", "Handler", 
+       "Thread", "Thread (User)", "Handler",
 };
 
 char* armv7m_exception_strings[] =
@@ -90,7 +90,7 @@ reg_t armv7m_gdb_dummy_cpsr_reg =
 };
 #endif
 
-armv7m_core_reg_t armv7m_core_reg_list_arch_info[] = 
+armv7m_core_reg_t armv7m_core_reg_list_arch_info[] =
 {
        /*  CORE_GP are accesible using the core debug registers */
        {0, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
@@ -107,7 +107,7 @@ armv7m_core_reg_t armv7m_core_reg_list_arch_info[] =
        {11, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
        {12, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
        {13, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
-       {14, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},     
+       {14, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
        {15, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL},
 
        {16, ARMV7M_REGISTER_CORE_GP, ARMV7M_MODE_ANY, NULL, NULL}, /* xPSR */
@@ -127,7 +127,7 @@ int armv7m_dummy_core_reg_arch_type = -1;
 int armv7m_restore_context(target_t *target)
 {
        int i;
-       
+
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
 
@@ -135,7 +135,7 @@ int armv7m_restore_context(target_t *target)
 
        if (armv7m->pre_restore_context)
                armv7m->pre_restore_context(target);
-               
+
        for (i = ARMV7NUMCOREREGS-1; i >= 0; i--)
        {
                if (armv7m->core_cache->reg_list[i].dirty)
@@ -143,18 +143,18 @@ int armv7m_restore_context(target_t *target)
                        armv7m->write_core_reg(target, i);
                }
        }
-       
+
        if (armv7m->post_restore_context)
                armv7m->post_restore_context(target);
-               
-       return ERROR_OK;                
+
+       return ERROR_OK;
 }
 
 /* Core state functions */
 char *armv7m_exception_string(int number)
 {
        static char enamebuf[32];
-       
+
        if ((number < 0) | (number > 511))
                return "Invalid exception";
        if (number < 16)
@@ -169,14 +169,14 @@ int armv7m_get_core_reg(reg_t *reg)
        armv7m_core_reg_t *armv7m_reg = reg->arch_info;
        target_t *target = armv7m_reg->target;
        armv7m_common_t *armv7m_target = target->arch_info;
-       
+
        if (target->state != TARGET_HALTED)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
 
        retval = armv7m_target->read_core_reg(target, armv7m_reg->num);
-       
+
        return retval;
 }
 
@@ -185,12 +185,12 @@ int armv7m_set_core_reg(reg_t *reg, u8 *buf)
        armv7m_core_reg_t *armv7m_reg = reg->arch_info;
        target_t *target = armv7m_reg->target;
        u32 value = buf_get_u32(buf, 0, 32);
-               
+
        if (target->state != TARGET_HALTED)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-               
+
        buf_set_u32(reg->value, 0, 32, value);
        reg->dirty = 1;
        reg->valid = 1;
@@ -203,10 +203,10 @@ int armv7m_read_core_reg(struct target_s *target, int num)
        u32 reg_value;
        int retval;
        armv7m_core_reg_t * armv7m_core_reg;
-       
+
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
-               
+
        if ((num < 0) || (num >= ARMV7NUMCOREREGS))
                return ERROR_INVALID_ARGUMENTS;
 
@@ -215,8 +215,8 @@ int armv7m_read_core_reg(struct target_s *target, int num)
        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;
-       
-       return ERROR_OK;        
+
+       return ERROR_OK;
 }
 
 int armv7m_write_core_reg(struct target_s *target, int num)
@@ -224,13 +224,13 @@ int armv7m_write_core_reg(struct target_s *target, int num)
        int retval;
        u32 reg_value;
        armv7m_core_reg_t *armv7m_core_reg;
-       
+
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
 
        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);
@@ -243,7 +243,7 @@ int armv7m_write_core_reg(struct target_s *target, int num)
        LOG_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;
 }
 
@@ -252,13 +252,13 @@ int armv7m_invalidate_core_regs(target_t *target)
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
        int i;
-       
+
        for (i = 0; i < armv7m->core_cache->num_regs; i++)
        {
                armv7m->core_cache->reg_list[i].valid = 0;
                armv7m->core_cache->reg_list[i].dirty = 0;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -267,26 +267,26 @@ int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
        int i;
-       
+
        *reg_list_size = 26;
        *reg_list = malloc(sizeof(reg_t*) * (*reg_list_size));
-       
+
        for (i = 0; i < 16; i++)
        {
                (*reg_list)[i] = &armv7m->core_cache->reg_list[i];
        }
-       
+
        for (i = 16; i < 24; i++)
        {
                (*reg_list)[i] = &armv7m_gdb_dummy_fp_reg;
        }
-       
+
        (*reg_list)[24] = &armv7m_gdb_dummy_fps_reg;
 
 #ifdef ARMV7_GDB_HACKS
        /* use dummy cpsr reg otherwise gdb may try and set the thumb bit */
        (*reg_list)[25] = &armv7m_gdb_dummy_cpsr_reg;
-       
+
        /* ARMV7M is always in thumb mode, try to make GDB understand this
         * if it does not support this arch */
        armv7m->core_cache->reg_list[15].value[0] |= 1;
@@ -307,54 +307,54 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
        u32 pc;
        int i;
        u32 context[ARMV7NUMCOREREGS];
-       
+
        if (armv7m_algorithm_info->common_magic != ARMV7M_COMMON_MAGIC)
        {
                LOG_ERROR("current target isn't an ARMV7M target");
                return ERROR_TARGET_INVALID;
        }
-       
+
        if (target->state != TARGET_HALTED)
        {
                LOG_WARNING("target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        /* refresh core register cache */
-       /* Not needed if core register cache is always consistent with target process state */ 
+       /* Not needed if core register cache is always consistent with target process state */
        for (i = 0; i < ARMV7NUMCOREREGS; i++)
        {
                if (!armv7m->core_cache->reg_list[i].valid)
                        armv7m->read_core_reg(target, i);
                context[i] = buf_get_u32(armv7m->core_cache->reg_list[i].value, 0, 32);
        }
-       
+
        for (i = 0; i < num_mem_params; i++)
        {
                target_write_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value);
        }
-       
+
        for (i = 0; i < num_reg_params; i++)
        {
                reg_t *reg = register_get_by_name(armv7m->core_cache, reg_params[i].reg_name, 0);
                u32 regvalue;
-               
+
                if (!reg)
                {
                        LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
                        exit(-1);
                }
-               
+
                if (reg->size != reg_params[i].size)
                {
                        LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
                        exit(-1);
                }
-               
+
                regvalue = buf_get_u32(reg_params[i].value, 0, 32);
                armv7m_set_core_reg(reg, reg_params[i].value);
        }
-       
+
        if (armv7m_algorithm_info->core_mode != ARMV7M_MODE_ANY)
        {
                LOG_DEBUG("setting core_mode: 0x%2.2x", armv7m_algorithm_info->core_mode);
@@ -362,19 +362,19 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                armv7m->core_cache->reg_list[ARMV7M_CONTROL].dirty = 1;
                armv7m->core_cache->reg_list[ARMV7M_CONTROL].valid = 1;
        }
-       
+
        /* ARMV7M always runs in Thumb state */
        if ((retval = breakpoint_add(target, exit_point, 2, BKPT_SOFT)) != ERROR_OK)
        {
                LOG_ERROR("can't add breakpoint to finish algorithm execution");
                return ERROR_TARGET_FAILURE;
        }
-       
-       /* This code relies on the target specific  resume() and  poll()->debug_entry() 
+
+       /* This code relies on the target specific  resume() and  poll()->debug_entry()
        sequence to write register values to the processor and the read them back */
        target_resume(target, 0, entry_point, 1, 1);
        target_poll(target);
-       
+
        target_wait_state(target, TARGET_HALTED, timeout_ms);
        if (target->state != TARGET_HALTED)
        {
@@ -386,47 +386,47 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                }
                return ERROR_TARGET_TIMEOUT;
        }
-       
-       
+
+
        armv7m->load_core_reg_u32(target, ARMV7M_REGISTER_CORE_GP, 15, &pc);
        if (pc != exit_point)
        {
-               LOG_DEBUG("failed algoritm halted at 0x%x ", pc); 
+               LOG_DEBUG("failed algoritm halted at 0x%x ", pc);
                return ERROR_TARGET_TIMEOUT;
        }
-       
+
        breakpoint_remove(target, exit_point);
-       
+
        /* Read memory values to mem_params[] */
        for (i = 0; i < num_mem_params; i++)
        {
                if (mem_params[i].direction != PARAM_OUT)
                        target_read_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value);
        }
-       
+
        /* Copy core register values to reg_params[] */
        for (i = 0; i < num_reg_params; i++)
        {
                if (reg_params[i].direction != PARAM_OUT)
                {
                        reg_t *reg = register_get_by_name(armv7m->core_cache, reg_params[i].reg_name, 0);
-               
+
                        if (!reg)
                        {
                                LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
                                exit(-1);
                        }
-                       
+
                        if (reg->size != reg_params[i].size)
                        {
                                LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
                                exit(-1);
                        }
-                       
+
                        buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32));
                }
        }
-       
+
        for (i = ARMV7NUMCOREREGS-1; i >= 0; i--)
        {
                LOG_DEBUG("restoring register %s with value 0x%8.8x", armv7m->core_cache->reg_list[i].name, context[i]);
@@ -434,9 +434,9 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
                armv7m->core_cache->reg_list[i].valid = 1;
                armv7m->core_cache->reg_list[i].dirty = 1;
        }
-       
+
        armv7m->core_mode = core_mode;
-       
+
        return retval;
 }
 
@@ -444,14 +444,14 @@ int armv7m_arch_state(struct target_s *target)
 {
        /* get pointers to arch-specific information */
        armv7m_common_t *armv7m = target->arch_info;
-       
+
        LOG_USER("target halted due to %s, current mode: %s %s\nxPSR: 0x%8.8x pc: 0x%8.8x",
                 Jim_Nvp_value2name_simple( nvp_target_debug_reason,target->debug_reason)->name,
                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;
 }
 
@@ -466,24 +466,26 @@ reg_cache_t *armv7m_build_reg_cache(target_t *target)
        reg_t *reg_list = malloc(sizeof(reg_t) * num_regs);
        armv7m_core_reg_t *arch_info = malloc(sizeof(armv7m_core_reg_t) * num_regs);
        int i;
-       
+
        if (armv7m_core_reg_arch_type == -1)
        {
                armv7m_core_reg_arch_type = register_reg_arch_type(armv7m_get_core_reg, armv7m_set_core_reg);
        }
-       
+
        register_init_dummy(&armv7m_gdb_dummy_fps_reg);
+#ifdef ARMV7_GDB_HACKS
        register_init_dummy(&armv7m_gdb_dummy_cpsr_reg);
+#endif
        register_init_dummy(&armv7m_gdb_dummy_fp_reg);
-               
-       /* Build the process context cache */ 
+
+       /* Build the process context cache */
        cache->name = "arm v7m registers";
        cache->next = NULL;
        cache->reg_list = reg_list;
        cache->num_regs = num_regs;
        (*cache_p) = cache;
        armv7m->core_cache = cache;
-       
+
        for (i = 0; i < num_regs; i++)
        {
                arch_info[i] = armv7m_core_reg_list_arch_info[i];
@@ -499,25 +501,25 @@ 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;
        armv7m->read_core_reg = armv7m_read_core_reg;
        armv7m->write_core_reg = armv7m_write_core_reg;
-       
+
        return ERROR_OK;
 }
 
@@ -532,8 +534,8 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
        armv7m_algorithm_t armv7m_info;
        reg_param_t reg_params[2];
        int retval;
-       
-       u16 cortex_m3_crc_code[] = {        
+
+       u16 cortex_m3_crc_code[] = {
                0x4602,                                 /* mov  r2, r0 */
                0xF04F, 0x30FF,                 /* mov  r0, #0xffffffff */
                0x460B,                                 /* mov  r3, r1 */
@@ -543,7 +545,7 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
                0x5D11,                                 /* ldrb r1, [r2, r4] */
                0xF8DF, 0x7028,                 /* ldr          r7, CRC32XOR */
                0xEA80, 0x6001,                 /* eor          r0, r0, r1, asl #24 */
-               
+
                0xF04F, 0x0500,                 /* mov          r5, #0 */
                                                                /* loop: */
                0x2800,                                 /* cmp          r0, #0 */
@@ -554,7 +556,7 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
                0xEA86, 0x0007,                 /* eor          r0, r6, r7 */
                0x2D08,                                 /* cmp          r5, #8 */
                0xD1F4,                                 /* bne          loop */
-               
+
                0xF104, 0x0401,                 /* add  r4, r4, #1 */
                                                                /* ncomp: */
                0x429C,                                 /* cmp  r4, r3 */
@@ -565,25 +567,25 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
        };
 
        int i;
-       
+
        if (target_alloc_working_area(target, sizeof(cortex_m3_crc_code), &crc_algorithm) != ERROR_OK)
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        /* convert flash writing code into a buffer in target endianness */
        for (i = 0; i < (sizeof(cortex_m3_crc_code)/sizeof(u16)); i++)
                target_write_u16(target, crc_algorithm->address + i*sizeof(u16), cortex_m3_crc_code[i]);
-       
+
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
        armv7m_info.core_mode = ARMV7M_MODE_ANY;
-       
+
        init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
-       
+
        buf_set_u32(reg_params[0].value, 0, 32, address);
        buf_set_u32(reg_params[1].value, 0, 32, count);
-               
+
        if ((retval = target->type->run_algorithm(target, 0, NULL, 2, reg_params,
                crc_algorithm->address, crc_algorithm->address + (sizeof(cortex_m3_crc_code)-6), 20000, &armv7m_info)) != ERROR_OK)
        {
@@ -593,14 +595,14 @@ int armv7m_checksum_memory(struct target_s *target, u32 address, u32 count, u32*
                target_free_working_area(target, crc_algorithm);
                return retval;
        }
-       
+
        *checksum = buf_get_u32(reg_params[0].value, 0, 32);
-       
+
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
-       
+
        target_free_working_area(target, crc_algorithm);
-       
+
        return ERROR_OK;
 }
 
@@ -611,7 +613,7 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u
        armv7m_algorithm_t armv7m_info;
        int retval;
        int i;
-       
+
        u16 erase_check_code[] =
        {
                                                        /* loop: */
@@ -628,11 +630,11 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-       
+
        /* convert flash writing code into a buffer in target endianness */
        for (i = 0; i < (sizeof(erase_check_code)/sizeof(u16)); i++)
                target_write_u16(target, erase_check_algorithm->address + i*sizeof(u16), erase_check_code[i]);
-       
+
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
        armv7m_info.core_mode = ARMV7M_MODE_ANY;
 
@@ -645,7 +647,7 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u
        init_reg_param(&reg_params[2], "r2", 32, PARAM_IN_OUT);
        buf_set_u32(reg_params[2].value, 0, 32, 0xff);
 
-       if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, 
+       if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
                        erase_check_algorithm->address, erase_check_algorithm->address + (sizeof(erase_check_code)-2), 10000, &armv7m_info)) != ERROR_OK)
        {
                destroy_reg_param(&reg_params[0]);
@@ -654,14 +656,14 @@ int armv7m_blank_check_memory(struct target_s *target, u32 address, u32 count, u
                target_free_working_area(target, erase_check_algorithm);
                return 0;
        }
-       
+
        *blank = buf_get_u32(reg_params[2].value, 0, 32);
-       
+
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
-       
+
        target_free_working_area(target, erase_check_algorithm);
-       
+
        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)