Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
now builds on 64 and 32 bit systems
[openocd.git] / src / target / arm7tdmi.c
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 41b4181a5d2a26b6f9acc2c0ba06b7f9fa62e631..44d9b0a55c2539a717d3f6ae38f2ca7befd9049c 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -5,6 +5,9 @@
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -26,30 +29,14 @@
 
 #include "arm7tdmi.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_
 #endif
 
-/* cli handling */
-int arm7tdmi_register_commands(struct command_context_s *cmd_ctx);
-
 /* forward declarations */
 
 int arm7tdmi_target_create(struct target_s *target,Jim_Interp *interp);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm7tdmi_quit(void);
 
 /* target function declarations */
@@ -115,22 +102,12 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                fields[0].tap = arm7_9->jtag_info.tap;
                fields[0].num_bits = 1;
                fields[0].out_value = NULL;
-               fields[0].out_mask = NULL;
                fields[0].in_value = &breakpoint;
-               fields[0].in_check_value = NULL;
-               fields[0].in_check_mask = NULL;
-               fields[0].in_handler = NULL;
-               fields[0].in_handler_priv = NULL;
 
                fields[1].tap = arm7_9->jtag_info.tap;
                fields[1].num_bits = 32;
                fields[1].out_value = NULL;
-               fields[1].out_mask = NULL;
                fields[1].in_value = databus;
-               fields[1].in_check_value = NULL;
-               fields[1].in_check_mask = NULL;
-               fields[1].in_handler = NULL;
-               fields[1].in_handler_priv = NULL;
 
                if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
                {
@@ -169,9 +146,9 @@ static __inline int arm7tdmi_clock_out_inner(arm_jtag_t *jtag_info, u32 out, int
                        2,
                        arm7tdmi_num_bits,
                        values,
-                       -1);
+                       TAP_INVALID);
 
-       jtag_add_runtest(0, -1);
+       jtag_add_runtest(0, TAP_INVALID);
 
        return ERROR_OK;
 }
@@ -202,26 +179,18 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
-       fields[0].out_mask = NULL;
        fields[0].in_value = NULL;
-       fields[0].in_check_value = NULL;
-       fields[0].in_check_mask = NULL;
-       fields[0].in_handler = NULL;
-       fields[0].in_handler_priv = NULL;
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-       fields[1].out_mask = NULL;
-       fields[1].in_value = NULL;
-       fields[1].in_handler = arm_jtag_buf_to_u32_flip;
-       fields[1].in_handler_priv = in;
-       fields[1].in_check_value = NULL;
-       fields[1].in_check_mask = NULL;
+       fields[1].in_value = (u8 *)in;
 
-       jtag_add_dr_scan(2, fields, -1);
+       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-       jtag_add_runtest(0, -1);
+       jtag_add_callback(arm7flip32, (u8 *)in);
+
+       jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -244,6 +213,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 dummy)
+{
+       arm_endianness(in, 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
@@ -263,37 +269,18 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
-       fields[0].out_mask = NULL;
        fields[0].in_value = NULL;
-       fields[0].in_check_value = NULL;
-       fields[0].in_check_mask = NULL;
-       fields[0].in_handler = NULL;
-       fields[0].in_handler_priv = NULL;
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-       fields[1].out_mask = NULL;
-       fields[1].in_value = NULL;
-       switch (size)
-       {
-               case 4:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip;
-                       break;
-               case 2:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip;
-                       break;
-               case 1:
-                       fields[1].in_handler = arm_jtag_buf_to_8_flip;
-                       break;
-       }
-       fields[1].in_handler_priv = in;
-       fields[1].in_check_value = NULL;
-       fields[1].in_check_mask = NULL;
+       fields[1].in_value = (u8 *)in;
+
+       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-       jtag_add_dr_scan(2, fields, -1);
+       jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)NULL);
 
-       jtag_add_runtest(0, -1);
+       jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -366,6 +353,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;
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)