summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-10-30 17:29:38 -0700
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-10-30 17:29:38 -0700
commit54c3cab266d2437299a6a3ba27e9f028d97822fa (patch)
treef3f9ddfca476b69db428ce4d08157389966ecf78
parente8a5092f1e23cee70cf1c3565db2ca40a61a11af (diff)
downloadopenocd_libswd-54c3cab266d2437299a6a3ba27e9f028d97822fa.tar.gz
openocd_libswd-54c3cab266d2437299a6a3ba27e9f028d97822fa.tar.bz2
openocd_libswd-54c3cab266d2437299a6a3ba27e9f028d97822fa.tar.xz
openocd_libswd-54c3cab266d2437299a6a3ba27e9f028d97822fa.zip
ARM926: fix arm926ejs_mmu() reading from bad pointer
I'm suspecting this code can never have worked, since the original commit (svn #335) in early 2008. Fix is just copy/paste from another (working) function. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-rw-r--r--src/target/arm926ejs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 53f79809..608a7edf 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -906,7 +906,9 @@ static int arm926ejs_virt2phys(struct target_s *target, uint32_t virtual, uint32
static int arm926ejs_mmu(struct target_s *target, int *enabled)
{
armv4_5_common_t *armv4_5 = target->arch_info;
- arm926ejs_common_t *arm926ejs = armv4_5->arch_info;
+ arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+ arm9tdmi_common_t *arm9tdmi = arm7_9->arch_info;
+ arm926ejs_common_t *arm926ejs = arm9tdmi->arch_info;
if (target->state != TARGET_HALTED)
{