ARMv7-M: no exit() calls

[openocd.git] / src / target / armv7m.c

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index ff97a4cb7264c55281b0d8c8a0ab5489762d0079..3b01fa9abe0fd14365d18215f2756a733f967132 100644 (file)
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -34,9 +34,11 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
+#include "target.h"
 #include "armv7m.h"
-
-#define ARRAY_SIZE(x)  ((int)(sizeof(x)/sizeof((x)[0])))
+#include "algorithm.h"
+#include "register.h"
 
 
 #if 0
@@ -232,14 +234,14 @@ static int armv7m_set_core_reg(struct reg *reg, uint8_t *buf)
        return ERROR_OK;
 }
 
-static int armv7m_read_core_reg(struct target *target, int num)
+static int armv7m_read_core_reg(struct target *target, unsigned num)
 {
        uint32_t reg_value;
        int retval;
        struct armv7m_core_reg * armv7m_core_reg;
        struct armv7m_common *armv7m = target_to_armv7m(target);
 
-       if ((num < 0) || (num >= ARMV7M_NUM_REGS))
+       if (num >= ARMV7M_NUM_REGS)
                return ERROR_INVALID_ARGUMENTS;
 
        armv7m_core_reg = armv7m->core_cache->reg_list[num].arch_info;
@@ -251,14 +253,14 @@ static int armv7m_read_core_reg(struct target *target, int num)
        return retval;
 }
 
-static int armv7m_write_core_reg(struct target *target, int num)
+static int armv7m_write_core_reg(struct target *target, unsigned num)
 {
        int retval;
        uint32_t reg_value;
        struct armv7m_core_reg *armv7m_core_reg;
        struct armv7m_common *armv7m = target_to_armv7m(target);
 
-       if ((num < 0) || (num >= ARMV7M_NUM_REGS))
+       if (num >= ARMV7M_NUM_REGS)
                return ERROR_INVALID_ARGUMENTS;
 
        reg_value = buf_get_u32(armv7m->core_cache->reg_list[num].value, 0, 32);
@@ -385,7 +387,6 @@ int armv7m_run_algorithm(struct target *target,
        struct armv7m_algorithm *armv7m_algorithm_info = arch_info;
        enum armv7m_mode core_mode = armv7m->core_mode;
        int retval = ERROR_OK;
-       int i;
        uint32_t context[ARMV7M_NUM_REGS];
 
        if (armv7m_algorithm_info->common_magic != ARMV7M_COMMON_MAGIC)
@@ -402,20 +403,20 @@ int armv7m_run_algorithm(struct target *target,
 
        /* refresh core register cache */
        /* Not needed if core register cache is always consistent with target process state */
-       for (i = 0; i < ARMV7M_NUM_REGS; i++)
+       for (unsigned i = 0; i < ARMV7M_NUM_REGS; 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++)
+       for (int i = 0; i < num_mem_params; i++)
        {
                if ((retval = target_write_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value)) != ERROR_OK)
                        return retval;
        }
 
-       for (i = 0; i < num_reg_params; i++)
+       for (int i = 0; i < num_reg_params; i++)
        {
                struct reg *reg = register_get_by_name(armv7m->core_cache, reg_params[i].reg_name, 0);
 //             uint32_t regvalue;
@@ -423,13 +424,13 @@ int armv7m_run_algorithm(struct target *target,
                if (!reg)
                {
                        LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
-                       exit(-1);
+                       return ERROR_INVALID_ARGUMENTS;
                }
 
                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);
+                       return ERROR_INVALID_ARGUMENTS;
                }
 
 //             regvalue = buf_get_u32(reg_params[i].value, 0, 32);
@@ -467,7 +468,7 @@ int armv7m_run_algorithm(struct target *target,
        }
 
        /* Read memory values to mem_params[] */
-       for (i = 0; i < num_mem_params; i++)
+       for (int i = 0; i < num_mem_params; i++)
        {
                if (mem_params[i].direction != PARAM_OUT)
                        if ((retval = target_read_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value)) != ERROR_OK)
@@ -477,7 +478,7 @@ int armv7m_run_algorithm(struct target *target,
        }
 
        /* Copy core register values to reg_params[] */
-       for (i = 0; i < num_reg_params; i++)
+       for (int i = 0; i < num_reg_params; i++)
        {
                if (reg_params[i].direction != PARAM_OUT)
                {
@@ -486,20 +487,20 @@ int armv7m_run_algorithm(struct target *target,
                        if (!reg)
                        {
                                LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
-                               exit(-1);
+                               return ERROR_INVALID_ARGUMENTS;
                        }
 
                        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);
+                               return ERROR_INVALID_ARGUMENTS;
                        }
 
                        buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32));
                }
        }
 
-       for (i = ARMV7M_NUM_REGS - 1; i >= 0; i--)
+       for (int i = ARMV7M_NUM_REGS - 1; i >= 0; i--)
        {
                uint32_t regvalue;
                regvalue = buf_get_u32(armv7m->core_cache->reg_list[i].value, 0, 32);