Menu
▾
▴
[Openocd-svn] r1542 - trunk/src/target
|
From: oharboe at B. <oh...@ma...> - 2009-04-27 13:24:05
|
Author: oharboe
Date: 2009-04-27 13:24:01 +0200 (Mon, 27 Apr 2009)
New Revision: 1542
Modified:
trunk/src/target/arm11.c
trunk/src/target/arm11.h
trunk/src/target/arm11_dbgtap.c
Log:
a little bit more error handling in ARM11
Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c 2009-04-27 10:37:07 UTC (rev 1541)
+++ trunk/src/target/arm11.c 2009-04-27 11:24:01 UTC (rev 1542)
@@ -48,7 +48,7 @@
#define FNC_INFO_NOTIMPLEMENTED
#endif
-static void arm11_on_enter_debug_state(arm11_common_t * arm11);
+static int arm11_on_enter_debug_state(arm11_common_t * arm11);
bool arm11_config_memwrite_burst = true;
bool arm11_config_memwrite_error_fatal = true;
@@ -313,16 +313,18 @@
* available a pointer to a word holding the
* DSCR can be passed. Otherwise use NULL.
*/
-void arm11_check_init(arm11_common_t * arm11, u32 * dscr)
+int arm11_check_init(arm11_common_t * arm11, u32 * dscr)
{
FNC_INFO;
+ int retval;
u32 dscr_local_tmp_copy;
if (!dscr)
{
dscr = &dscr_local_tmp_copy;
- *dscr = arm11_read_DSCR(arm11);
+ if ((retval=arm11_read_DSCR(arm11, dscr))!=ERROR_OK)
+ return retval;
}
if (!(*dscr & ARM11_DSCR_MODE_SELECT))
@@ -353,6 +355,8 @@
arm11_sc7_clear_vbw(arm11);
}
+
+ return ERROR_OK;
}
@@ -366,7 +370,7 @@
* or on other occasions that stop the processor.
*
*/
-static void arm11_on_enter_debug_state(arm11_common_t * arm11)
+static int arm11_on_enter_debug_state(arm11_common_t * arm11)
{
FNC_INFO;
@@ -378,9 +382,10 @@
}}
/* Save DSCR */
+ int retval;
+ if ((retval=arm11_read_DSCR(arm11, &R(DSCR)))!=ERROR_OK)
+ return retval;
- R(DSCR) = arm11_read_DSCR(arm11);
-
/* Save wDTR */
if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
@@ -514,6 +519,8 @@
arm11_run_instr_data_finish(arm11);
arm11_dump_reg_changes(arm11);
+
+ return ERROR_OK;
}
void arm11_dump_reg_changes(arm11_common_t * arm11)
@@ -546,7 +553,7 @@
* This is called in preparation for the RESTART function.
*
*/
-void arm11_leave_debug_state(arm11_common_t * arm11)
+int arm11_leave_debug_state(arm11_common_t * arm11)
{
FNC_INFO;
@@ -572,7 +579,12 @@
/* spec says clear wDTR and rDTR; we assume they are clear as
otherwise our programming would be sloppy */
{
- u32 DSCR = arm11_read_DSCR(arm11);
+ u32 DSCR;
+ int retval;
+ if ((retval=arm11_read_DSCR(arm11, &DSCR))!=ERROR_OK)
+ {
+ return retval;
+ }
if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
{
@@ -632,6 +644,8 @@
}
arm11_record_register_history(arm11);
+
+ return ERROR_OK;
}
void arm11_record_register_history(arm11_common_t * arm11)
@@ -658,11 +672,15 @@
if (arm11->trst_active)
return ERROR_OK;
- u32 dscr = arm11_read_DSCR(arm11);
+ u32 dscr;
+ int retval;
+ if ((retval=arm11_read_DSCR(arm11, &dscr))!=ERROR_OK)
+ return retval;
LOG_DEBUG("DSCR %08x", dscr);
- arm11_check_init(arm11, &dscr);
+ if ((retval=arm11_check_init(arm11, &dscr))!=ERROR_OK)
+ return retval;
if (dscr & ARM11_DSCR_CORE_HALTED)
{
@@ -747,7 +765,10 @@
while (1)
{
- dscr = arm11_read_DSCR(arm11);
+ int retval;
+ retval = arm11_read_DSCR(arm11, &dscr);
+ if (retval!=ERROR_OK)
+ return retval;
if (dscr & ARM11_DSCR_CORE_HALTED)
break;
@@ -774,7 +795,7 @@
int retval = ERROR_OK;
FNC_INFO;
-
+
// LOG_DEBUG("current %d address %08x handle_breakpoints %d debug_execution %d",
// current, address, handle_breakpoints, debug_execution);
@@ -851,7 +872,10 @@
while (1)
{
- u32 dscr = arm11_read_DSCR(arm11);
+ u32 dscr;
+ retval = arm11_read_DSCR(arm11, &dscr);
+ if (retval!=ERROR_OK)
+ return retval;
LOG_DEBUG("DSCR %08x", dscr);
@@ -961,8 +985,8 @@
R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE; /* should be redundant */
else
R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE;
-
+
arm11_leave_debug_state(arm11);
arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
@@ -978,7 +1002,10 @@
while (1)
{
- u32 dscr = arm11_read_DSCR(arm11);
+ u32 dscr;
+ retval = arm11_read_DSCR(arm11, &dscr);
+ if (retval!=ERROR_OK)
+ return retval;
LOG_DEBUG("DSCR %08x", dscr);
@@ -1987,7 +2014,7 @@
RC_FINAL_BOOL( "no_increment", "Don't increment address on multi-read/-write (default: disabled)",
memrw_no_increment)
-
+
RC_FINAL_BOOL( "step_irq_enable", "Enable interrupts while stepping (default: disabled)",
step_irq_enable)
Modified: trunk/src/target/arm11.h
===================================================================
--- trunk/src/target/arm11.h 2009-04-27 10:37:07 UTC (rev 1541)
+++ trunk/src/target/arm11.h 2009-04-27 11:24:01 UTC (rev 1542)
@@ -91,7 +91,7 @@
bool trst_active;
bool halt_requested; /**< Keep track if arm11_halt() calls occured
during reset. Otherwise do it ASAP. */
-
+
bool simulate_reset_on_next_halt; /**< Perform cleanups of the ARM state on next halt */
/** \name Shadow registers to save processor state */
@@ -239,7 +239,7 @@
void arm11_add_IR (arm11_common_t * arm11, u8 instr, tap_state_t state);
void arm11_add_debug_SCAN_N (arm11_common_t * arm11, u8 chain, tap_state_t state);
void arm11_add_debug_INST (arm11_common_t * arm11, u32 inst, u8 * flag, tap_state_t state);
-u32 arm11_read_DSCR (arm11_common_t * arm11);
+int arm11_read_DSCR (arm11_common_t * arm11, u32 *dscr);
void arm11_write_DSCR (arm11_common_t * arm11, u32 dscr);
enum target_debug_reason arm11_get_DSCR_debug_reason(u32 dscr);
Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c 2009-04-27 10:37:07 UTC (rev 1541)
+++ trunk/src/target/arm11_dbgtap.c 2009-04-27 11:24:01 UTC (rev 1542)
@@ -216,7 +216,7 @@
*
* \remarks This is a stand-alone function that executes the JTAG command queue.
*/
-u32 arm11_read_DSCR(arm11_common_t * arm11)
+int arm11_read_DSCR(arm11_common_t * arm11, u32 *value)
{
arm11_add_debug_SCAN_N(arm11, 0x01, ARM11_TAP_DEFAULT);
@@ -229,14 +229,20 @@
arm11_add_dr_scan_vc(1, &chain1_field, TAP_DRPAUSE);
- jtag_execute_queue();
+ int retval;
+ if ((retval=jtag_execute_queue())!=ERROR_OK)
+ {
+ return retval;
+ }
if (arm11->last_dscr != dscr)
JTAG_DEBUG("DSCR = %08x (OLD %08x)", dscr, arm11->last_dscr);
arm11->last_dscr = dscr;
- return dscr;
+ *value=dscr;
+
+ return retval;
}
/** Write the Debug Status and Control Register (DSCR)
|
