cortex a8: add missing error handling

[openocd] / src / target / armv4_5_mmu.c

diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c
index 6990d13fc03c8e467105a7158f99d7b8443eafae..861410dd89a3bd28afc224222c5c8a3f35dfe920 100644 (file)
--- a/src/target/armv4_5_mmu.c
+++ b/src/target/armv4_5_mmu.c
@@ -26,7 +26,7 @@
 #include "armv4_5_mmu.h"
 
 
-int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val)
+int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, uint32_t *cb, uint32_t *val)
 {
        uint32_t first_lvl_descriptor = 0x0;
        uint32_t second_lvl_descriptor = 0x0;
@@ -44,27 +44,20 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
 
        if ((first_lvl_descriptor & 0x3) == 0)
        {
-               *type = -1;
                LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
        if (!armv4_5_mmu->has_tiny_pages && ((first_lvl_descriptor & 0x3) == 3))
        {
-               *type = -1;
                LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
-       /* domain is always specified in bits 8-5 */
-       *domain = (first_lvl_descriptor & 0x1e0) >> 5;
-
        if ((first_lvl_descriptor & 0x3) == 2)
        {
                /* section descriptor */
-               *type = ARMV4_5_SECTION;
                *cb = (first_lvl_descriptor & 0xc) >> 2;
-               *ap = (first_lvl_descriptor & 0xc00) >> 10;
                *val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff);
                return ERROR_OK;
        }
@@ -94,7 +87,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
 
        if ((second_lvl_descriptor & 0x3) == 0)
        {
-               *type = -1;
                LOG_ERROR("Address translation failure");
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
@@ -105,8 +97,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
        if ((second_lvl_descriptor & 0x3) == 1)
        {
                /* large page descriptor */
-               *type = ARMV4_5_LARGE_PAGE;
-               *ap = (second_lvl_descriptor & 0xff0) >> 4;
                *val = (second_lvl_descriptor & 0xffff0000) | (va & 0x0000ffff);
                return ERROR_OK;
        }
@@ -114,8 +104,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
        if ((second_lvl_descriptor & 0x3) == 2)
        {
                /* small page descriptor */
-               *type = ARMV4_5_SMALL_PAGE;
-               *ap = (second_lvl_descriptor & 0xff0) >> 4;
                *val = (second_lvl_descriptor & 0xfffff000) | (va & 0x00000fff);
                return ERROR_OK;
        }
@@ -123,14 +111,11 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
        if ((second_lvl_descriptor & 0x3) == 3)
        {
                /* tiny page descriptor */
-               *type = ARMV4_5_TINY_PAGE;
-               *ap = (second_lvl_descriptor & 0x30) >> 4;
                *val = (second_lvl_descriptor & 0xfffffc00) | (va & 0x000003ff);
                return ERROR_OK;
        }
 
        /* should not happen */
-       *type = -1;
        LOG_ERROR("Address translation failure");
        return ERROR_TARGET_TRANSLATION_FAULT;
 }