cortex a8: add missing error handling from cortex_a8_exec_opcode()

[openocd] / src / target / arm720t.c

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index d4502241d2b48dd2bf1ceb64de9393685e1ac8c3..0ea6cb2b0e211559d04983728fa18e094842c33b 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -41,7 +41,7 @@
 #endif
 
 static int arm720t_scan_cp15(struct target *target,
-               uint32_t out, uint32_t *in, int instruction, int clock)
+               uint32_t out, uint32_t *in, int instruction, int clock_arg)
 {
        int retval;
        struct arm720t_common *arm720t = target_to_arm720(target);
@@ -81,7 +81,7 @@ static int arm720t_scan_cp15(struct target *target,
                jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_DRPAUSE);
        }
 
-       if (clock)
+       if (clock_arg)
                jtag_add_runtest(0, TAP_DRPAUSE);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
@@ -93,9 +93,9 @@ static int arm720t_scan_cp15(struct target *target,
        if (in)
                LOG_DEBUG("out: %8.8x, in: %8.8x, instruction: %i, clock: %i", out, *in, instruction, clock);
        else
-               LOG_DEBUG("out: %8.8x, instruction: %i, clock: %i", out, instruction, clock);
+               LOG_DEBUG("out: %8.8x, instruction: %i, clock: %i", out, instruction, clock_arg);
 #else
-               LOG_DEBUG("out: %8.8" PRIx32 ", instruction: %i, clock: %i", out, instruction, clock);
+               LOG_DEBUG("out: %8.8" PRIx32 ", instruction: %i, clock: %i", out, instruction, clock_arg);
 #endif
 
        return ERROR_OK;
@@ -255,13 +255,11 @@ static int arm720_virt2phys(struct target *target,
                uint32_t virtual, uint32_t *physical)
 {
        uint32_t cb;
-       int domain;
-       uint32_t ap;
        struct arm720t_common *arm720t = target_to_arm720(target);
 
        uint32_t ret;
        int retval = armv4_5_mmu_translate_va(target,
-                       &arm720t->armv4_5_mmu, virtual, &cb, &domain, &ap, &ret);
+                       &arm720t->armv4_5_mmu, virtual, &cb, &ret);
        if (retval != ERROR_OK)
                return retval;
        *physical = ret;