Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: abdd568)
mips32: use 'unsigned int' for CPU register indices 16/2216/5
authorAntony Pavlov <antonynpavlov@gmail.com>
Tue, 15 Jul 2014 07:59:04 +0000 (11:59 +0400)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Wed, 11 Feb 2015 22:09:27 +0000 (22:09 +0000)
Change-Id: I77e94b2fe0943a87e1d18d88ebf2a0133aaad728
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Reviewed-on: http://openocd.zylin.com/2216
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
src/target/mips32.c patch | blob | history
src/target/mips32.h patch | blob | history

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 75197f170f85f5368e2bce18a1eda6d67522dac7..74b42b0542d016aea83066097c578ed17465bde5 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -131,14 +131,14 @@ static int mips32_set_core_reg(struct reg *reg, uint8_t *buf)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 
-static int mips32_read_core_reg(struct target *target, int num)
+static int mips32_read_core_reg(struct target *target, unsigned int num)
 {
        uint32_t reg_value;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
 {
        uint32_t reg_value;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if ((num < 0) || (num >= MIPS32NUMCOREREGS))
+       if (num >= MIPS32NUMCOREREGS)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        reg_value = mips32->core_regs[num];
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        reg_value = mips32->core_regs[num];
@@ -149,14 +149,14 @@ static int mips32_read_core_reg(struct target *target, int num)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 
-static int mips32_write_core_reg(struct target *target, int num)
+static int mips32_write_core_reg(struct target *target, unsigned int num)
 {
        uint32_t reg_value;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
 {
        uint32_t reg_value;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
-       if ((num < 0) || (num >= MIPS32NUMCOREREGS))
+       if (num >= MIPS32NUMCOREREGS)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        reg_value = buf_get_u32(mips32->core_cache->reg_list[num].value, 0, 32);
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        reg_value = buf_get_u32(mips32->core_cache->reg_list[num].value, 0, 32);
@@ -173,7 +173,7 @@ int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 {
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
-       int i;
+       unsigned int i;
 
        /* include floating point registers */
        *reg_list_size = MIPS32NUMCOREREGS + MIPS32NUMFPREGS;
 
        /* include floating point registers */
        *reg_list_size = MIPS32NUMCOREREGS + MIPS32NUMFPREGS;
@@ -191,7 +191,7 @@ int mips32_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
 
 int mips32_save_context(struct target *target)
 {
 
 int mips32_save_context(struct target *target)
 {
-       int i;
+       unsigned int i;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
@@ -210,7 +210,7 @@ int mips32_save_context(struct target *target)
 
 int mips32_restore_context(struct target *target)
 {
 
 int mips32_restore_context(struct target *target)
 {
-       int i;
+       unsigned int i;
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
 
        /* get pointers to arch-specific information */
        struct mips32_common *mips32 = target_to_mips32(target);
@@ -346,7 +346,6 @@ int mips32_run_algorithm(struct target *target, int num_mem_params,
        enum mips32_isa_mode isa_mode = mips32->isa_mode;
 
        uint32_t context[MIPS32NUMCOREREGS];
        enum mips32_isa_mode isa_mode = mips32->isa_mode;
 
        uint32_t context[MIPS32NUMCOREREGS];
-       int i;
        int retval = ERROR_OK;
 
        LOG_DEBUG("Running algorithm");
        int retval = ERROR_OK;
 
        LOG_DEBUG("Running algorithm");
@@ -365,20 +364,20 @@ int mips32_run_algorithm(struct target *target, int num_mem_params,
        }
 
        /* refresh core register cache */
        }
 
        /* refresh core register cache */
-       for (i = 0; i < MIPS32NUMCOREREGS; i++) {
+       for (unsigned int i = 0; i < MIPS32NUMCOREREGS; i++) {
                if (!mips32->core_cache->reg_list[i].valid)
                        mips32->read_core_reg(target, i);
                context[i] = buf_get_u32(mips32->core_cache->reg_list[i].value, 0, 32);
        }
 
                if (!mips32->core_cache->reg_list[i].valid)
                        mips32->read_core_reg(target, i);
                context[i] = buf_get_u32(mips32->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++) {
                retval = target_write_buffer(target, mem_params[i].address,
                                mem_params[i].size, mem_params[i].value);
                if (retval != ERROR_OK)
                        return retval;
        }
 
                retval = target_write_buffer(target, mem_params[i].address,
                                mem_params[i].size, mem_params[i].value);
                if (retval != 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(mips32->core_cache, reg_params[i].reg_name, 0);
 
                if (!reg) {
                struct reg *reg = register_get_by_name(mips32->core_cache, reg_params[i].reg_name, 0);
 
                if (!reg) {
@@ -402,7 +401,7 @@ int mips32_run_algorithm(struct target *target, int num_mem_params,
        if (retval != ERROR_OK)
                return retval;
 
        if (retval != ERROR_OK)
                return retval;
 
-       for (i = 0; i < num_mem_params; i++) {
+       for (int i = 0; i < num_mem_params; i++) {
                if (mem_params[i].direction != PARAM_OUT) {
                        retval = target_read_buffer(target, mem_params[i].address, mem_params[i].size,
                                        mem_params[i].value);
                if (mem_params[i].direction != PARAM_OUT) {
                        retval = target_read_buffer(target, mem_params[i].address, mem_params[i].size,
                                        mem_params[i].value);
@@ -411,7 +410,7 @@ int mips32_run_algorithm(struct target *target, int num_mem_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) {
                        struct reg *reg = register_get_by_name(mips32->core_cache, reg_params[i].reg_name, 0);
                        if (!reg) {
                if (reg_params[i].direction != PARAM_OUT) {
                        struct reg *reg = register_get_by_name(mips32->core_cache, reg_params[i].reg_name, 0);
                        if (!reg) {
@@ -430,7 +429,7 @@ int mips32_run_algorithm(struct target *target, int num_mem_params,
        }
 
        /* restore everything we saved before */
        }
 
        /* restore everything we saved before */
-       for (i = 0; i < MIPS32NUMCOREREGS; i++) {
+       for (unsigned int i = 0; i < MIPS32NUMCOREREGS; i++) {
                uint32_t regvalue;
                regvalue = buf_get_u32(mips32->core_cache->reg_list[i].value, 0, 32);
                if (regvalue != context[i]) {
                uint32_t regvalue;
                regvalue = buf_get_u32(mips32->core_cache->reg_list[i].value, 0, 32);
                if (regvalue != context[i]) {
diff --git a/src/target/mips32.h b/src/target/mips32.h
index 4f44384a38088c729d7bc361fdc2021c963265ea..bfd7facb1dd59d3326a2fa3f45441a6ba26abee6 100644 (file)
--- a/src/target/mips32.h
+++ b/src/target/mips32.h
@@ -100,8 +100,8 @@ struct mips32_common {
        struct mips32_comparator *data_break_list;
 
        /* register cache to processor synchronization */
        struct mips32_comparator *data_break_list;
 
        /* register cache to processor synchronization */
-       int (*read_core_reg)(struct target *target, int num);
-       int (*write_core_reg)(struct target *target, int num);
+       int (*read_core_reg)(struct target *target, unsigned int num);
+       int (*write_core_reg)(struct target *target, unsigned int num);
 };
 
 static inline struct mips32_common *
 };
 
 static inline struct mips32_common *
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)