aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2013-04-23 12:15:07 +0100
committerFreddie Chopin <freddie.chopin@gmail.com>2013-04-28 07:35:41 +0000
commit37299b2b5809fa9a3bd531ca3e2528085e095a0e (patch)
treef3cc1efd2910db282e973bd79f2d52c298b96497
parentda2e40bcd3541a172ed037d57b7eaafb479f94d5 (diff)
arm: fix arm reg regression
Seems commit fc2abe63fd3cea7497da7be2955d333bd3f800b9 caused a regression in that the arm reg cmd no longer worked. The issue was caused because we changed the value of ARM_MODE_THREAD which was being checked in arm_init_arch_info. Change-Id: Id571d4ab336d1b0e2b93363147af245d24b65ca5 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/1362 Tested-by: jenkins Reviewed-by: Luca Bruno <lucab@debian.org> Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
-rw-r--r--src/target/arm11.c1
-rw-r--r--src/target/arm7_9_common.c1
-rw-r--r--src/target/xscale.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 26e8116f..2e0fd238 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1094,6 +1094,7 @@ static int arm11_target_create(struct target *target, Jim_Interp *interp)
if (!arm11)
return ERROR_FAIL;
+ arm11->arm.core_type = ARM_MODE_ANY;
arm_init_arch_info(target, &arm11->arm);
arm11->jtag_info.tap = target->tap;
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index faeed0d2..07beef51 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2806,6 +2806,7 @@ int arm7_9_init_arch_info(struct target *target, struct arm7_9_common *arm7_9)
arm7_9->dcc_downloads = false;
arm->arch_info = arm7_9;
+ arm->core_type = ARM_MODE_ANY;
arm->read_core_reg = arm7_9_read_core_reg;
arm->write_core_reg = arm7_9_write_core_reg;
arm->full_context = arm7_9_full_context;
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 5e9c5982..3fe8f013 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -2997,6 +2997,7 @@ static int xscale_init_arch_info(struct target *target,
/* prepare ARMv4/5 specific information */
arm->arch_info = xscale;
+ arm->core_type = ARM_MODE_ANY;
arm->read_core_reg = xscale_read_core_reg;
arm->write_core_reg = xscale_write_core_reg;
arm->full_context = xscale_full_context;