no longer use jtag_add_xxx() to set end state to TAP_DRPAUSE

[fw/openocd] / src / target / arm7tdmi.c

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 136a8a05b0a7155e0a6f927f88f413d5bca0dab1..e3185bec866fa85c15222e8fc2d2ffb586d617d2 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -28,19 +28,8 @@
 #endif
 
 #include "arm7tdmi.h"
+#include "target_type.h"
 
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
@@ -115,13 +104,11 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                fields[0].num_bits = 1;
                fields[0].out_value = NULL;
                fields[0].in_value = &breakpoint;
-               fields[0].in_handler = NULL;
 
                fields[1].tap = arm7_9->jtag_info.tap;
                fields[1].num_bits = 32;
                fields[1].out_value = NULL;
                fields[1].in_value = databus;
-               fields[1].in_handler = NULL;
 
                if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
                {
@@ -129,7 +116,7 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                }
                arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
 
-               jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+               jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
                if((retval = jtag_execute_queue()) != ERROR_OK)
                {
                        return retval;
@@ -140,7 +127,7 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                fields[1].in_value = NULL;
                fields[1].out_value = databus;
 
-               jtag_add_dr_scan(2, fields, TAP_DRPAUSE);
+               jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_DRPAUSE));
 
                if (breakpoint & 1)
                        target->debug_reason = DBG_REASON_WATCHPOINT;
@@ -160,9 +147,9 @@ static __inline int arm7tdmi_clock_out_inner(arm_jtag_t *jtag_info, u32 out, int
                        2,
                        arm7tdmi_num_bits,
                        values,
-                       TAP_INVALID);
+                       jtag_add_end_state(TAP_INVALID));
 
-       jtag_add_runtest(0, TAP_INVALID);
+       jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
 
        return ERROR_OK;
 }
@@ -194,24 +181,17 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
        fields[0].in_value = NULL;
-       fields[0].in_handler = NULL;
-
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-       u8 tmp[4];
-       fields[1].in_value = tmp;
-       fields[1].in_handler = NULL;
+       fields[1].in_value = (u8 *)in;
 
-       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+       jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
 
-       if (jtag_error==ERROR_OK)
-       {
-               *in=flip_u32(le_to_h_u32(tmp), 32);
-       }
+       jtag_add_callback(arm7flip32, (u8 *)in);
 
-       jtag_add_runtest(0, TAP_INVALID);
+       jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -234,6 +214,43 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        return ERROR_OK;
 }
 
+void arm_endianness(u8 *tmp, void *in, int size, int be, int flip)
+{
+       u32 readback=le_to_h_u32(tmp);
+       if (flip)
+               readback=flip_u32(readback, 32);
+       switch (size)
+       {
+               case 4:
+                       if (be)
+                       {
+                               h_u32_to_be(((u8*)in), readback);
+                       } else
+                       {
+                                h_u32_to_le(((u8*)in), readback);
+                       }
+                       break;
+               case 2:
+                       if (be)
+                       {
+                               h_u16_to_be(((u8*)in), readback & 0xffff);
+                       } else
+                       {
+                               h_u16_to_le(((u8*)in), readback & 0xffff);
+                       }
+                       break;
+               case 1:
+                       *((u8 *)in)= readback & 0xff;
+                       break;
+       }
+}
+
+static int arm7endianness(u8 *in, jtag_callback_data_t size, jtag_callback_data_t be, jtag_callback_data_t captured)
+{
+       arm_endianness((u8 *)captured, in, (int)size, (int)be, 1);
+       return ERROR_OK;
+}
+
 /* clock the target, and read the databus
  * the *in pointer points to a buffer where elements of 'size' bytes
  * are stored in big (be==1) or little (be==0) endianness
@@ -254,43 +271,17 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
        fields[0].in_value = NULL;
-       fields[0].in_handler = NULL;
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-       u8 tmp[4];
-       fields[1].in_value = tmp;
-       fields[1].in_handler = NULL;
+       jtag_alloc_in_value32(&fields[1]);
 
-       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+       jtag_add_dr_scan(2, fields, jtag_add_end_state(TAP_INVALID));
 
-       switch (size)
-       {
-               case 4:
-                       if (be)
-                       {
-                               h_u32_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
-                       } else
-                       {
-                                h_u32_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
-                       }
-                       break;
-               case 2:
-                       if (be)
-                       {
-                               h_u16_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
-                       } else
-                       {
-                               h_u16_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
-                       }
-                       break;
-               case 1:
-                       *((u8 *)in)= flip_u32(le_to_h_u32(tmp), 32) & 0xff;
-                       break;
-       }
+       jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[1].in_value);
 
-       jtag_add_runtest(0, TAP_INVALID);
+       jtag_add_runtest(0, jtag_add_end_state(TAP_INVALID));
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -363,6 +354,13 @@ void arm7tdmi_change_to_arm(target_t *target, u32 *r0, u32 *pc)
        *pc -= 0xa;
 }
 
+
+/* FIX!!! is this a potential performance bottleneck w.r.t. requiring too many
+ * roundtrips when jtag_execute_queue() has a large overhead(e.g. for USB)s?
+ *
+ * The solution is to arrange for a large out/in scan in this loop and
+ * and convert data afterwards.
+ */
 void arm7tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])
 {
        int i;
@@ -721,7 +719,7 @@ int arm7tdmi_examine(struct target_s *target)
        int retval;
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       if (!target->type->examined)
+       if (!target_was_examined(target))
        {
                /* get pointers to arch-specific information */
                reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
@@ -738,7 +736,7 @@ int arm7tdmi_examine(struct target_s *target)
                        (*cache_p)->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx);
                        arm7_9->etm_ctx->reg_cache = (*cache_p)->next;
                }
-               target->type->examined = 1;
+               target_set_examined(target);
        }
        if ((retval=embeddedice_setup(target))!=ERROR_OK)
                return retval;