aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Vanek <vanekt@fbl.cz>2018-12-18 17:17:33 +0100
committerMatthias Welwarsky <matthias@welwarsky.de>2019-02-07 07:51:50 +0000
commit7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e (patch)
tree8b8d19f57f6f12dec1c1c0b728f04f1c6309bbbf
parent0d48104e03320112db1e8825d0700ea8be735cef (diff)
downloadriscv-openocd-7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e.zip
riscv-openocd-7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e.tar.gz
riscv-openocd-7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e.tar.bz2
target algo: do not write reg_param if direction is PARAM_IN
Without this change xxx_start_algorithm() writes all register parameters no matter of their direction. It usually results in writing of uninitialized reg_params[].value - possibly reported by valgrind. While on it fix the wrong parameter direction in kinetis_disable_wdog_algo(). This bug did not have any impact because of unconditional write of reg_params. Change-Id: Ia9c6a7b37f77d5eb6e5f5463012dddd50471742b Signed-off-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-on: http://openocd.zylin.com/4813 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
-rw-r--r--src/flash/nor/kinetis.c2
-rw-r--r--src/target/armv4_5.c3
-rw-r--r--src/target/armv7m.c3
-rw-r--r--src/target/dsp563xx.c3
-rw-r--r--src/target/mips32.c3
-rw-r--r--src/target/riscv/riscv.c3
-rw-r--r--src/target/stm8.c3
7 files changed, 19 insertions, 1 deletions
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 86fad72..eca74a8 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -1035,7 +1035,7 @@ static int kinetis_disable_wdog_algo(struct target *target, size_t code_size, co
armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
armv7m_info.core_mode = ARM_MODE_THREAD;
- init_reg_param(&reg_params[0], "r0", 32, PARAM_IN);
+ init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
buf_set_u32(reg_params[0].value, 0, 32, wdog_base);
retval = target_run_algorithm(target, 0, NULL, 1, reg_params,
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index b3bee8d..6c30acc 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -1362,6 +1362,9 @@ int armv4_5_run_algorithm_inner(struct target *target,
}
for (i = 0; i < num_reg_params; i++) {
+ if (reg_params[i].direction == PARAM_IN)
+ continue;
+
struct reg *reg = register_get_by_name(arm->core_cache, reg_params[i].reg_name, 0);
if (!reg) {
LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index a1962fe..ecca0e7 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -388,6 +388,9 @@ int armv7m_start_algorithm(struct target *target,
}
for (int i = 0; i < num_reg_params; i++) {
+ if (reg_params[i].direction == PARAM_IN)
+ continue;
+
struct reg *reg =
register_get_by_name(armv7m->arm.core_cache, reg_params[i].reg_name, 0);
/* uint32_t regvalue; */
diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c
index 1d728df..e7306d2 100644
--- a/src/target/dsp563xx.c
+++ b/src/target/dsp563xx.c
@@ -1394,6 +1394,9 @@ static int dsp563xx_run_algorithm(struct target *target,
}
for (i = 0; i < num_reg_params; i++) {
+ if (reg_params[i].direction == PARAM_IN)
+ continue;
+
struct reg *reg = register_get_by_name(dsp563xx->core_cache,
reg_params[i].reg_name,
0);
diff --git a/src/target/mips32.c b/src/target/mips32.c
index b5dbea3..abb4255 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -468,6 +468,9 @@ int mips32_run_algorithm(struct target *target, int num_mem_params,
}
for (int i = 0; i < num_reg_params; i++) {
+ if (reg_params[i].direction == PARAM_IN)
+ continue;
+
struct reg *reg = register_get_by_name(mips32->core_cache, reg_params[i].reg_name, 0);
if (!reg) {
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 8d76c4a..02ba380 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -853,6 +853,9 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
uint64_t saved_regs[32];
for (int i = 0; i < num_reg_params; i++) {
+ if (mem_params[i].direction == PARAM_IN)
+ continue;
+
LOG_DEBUG("save %s", reg_params[i].reg_name);
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
if (!r) {
diff --git a/src/target/stm8.c b/src/target/stm8.c
index 39fbb50..f5df248 100644
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -1897,6 +1897,9 @@ static int stm8_run_algorithm(struct target *target, int num_mem_params,
}
for (int i = 0; i < num_reg_params; i++) {
+ if (reg_params[i].direction == PARAM_IN)
+ continue;
+
struct reg *reg = register_get_by_name(stm8->core_cache,
reg_params[i].reg_name, 0);