Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
FLASH/NOR: Remove useless file stellaris.h
[openocd.git] / src / target / arm7_9_common.c
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index abe0c2f13790b2bf4cd51867641c509e8c8ab541..778e606b608adfd1a57644f5802b946d6630b7ba 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007-2009 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -690,9 +690,13 @@ int arm7_9_execute_sys_speed(struct target *target)
        /* set RESTART instruction */
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+               retval = arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+               if (retval != ERROR_OK)
+                       return retval;
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       if (retval != ERROR_OK)
+               return retval;
 
        long long then = timeval_ms();
        int timeout;
@@ -738,13 +742,18 @@ static int arm7_9_execute_fast_sys_speed(struct target *target)
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct arm_jtag *jtag_info = &arm7_9->jtag_info;
        struct reg *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
+       int retval;
 
        /* set RESTART instruction */
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+               retval = arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+               if (retval != ERROR_OK)
+                       return retval;
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       if (retval != ERROR_OK)
+               return retval;
 
        if (!set)
        {
@@ -1065,24 +1074,29 @@ int arm7_9_deassert_reset(struct target *target)
        /* deassert reset lines */
        jtag_add_reset(0, 0);
 
+       /* In case polling is disabled, we need to examine the
+        * target and poll here for this target to work correctly.
+        *
+        * Otherwise, e.g. halt will fail afterwards with bogus
+        * error messages as halt will believe that reset is
+        * still in effect.
+        */
+       if ((retval = target_examine_one(target)) != ERROR_OK)
+               return retval;
+
+       if ((retval = target_poll(target)) != ERROR_OK)
+       {
+               return retval;
+       }
+
        enum reset_types jtag_reset_config = jtag_get_reset_config();
        if (target->reset_halt && (jtag_reset_config & RESET_SRST_PULLS_TRST) != 0)
        {
                LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
-               /* set up embedded ice registers again */
-               if ((retval = target_examine_one(target)) != ERROR_OK)
-                       return retval;
-
-               if ((retval = target_poll(target)) != ERROR_OK)
-               {
-                       return retval;
-               }
-
                if ((retval = target_halt(target)) != ERROR_OK)
                {
                        return retval;
                }
-
        }
        return retval;
 }
@@ -1470,7 +1484,11 @@ static int arm7_9_debug_entry(struct target *target)
                return retval;
 
        if (arm7_9->post_debug_entry)
-               arm7_9->post_debug_entry(target);
+       {
+               retval = arm7_9->post_debug_entry(target);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
        return ERROR_OK;
 }
@@ -1500,7 +1518,10 @@ static int arm7_9_full_context(struct target *target)
        }
 
        if (!is_arm_mode(armv4_5->core_mode))
+       {
+               LOG_ERROR("not a valid arm core mode - communication failure?");
                return ERROR_FAIL;
+       }
 
        /* iterate through processor modes (User, FIQ, IRQ, SVC, ABT, UND)
         * SYS shares registers with User, so we don't touch SYS
@@ -1603,7 +1624,10 @@ static int arm7_9_restore_context(struct target *target)
                arm7_9->pre_restore_context(target);
 
        if (!is_arm_mode(armv4_5->core_mode))
+       {
+               LOG_ERROR("not a valid arm core mode - communication failure?");
                return ERROR_FAIL;
+       }
 
        /* iterate through processor modes (User, FIQ, IRQ, SVC, ABT, UND)
         * SYS shares registers with User, so we don't touch SYS
@@ -1740,13 +1764,19 @@ static int arm7_9_restart_core(struct target *target)
 {
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
        struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+       int retval;
 
        /* set RESTART instruction */
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+
+               retval = arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+               if (retval != ERROR_OK)
+                       return retval;
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
+       if (retval != ERROR_OK)
+               return retval;
 
        jtag_add_runtest(1, TAP_IDLE);
        return jtag_execute_queue();
@@ -1878,7 +1908,9 @@ int arm7_9_resume(struct target *target, int current, uint32_t address, int hand
                                return err;
                        }
 
-                       arm7_9_debug_entry(target);
+                       retval = arm7_9_debug_entry(target);
+                       if (retval != ERROR_OK)
+                               return retval;
                        LOG_DEBUG("new PC after step: 0x%8.8" PRIx32,
                                        buf_get_u32(armv4_5->pc->value, 0, 32));
 
@@ -2079,7 +2111,9 @@ int arm7_9_step(struct target *target, int current, uint32_t address, int handle
        {
                target->state = TARGET_UNKNOWN;
        } else {
-               arm7_9_debug_entry(target);
+               retval = arm7_9_debug_entry(target);
+               if (retval != ERROR_OK)
+                       return retval;
                if ((retval = target_call_event_callbacks(target, TARGET_EVENT_HALTED)) != ERROR_OK)
                {
                        return retval;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)