summaryrefslogtreecommitdiff
path: root/src/target/xscale.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-06-10 16:18:14 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-11 15:53:23 +0200
commit0538081246fafbfb74d554bb1b758412534aa254 (patch)
treec845abc278fa7483617669557d53b034aa17b90f /src/target/xscale.c
parentecc8041c0f4c30a7310c0f8414a5261ee7a090ca (diff)
downloadopenocd_libswd-0538081246fafbfb74d554bb1b758412534aa254.tar.gz
openocd_libswd-0538081246fafbfb74d554bb1b758412534aa254.tar.bz2
openocd_libswd-0538081246fafbfb74d554bb1b758412534aa254.tar.xz
openocd_libswd-0538081246fafbfb74d554bb1b758412534aa254.zip
arm mmu: error propagation added for address translation
The return value for MMU translation was a mess, either error or value. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/xscale.c')
-rw-r--r--src/target/xscale.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c
index ed0eef35..ab7eee3d 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3226,7 +3226,10 @@ static int xscale_virt2phys(struct target *target,
return ERROR_TARGET_INVALID;
}
- uint32_t ret = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap);
+ uint32_t ret;
+ int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret);
+ if (retval != ERROR_OK)
+ return retval;
if (type == -1)
{
return ret;