- convert all files to unix line-ending
[fw/openocd] / src / target / arm7tdmi.c
index 5679bbc6e6d4898c05bb251187b08f5e16618fee..d8d5e57ed0f6c9f218ebcf16b61586c3d2dad154 100644 (file)
-/***************************************************************************\r
- *   Copyright (C) 2005 by Dominic Rath                                    *\r
- *   Dominic.Rath@gmx.de                                                   *\r
- *                                                                         *\r
- *   This program is free software; you can redistribute it and/or modify  *\r
- *   it under the terms of the GNU General Public License as published by  *\r
- *   the Free Software Foundation; either version 2 of the License, or     *\r
- *   (at your option) any later version.                                   *\r
- *                                                                         *\r
- *   This program is distributed in the hope that it will be useful,       *\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
- *   GNU General Public License for more details.                          *\r
- *                                                                         *\r
- *   You should have received a copy of the GNU General Public License     *\r
- *   along with this program; if not, write to the                         *\r
- *   Free Software Foundation, Inc.,                                       *\r
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
- ***************************************************************************/\r
-#ifdef HAVE_CONFIG_H\r
-#include "config.h"\r
-#endif\r
-\r
-#include "arm7tdmi.h"\r
-\r
-#include "arm7_9_common.h"\r
-#include "register.h"\r
-#include "target.h"\r
-#include "armv4_5.h"\r
-#include "embeddedice.h"\r
-#include "etm.h"\r
-#include "log.h"\r
-#include "jtag.h"\r
-#include "arm_jtag.h"\r
-\r
-#include <stdlib.h>\r
-#include <string.h>\r
-\r
-#if 0\r
-#define _DEBUG_INSTRUCTION_EXECUTION_\r
-#endif\r
-\r
-/* cli handling */\r
-int arm7tdmi_register_commands(struct command_context_s *cmd_ctx);\r
-\r
-/* forward declarations */\r
-int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);\r
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);\r
-int arm7tdmi_quit();\r
-\r
-/* target function declarations */\r
-int arm7tdmi_poll(struct target_s *target);\r
-int arm7tdmi_halt(target_t *target);\r
-               \r
-target_type_t arm7tdmi_target =\r
-{\r
-       .name = "arm7tdmi",\r
-\r
-       .poll = arm7_9_poll,\r
-       .arch_state = armv4_5_arch_state,\r
-\r
-       .target_request_data = arm7_9_target_request_data,\r
-\r
-       .halt = arm7_9_halt,\r
-       .resume = arm7_9_resume,\r
-       .step = arm7_9_step,\r
-\r
-       .assert_reset = arm7_9_assert_reset,\r
-       .deassert_reset = arm7_9_deassert_reset,\r
-       .soft_reset_halt = arm7_9_soft_reset_halt,\r
-       .prepare_reset_halt = arm7_9_prepare_reset_halt,\r
-\r
-       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,\r
-       \r
-       .read_memory = arm7_9_read_memory,\r
-       .write_memory = arm7_9_write_memory,\r
-       .bulk_write_memory = arm7_9_bulk_write_memory,\r
-       .checksum_memory = arm7_9_checksum_memory,\r
-       \r
-       .run_algorithm = armv4_5_run_algorithm,\r
-       \r
-       .add_breakpoint = arm7_9_add_breakpoint,\r
-       .remove_breakpoint = arm7_9_remove_breakpoint,\r
-       .add_watchpoint = arm7_9_add_watchpoint,\r
-       .remove_watchpoint = arm7_9_remove_watchpoint,\r
-\r
-       .register_commands = arm7tdmi_register_commands,\r
-       .target_command = arm7tdmi_target_command,\r
-       .init_target = arm7tdmi_init_target,\r
-       .quit = arm7tdmi_quit\r
-};\r
-\r
-int arm7tdmi_examine_debug_reason(target_t *target)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       \r
-       /* only check the debug reason if we don't know it already */\r
-       if ((target->debug_reason != DBG_REASON_DBGRQ)\r
-                       && (target->debug_reason != DBG_REASON_SINGLESTEP))\r
-       {\r
-               scan_field_t fields[2];\r
-               u8 databus[4];\r
-               u8 breakpoint;\r
-               \r
-               jtag_add_end_state(TAP_PD);\r
-\r
-               fields[0].device = arm7_9->jtag_info.chain_pos;\r
-               fields[0].num_bits = 1;\r
-               fields[0].out_value = NULL;\r
-               fields[0].out_mask = NULL;\r
-               fields[0].in_value = &breakpoint;\r
-               fields[0].in_check_value = NULL;\r
-               fields[0].in_check_mask = NULL;\r
-               fields[0].in_handler = NULL;\r
-               fields[0].in_handler_priv = NULL;\r
-               \r
-               fields[1].device = arm7_9->jtag_info.chain_pos;\r
-               fields[1].num_bits = 32;\r
-               fields[1].out_value = NULL;\r
-               fields[1].out_mask = NULL;\r
-               fields[1].in_value = databus;\r
-               fields[1].in_check_value = NULL;\r
-               fields[1].in_check_mask = NULL;\r
-               fields[1].in_handler = NULL;\r
-               fields[1].in_handler_priv = NULL;\r
-               \r
-               arm_jtag_scann(&arm7_9->jtag_info, 0x1);\r
-               arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);\r
-\r
-               jtag_add_dr_scan(2, fields, TAP_PD);\r
-               jtag_execute_queue();\r
-               \r
-               fields[0].in_value = NULL;\r
-               fields[0].out_value = &breakpoint;\r
-               fields[1].in_value = NULL;\r
-               fields[1].out_value = databus;\r
-               \r
-               jtag_add_dr_scan(2, fields, TAP_PD);\r
-\r
-               if (breakpoint & 1)\r
-                       target->debug_reason = DBG_REASON_WATCHPOINT; \r
-               else\r
-                       target->debug_reason = DBG_REASON_BREAKPOINT; \r
-       }\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-/* put an instruction in the ARM7TDMI pipeline or write the data bus, and optionally read data */\r
-int arm7tdmi_clock_out(arm_jtag_t *jtag_info, u32 out, u32 *in, int breakpoint)\r
-{\r
-       scan_field_t fields[2];\r
-       u8 out_buf[4];\r
-       u8 breakpoint_buf;\r
-       \r
-       buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));\r
-       buf_set_u32(&breakpoint_buf, 0, 1, breakpoint);\r
-\r
-       jtag_add_end_state(TAP_PD);\r
-       arm_jtag_scann(jtag_info, 0x1);\r
-       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);\r
-       \r
-       fields[0].device = jtag_info->chain_pos;\r
-       fields[0].num_bits = 1;\r
-       fields[0].out_value = &breakpoint_buf;\r
-       fields[0].out_mask = NULL;\r
-       fields[0].in_value = NULL;\r
-       fields[0].in_check_value = NULL;\r
-       fields[0].in_check_mask = NULL;\r
-       fields[0].in_handler = NULL;\r
-       fields[0].in_handler_priv = NULL;\r
-               \r
-       fields[1].device = jtag_info->chain_pos;\r
-       fields[1].num_bits = 32;\r
-       fields[1].out_value = out_buf;\r
-       fields[1].out_mask = NULL;\r
-       fields[1].in_value = NULL;\r
-       if (in)\r
-       {\r
-               fields[1].in_handler = arm_jtag_buf_to_u32_flip;\r
-               fields[1].in_handler_priv = in;\r
-       }\r
-       else\r
-       {\r
-               fields[1].in_handler = NULL;\r
-               fields[1].in_handler_priv = NULL;\r
-       }\r
-       fields[1].in_check_value = NULL;\r
-       fields[1].in_check_mask = NULL;\r
-\r
-       jtag_add_dr_scan(2, fields, -1);\r
-\r
-       jtag_add_runtest(0, -1);\r
-       \r
-#ifdef _DEBUG_INSTRUCTION_EXECUTION_\r
-{\r
-               jtag_execute_queue();\r
-               \r
-               if (in)\r
-               {\r
-                       DEBUG("out: 0x%8.8x, in: 0x%8.8x", out, *in);\r
-               }\r
-               else\r
-                       DEBUG("out: 0x%8.8x", out);\r
-}\r
-#endif\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-/* clock the target, reading the databus */\r
-int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)\r
-{\r
-       scan_field_t fields[2];\r
-\r
-       jtag_add_end_state(TAP_PD);\r
-       arm_jtag_scann(jtag_info, 0x1);\r
-       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);\r
-       \r
-       fields[0].device = jtag_info->chain_pos;\r
-       fields[0].num_bits = 1;\r
-       fields[0].out_value = NULL;\r
-       fields[0].out_mask = NULL;\r
-       fields[0].in_value = NULL;\r
-       fields[0].in_check_value = NULL;\r
-       fields[0].in_check_mask = NULL;\r
-       fields[0].in_handler = NULL;\r
-       fields[0].in_handler_priv = NULL;\r
-               \r
-       fields[1].device = jtag_info->chain_pos;\r
-       fields[1].num_bits = 32;\r
-       fields[1].out_value = NULL;\r
-       fields[1].out_mask = NULL;\r
-       fields[1].in_value = NULL;\r
-       fields[1].in_handler = arm_jtag_buf_to_u32_flip;\r
-       fields[1].in_handler_priv = in;\r
-       fields[1].in_check_value = NULL;\r
-       fields[1].in_check_mask = NULL;\r
-\r
-       jtag_add_dr_scan(2, fields, -1);\r
-\r
-       jtag_add_runtest(0, -1);\r
-       \r
-#ifdef _DEBUG_INSTRUCTION_EXECUTION_\r
-{\r
-               jtag_execute_queue();\r
-                       \r
-               if (in)\r
-               {\r
-                       DEBUG("in: 0x%8.8x", *in);\r
-               }\r
-               else\r
-               {\r
-                       ERROR("BUG: called with in == NULL");\r
-               }\r
-}\r
-#endif\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-/* clock the target, and read the databus\r
- * the *in pointer points to a buffer where elements of 'size' bytes\r
- * are stored in big (be==1) or little (be==0) endianness\r
- */ \r
-int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, int be)\r
-{\r
-       scan_field_t fields[2];\r
-\r
-       jtag_add_end_state(TAP_PD);\r
-       arm_jtag_scann(jtag_info, 0x1);\r
-       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);\r
-       \r
-       fields[0].device = jtag_info->chain_pos;\r
-       fields[0].num_bits = 1;\r
-       fields[0].out_value = NULL;\r
-       fields[0].out_mask = NULL;\r
-       fields[0].in_value = NULL;\r
-       fields[0].in_check_value = NULL;\r
-       fields[0].in_check_mask = NULL;\r
-       fields[0].in_handler = NULL;\r
-       fields[0].in_handler_priv = NULL;\r
-               \r
-       fields[1].device = jtag_info->chain_pos;\r
-       fields[1].num_bits = 32;\r
-       fields[1].out_value = NULL;\r
-       fields[1].out_mask = NULL;\r
-       fields[1].in_value = NULL;\r
-       switch (size)\r
-       {\r
-               case 4:\r
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip;\r
-                       break;\r
-               case 2:\r
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip;\r
-                       break;\r
-               case 1:\r
-                       fields[1].in_handler = arm_jtag_buf_to_8_flip;\r
-                       break;\r
-       }\r
-       fields[1].in_handler_priv = in;\r
-       fields[1].in_check_value = NULL;\r
-       fields[1].in_check_mask = NULL;\r
-\r
-       jtag_add_dr_scan(2, fields, -1);\r
-\r
-       jtag_add_runtest(0, -1);\r
-       \r
-#ifdef _DEBUG_INSTRUCTION_EXECUTION_\r
-{\r
-               jtag_execute_queue();\r
-                       \r
-               if (in)\r
-               {\r
-                       DEBUG("in: 0x%8.8x", *in);\r
-               }\r
-               else\r
-               {\r
-                       ERROR("BUG: called with in == NULL");\r
-               }\r
-}\r
-#endif\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-void arm7tdmi_change_to_arm(target_t *target, u32 *r0, u32 *pc)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       \r
-       /* save r0 before using it and put system in ARM state \r
-        * to allow common handling of ARM and THUMB debugging */\r
-       \r
-       /* fetch STR r0, [r0] */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_STR(0, 0), NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* nothing fetched, STR r0, [r0] in Execute (2) */\r
-       arm7tdmi_clock_data_in(jtag_info, r0);\r
-\r
-       /* MOV r0, r15 fetched, STR in Decode */        \r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_MOV(0, 15), NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_STR(0, 0), NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* nothing fetched, STR r0, [r0] in Execute (2) */\r
-       arm7tdmi_clock_data_in(jtag_info, pc);\r
-\r
-       /* use pc-relative LDR to clear r0[1:0] (for switch to ARM mode) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_LDR_PCREL(0), NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* nothing fetched, data for LDR r0, [PC, #0] */\r
-       arm7tdmi_clock_out(jtag_info, 0x0, NULL, 0);\r
-       /* nothing fetched, data from previous cycle is written to register */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       \r
-       /* fetch BX */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_BX(0), NULL, 0);\r
-       /* NOP fetched, BX in Decode, MOV in Execute */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* NOP fetched, BX in Execute (1) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       \r
-       jtag_execute_queue();\r
-       \r
-       /* fix program counter:\r
-        * MOV r0, r15 was the 4th instruction (+6)\r
-        * reading PC in Thumb state gives address of instruction + 4\r
-        */\r
-       *pc -= 0xa;\r
-       \r
-}\r
-\r
-void arm7tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])\r
-{\r
-       int i;\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-               \r
-       /* STMIA r0-15, [r0] at debug speed\r
-        * register values will start to appear on 4th DCLK\r
-        */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), NULL, 0);\r
-\r
-       /* fetch NOP, STM in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, STM in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-\r
-       for (i = 0; i <= 15; i++)\r
-       {\r
-               if (mask & (1 << i))\r
-                       /* nothing fetched, STM still in EXECUTE (1+i cycle) */\r
-                       arm7tdmi_clock_data_in(jtag_info, core_regs[i]);\r
-       }\r
-\r
-}\r
-\r
-void arm7tdmi_read_core_regs_target_buffer(target_t *target, u32 mask, void* buffer, int size)\r
-{\r
-       int i;\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       int be = (target->endianness == TARGET_BIG_ENDIAN) ? 1 : 0;\r
-       u32 *buf_u32 = buffer;\r
-       u16 *buf_u16 = buffer;\r
-       u8 *buf_u8 = buffer;\r
-               \r
-       /* STMIA r0-15, [r0] at debug speed\r
-        * register values will start to appear on 4th DCLK\r
-        */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), NULL, 0);\r
-\r
-       /* fetch NOP, STM in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, STM in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-\r
-       for (i = 0; i <= 15; i++)\r
-       {\r
-               /* nothing fetched, STM still in EXECUTE (1+i cycle), read databus */\r
-               if (mask & (1 << i))\r
-               {\r
-                       switch (size)\r
-                       {\r
-                               case 4:\r
-                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u32++, 4, be);\r
-                                       break;\r
-                               case 2:\r
-                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u16++, 2, be);\r
-                                       break;\r
-                               case 1:\r
-                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u8++, 1, be);\r
-                                       break;\r
-                       }\r
-               }\r
-       }\r
-       \r
-}\r
-\r
-void arm7tdmi_read_xpsr(target_t *target, u32 *xpsr, int spsr)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-               \r
-       /* MRS r0, cpsr */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MRS(0, spsr & 1), NULL, 0);\r
-       \r
-       /* STR r0, [r15] */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STR(0, 15), NULL, 0);\r
-       /* fetch NOP, STR in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, STR in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, STR still in EXECUTE (2nd cycle) */\r
-       arm7tdmi_clock_data_in(jtag_info, xpsr);\r
-\r
-}\r
-\r
-void arm7tdmi_write_xpsr(target_t *target, u32 xpsr, int spsr)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-               \r
-       DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);\r
-\r
-       /* MSR1 fetched */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr & 0xff, 0, 1, spsr), NULL, 0);\r
-       /* MSR2 fetched, MSR1 in DECODE */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff00) >> 8, 0xc, 2, spsr), NULL, 0);\r
-       /* MSR3 fetched, MSR1 in EXECUTE (1), MSR2 in DECODE */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff0000) >> 16, 0x8, 4, spsr), NULL, 0);\r
-       /* nothing fetched, MSR1 in EXECUTE (2) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* MSR4 fetched, MSR2 in EXECUTE (1), MSR3 in DECODE */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff000000) >> 24, 0x4, 8, spsr), NULL, 0);\r
-       /* nothing fetched, MSR2 in EXECUTE (2) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* NOP fetched, MSR3 in EXECUTE (1), MSR4 in DECODE */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, MSR3 in EXECUTE (2) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* NOP fetched, MSR4 in EXECUTE (1) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, MSR4 in EXECUTE (2) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-}\r
-\r
-void arm7tdmi_write_xpsr_im8(target_t *target, u8 xpsr_im, int rot, int spsr)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-               \r
-       DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);\r
-       \r
-       /* MSR fetched */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr_im, rot, 1, spsr), NULL, 0);\r
-       /* NOP fetched, MSR in DECODE */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* NOP fetched, MSR in EXECUTE (1) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, MSR in EXECUTE (2) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       \r
-}\r
-\r
-void arm7tdmi_write_core_regs(target_t *target, u32 mask, u32 core_regs[16])\r
-{\r
-       int i;\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-               \r
-       /* LDMIA r0-15, [r0] at debug speed\r
-       * register values will start to appear on 4th DCLK\r
-       */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, mask & 0xffff, 0, 0), NULL, 0);\r
-\r
-       /* fetch NOP, LDM in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-\r
-       for (i = 0; i <= 15; i++)\r
-       {\r
-               if (mask & (1 << i))\r
-                       /* nothing fetched, LDM still in EXECUTE (1+i cycle) */\r
-                       arm7tdmi_clock_out(jtag_info, core_regs[i], NULL, 0);\r
-       }\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       \r
-}\r
-\r
-void arm7tdmi_load_word_regs(target_t *target, u32 mask)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       /* put system-speed load-multiple into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, mask & 0xffff, 0, 1), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_load_hword_reg(target_t *target, int num)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       \r
-       /* put system-speed load half-word into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDRH_IP(num, 0), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_load_byte_reg(target_t *target, int num)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       /* put system-speed load byte into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDRB_IP(num, 0), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_store_word_regs(target_t *target, u32 mask)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       /* put system-speed store-multiple into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask, 0, 1), NULL, 0);\r
-       \r
-}\r
-\r
-void arm7tdmi_store_hword_reg(target_t *target, int num)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       /* put system-speed store half-word into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STRH_IP(num, 0), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_store_byte_reg(target_t *target, int num)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       /* put system-speed store byte into the pipeline */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_STRB_IP(num, 0), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_write_pc(target_t *target, u32 pc)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       \r
-       /* LDMIA r0-15, [r0] at debug speed\r
-        * register values will start to appear on 4th DCLK\r
-        */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 0x8000, 0, 0), NULL, 0);\r
-       /* fetch NOP, LDM in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, LDM in EXECUTE stage (1st cycle) load register */\r
-       arm7tdmi_clock_out(jtag_info, pc, NULL, 0);\r
-       /* nothing fetched, LDM in EXECUTE stage (2nd cycle) load register */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, LDM in EXECUTE stage (3rd cycle) load register */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, LDM in EXECUTE stage (4th cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, LDM in EXECUTE stage (5th cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-}\r
-\r
-void arm7tdmi_branch_resume(target_t *target)\r
-{\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       \r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_B(0xfffffa, 0), NULL, 0);\r
-\r
-}\r
-\r
-void arm7tdmi_branch_resume_thumb(target_t *target)\r
-{\r
-       DEBUG("-");\r
-       \r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-       reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];\r
-\r
-       /* LDMIA r0, [r0] at debug speed\r
-        * register values will start to appear on 4th DCLK\r
-        */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 0x1, 0, 0), NULL, 0);\r
-\r
-       /* fetch NOP, LDM in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       /* nothing fetched, LDM in EXECUTE stage (2nd cycle) */\r
-       arm7tdmi_clock_out(jtag_info, buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32) | 1, NULL, 0);\r
-       /* nothing fetched, LDM in EXECUTE stage (3rd cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-\r
-       /* Branch and eXchange */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_BX(0), NULL, 0);\r
-       \r
-       embeddedice_read_reg(dbg_stat);\r
-       \r
-       /* fetch NOP, BX in DECODE stage */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-       \r
-       /* target is now in Thumb state */\r
-       embeddedice_read_reg(dbg_stat);\r
-       \r
-       /* fetch NOP, BX in EXECUTE stage (1st cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);\r
-\r
-       /* target is now in Thumb state */\r
-       embeddedice_read_reg(dbg_stat);\r
-\r
-       /* load r0 value */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_LDR_PCREL(0), NULL, 0);\r
-       /* fetch NOP, LDR in Decode */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* fetch NOP, LDR in Execute */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       /* nothing fetched, LDR in EXECUTE stage (2nd cycle) */\r
-       arm7tdmi_clock_out(jtag_info, buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32), NULL, 0);\r
-       /* nothing fetched, LDR in EXECUTE stage (3rd cycle) */\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       \r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);\r
-\r
-       embeddedice_read_reg(dbg_stat);\r
-       \r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 1);\r
-       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_B(0x7f8), NULL, 0);\r
-\r
-}\r
-               \r
-void arm7tdmi_build_reg_cache(target_t *target)\r
-{\r
-       reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);\r
-       /* get pointers to arch-specific information */\r
-       armv4_5_common_t *armv4_5 = target->arch_info;\r
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;\r
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;\r
-\r
-       (*cache_p) = armv4_5_build_reg_cache(target, armv4_5);\r
-       armv4_5->core_cache = (*cache_p);\r
-       \r
-       (*cache_p)->next = embeddedice_build_reg_cache(target, arm7_9);\r
-       arm7_9->eice_cache = (*cache_p)->next;\r
-       \r
-       if (arm7_9->etm_ctx)\r
-       {\r
-               (*cache_p)->next->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx);\r
-               arm7_9->etm_ctx->reg_cache = (*cache_p)->next->next;\r
-       }\r
-}\r
-\r
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target)\r
-{\r
-       \r
-       arm7tdmi_build_reg_cache(target);\r
-       \r
-       return ERROR_OK;\r
-       \r
-}\r
-\r
-int arm7tdmi_quit()\r
-{\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int chain_pos, char *variant)\r
-{\r
-       armv4_5_common_t *armv4_5;\r
-       arm7_9_common_t *arm7_9;\r
-       \r
-       arm7_9 = &arm7tdmi->arm7_9_common;\r
-       armv4_5 = &arm7_9->armv4_5_common;\r
-       \r
-       /* prepare JTAG information for the new target */\r
-       arm7_9->jtag_info.chain_pos = chain_pos;\r
-       arm7_9->jtag_info.scann_size = 4;\r
-       \r
-       /* register arch-specific functions */\r
-       arm7_9->examine_debug_reason = arm7tdmi_examine_debug_reason;\r
-       arm7_9->change_to_arm = arm7tdmi_change_to_arm;\r
-       arm7_9->read_core_regs = arm7tdmi_read_core_regs;\r
-       arm7_9->read_core_regs_target_buffer = arm7tdmi_read_core_regs_target_buffer;\r
-       arm7_9->read_xpsr = arm7tdmi_read_xpsr;\r
-       \r
-       arm7_9->write_xpsr = arm7tdmi_write_xpsr;\r
-       arm7_9->write_xpsr_im8 = arm7tdmi_write_xpsr_im8;\r
-       arm7_9->write_core_regs = arm7tdmi_write_core_regs;\r
-       \r
-       arm7_9->load_word_regs = arm7tdmi_load_word_regs;\r
-       arm7_9->load_hword_reg = arm7tdmi_load_hword_reg;\r
-       arm7_9->load_byte_reg = arm7tdmi_load_byte_reg;\r
-       \r
-       arm7_9->store_word_regs = arm7tdmi_store_word_regs;\r
-       arm7_9->store_hword_reg = arm7tdmi_store_hword_reg;\r
-       arm7_9->store_byte_reg = arm7tdmi_store_byte_reg;\r
-       \r
-       arm7_9->write_pc = arm7tdmi_write_pc;\r
-       arm7_9->branch_resume = arm7tdmi_branch_resume;\r
-       arm7_9->branch_resume_thumb = arm7tdmi_branch_resume_thumb;\r
-       \r
-       arm7_9->enable_single_step = arm7_9_enable_eice_step;\r
-       arm7_9->disable_single_step = arm7_9_disable_eice_step;\r
-               \r
-       arm7_9->pre_debug_entry = NULL;\r
-       arm7_9->post_debug_entry = NULL;\r
-       \r
-       arm7_9->pre_restore_context = NULL;\r
-       arm7_9->post_restore_context = NULL;\r
-       \r
-       /* initialize arch-specific breakpoint handling */\r
-       arm7_9->arm_bkpt = 0xdeeedeee;\r
-       arm7_9->thumb_bkpt = 0xdeee;\r
-       \r
-       arm7_9->sw_bkpts_use_wp = 1;\r
-       arm7_9->sw_bkpts_enabled = 0;\r
-       arm7_9->dbgreq_adjust_pc = 2;\r
-       arm7_9->arch_info = arm7tdmi;\r
-\r
-       arm7tdmi->arch_info = NULL;\r
-       arm7tdmi->common_magic = ARM7TDMI_COMMON_MAGIC;\r
-       \r
-       if (variant)\r
-       {\r
-               arm7tdmi->variant = strdup(variant);\r
-       }\r
-       else\r
-       {\r
-               arm7tdmi->variant = strdup("");\r
-       }\r
-       \r
-       arm7_9_init_arch_info(target, arm7_9);\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-/* target arm7tdmi <endianess> <startup_mode> <chain_pos> <variant> */\r
-int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)\r
-{\r
-       int chain_pos;\r
-       char *variant = NULL;\r
-       arm7tdmi_common_t *arm7tdmi = malloc(sizeof(arm7tdmi_common_t));\r
-\r
-       if (argc < 4)\r
-       {\r
-               ERROR("'target arm7tdmi' requires at least one additional argument");\r
-               exit(-1);\r
-       }\r
-       \r
-       chain_pos = strtoul(args[3], NULL, 0);\r
-       \r
-       if (argc >= 5)\r
-               variant = args[4];\r
-       \r
-       arm7tdmi_init_arch_info(target, arm7tdmi, chain_pos, variant);\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int arm7tdmi_register_commands(struct command_context_s *cmd_ctx)\r
-{\r
-       int retval;\r
-       \r
-       retval = arm7_9_register_commands(cmd_ctx);\r
-       \r
-       return ERROR_OK;\r
-\r
-}\r
-\r
+/***************************************************************************
+ *   Copyright (C) 2005 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   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     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#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_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
+int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
+int arm7tdmi_quit();
+
+/* target function declarations */
+int arm7tdmi_poll(struct target_s *target);
+int arm7tdmi_halt(target_t *target);
+               
+target_type_t arm7tdmi_target =
+{
+       .name = "arm7tdmi",
+
+       .poll = arm7_9_poll,
+       .arch_state = armv4_5_arch_state,
+
+       .target_request_data = arm7_9_target_request_data,
+
+       .halt = arm7_9_halt,
+       .resume = arm7_9_resume,
+       .step = arm7_9_step,
+
+       .assert_reset = arm7_9_assert_reset,
+       .deassert_reset = arm7_9_deassert_reset,
+       .soft_reset_halt = arm7_9_soft_reset_halt,
+       .prepare_reset_halt = arm7_9_prepare_reset_halt,
+
+       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
+       
+       .read_memory = arm7_9_read_memory,
+       .write_memory = arm7_9_write_memory,
+       .bulk_write_memory = arm7_9_bulk_write_memory,
+       .checksum_memory = arm7_9_checksum_memory,
+       
+       .run_algorithm = armv4_5_run_algorithm,
+       
+       .add_breakpoint = arm7_9_add_breakpoint,
+       .remove_breakpoint = arm7_9_remove_breakpoint,
+       .add_watchpoint = arm7_9_add_watchpoint,
+       .remove_watchpoint = arm7_9_remove_watchpoint,
+
+       .register_commands = arm7tdmi_register_commands,
+       .target_command = arm7tdmi_target_command,
+       .init_target = arm7tdmi_init_target,
+       .quit = arm7tdmi_quit
+};
+
+int arm7tdmi_examine_debug_reason(target_t *target)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       
+       /* only check the debug reason if we don't know it already */
+       if ((target->debug_reason != DBG_REASON_DBGRQ)
+                       && (target->debug_reason != DBG_REASON_SINGLESTEP))
+       {
+               scan_field_t fields[2];
+               u8 databus[4];
+               u8 breakpoint;
+               
+               jtag_add_end_state(TAP_PD);
+
+               fields[0].device = arm7_9->jtag_info.chain_pos;
+               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].device = arm7_9->jtag_info.chain_pos;
+               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;
+               
+               arm_jtag_scann(&arm7_9->jtag_info, 0x1);
+               arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
+
+               jtag_add_dr_scan(2, fields, TAP_PD);
+               jtag_execute_queue();
+               
+               fields[0].in_value = NULL;
+               fields[0].out_value = &breakpoint;
+               fields[1].in_value = NULL;
+               fields[1].out_value = databus;
+               
+               jtag_add_dr_scan(2, fields, TAP_PD);
+
+               if (breakpoint & 1)
+                       target->debug_reason = DBG_REASON_WATCHPOINT; 
+               else
+                       target->debug_reason = DBG_REASON_BREAKPOINT; 
+       }
+
+       return ERROR_OK;
+}
+
+/* put an instruction in the ARM7TDMI pipeline or write the data bus, and optionally read data */
+int arm7tdmi_clock_out(arm_jtag_t *jtag_info, u32 out, u32 *in, int breakpoint)
+{
+       scan_field_t fields[2];
+       u8 out_buf[4];
+       u8 breakpoint_buf;
+       
+       buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));
+       buf_set_u32(&breakpoint_buf, 0, 1, breakpoint);
+
+       jtag_add_end_state(TAP_PD);
+       arm_jtag_scann(jtag_info, 0x1);
+       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
+       
+       fields[0].device = jtag_info->chain_pos;
+       fields[0].num_bits = 1;
+       fields[0].out_value = &breakpoint_buf;
+       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].device = jtag_info->chain_pos;
+       fields[1].num_bits = 32;
+       fields[1].out_value = out_buf;
+       fields[1].out_mask = NULL;
+       fields[1].in_value = NULL;
+       if (in)
+       {
+               fields[1].in_handler = arm_jtag_buf_to_u32_flip;
+               fields[1].in_handler_priv = in;
+       }
+       else
+       {
+               fields[1].in_handler = NULL;
+               fields[1].in_handler_priv = NULL;
+       }
+       fields[1].in_check_value = NULL;
+       fields[1].in_check_mask = NULL;
+
+       jtag_add_dr_scan(2, fields, -1);
+
+       jtag_add_runtest(0, -1);
+       
+#ifdef _DEBUG_INSTRUCTION_EXECUTION_
+{
+               jtag_execute_queue();
+               
+               if (in)
+               {
+                       DEBUG("out: 0x%8.8x, in: 0x%8.8x", out, *in);
+               }
+               else
+                       DEBUG("out: 0x%8.8x", out);
+}
+#endif
+
+       return ERROR_OK;
+}
+
+/* clock the target, reading the databus */
+int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
+{
+       scan_field_t fields[2];
+
+       jtag_add_end_state(TAP_PD);
+       arm_jtag_scann(jtag_info, 0x1);
+       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
+       
+       fields[0].device = jtag_info->chain_pos;
+       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].device = jtag_info->chain_pos;
+       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;
+
+       jtag_add_dr_scan(2, fields, -1);
+
+       jtag_add_runtest(0, -1);
+       
+#ifdef _DEBUG_INSTRUCTION_EXECUTION_
+{
+               jtag_execute_queue();
+                       
+               if (in)
+               {
+                       DEBUG("in: 0x%8.8x", *in);
+               }
+               else
+               {
+                       ERROR("BUG: called with in == NULL");
+               }
+}
+#endif
+
+       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
+ */ 
+int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, int be)
+{
+       scan_field_t fields[2];
+
+       jtag_add_end_state(TAP_PD);
+       arm_jtag_scann(jtag_info, 0x1);
+       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
+       
+       fields[0].device = jtag_info->chain_pos;
+       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].device = jtag_info->chain_pos;
+       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;
+
+       jtag_add_dr_scan(2, fields, -1);
+
+       jtag_add_runtest(0, -1);
+       
+#ifdef _DEBUG_INSTRUCTION_EXECUTION_
+{
+               jtag_execute_queue();
+                       
+               if (in)
+               {
+                       DEBUG("in: 0x%8.8x", *in);
+               }
+               else
+               {
+                       ERROR("BUG: called with in == NULL");
+               }
+}
+#endif
+
+       return ERROR_OK;
+}
+
+void arm7tdmi_change_to_arm(target_t *target, u32 *r0, u32 *pc)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       
+       /* save r0 before using it and put system in ARM state 
+        * to allow common handling of ARM and THUMB debugging */
+       
+       /* fetch STR r0, [r0] */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_STR(0, 0), NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* nothing fetched, STR r0, [r0] in Execute (2) */
+       arm7tdmi_clock_data_in(jtag_info, r0);
+
+       /* MOV r0, r15 fetched, STR in Decode */        
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_MOV(0, 15), NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_STR(0, 0), NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* nothing fetched, STR r0, [r0] in Execute (2) */
+       arm7tdmi_clock_data_in(jtag_info, pc);
+
+       /* use pc-relative LDR to clear r0[1:0] (for switch to ARM mode) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_LDR_PCREL(0), NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* nothing fetched, data for LDR r0, [PC, #0] */
+       arm7tdmi_clock_out(jtag_info, 0x0, NULL, 0);
+       /* nothing fetched, data from previous cycle is written to register */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       
+       /* fetch BX */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_BX(0), NULL, 0);
+       /* NOP fetched, BX in Decode, MOV in Execute */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* NOP fetched, BX in Execute (1) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       
+       jtag_execute_queue();
+       
+       /* fix program counter:
+        * MOV r0, r15 was the 4th instruction (+6)
+        * reading PC in Thumb state gives address of instruction + 4
+        */
+       *pc -= 0xa;
+       
+}
+
+void arm7tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])
+{
+       int i;
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+               
+       /* STMIA r0-15, [r0] at debug speed
+        * register values will start to appear on 4th DCLK
+        */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), NULL, 0);
+
+       /* fetch NOP, STM in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, STM in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+
+       for (i = 0; i <= 15; i++)
+       {
+               if (mask & (1 << i))
+                       /* nothing fetched, STM still in EXECUTE (1+i cycle) */
+                       arm7tdmi_clock_data_in(jtag_info, core_regs[i]);
+       }
+
+}
+
+void arm7tdmi_read_core_regs_target_buffer(target_t *target, u32 mask, void* buffer, int size)
+{
+       int i;
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       int be = (target->endianness == TARGET_BIG_ENDIAN) ? 1 : 0;
+       u32 *buf_u32 = buffer;
+       u16 *buf_u16 = buffer;
+       u8 *buf_u8 = buffer;
+               
+       /* STMIA r0-15, [r0] at debug speed
+        * register values will start to appear on 4th DCLK
+        */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), NULL, 0);
+
+       /* fetch NOP, STM in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, STM in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+
+       for (i = 0; i <= 15; i++)
+       {
+               /* nothing fetched, STM still in EXECUTE (1+i cycle), read databus */
+               if (mask & (1 << i))
+               {
+                       switch (size)
+                       {
+                               case 4:
+                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u32++, 4, be);
+                                       break;
+                               case 2:
+                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u16++, 2, be);
+                                       break;
+                               case 1:
+                                       arm7tdmi_clock_data_in_endianness(jtag_info, buf_u8++, 1, be);
+                                       break;
+                       }
+               }
+       }
+       
+}
+
+void arm7tdmi_read_xpsr(target_t *target, u32 *xpsr, int spsr)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+               
+       /* MRS r0, cpsr */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MRS(0, spsr & 1), NULL, 0);
+       
+       /* STR r0, [r15] */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STR(0, 15), NULL, 0);
+       /* fetch NOP, STR in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, STR in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, STR still in EXECUTE (2nd cycle) */
+       arm7tdmi_clock_data_in(jtag_info, xpsr);
+
+}
+
+void arm7tdmi_write_xpsr(target_t *target, u32 xpsr, int spsr)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+               
+       DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);
+
+       /* MSR1 fetched */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr & 0xff, 0, 1, spsr), NULL, 0);
+       /* MSR2 fetched, MSR1 in DECODE */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff00) >> 8, 0xc, 2, spsr), NULL, 0);
+       /* MSR3 fetched, MSR1 in EXECUTE (1), MSR2 in DECODE */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff0000) >> 16, 0x8, 4, spsr), NULL, 0);
+       /* nothing fetched, MSR1 in EXECUTE (2) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* MSR4 fetched, MSR2 in EXECUTE (1), MSR3 in DECODE */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM((xpsr & 0xff000000) >> 24, 0x4, 8, spsr), NULL, 0);
+       /* nothing fetched, MSR2 in EXECUTE (2) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* NOP fetched, MSR3 in EXECUTE (1), MSR4 in DECODE */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, MSR3 in EXECUTE (2) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* NOP fetched, MSR4 in EXECUTE (1) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, MSR4 in EXECUTE (2) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+}
+
+void arm7tdmi_write_xpsr_im8(target_t *target, u8 xpsr_im, int rot, int spsr)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+               
+       DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);
+       
+       /* MSR fetched */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr_im, rot, 1, spsr), NULL, 0);
+       /* NOP fetched, MSR in DECODE */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* NOP fetched, MSR in EXECUTE (1) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, MSR in EXECUTE (2) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       
+}
+
+void arm7tdmi_write_core_regs(target_t *target, u32 mask, u32 core_regs[16])
+{
+       int i;
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+               
+       /* LDMIA r0-15, [r0] at debug speed
+       * register values will start to appear on 4th DCLK
+       */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, mask & 0xffff, 0, 0), NULL, 0);
+
+       /* fetch NOP, LDM in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+
+       for (i = 0; i <= 15; i++)
+       {
+               if (mask & (1 << i))
+                       /* nothing fetched, LDM still in EXECUTE (1+i cycle) */
+                       arm7tdmi_clock_out(jtag_info, core_regs[i], NULL, 0);
+       }
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       
+}
+
+void arm7tdmi_load_word_regs(target_t *target, u32 mask)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       /* put system-speed load-multiple into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, mask & 0xffff, 0, 1), NULL, 0);
+
+}
+
+void arm7tdmi_load_hword_reg(target_t *target, int num)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       
+       /* put system-speed load half-word into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDRH_IP(num, 0), NULL, 0);
+
+}
+
+void arm7tdmi_load_byte_reg(target_t *target, int num)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       /* put system-speed load byte into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDRB_IP(num, 0), NULL, 0);
+
+}
+
+void arm7tdmi_store_word_regs(target_t *target, u32 mask)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       /* put system-speed store-multiple into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask, 0, 1), NULL, 0);
+       
+}
+
+void arm7tdmi_store_hword_reg(target_t *target, int num)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       /* put system-speed store half-word into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STRH_IP(num, 0), NULL, 0);
+
+}
+
+void arm7tdmi_store_byte_reg(target_t *target, int num)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       /* put system-speed store byte into the pipeline */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_STRB_IP(num, 0), NULL, 0);
+
+}
+
+void arm7tdmi_write_pc(target_t *target, u32 pc)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       
+       /* LDMIA r0-15, [r0] at debug speed
+        * register values will start to appear on 4th DCLK
+        */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 0x8000, 0, 0), NULL, 0);
+       /* fetch NOP, LDM in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, LDM in EXECUTE stage (1st cycle) load register */
+       arm7tdmi_clock_out(jtag_info, pc, NULL, 0);
+       /* nothing fetched, LDM in EXECUTE stage (2nd cycle) load register */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, LDM in EXECUTE stage (3rd cycle) load register */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, LDM in EXECUTE stage (4th cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, LDM in EXECUTE stage (5th cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+}
+
+void arm7tdmi_branch_resume(target_t *target)
+{
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_B(0xfffffa, 0), NULL, 0);
+
+}
+
+void arm7tdmi_branch_resume_thumb(target_t *target)
+{
+       DEBUG("-");
+       
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
+
+       /* LDMIA r0, [r0] at debug speed
+        * register values will start to appear on 4th DCLK
+        */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 0x1, 0, 0), NULL, 0);
+
+       /* fetch NOP, LDM in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* fetch NOP, LDM in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       /* nothing fetched, LDM in EXECUTE stage (2nd cycle) */
+       arm7tdmi_clock_out(jtag_info, buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32) | 1, NULL, 0);
+       /* nothing fetched, LDM in EXECUTE stage (3rd cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+
+       /* Branch and eXchange */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_BX(0), NULL, 0);
+       
+       embeddedice_read_reg(dbg_stat);
+       
+       /* fetch NOP, BX in DECODE stage */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+       
+       /* target is now in Thumb state */
+       embeddedice_read_reg(dbg_stat);
+       
+       /* fetch NOP, BX in EXECUTE stage (1st cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_NOP, NULL, 0);
+
+       /* target is now in Thumb state */
+       embeddedice_read_reg(dbg_stat);
+
+       /* load r0 value */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_LDR_PCREL(0), NULL, 0);
+       /* fetch NOP, LDR in Decode */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* fetch NOP, LDR in Execute */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       /* nothing fetched, LDR in EXECUTE stage (2nd cycle) */
+       arm7tdmi_clock_out(jtag_info, buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32), NULL, 0);
+       /* nothing fetched, LDR in EXECUTE stage (3rd cycle) */
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 0);
+
+       embeddedice_read_reg(dbg_stat);
+       
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, NULL, 1);
+       arm7tdmi_clock_out(jtag_info, ARMV4_5_T_B(0x7f8), NULL, 0);
+
+}
+               
+void arm7tdmi_build_reg_cache(target_t *target)
+{
+       reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
+       /* get pointers to arch-specific information */
+       armv4_5_common_t *armv4_5 = target->arch_info;
+       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+
+       (*cache_p) = armv4_5_build_reg_cache(target, armv4_5);
+       armv4_5->core_cache = (*cache_p);
+       
+       (*cache_p)->next = embeddedice_build_reg_cache(target, arm7_9);
+       arm7_9->eice_cache = (*cache_p)->next;
+       
+       if (arm7_9->etm_ctx)
+       {
+               (*cache_p)->next->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx);
+               arm7_9->etm_ctx->reg_cache = (*cache_p)->next->next;
+       }
+}
+
+int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
+{
+       
+       arm7tdmi_build_reg_cache(target);
+       
+       return ERROR_OK;
+       
+}
+
+int arm7tdmi_quit()
+{
+       
+       return ERROR_OK;
+}
+
+int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int chain_pos, char *variant)
+{
+       armv4_5_common_t *armv4_5;
+       arm7_9_common_t *arm7_9;
+       
+       arm7_9 = &arm7tdmi->arm7_9_common;
+       armv4_5 = &arm7_9->armv4_5_common;
+       
+       /* prepare JTAG information for the new target */
+       arm7_9->jtag_info.chain_pos = chain_pos;
+       arm7_9->jtag_info.scann_size = 4;
+       
+       /* register arch-specific functions */
+       arm7_9->examine_debug_reason = arm7tdmi_examine_debug_reason;
+       arm7_9->change_to_arm = arm7tdmi_change_to_arm;
+       arm7_9->read_core_regs = arm7tdmi_read_core_regs;
+       arm7_9->read_core_regs_target_buffer = arm7tdmi_read_core_regs_target_buffer;
+       arm7_9->read_xpsr = arm7tdmi_read_xpsr;
+       
+       arm7_9->write_xpsr = arm7tdmi_write_xpsr;
+       arm7_9->write_xpsr_im8 = arm7tdmi_write_xpsr_im8;
+       arm7_9->write_core_regs = arm7tdmi_write_core_regs;
+       
+       arm7_9->load_word_regs = arm7tdmi_load_word_regs;
+       arm7_9->load_hword_reg = arm7tdmi_load_hword_reg;
+       arm7_9->load_byte_reg = arm7tdmi_load_byte_reg;
+       
+       arm7_9->store_word_regs = arm7tdmi_store_word_regs;
+       arm7_9->store_hword_reg = arm7tdmi_store_hword_reg;
+       arm7_9->store_byte_reg = arm7tdmi_store_byte_reg;
+       
+       arm7_9->write_pc = arm7tdmi_write_pc;
+       arm7_9->branch_resume = arm7tdmi_branch_resume;
+       arm7_9->branch_resume_thumb = arm7tdmi_branch_resume_thumb;
+       
+       arm7_9->enable_single_step = arm7_9_enable_eice_step;
+       arm7_9->disable_single_step = arm7_9_disable_eice_step;
+               
+       arm7_9->pre_debug_entry = NULL;
+       arm7_9->post_debug_entry = NULL;
+       
+       arm7_9->pre_restore_context = NULL;
+       arm7_9->post_restore_context = NULL;
+       
+       /* initialize arch-specific breakpoint handling */
+       arm7_9->arm_bkpt = 0xdeeedeee;
+       arm7_9->thumb_bkpt = 0xdeee;
+       
+       arm7_9->sw_bkpts_use_wp = 1;
+       arm7_9->sw_bkpts_enabled = 0;
+       arm7_9->dbgreq_adjust_pc = 2;
+       arm7_9->arch_info = arm7tdmi;
+
+       arm7tdmi->arch_info = NULL;
+       arm7tdmi->common_magic = ARM7TDMI_COMMON_MAGIC;
+       
+       if (variant)
+       {
+               arm7tdmi->variant = strdup(variant);
+       }
+       else
+       {
+               arm7tdmi->variant = strdup("");
+       }
+       
+       arm7_9_init_arch_info(target, arm7_9);
+
+       return ERROR_OK;
+}
+
+/* target arm7tdmi <endianess> <startup_mode> <chain_pos> <variant> */
+int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
+{
+       int chain_pos;
+       char *variant = NULL;
+       arm7tdmi_common_t *arm7tdmi = malloc(sizeof(arm7tdmi_common_t));
+
+       if (argc < 4)
+       {
+               ERROR("'target arm7tdmi' requires at least one additional argument");
+               exit(-1);
+       }
+       
+       chain_pos = strtoul(args[3], NULL, 0);
+       
+       if (argc >= 5)
+               variant = args[4];
+       
+       arm7tdmi_init_arch_info(target, arm7tdmi, chain_pos, variant);
+       
+       return ERROR_OK;
+}
+
+int arm7tdmi_register_commands(struct command_context_s *cmd_ctx)
+{
+       int retval;
+       
+       retval = arm7_9_register_commands(cmd_ctx);
+       
+       return ERROR_OK;
+
+}
+