scan_field_t -> struct scan_field
[fw/openocd] / src / target / arm11.c
index 05b6112e87e9f8844c8520ff32a4b8c193391bdc..23185488dc6bdf8362c1d843932f54f6fdd2a3b3 100644 (file)
@@ -1,5 +1,10 @@
 /***************************************************************************
  *   Copyright (C) 2008 digenius technology GmbH.                          *
+ *   Michael Bruck                                                         *
+ *                                                                         *
+ *   Copyright (C) 2008,2009 Oyvind Harboe oyvind.harboe@zylin.com         *
+ *                                                                         *
+ *   Copyright (C) 2008 Georg Acher <acher@in.tum.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  *
 #endif
 
 #include "arm11.h"
-#include "jtag.h"
-#include "log.h"
+#include "arm11_dbgtap.h"
+#include "armv4_5.h"
+#include "arm_simulator.h"
+#include "time_support.h"
+#include "target_type.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-
 #if 0
-#define FNC_INFO    DEBUG("-")
+#define FNC_INFO       LOG_DEBUG("-")
 #else
 #define FNC_INFO
 #endif
 
 #if 1
-#define FNC_INFO_NOTIMPLEMENTED    do { DEBUG("NOT IMPLEMENTED"); /*exit(-1);*/ } while (0)
+#define FNC_INFO_NOTIMPLEMENTED do { LOG_DEBUG("NOT IMPLEMENTED"); /*exit(-1);*/ } while (0)
 #else
 #define FNC_INFO_NOTIMPLEMENTED
 #endif
 
-static void arm11_on_enter_debug_state(arm11_common_t * arm11);
-
-
-int    arm11_config_memwrite_burst             = 1;
-int    arm11_config_memwrite_error_fatal       = 1;
-u32    arm11_vcr                               = 0;
-
-
-#define ARM11_HANDLER(x)       \
-    .x                         = arm11_##x
-
-target_type_t arm11_target =
-{
-    .name                      = "arm11",
-
-    ARM11_HANDLER(poll),
-    ARM11_HANDLER(arch_state),
-
-    ARM11_HANDLER(target_request_data),
-
-    ARM11_HANDLER(halt),
-    ARM11_HANDLER(resume),
-    ARM11_HANDLER(step),
-
-    ARM11_HANDLER(assert_reset),
-    ARM11_HANDLER(deassert_reset),
-    ARM11_HANDLER(soft_reset_halt),
-    ARM11_HANDLER(prepare_reset_halt),
-       
-    ARM11_HANDLER(get_gdb_reg_list),
-       
-    ARM11_HANDLER(read_memory),
-    ARM11_HANDLER(write_memory),
-       
-    ARM11_HANDLER(bulk_write_memory),
-       
-    ARM11_HANDLER(checksum_memory),
-
-    ARM11_HANDLER(add_breakpoint),
-    ARM11_HANDLER(remove_breakpoint),
-    ARM11_HANDLER(add_watchpoint),
-    ARM11_HANDLER(remove_watchpoint),
-
-    ARM11_HANDLER(run_algorithm),
-       
-    ARM11_HANDLER(register_commands),
-    ARM11_HANDLER(target_command),
-    ARM11_HANDLER(init_target),
-    ARM11_HANDLER(quit),
-};
-
-int arm11_regs_arch_type = -1;
+static bool arm11_config_memwrite_burst = true;
+static bool arm11_config_memwrite_error_fatal = true;
+static uint32_t arm11_vcr = 0;
+static bool arm11_config_step_irq_enable = false;
+static bool arm11_config_hardware_step = false;
 
+static int arm11_regs_arch_type = -1;
 
 enum arm11_regtype
 {
-    ARM11_REGISTER_CORE,
-    ARM11_REGISTER_CPSR,
-
-    ARM11_REGISTER_FX,
-    ARM11_REGISTER_FPS,
-
-    ARM11_REGISTER_FIQ,
-    ARM11_REGISTER_SVC,
-    ARM11_REGISTER_ABT,
-    ARM11_REGISTER_IRQ,
-    ARM11_REGISTER_UND,
-    ARM11_REGISTER_MON,
-
-    ARM11_REGISTER_SPSR_FIQ,
-    ARM11_REGISTER_SPSR_SVC,
-    ARM11_REGISTER_SPSR_ABT,
-    ARM11_REGISTER_SPSR_IRQ,
-    ARM11_REGISTER_SPSR_UND,
-    ARM11_REGISTER_SPSR_MON,
-
-    /* debug regs */
-    ARM11_REGISTER_DSCR,
-    ARM11_REGISTER_WDTR,
-    ARM11_REGISTER_RDTR,
+       ARM11_REGISTER_CORE,
+       ARM11_REGISTER_CPSR,
+
+       ARM11_REGISTER_FX,
+       ARM11_REGISTER_FPS,
+
+       ARM11_REGISTER_FIQ,
+       ARM11_REGISTER_SVC,
+       ARM11_REGISTER_ABT,
+       ARM11_REGISTER_IRQ,
+       ARM11_REGISTER_UND,
+       ARM11_REGISTER_MON,
+
+       ARM11_REGISTER_SPSR_FIQ,
+       ARM11_REGISTER_SPSR_SVC,
+       ARM11_REGISTER_SPSR_ABT,
+       ARM11_REGISTER_SPSR_IRQ,
+       ARM11_REGISTER_SPSR_UND,
+       ARM11_REGISTER_SPSR_MON,
+
+       /* debug regs */
+       ARM11_REGISTER_DSCR,
+       ARM11_REGISTER_WDTR,
+       ARM11_REGISTER_RDTR,
 };
 
 
 typedef struct arm11_reg_defs_s
 {
-    char *                     name;
-    u32                                num;
-    int                                gdb_num;
-    enum arm11_regtype         type;
+       char *                                  name;
+       uint32_t                                                num;
+       int                                             gdb_num;
+       enum arm11_regtype              type;
 } arm11_reg_defs_t;
 
 /* update arm11_regcache_ids when changing this */
 static const arm11_reg_defs_t arm11_reg_defs[] =
 {
-    {"r0",     0,      0,      ARM11_REGISTER_CORE},
-    {"r1",     1,      1,      ARM11_REGISTER_CORE},
-    {"r2",     2,      2,      ARM11_REGISTER_CORE},
-    {"r3",     3,      3,      ARM11_REGISTER_CORE},
-    {"r4",     4,      4,      ARM11_REGISTER_CORE},
-    {"r5",     5,      5,      ARM11_REGISTER_CORE},
-    {"r6",     6,      6,      ARM11_REGISTER_CORE},
-    {"r7",     7,      7,      ARM11_REGISTER_CORE},
-    {"r8",     8,      8,      ARM11_REGISTER_CORE},
-    {"r9",     9,      9,      ARM11_REGISTER_CORE},
-    {"r10",    10,     10,     ARM11_REGISTER_CORE},
-    {"r11",    11,     11,     ARM11_REGISTER_CORE},
-    {"r12",    12,     12,     ARM11_REGISTER_CORE},
-    {"sp",     13,     13,     ARM11_REGISTER_CORE},
-    {"lr",     14,     14,     ARM11_REGISTER_CORE},
-    {"pc",     15,     15,     ARM11_REGISTER_CORE},
+       {"r0",  0,      0,      ARM11_REGISTER_CORE},
+       {"r1",  1,      1,      ARM11_REGISTER_CORE},
+       {"r2",  2,      2,      ARM11_REGISTER_CORE},
+       {"r3",  3,      3,      ARM11_REGISTER_CORE},
+       {"r4",  4,      4,      ARM11_REGISTER_CORE},
+       {"r5",  5,      5,      ARM11_REGISTER_CORE},
+       {"r6",  6,      6,      ARM11_REGISTER_CORE},
+       {"r7",  7,      7,      ARM11_REGISTER_CORE},
+       {"r8",  8,      8,      ARM11_REGISTER_CORE},
+       {"r9",  9,      9,      ARM11_REGISTER_CORE},
+       {"r10", 10,     10,     ARM11_REGISTER_CORE},
+       {"r11", 11,     11,     ARM11_REGISTER_CORE},
+       {"r12", 12,     12,     ARM11_REGISTER_CORE},
+       {"sp",  13,     13,     ARM11_REGISTER_CORE},
+       {"lr",  14,     14,     ARM11_REGISTER_CORE},
+       {"pc",  15,     15,     ARM11_REGISTER_CORE},
 
 #if ARM11_REGCACHE_FREGS
-    {"f0",     0,      16,     ARM11_REGISTER_FX},
-    {"f1",     1,      17,     ARM11_REGISTER_FX},
-    {"f2",     2,      18,     ARM11_REGISTER_FX},
-    {"f3",     3,      19,     ARM11_REGISTER_FX},
-    {"f4",     4,      20,     ARM11_REGISTER_FX},
-    {"f5",     5,      21,     ARM11_REGISTER_FX},
-    {"f6",     6,      22,     ARM11_REGISTER_FX},
-    {"f7",     7,      23,     ARM11_REGISTER_FX},
-    {"fps",    0,      24,     ARM11_REGISTER_FPS},
+       {"f0",  0,      16,     ARM11_REGISTER_FX},
+       {"f1",  1,      17,     ARM11_REGISTER_FX},
+       {"f2",  2,      18,     ARM11_REGISTER_FX},
+       {"f3",  3,      19,     ARM11_REGISTER_FX},
+       {"f4",  4,      20,     ARM11_REGISTER_FX},
+       {"f5",  5,      21,     ARM11_REGISTER_FX},
+       {"f6",  6,      22,     ARM11_REGISTER_FX},
+       {"f7",  7,      23,     ARM11_REGISTER_FX},
+       {"fps", 0,      24,     ARM11_REGISTER_FPS},
 #endif
 
-    {"cpsr",   0,      25,     ARM11_REGISTER_CPSR},
+       {"cpsr",        0,      25,     ARM11_REGISTER_CPSR},
 
 #if ARM11_REGCACHE_MODEREGS
-    {"r8_fiq", 8,      -1,     ARM11_REGISTER_FIQ},
-    {"r9_fiq", 9,      -1,     ARM11_REGISTER_FIQ},
-    {"r10_fiq",        10,     -1,     ARM11_REGISTER_FIQ},
-    {"r11_fiq",        11,     -1,     ARM11_REGISTER_FIQ},
-    {"r12_fiq",        12,     -1,     ARM11_REGISTER_FIQ},
-    {"r13_fiq",        13,     -1,     ARM11_REGISTER_FIQ},
-    {"r14_fiq",        14,     -1,     ARM11_REGISTER_FIQ},
-    {"spsr_fiq", 0,    -1,     ARM11_REGISTER_SPSR_FIQ},
-
-    {"r13_svc",        13,     -1,     ARM11_REGISTER_SVC},
-    {"r14_svc",        14,     -1,     ARM11_REGISTER_SVC},
-    {"spsr_svc", 0,    -1,     ARM11_REGISTER_SPSR_SVC},
-
-    {"r13_abt",        13,     -1,     ARM11_REGISTER_ABT},
-    {"r14_abt",        14,     -1,     ARM11_REGISTER_ABT},
-    {"spsr_abt", 0,    -1,     ARM11_REGISTER_SPSR_ABT},
-
-    {"r13_irq",        13,     -1,     ARM11_REGISTER_IRQ},
-    {"r14_irq",        14,     -1,     ARM11_REGISTER_IRQ},
-    {"spsr_irq", 0,    -1,     ARM11_REGISTER_SPSR_IRQ},
-
-    {"r13_und",        13,     -1,     ARM11_REGISTER_UND},
-    {"r14_und",        14,     -1,     ARM11_REGISTER_UND},
-    {"spsr_und", 0,    -1,     ARM11_REGISTER_SPSR_UND},
-
-    /* ARM1176 only */
-    {"r13_mon",        13,     -1,     ARM11_REGISTER_MON},
-    {"r14_mon",        14,     -1,     ARM11_REGISTER_MON},
-    {"spsr_mon", 0,    -1,     ARM11_REGISTER_SPSR_MON},
+       {"r8_fiq",      8,      -1,     ARM11_REGISTER_FIQ},
+       {"r9_fiq",      9,      -1,     ARM11_REGISTER_FIQ},
+       {"r10_fiq",     10,     -1,     ARM11_REGISTER_FIQ},
+       {"r11_fiq",     11,     -1,     ARM11_REGISTER_FIQ},
+       {"r12_fiq",     12,     -1,     ARM11_REGISTER_FIQ},
+       {"r13_fiq",     13,     -1,     ARM11_REGISTER_FIQ},
+       {"r14_fiq",     14,     -1,     ARM11_REGISTER_FIQ},
+       {"spsr_fiq", 0, -1,     ARM11_REGISTER_SPSR_FIQ},
+
+       {"r13_svc",     13,     -1,     ARM11_REGISTER_SVC},
+       {"r14_svc",     14,     -1,     ARM11_REGISTER_SVC},
+       {"spsr_svc", 0, -1,     ARM11_REGISTER_SPSR_SVC},
+
+       {"r13_abt",     13,     -1,     ARM11_REGISTER_ABT},
+       {"r14_abt",     14,     -1,     ARM11_REGISTER_ABT},
+       {"spsr_abt", 0, -1,     ARM11_REGISTER_SPSR_ABT},
+
+       {"r13_irq",     13,     -1,     ARM11_REGISTER_IRQ},
+       {"r14_irq",     14,     -1,     ARM11_REGISTER_IRQ},
+       {"spsr_irq", 0, -1,     ARM11_REGISTER_SPSR_IRQ},
+
+       {"r13_und",     13,     -1,     ARM11_REGISTER_UND},
+       {"r14_und",     14,     -1,     ARM11_REGISTER_UND},
+       {"spsr_und", 0, -1,     ARM11_REGISTER_SPSR_UND},
+
+       /* ARM1176 only */
+       {"r13_mon",     13,     -1,     ARM11_REGISTER_MON},
+       {"r14_mon",     14,     -1,     ARM11_REGISTER_MON},
+       {"spsr_mon", 0, -1,     ARM11_REGISTER_SPSR_MON},
 #endif
 
-    /* Debug Registers */
-    {"dscr",   0,      -1,     ARM11_REGISTER_DSCR},
-    {"wdtr",   0,      -1,     ARM11_REGISTER_WDTR},
-    {"rdtr",   0,      -1,     ARM11_REGISTER_RDTR},
+       /* Debug Registers */
+       {"dscr",        0,      -1,     ARM11_REGISTER_DSCR},
+       {"wdtr",        0,      -1,     ARM11_REGISTER_WDTR},
+       {"rdtr",        0,      -1,     ARM11_REGISTER_RDTR},
 };
 
 enum arm11_regcache_ids
 {
-    ARM11_RC_R0,
-    ARM11_RC_RX                        = ARM11_RC_R0,
-
-    ARM11_RC_R1,
-    ARM11_RC_R2,
-    ARM11_RC_R3,
-    ARM11_RC_R4,
-    ARM11_RC_R5,
-    ARM11_RC_R6,
-    ARM11_RC_R7,
-    ARM11_RC_R8,
-    ARM11_RC_R9,
-    ARM11_RC_R10,
-    ARM11_RC_R11,
-    ARM11_RC_R12,
-    ARM11_RC_R13,
-    ARM11_RC_SP                        = ARM11_RC_R13,
-    ARM11_RC_R14,
-    ARM11_RC_LR                        = ARM11_RC_R14,
-    ARM11_RC_R15,
-    ARM11_RC_PC                        = ARM11_RC_R15,
+       ARM11_RC_R0,
+       ARM11_RC_RX                     = ARM11_RC_R0,
+
+       ARM11_RC_R1,
+       ARM11_RC_R2,
+       ARM11_RC_R3,
+       ARM11_RC_R4,
+       ARM11_RC_R5,
+       ARM11_RC_R6,
+       ARM11_RC_R7,
+       ARM11_RC_R8,
+       ARM11_RC_R9,
+       ARM11_RC_R10,
+       ARM11_RC_R11,
+       ARM11_RC_R12,
+       ARM11_RC_R13,
+       ARM11_RC_SP                     = ARM11_RC_R13,
+       ARM11_RC_R14,
+       ARM11_RC_LR                     = ARM11_RC_R14,
+       ARM11_RC_R15,
+       ARM11_RC_PC                     = ARM11_RC_R15,
 
 #if ARM11_REGCACHE_FREGS
-    ARM11_RC_F0,
-    ARM11_RC_FX                        = ARM11_RC_F0,
-    ARM11_RC_F1,
-    ARM11_RC_F2,
-    ARM11_RC_F3,
-    ARM11_RC_F4,
-    ARM11_RC_F5,
-    ARM11_RC_F6,
-    ARM11_RC_F7,
-    ARM11_RC_FPS,
+       ARM11_RC_F0,
+       ARM11_RC_FX                     = ARM11_RC_F0,
+       ARM11_RC_F1,
+       ARM11_RC_F2,
+       ARM11_RC_F3,
+       ARM11_RC_F4,
+       ARM11_RC_F5,
+       ARM11_RC_F6,
+       ARM11_RC_F7,
+       ARM11_RC_FPS,
 #endif
 
-    ARM11_RC_CPSR,
+       ARM11_RC_CPSR,
 
 #if ARM11_REGCACHE_MODEREGS
-    ARM11_RC_R8_FIQ,
-    ARM11_RC_R9_FIQ,
-    ARM11_RC_R10_FIQ,
-    ARM11_RC_R11_FIQ,
-    ARM11_RC_R12_FIQ,
-    ARM11_RC_R13_FIQ,
-    ARM11_RC_R14_FIQ,
-    ARM11_RC_SPSR_FIQ,
-
-    ARM11_RC_R13_SVC,
-    ARM11_RC_R14_SVC,
-    ARM11_RC_SPSR_SVC,
-
-    ARM11_RC_R13_ABT,
-    ARM11_RC_R14_ABT,
-    ARM11_RC_SPSR_ABT,
-
-    ARM11_RC_R13_IRQ,
-    ARM11_RC_R14_IRQ,
-    ARM11_RC_SPSR_IRQ,
-
-    ARM11_RC_R13_UND,
-    ARM11_RC_R14_UND,
-    ARM11_RC_SPSR_UND,
-
-    ARM11_RC_R13_MON,
-    ARM11_RC_R14_MON,
-    ARM11_RC_SPSR_MON,
+       ARM11_RC_R8_FIQ,
+       ARM11_RC_R9_FIQ,
+       ARM11_RC_R10_FIQ,
+       ARM11_RC_R11_FIQ,
+       ARM11_RC_R12_FIQ,
+       ARM11_RC_R13_FIQ,
+       ARM11_RC_R14_FIQ,
+       ARM11_RC_SPSR_FIQ,
+
+       ARM11_RC_R13_SVC,
+       ARM11_RC_R14_SVC,
+       ARM11_RC_SPSR_SVC,
+
+       ARM11_RC_R13_ABT,
+       ARM11_RC_R14_ABT,
+       ARM11_RC_SPSR_ABT,
+
+       ARM11_RC_R13_IRQ,
+       ARM11_RC_R14_IRQ,
+       ARM11_RC_SPSR_IRQ,
+
+       ARM11_RC_R13_UND,
+       ARM11_RC_R14_UND,
+       ARM11_RC_SPSR_UND,
+
+       ARM11_RC_R13_MON,
+       ARM11_RC_R14_MON,
+       ARM11_RC_SPSR_MON,
 #endif
 
-    ARM11_RC_DSCR,
-    ARM11_RC_WDTR,
-    ARM11_RC_RDTR,
+       ARM11_RC_DSCR,
+       ARM11_RC_WDTR,
+       ARM11_RC_RDTR,
 
-
-    ARM11_RC_MAX,
+       ARM11_RC_MAX,
 };
 
 #define ARM11_GDB_REGISTER_COUNT       26
 
-u8 arm11_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static uint8_t arm11_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-reg_t arm11_gdb_dummy_fp_reg =
+static reg_t arm11_gdb_dummy_fp_reg =
 {
-    "GDB dummy floating-point register", arm11_gdb_dummy_fp_value, 0, 1, 96, NULL, 0, NULL, 0
+       "GDB dummy floating-point register", arm11_gdb_dummy_fp_value, 0, 1, 96, NULL, 0, NULL, 0
 };
 
-u8 arm11_gdb_dummy_fps_value[] = {0, 0, 0, 0};
+static uint8_t arm11_gdb_dummy_fps_value[] = {0, 0, 0, 0};
 
-reg_t arm11_gdb_dummy_fps_reg =
+static reg_t arm11_gdb_dummy_fps_reg =
 {
-    "GDB dummy floating-point status register", arm11_gdb_dummy_fps_value, 0, 1, 32, NULL, 0, NULL, 0
+       "GDB dummy floating-point status register", arm11_gdb_dummy_fps_value, 0, 1, 32, NULL, 0, NULL, 0
 };
 
 
+static int arm11_on_enter_debug_state(arm11_common_t *arm11);
+static int arm11_step(struct target_s *target, int current,
+               uint32_t address, int handle_breakpoints);
+/* helpers */
+static int arm11_build_reg_cache(target_t *target);
+static int arm11_set_reg(reg_t *reg, uint8_t *buf);
+static int arm11_get_reg(reg_t *reg);
+
+static void arm11_record_register_history(arm11_common_t * arm11);
+static void arm11_dump_reg_changes(arm11_common_t * arm11);
+
 
 /** Check and if necessary take control of the system
  *
  * \param arm11                Target state variable.
  * \param dscr         If the current DSCR content is
- *                     available a pointer to a word holding the
- *                     DSCR can be passed. Otherwise use NULL.
+ *                                     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)
+static int arm11_check_init(arm11_common_t *arm11, uint32_t *dscr)
 {
-    FNC_INFO;
+       FNC_INFO;
 
-    u32                        dscr_local_tmp_copy;
+       uint32_t                        dscr_local_tmp_copy;
 
-    if (!dscr)
-    {
-       dscr = &dscr_local_tmp_copy;
-       *dscr = arm11_read_DSCR(arm11);
-    }
+       if (!dscr)
+       {
+               dscr = &dscr_local_tmp_copy;
 
-    if (!(*dscr & ARM11_DSCR_MODE_SELECT))
-    {
-       DEBUG("Bringing target into debug mode");
+               CHECK_RETVAL(arm11_read_DSCR(arm11, dscr));
+       }
 
-       *dscr |= ARM11_DSCR_MODE_SELECT;                /* Halt debug-mode */
-       arm11_write_DSCR(arm11, *dscr);
+       if (!(*dscr & ARM11_DSCR_MODE_SELECT))
+       {
+               LOG_DEBUG("Bringing target into debug mode");
 
-       /* add further reset initialization here */
+               *dscr |= ARM11_DSCR_MODE_SELECT;                /* Halt debug-mode */
+               arm11_write_DSCR(arm11, *dscr);
 
-       if (*dscr & ARM11_DSCR_CORE_HALTED)
-       {
-           arm11->target->state        = TARGET_HALTED;
-           arm11->target->debug_reason = arm11_get_DSCR_debug_reason(*dscr);
-       }
-       else
-       {
-           arm11->target->state        = TARGET_RUNNING;
-           arm11->target->debug_reason = DBG_REASON_NOTHALTED;
+               /* add further reset initialization here */
+
+               arm11->simulate_reset_on_next_halt = true;
+
+               if (*dscr & ARM11_DSCR_CORE_HALTED)
+               {
+                       /** \todo TODO: this needs further scrutiny because
+                         * arm11_on_enter_debug_state() never gets properly called.
+                         * As a result we don't read the actual register states from
+                         * the target.
+                         */
+
+                       arm11->target->state    = TARGET_HALTED;
+                       arm11->target->debug_reason     = arm11_get_DSCR_debug_reason(*dscr);
+               }
+               else
+               {
+                       arm11->target->state    = TARGET_RUNNING;
+                       arm11->target->debug_reason     = DBG_REASON_NOTHALTED;
+               }
+
+               arm11_sc7_clear_vbw(arm11);
        }
 
-       arm11_sc7_clear_vbw(arm11);
-    }
+       return ERROR_OK;
 }
 
 
 
 #define R(x) \
-    (arm11->reg_values[ARM11_RC_##x])
+       (arm11->reg_values[ARM11_RC_##x])
 
 /** Save processor state.
   *
@@ -358,1262 +338,1951 @@ void arm11_check_init(arm11_common_t * arm11, u32 * dscr)
   * 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;
+       int retval;
+       FNC_INFO;
 
-    {size_t i;
-    for(i = 0; i < asizeof(arm11->reg_values); i++)
-    {
-       arm11->reg_list[i].valid        = 1;
-       arm11->reg_list[i].dirty        = 0;
-    }}
-
-    /* Save DSCR */
+       for (size_t i = 0; i < asizeof(arm11->reg_values); i++)
+       {
+               arm11->reg_list[i].valid        = 1;
+               arm11->reg_list[i].dirty        = 0;
+       }
 
-    R(DSCR) = arm11_read_DSCR(arm11);
+       /* Save DSCR */
+       CHECK_RETVAL(arm11_read_DSCR(arm11, &R(DSCR)));
 
-    /* Save wDTR */
+       /* Save wDTR */
 
-    if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
-    {
-       arm11_add_debug_SCAN_N(arm11, 0x05, -1);
+       if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
+       {
+               arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
 
-       arm11_add_IR(arm11, ARM11_INTEST, -1);
+               arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
 
-       scan_field_t    chain5_fields[3];
+               struct scan_field       chain5_fields[3];
 
-       arm11_setup_field(arm11, 32, NULL, &R(WDTR),    chain5_fields + 0);
-       arm11_setup_field(arm11,  1, NULL, NULL,        chain5_fields + 1);
-       arm11_setup_field(arm11,  1, NULL, NULL,        chain5_fields + 2);
+               arm11_setup_field(arm11, 32, NULL, &R(WDTR),    chain5_fields + 0);
+               arm11_setup_field(arm11,  1, NULL, NULL,                chain5_fields + 1);
+               arm11_setup_field(arm11,  1, NULL, NULL,                chain5_fields + 2);
 
-       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_PD);
-    }
-    else
-    {
-       arm11->reg_list[ARM11_RC_WDTR].valid    = 0;
-    }
+               arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
+       }
+       else
+       {
+               arm11->reg_list[ARM11_RC_WDTR].valid    = 0;
+       }
 
 
-    /* DSCR: set ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE */
-    /* ARM1176 spec says this is needed only for wDTR/rDTR's "ITR mode", but not to issue ITRs
-       ARM1136 seems to require this to issue ITR's as well */
+       /* DSCR: set ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE */
+       /* ARM1176 spec says this is needed only for wDTR/rDTR's "ITR mode", but not to issue ITRs
+          ARM1136 seems to require this to issue ITR's as well */
 
-    u32 new_dscr = R(DSCR) | ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE;
+       uint32_t new_dscr = R(DSCR) | ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE;
 
-    /* this executes JTAG queue: */ 
+       /* this executes JTAG queue: */
 
-    arm11_write_DSCR(arm11, new_dscr);
+       arm11_write_DSCR(arm11, new_dscr);
 
-//    jtag_execute_queue();
 
+       /* From the spec:
+          Before executing any instruction in debug state you have to drain the write buffer.
+          This ensures that no imprecise Data Aborts can return at a later point:*/
 
+       /** \todo TODO: Test drain write buffer. */
 
-//    DEBUG("SAVE DSCR %08x", R(DSCR));
+#if 0
+       while (1)
+       {
+               /* MRC p14,0,R0,c5,c10,0 */
+               //      arm11_run_instr_no_data1(arm11, /*0xee150e1a*/0xe320f000);
 
-//    if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
-//     DEBUG("SAVE wDTR %08x", R(WDTR));
+               /* mcr     15, 0, r0, cr7, cr10, {4} */
+               arm11_run_instr_no_data1(arm11, 0xee070f9a);
 
+               uint32_t dscr = arm11_read_DSCR(arm11);
 
-    /* From the spec:
-       Before executing any instruction in debug state you have to drain the write buffer.
-        This ensures that no imprecise Data Aborts can return at a later point:*/
+               LOG_DEBUG("DRAIN, DSCR %08x", dscr);
 
-    /** \todo TODO: Test drain write buffer. */
+               if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT)
+               {
+                       arm11_run_instr_no_data1(arm11, 0xe320f000);
 
-#if 0
-    while (1)
-    {
-       /* MRC p14,0,R0,c5,c10,0 */
-//     arm11_run_instr_no_data1(arm11, /*0xee150e1a*/0xe320f000);
+                       dscr = arm11_read_DSCR(arm11);
 
-       /* mcr     15, 0, r0, cr7, cr10, {4} */
-       arm11_run_instr_no_data1(arm11, 0xee070f9a);
-               
-       u32 dscr = arm11_read_DSCR(arm11);
+                       LOG_DEBUG("DRAIN, DSCR %08x (DONE)", dscr);
 
-       DEBUG("DRAIN, DSCR %08x", dscr);
+                       break;
+               }
+       }
+#endif
 
-       if (dscr & ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT)
-       {
-           arm11_run_instr_no_data1(arm11, 0xe320f000);
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-           dscr = arm11_read_DSCR(arm11);
+       /* save r0 - r14 */
 
-           DEBUG("DRAIN, DSCR %08x (DONE)", dscr);
+       /** \todo TODO: handle other mode registers */
 
-           break;
+       for (size_t i = 0; i < 15; i++)
+       {
+               /* MCR p14,0,R?,c0,c5,0 */
+               retval = arm11_run_instr_data_from_core(arm11, 0xEE000E15 | (i << 12), &R(RX + i), 1);
+               if (retval != ERROR_OK)
+                       return retval;
        }
-    }
-#endif
-
-
-    arm11_run_instr_data_prepare(arm11);
 
-    /* save r0 - r14 */
+       /* save rDTR */
 
+       /* check rDTRfull in DSCR */
 
-    /** \todo TODO: handle other mode registers */
+       if (R(DSCR) & ARM11_DSCR_RDTR_FULL)
+       {
+               /* MRC p14,0,R0,c0,c5,0 (move rDTR -> r0 (-> wDTR -> local var)) */
+               retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xEE100E15, &R(RDTR));
+               if (retval != ERROR_OK)
+                       return retval;
+       }
+       else
+       {
+               arm11->reg_list[ARM11_RC_RDTR].valid    = 0;
+       }
 
-    {size_t i;
-    for (i = 0; i < 15; i++)
-    {
-       /* MCR p14,0,R?,c0,c5,0 */
-       arm11_run_instr_data_from_core(arm11, 0xEE000E15 | (i << 12), &R(RX + i), 1);
-    }}
+       /* save CPSR */
 
+       /* MRS r0,CPSR (move CPSR -> r0 (-> wDTR -> local var)) */
+       retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xE10F0000, &R(CPSR));
+       if (retval != ERROR_OK)
+               return retval;
 
-    /* save rDTR */
+       /* save PC */
 
-    /* check rDTRfull in DSCR */
+       /* MOV R0,PC (move PC -> r0 (-> wDTR -> local var)) */
+       retval = arm11_run_instr_data_from_core_via_r0(arm11, 0xE1A0000F, &R(PC));
+       if (retval != ERROR_OK)
+               return retval;
 
-    if (R(DSCR) & ARM11_DSCR_RDTR_FULL)
-    {
-       /* MRC p14,0,R0,c0,c5,0 (move rDTR -> r0 (-> wDTR -> local var)) */
-       arm11_run_instr_data_from_core_via_r0(arm11, 0xEE100E15, &R(RDTR));
-    }
-    else
-    {
-       arm11->reg_list[ARM11_RC_RDTR].valid    = 0;
-    }
+       /* adjust PC depending on ARM state */
 
-    /* save CPSR */
+       if (R(CPSR) & ARM11_CPSR_J)     /* Java state */
+       {
+               arm11->reg_values[ARM11_RC_PC] -= 0;
+       }
+       else if (R(CPSR) & ARM11_CPSR_T)        /* Thumb state */
+       {
+               arm11->reg_values[ARM11_RC_PC] -= 4;
+       }
+       else                                    /* ARM state */
+       {
+               arm11->reg_values[ARM11_RC_PC] -= 8;
+       }
 
-    /* MRS r0,CPSR (move CPSR -> r0 (-> wDTR -> local var)) */
-    arm11_run_instr_data_from_core_via_r0(arm11, 0xE10F0000, &R(CPSR));
+       if (arm11->simulate_reset_on_next_halt)
+       {
+               arm11->simulate_reset_on_next_halt = false;
 
-    /* save PC */
+               LOG_DEBUG("Reset c1 Control Register");
 
-    /* MOV R0,PC (move PC -> r0 (-> wDTR -> local var)) */
-    arm11_run_instr_data_from_core_via_r0(arm11, 0xE1A0000F, &R(PC));
+               /* Write 0 (reset value) to Control register 0 to disable MMU/Cache etc. */
 
-    /* adjust PC depending on ARM state */
+               /* MCR p15,0,R0,c1,c0,0 */
+               retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xee010f10, 0);
+               if (retval != ERROR_OK)
+                       return retval;
 
-    if (R(CPSR) & ARM11_CPSR_J)        /* Java state */
-    {
-       arm11->reg_values[ARM11_RC_PC] -= 0;
-    }
-    else if (R(CPSR) & ARM11_CPSR_T)   /* Thumb state */
-    {
-       arm11->reg_values[ARM11_RC_PC] -= 4;
-    }
-    else                                       /* ARM state */
-    {
-       arm11->reg_values[ARM11_RC_PC] -= 8;
-    }
+       }
 
-//    DEBUG("SAVE PC   %08x", R(PC));
+       retval = arm11_run_instr_data_finish(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-    arm11_run_instr_data_finish(arm11);
+       arm11_dump_reg_changes(arm11);
 
-    arm11_dump_reg_changes(arm11);
+       return ERROR_OK;
 }
 
 void arm11_dump_reg_changes(arm11_common_t * arm11)
 {
-    {size_t i;
-    for(i = 0; i < ARM11_REGCACHE_COUNT; i++)
-    {
-       if (!arm11->reg_list[i].valid)
+
+       if (!(debug_level >= LOG_LVL_DEBUG))
        {
-           if (arm11->reg_history[i].valid)
-               INFO("%8s INVALID    (%08x)", arm11_reg_defs[i].name, arm11->reg_history[i].value);
+               return;
        }
-       else
+
+       for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++)
        {
-           if (arm11->reg_history[i].valid)
-           {
-               if (arm11->reg_history[i].value != arm11->reg_values[i])
-                   INFO("%8s %08x (%08x)", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value);
-           }
-           else
-           {
-               INFO("%8s %08x (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]);
-           }
-       }
-    }}
+               if (!arm11->reg_list[i].valid)
+               {
+                       if (arm11->reg_history[i].valid)
+                               LOG_DEBUG("%8s INVALID   (%08" PRIx32 ")", arm11_reg_defs[i].name, arm11->reg_history[i].value);
+               }
+               else
+               {
+                       if (arm11->reg_history[i].valid)
+                       {
+                               if (arm11->reg_history[i].value != arm11->reg_values[i])
+                                       LOG_DEBUG("%8s %08" PRIx32 " (%08" PRIx32 ")", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value);
+                       }
+                       else
+                       {
+                               LOG_DEBUG("%8s %08" PRIx32 " (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]);
+                       }
+               }
+       }
 }
 
-
 /** Restore processor state
   *
   * This is called in preparation for the RESTART function.
   *
   */
-void arm11_leave_debug_state(arm11_common_t * arm11)
+static int arm11_leave_debug_state(arm11_common_t *arm11)
 {
-    FNC_INFO;
-
-    arm11_run_instr_data_prepare(arm11);
-
-    /** \todo TODO: handle other mode registers */
+       FNC_INFO;
+       int retval;
 
-    /* restore R1 - R14 */
-    {size_t i;
-    for (i = 1; i < 15; i++)
-    {
-       if (!arm11->reg_list[ARM11_RC_RX + i].dirty)
-           continue;
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-       /* MRC p14,0,r?,c0,c5,0 */
-       arm11_run_instr_data_to_core1(arm11, 0xee100e15 | (i << 12), R(RX + i));
+       /** \todo TODO: handle other mode registers */
 
-//     DEBUG("RESTORE R%d %08x", i, R(RX + i));
-    }}
+       /* restore R1 - R14 */
 
-    arm11_run_instr_data_finish(arm11);
+       for (size_t i = 1; i < 15; i++)
+       {
+               if (!arm11->reg_list[ARM11_RC_RX + i].dirty)
+                       continue;
 
+               /* MRC p14,0,r?,c0,c5,0 */
+               arm11_run_instr_data_to_core1(arm11, 0xee100e15 | (i << 12), R(RX + i));
 
-    /* spec says clear wDTR and rDTR; we assume they are clear as
-       otherwise our programming would be sloppy */
+               //      LOG_DEBUG("RESTORE R" ZU " %08x", i, R(RX + i));
+       }
 
-    {
-       u32 DSCR = arm11_read_DSCR(arm11);
+       retval = arm11_run_instr_data_finish(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-       if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
+       /* spec says clear wDTR and rDTR; we assume they are clear as
+          otherwise our programming would be sloppy */
        {
-           ERROR("wDTR/rDTR inconsistent (DSCR %08x)", DSCR);
+               uint32_t DSCR;
+
+               CHECK_RETVAL(arm11_read_DSCR(arm11, &DSCR));
+
+               if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
+               {
+                       /*
+                       The wDTR/rDTR two registers that are used to send/receive data to/from
+                       the core in tandem with corresponding instruction codes that are
+                       written into the core. The RDTR FULL/WDTR FULL flag indicates that the
+                       registers hold data that was written by one side (CPU or JTAG) and not
+                       read out by the other side.
+                       */
+                       LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08" PRIx32 ")", DSCR);
+                       return ERROR_FAIL;
+               }
        }
-    }
 
-    arm11_run_instr_data_prepare(arm11);
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-    /* restore original wDTR */
+       /* restore original wDTR */
 
-    if ((R(DSCR) & ARM11_DSCR_WDTR_FULL) || arm11->reg_list[ARM11_RC_WDTR].dirty)
-    {
-       /* MCR p14,0,R0,c0,c5,0 */
-       arm11_run_instr_data_to_core_via_r0(arm11, 0xee000e15, R(WDTR));
-    }
+       if ((R(DSCR) & ARM11_DSCR_WDTR_FULL) || arm11->reg_list[ARM11_RC_WDTR].dirty)
+       {
+               /* MCR p14,0,R0,c0,c5,0 */
+               retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xee000e15, R(WDTR));
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-    /* restore CPSR */
+       /* restore CPSR */
 
-    /* MSR CPSR,R0*/
-    arm11_run_instr_data_to_core_via_r0(arm11, 0xe129f000, R(CPSR));
+       /* MSR CPSR,R0*/
+       retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xe129f000, R(CPSR));
+       if (retval != ERROR_OK)
+               return retval;
 
 
-    /* restore PC */
+       /* restore PC */
 
-    /* MOV PC,R0 */
-    arm11_run_instr_data_to_core_via_r0(arm11, 0xe1a0f000, R(PC));
+       /* MOV PC,R0 */
+       retval = arm11_run_instr_data_to_core_via_r0(arm11, 0xe1a0f000, R(PC));
+       if (retval != ERROR_OK)
+               return retval;
 
 
-    /* restore R0 */
+       /* restore R0 */
 
-    /* MRC p14,0,r0,c0,c5,0 */
-    arm11_run_instr_data_to_core1(arm11, 0xee100e15, R(R0));
+       /* MRC p14,0,r0,c0,c5,0 */
+       arm11_run_instr_data_to_core1(arm11, 0xee100e15, R(R0));
 
-    arm11_run_instr_data_finish(arm11);
+       retval = arm11_run_instr_data_finish(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
+       /* restore DSCR */
 
-    /* restore DSCR */
+       arm11_write_DSCR(arm11, R(DSCR));
 
-    arm11_write_DSCR(arm11, R(DSCR));
+       /* restore rDTR */
 
+       if (R(DSCR) & ARM11_DSCR_RDTR_FULL || arm11->reg_list[ARM11_RC_RDTR].dirty)
+       {
+               arm11_add_debug_SCAN_N(arm11, 0x05, ARM11_TAP_DEFAULT);
 
-    /* restore rDTR */
-    
-    if (R(DSCR) & ARM11_DSCR_RDTR_FULL || arm11->reg_list[ARM11_RC_RDTR].dirty)
-    {
-       arm11_add_debug_SCAN_N(arm11, 0x05, -1);
+               arm11_add_IR(arm11, ARM11_EXTEST, ARM11_TAP_DEFAULT);
 
-       arm11_add_IR(arm11, ARM11_EXTEST, -1);
+               struct scan_field       chain5_fields[3];
 
-       scan_field_t    chain5_fields[3];
+               uint8_t                 Ready           = 0;    /* ignored */
+               uint8_t                 Valid           = 0;    /* ignored */
 
-       u8                      Ready       = 0;        /* ignored */
-       u8                      Valid       = 0;        /* ignored */
+               arm11_setup_field(arm11, 32, &R(RDTR),  NULL, chain5_fields + 0);
+               arm11_setup_field(arm11,  1, &Ready,    NULL, chain5_fields + 1);
+               arm11_setup_field(arm11,  1, &Valid,    NULL, chain5_fields + 2);
 
-       arm11_setup_field(arm11, 32, &R(RDTR),  NULL, chain5_fields + 0);
-       arm11_setup_field(arm11,  1, &Ready,    NULL, chain5_fields + 1);
-       arm11_setup_field(arm11,  1, &Valid,    NULL, chain5_fields + 2);
+               arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
+       }
 
-       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_PD);
-    }
+       arm11_record_register_history(arm11);
 
-    arm11_record_register_history(arm11);
+       return ERROR_OK;
 }
 
-void arm11_record_register_history(arm11_common_t * arm11)
+static void arm11_record_register_history(arm11_common_t *arm11)
 {
-    {size_t i;
-    for(i = 0; i < ARM11_REGCACHE_COUNT; i++)
-    {
-       arm11->reg_history[i].value     = arm11->reg_values[i];
-       arm11->reg_history[i].valid     = arm11->reg_list[i].valid;
-
-       arm11->reg_list[i].valid        = 0;
-       arm11->reg_list[i].dirty        = 0;
-    }}
+       for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++)
+       {
+               arm11->reg_history[i].value     = arm11->reg_values[i];
+               arm11->reg_history[i].valid     = arm11->reg_list[i].valid;
+
+               arm11->reg_list[i].valid        = 0;
+               arm11->reg_list[i].dirty        = 0;
+       }
 }
 
 
 /* poll current target status */
-int arm11_poll(struct target_s *target)
+static int arm11_poll(struct target_s *target)
 {
-    FNC_INFO;
+       FNC_INFO;
+       int retval;
 
-    arm11_common_t * arm11 = target->arch_info;
+       arm11_common_t * arm11 = target->arch_info;
 
-    if (arm11->trst_active)
-       return ERROR_OK;
+       uint32_t        dscr;
 
-    u32        dscr = arm11_read_DSCR(arm11);
+       CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
 
-    DEBUG("DSCR %08x", dscr);
+       LOG_DEBUG("DSCR %08" PRIx32 "", dscr);
 
-    arm11_check_init(arm11, &dscr);
+       CHECK_RETVAL(arm11_check_init(arm11, &dscr));
 
-    if (dscr & ARM11_DSCR_CORE_HALTED)
-    {
-       if (target->state != TARGET_HALTED)
+       if (dscr & ARM11_DSCR_CORE_HALTED)
        {
-           enum target_state old_state = target->state;
-
-           DEBUG("enter TARGET_HALTED");
-           target->state               = TARGET_HALTED;
-           target->debug_reason        = arm11_get_DSCR_debug_reason(dscr);
-           arm11_on_enter_debug_state(arm11);
-
-           target_call_event_callbacks(target,
-               old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED);
+               if (target->state != TARGET_HALTED)
+               {
+                       enum target_state old_state = target->state;
+
+                       LOG_DEBUG("enter TARGET_HALTED");
+                       target->state                   = TARGET_HALTED;
+                       target->debug_reason    = arm11_get_DSCR_debug_reason(dscr);
+                       retval = arm11_on_enter_debug_state(arm11);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       target_call_event_callbacks(target,
+                               old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED);
+               }
        }
-    }
-    else
-    {
-       if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
+       else
        {
-           DEBUG("enter TARGET_RUNNING");
-           target->state               = TARGET_RUNNING;
-           target->debug_reason        = DBG_REASON_NOTHALTED;
+               if (target->state != TARGET_RUNNING && target->state != TARGET_DEBUG_RUNNING)
+               {
+                       LOG_DEBUG("enter TARGET_RUNNING");
+                       target->state                   = TARGET_RUNNING;
+                       target->debug_reason    = DBG_REASON_NOTHALTED;
+               }
        }
-    }
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 /* architecture specific status reply */
-int arm11_arch_state(struct target_s *target)
+static int arm11_arch_state(struct target_s *target)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       arm11_common_t * arm11 = target->arch_info;
 
-    return ERROR_OK;
-}
+       LOG_USER("target halted due to %s\ncpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "",
+                        Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name,
+                        R(CPSR),
+                        R(PC));
 
+       return ERROR_OK;
+}
 
 /* target request support */
-int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer)
+static int arm11_target_request_data(struct target_s *target,
+               uint32_t size, uint8_t *buffer)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       FNC_INFO_NOTIMPLEMENTED;
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-
-
 /* target execution control */
-int arm11_halt(struct target_s *target)
+static int arm11_halt(struct target_s *target)
 {
-    FNC_INFO;
+       FNC_INFO;
+
+       arm11_common_t * arm11 = target->arch_info;
+
+       LOG_DEBUG("target->state: %s",
+               target_state_name(target));
+
+       if (target->state == TARGET_UNKNOWN)
+       {
+               arm11->simulate_reset_on_next_halt = true;
+       }
 
-    arm11_common_t * arm11 = target->arch_info;
+       if (target->state == TARGET_HALTED)
+       {
+               LOG_DEBUG("target was already halted");
+               return ERROR_OK;
+       }
+
+       arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE);
+
+       CHECK_RETVAL(jtag_execute_queue());
 
-    DEBUG("target->state: %s", target_state_strings[target->state]);
+       uint32_t dscr;
 
-    if (target->state == TARGET_HALTED)
-    {
-       WARNING("target was already halted");
-       return ERROR_TARGET_ALREADY_HALTED;
-    }
+       int i = 0;
+       while (1)
+       {
+               CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
+
+               if (dscr & ARM11_DSCR_CORE_HALTED)
+                       break;
+
+
+               long long then = 0;
+               if (i == 1000)
+               {
+                       then = timeval_ms();
+               }
+               if (i >= 1000)
+               {
+                       if ((timeval_ms()-then) > 1000)
+                       {
+                               LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
+                               return ERROR_FAIL;
+                       }
+               }
+               i++;
+       }
+
+       arm11_on_enter_debug_state(arm11);
+
+       enum target_state old_state     = target->state;
+
+       target->state           = TARGET_HALTED;
+       target->debug_reason    = arm11_get_DSCR_debug_reason(dscr);
+
+       CHECK_RETVAL(
+               target_call_event_callbacks(target,
+                       old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED));
 
-    if (arm11->trst_active)
-    {
-       arm11->halt_requested = 1;
        return ERROR_OK;
-    }
+}
 
-    arm11_add_IR(arm11, ARM11_HALT, TAP_RTI);
+static int arm11_resume(struct target_s *target, int current,
+               uint32_t address, int handle_breakpoints, int debug_execution)
+{
+       FNC_INFO;
 
-    jtag_execute_queue();
+       //        LOG_DEBUG("current %d  address %08x  handle_breakpoints %d  debug_execution %d",
+       //      current, address, handle_breakpoints, debug_execution);
 
-    u32 dscr;
+       arm11_common_t * arm11 = target->arch_info;
 
-    while (1)
-    {
-       dscr = arm11_read_DSCR(arm11);
+       LOG_DEBUG("target->state: %s",
+               target_state_name(target));
 
-       if (dscr & ARM11_DSCR_CORE_HALTED)
-           break;
-    }
 
-    arm11_on_enter_debug_state(arm11);
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
 
-    enum target_state old_state        = target->state;
+       if (!current)
+               R(PC) = address;
 
-    target->state              = TARGET_HALTED;
-    target->debug_reason       = arm11_get_DSCR_debug_reason(dscr);
+       LOG_DEBUG("RESUME PC %08" PRIx32 "%s", R(PC), !current ? "!" : "");
 
-    target_call_event_callbacks(target,
-       old_state == TARGET_DEBUG_RUNNING ? TARGET_EVENT_DEBUG_HALTED : TARGET_EVENT_HALTED);
+       /* clear breakpoints/watchpoints and VCR*/
+       arm11_sc7_clear_vbw(arm11);
 
-    return ERROR_OK;
-}
+       /* Set up breakpoints */
+       if (!debug_execution)
+       {
+               /* check if one matches PC and step over it if necessary */
 
+               breakpoint_t *  bp;
 
-int arm11_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution)
-{
-    FNC_INFO;
+               for (bp = target->breakpoints; bp; bp = bp->next)
+               {
+                       if (bp->address == R(PC))
+                       {
+                               LOG_DEBUG("must step over %08" PRIx32 "", bp->address);
+                               arm11_step(target, 1, 0, 0);
+                               break;
+                       }
+               }
+
+               /* set all breakpoints */
 
-//    DEBUG("current %d  address %08x  handle_breakpoints %d  debug_execution %d",
-//     current, address, handle_breakpoints, debug_execution);
+               size_t          brp_num = 0;
 
-    arm11_common_t * arm11 = target->arch_info;
+               for (bp = target->breakpoints; bp; bp = bp->next)
+               {
+                       arm11_sc7_action_t      brp[2];
 
-    DEBUG("target->state: %s", target_state_strings[target->state]);
+                       brp[0].write    = 1;
+                       brp[0].address  = ARM11_SC7_BVR0 + brp_num;
+                       brp[0].value    = bp->address;
+                       brp[1].write    = 1;
+                       brp[1].address  = ARM11_SC7_BCR0 + brp_num;
+                       brp[1].value    = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21);
 
-    if (target->state != TARGET_HALTED)
-    {
-       WARNING("target was not halted");
-       return ERROR_TARGET_NOT_HALTED;
-    }
+                       arm11_sc7_run(arm11, brp, asizeof(brp));
 
-    if (!current)
-       R(PC) = address;
+                       LOG_DEBUG("Add BP " ZU " at %08" PRIx32 "", brp_num, bp->address);
 
-    INFO("RESUME PC %08x", R(PC));
+                       brp_num++;
+               }
 
-    /* clear breakpoints/watchpoints and VCR*/
-    arm11_sc7_clear_vbw(arm11);
+               arm11_sc7_set_vcr(arm11, arm11_vcr);
+       }
 
-    /* Set up breakpoints */
-    if (!debug_execution)
-    {
-       /* check if one matches PC and step over it if necessary */
+       arm11_leave_debug_state(arm11);
 
-       breakpoint_t *  bp;
+       arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
-       for (bp = target->breakpoints; bp; bp = bp->next)
+       CHECK_RETVAL(jtag_execute_queue());
+
+       int i = 0;
+       while (1)
        {
-           if (bp->address == R(PC))
-           {
-               DEBUG("must step over %08x", bp->address);
-               arm11_step(target, 1, 0, 0);
-               break;
-           }
+               uint32_t dscr;
+
+               CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
+
+               LOG_DEBUG("DSCR %08" PRIx32 "", dscr);
+
+               if (dscr & ARM11_DSCR_CORE_RESTARTED)
+                       break;
+
+
+               long long then = 0;
+               if (i == 1000)
+               {
+                       then = timeval_ms();
+               }
+               if (i >= 1000)
+               {
+                       if ((timeval_ms()-then) > 1000)
+                       {
+                               LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
+                               return ERROR_FAIL;
+                       }
+               }
+               i++;
        }
 
-       /* set all breakpoints */
+       if (!debug_execution)
+       {
+               target->state                   = TARGET_RUNNING;
+               target->debug_reason    = DBG_REASON_NOTHALTED;
 
-       size_t          brp_num = 0;
-       
-       for (bp = target->breakpoints; bp; bp = bp->next)
+               CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
+       }
+       else
        {
-           arm11_sc7_action_t  brp[2];
+               target->state                   = TARGET_DEBUG_RUNNING;
+               target->debug_reason    = DBG_REASON_NOTHALTED;
 
-           brp[0].write        = 1;
-           brp[0].address      = ARM11_SC7_BVR0 + brp_num;
-           brp[0].value        = bp->address;
-           brp[1].write        = 1;
-           brp[1].address      = ARM11_SC7_BCR0 + brp_num;
-           brp[1].value        = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21);
-    
-           arm11_sc7_run(arm11, brp, asizeof(brp));
+               CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_RESUMED));
+       }
+
+       return ERROR_OK;
+}
 
-           DEBUG("Add BP %d at %08x", brp_num, bp->address);
 
-           brp_num++;
+static int armv4_5_to_arm11(int reg)
+{
+       if (reg < 16)
+               return reg;
+       switch (reg)
+       {
+       case ARMV4_5_CPSR:
+               return ARM11_RC_CPSR;
+       case 16:
+               /* FIX!!! handle thumb better! */
+               return ARM11_RC_CPSR;
+       default:
+               LOG_ERROR("BUG: register translation from armv4_5 to arm11 not supported %d", reg);
+               exit(-1);
        }
+}
+
 
-       arm11_sc7_set_vcr(arm11, arm11_vcr);
-    }
+static uint32_t arm11_sim_get_reg(struct arm_sim_interface *sim, int reg)
+{
+       arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
 
+       reg=armv4_5_to_arm11(reg);
 
-    arm11_leave_debug_state(arm11);
+       return buf_get_u32(arm11->reg_list[reg].value, 0, 32);
+}
 
-    arm11_add_IR(arm11, ARM11_RESTART, TAP_RTI);
+static void arm11_sim_set_reg(struct arm_sim_interface *sim,
+               int reg, uint32_t value)
+{
+       arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
 
-    jtag_execute_queue();
+       reg=armv4_5_to_arm11(reg);
 
-    while (1)
-    {
-       u32 dscr = arm11_read_DSCR(arm11);
+       buf_set_u32(arm11->reg_list[reg].value, 0, 32, value);
+}
 
-       DEBUG("DSCR %08x", dscr);
+static uint32_t arm11_sim_get_cpsr(struct arm_sim_interface *sim,
+               int pos, int bits)
+{
+       arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
 
-       if (dscr & ARM11_DSCR_CORE_RESTARTED)
-           break;
-    }
+       return buf_get_u32(arm11->reg_list[ARM11_RC_CPSR].value, pos, bits);
+}
 
-    if (!debug_execution)
-    {
-       target->state           = TARGET_RUNNING;
-       target->debug_reason    = DBG_REASON_NOTHALTED;
-       target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
-    }
-    else
-    {
-       target->state           = TARGET_DEBUG_RUNNING;
-       target->debug_reason    = DBG_REASON_NOTHALTED;
-       target_call_event_callbacks(target, TARGET_EVENT_DEBUG_RESUMED);
-    }
+static enum armv4_5_state arm11_sim_get_state(struct arm_sim_interface *sim)
+{
+//     arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
 
-    return ERROR_OK;
+       /* FIX!!!! we should implement thumb for arm11 */
+       return ARMV4_5_STATE_ARM;
 }
 
-int arm11_step(struct target_s *target, int current, u32 address, int handle_breakpoints)
+static void arm11_sim_set_state(struct arm_sim_interface *sim,
+               enum armv4_5_state mode)
 {
-    FNC_INFO;
+//     arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
+
+       /* FIX!!!! we should implement thumb for arm11 */
+       LOG_ERROR("Not implemetned!");
+}
 
-    DEBUG("target->state: %s", target_state_strings[target->state]);
 
-    if (target->state != TARGET_HALTED)
-    {
-       WARNING("target was not halted");
-       return ERROR_TARGET_NOT_HALTED;
-    }
+static enum armv4_5_mode arm11_sim_get_mode(struct arm_sim_interface *sim)
+{
+       //arm11_common_t * arm11 = (arm11_common_t *)sim->user_data;
 
-    arm11_common_t * arm11 = target->arch_info;
+       /* FIX!!!! we should implement something that returns the current mode here!!! */
+       return ARMV4_5_MODE_USR;
+}
 
-    if (!current)
-       R(PC) = address;
+static int arm11_simulate_step(target_t *target, uint32_t *dry_run_pc)
+{
+       struct arm_sim_interface sim;
 
-    INFO("STEP PC %08x", R(PC));
+       sim.user_data=target->arch_info;
+       sim.get_reg=&arm11_sim_get_reg;
+       sim.set_reg=&arm11_sim_set_reg;
+       sim.get_reg_mode=&arm11_sim_get_reg;
+       sim.set_reg_mode=&arm11_sim_set_reg;
+       sim.get_cpsr=&arm11_sim_get_cpsr;
+       sim.get_mode=&arm11_sim_get_mode;
+       sim.get_state=&arm11_sim_get_state;
+       sim.set_state=&arm11_sim_set_state;
 
-    /** \todo TODO: Thumb not supported here */
+       return arm_simulate_step_core(target, dry_run_pc, &sim);
 
-    u32        next_instruction;
+}
+
+static int arm11_step(struct target_s *target, int current,
+               uint32_t address, int handle_breakpoints)
+{
+       FNC_INFO;
 
-    arm11_read_memory_word(arm11, R(PC), &next_instruction);
+       LOG_DEBUG("target->state: %s",
+               target_state_name(target));
 
-    /** skip over BKPT */
-    if ((next_instruction & 0xFFF00070) == 0xe1200070)
-    {
-       R(PC) += 4;
-       arm11->reg_list[ARM11_RC_PC].valid = 1;
-       arm11->reg_list[ARM11_RC_PC].dirty = 0;
-       INFO("Skipping BKPT");
-    }
-    /* ignore B to self */
-    else if ((next_instruction & 0xFEFFFFFF) == 0xeafffffe)
-    {
-       INFO("Not stepping jump to self");
-    }
-    else
-    {
-       /** \todo TODO: check if break-/watchpoints make any sense at all in combination
-         * with this. */
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target was not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
 
-       /** \todo TODO: check if disabling IRQs might be a good idea here. Alternatively
-         * the VCR might be something worth looking into. */
+       arm11_common_t * arm11 = target->arch_info;
 
+       if (!current)
+               R(PC) = address;
 
-       /* Set up breakpoint for stepping */
+       LOG_DEBUG("STEP PC %08" PRIx32 "%s", R(PC), !current ? "!" : "");
 
-       arm11_sc7_action_t      brp[2];
 
-       brp[0].write    = 1;
-       brp[0].address  = ARM11_SC7_BVR0;
-       brp[0].value    = R(PC);
-       brp[1].write    = 1;
-       brp[1].address  = ARM11_SC7_BCR0;
-       brp[1].value    = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21);
+       /** \todo TODO: Thumb not supported here */
 
-       arm11_sc7_run(arm11, brp, asizeof(brp));
+       uint32_t        next_instruction;
 
-       /* resume */
+       CHECK_RETVAL(arm11_read_memory_word(arm11, R(PC), &next_instruction));
 
-       arm11_leave_debug_state(arm11);
+       /* skip over BKPT */
+       if ((next_instruction & 0xFFF00070) == 0xe1200070)
+       {
+               R(PC) += 4;
+               arm11->reg_list[ARM11_RC_PC].valid = 1;
+               arm11->reg_list[ARM11_RC_PC].dirty = 0;
+               LOG_DEBUG("Skipping BKPT");
+       }
+       /* skip over Wait for interrupt / Standby */
+       /* mcr  15, 0, r?, cr7, cr0, {4} */
+       else if ((next_instruction & 0xFFFF0FFF) == 0xee070f90)
+       {
+               R(PC) += 4;
+               arm11->reg_list[ARM11_RC_PC].valid = 1;
+               arm11->reg_list[ARM11_RC_PC].dirty = 0;
+               LOG_DEBUG("Skipping WFI");
+       }
+       /* ignore B to self */
+       else if ((next_instruction & 0xFEFFFFFF) == 0xeafffffe)
+       {
+               LOG_DEBUG("Not stepping jump to self");
+       }
+       else
+       {
+               /** \todo TODO: check if break-/watchpoints make any sense at all in combination
+               * with this. */
 
-       arm11_add_IR(arm11, ARM11_RESTART, TAP_RTI);
+               /** \todo TODO: check if disabling IRQs might be a good idea here. Alternatively
+               * the VCR might be something worth looking into. */
 
-       jtag_execute_queue();
 
-       /** \todo TODO: add a timeout */
+               /* Set up breakpoint for stepping */
 
-       /* wait for halt */
+               arm11_sc7_action_t      brp[2];
 
-       while (1)
-       {
-           u32 dscr = arm11_read_DSCR(arm11);
+               brp[0].write    = 1;
+               brp[0].address  = ARM11_SC7_BVR0;
+               brp[1].write    = 1;
+               brp[1].address  = ARM11_SC7_BCR0;
 
-           DEBUG("DSCR %08x", dscr);
+               if (arm11_config_hardware_step)
+               {
+                       /* hardware single stepping be used if possible or is it better to
+                        * always use the same code path? Hardware single stepping is not supported
+                        * on all hardware
+                        */
+                        brp[0].value   = R(PC);
+                        brp[1].value   = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (2 << 21);
+               } else
+               {
+                       /* sets a breakpoint on the next PC(calculated by simulation),
+                        */
+                       uint32_t next_pc;
+                       int retval;
+                       retval = arm11_simulate_step(target, &next_pc);
+                       if (retval != ERROR_OK)
+                               return retval;
 
-           if ((dscr & (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) ==
-               (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED))
-               break;
-       }
+                       brp[0].value    = next_pc;
+                       brp[1].value    = 0x1 | (3 << 1) | (0x0F << 5) | (0 << 14) | (0 << 16) | (0 << 20) | (0 << 21);
+               }
 
-       /* clear breakpoint */
-       arm11_sc7_clear_vbw(arm11);
+               CHECK_RETVAL(arm11_sc7_run(arm11, brp, asizeof(brp)));
 
-       /* save state */
-       arm11_on_enter_debug_state(arm11);
-    }
+               /* resume */
 
-//    target->state            = TARGET_HALTED;
-    target->debug_reason       = DBG_REASON_SINGLESTEP;
 
-    target_call_event_callbacks(target, TARGET_EVENT_HALTED);
+               if (arm11_config_step_irq_enable)
+                       R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE;              /* should be redundant */
+               else
+                       R(DSCR) |= ARM11_DSCR_INTERRUPTS_DISABLE;
 
-    return ERROR_OK;
-}
 
+               CHECK_RETVAL(arm11_leave_debug_state(arm11));
 
-/* target reset control */
-int arm11_assert_reset(struct target_s *target)
-{
-    FNC_INFO;
+               arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
-#if 0
-    /* assert reset lines */
-    /* resets only the DBGTAP, not the ARM */
+               CHECK_RETVAL(jtag_execute_queue());
 
-    jtag_add_reset(1, 0);
-    jtag_add_sleep(5000);
+               /* wait for halt */
+               int i = 0;
+               while (1)
+               {
+                       uint32_t dscr;
 
-    arm11_common_t * arm11 = target->arch_info;
-    arm11->trst_active = 1;
-#endif
+                       CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
+
+                       LOG_DEBUG("DSCR %08" PRIx32 "e", dscr);
+
+                       if ((dscr & (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED)) ==
+                               (ARM11_DSCR_CORE_RESTARTED | ARM11_DSCR_CORE_HALTED))
+                               break;
+
+                       long long then = 0;
+                       if (i == 1000)
+                       {
+                               then = timeval_ms();
+                       }
+                       if (i >= 1000)
+                       {
+                               if ((timeval_ms()-then) > 1000)
+                               {
+                                       LOG_WARNING("Timeout (1000ms) waiting for instructions to complete");
+                                       return ERROR_FAIL;
+                               }
+                       }
+                       i++;
+               }
+
+               /* clear breakpoint */
+               arm11_sc7_clear_vbw(arm11);
+
+               /* save state */
+               CHECK_RETVAL(arm11_on_enter_debug_state(arm11));
+
+           /* restore default state */
+               R(DSCR) &= ~ARM11_DSCR_INTERRUPTS_DISABLE;
 
-    return ERROR_OK;
+       }
+
+       //        target->state         = TARGET_HALTED;
+       target->debug_reason    = DBG_REASON_SINGLESTEP;
+
+       CHECK_RETVAL(target_call_event_callbacks(target, TARGET_EVENT_HALTED));
+
+       return ERROR_OK;
 }
 
-int arm11_deassert_reset(struct target_s *target)
+static int arm11_assert_reset(target_t *target)
 {
-    FNC_INFO;
+       FNC_INFO;
+       int retval;
 
-#if 0
-    DEBUG("target->state: %s", target_state_strings[target->state]);
+       arm11_common_t * arm11 = target->arch_info;
+       retval = arm11_check_init(arm11, NULL);
+       if (retval != ERROR_OK)
+               return retval;
+
+       target->state = TARGET_UNKNOWN;
 
-    /* deassert reset lines */
-    jtag_add_reset(0, 0);
+       /* we would very much like to reset into the halted, state,
+        * but resetting and halting is second best... */
+       if (target->reset_halt)
+       {
+               CHECK_RETVAL(target_halt(target));
+       }
 
-    arm11_common_t * arm11 = target->arch_info;
-    arm11->trst_active = false;
 
-    if (arm11->halt_requested)
-       return arm11_halt(target);
-#endif
+       /* srst is funny. We can not do *anything* else while it's asserted
+        * and it has unkonwn side effects. Make sure no other code runs
+        * meanwhile.
+        *
+        * Code below assumes srst:
+        *
+        * - Causes power-on-reset (but of what parts of the system?). Bug
+        * in arm11?
+        *
+        * - Messes us TAP state without asserting trst.
+        *
+        * - There is another bug in the arm11 core. When you generate an access to
+        * external logic (for example ddr controller via AHB bus) and that block
+        * is not configured (perhaps it is still held in reset), that transaction
+        * will never complete. This will hang arm11 core but it will also hang
+        * JTAG controller. Nothing, short of srst assertion will bring it out of
+        * this.
+        *
+        * Mysteries:
+        *
+        * - What should the PC be after an srst reset when starting in the halted
+        * state?
+        */
+
+       jtag_add_reset(0, 1);
+       jtag_add_reset(0, 0);
+
+       /* How long do we have to wait? */
+       jtag_add_sleep(5000);
+
+       /* un-mess up TAP state */
+       jtag_add_tlr();
+
+       retval = jtag_execute_queue();
+       if (retval != ERROR_OK)
+       {
+               return retval;
+       }
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-int arm11_soft_reset_halt(struct target_s *target)
+static int arm11_deassert_reset(target_t *target)
 {
-    FNC_INFO_NOTIMPLEMENTED;
-
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-int arm11_prepare_reset_halt(struct target_s *target)
+static int arm11_soft_reset_halt(struct target_s *target)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       FNC_INFO_NOTIMPLEMENTED;
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-
 /* target register access for gdb */
-int arm11_get_gdb_reg_list(struct target_s *target, struct reg_s **reg_list[], int *reg_list_size)
+static int arm11_get_gdb_reg_list(struct target_s *target,
+               struct reg_s **reg_list[], int *reg_list_size)
 {
-    FNC_INFO;
+       FNC_INFO;
 
-    arm11_common_t * arm11 = target->arch_info;
+       arm11_common_t * arm11 = target->arch_info;
 
-    if (target->state != TARGET_HALTED)
-    {
-       return ERROR_TARGET_NOT_HALTED;
-    }
-       
-    *reg_list_size  = ARM11_GDB_REGISTER_COUNT;
-    *reg_list      = malloc(sizeof(reg_t*) * ARM11_GDB_REGISTER_COUNT);
+       *reg_list_size  = ARM11_GDB_REGISTER_COUNT;
+       *reg_list               = malloc(sizeof(reg_t*) * ARM11_GDB_REGISTER_COUNT);
 
-    {size_t i;
-    for (i = 16; i < 24; i++)
-    {
-       (*reg_list)[i] = &arm11_gdb_dummy_fp_reg;
-    }}
-
-    (*reg_list)[24] = &arm11_gdb_dummy_fps_reg;
+       for (size_t i = 16; i < 24; i++)
+       {
+               (*reg_list)[i] = &arm11_gdb_dummy_fp_reg;
+       }
 
+       (*reg_list)[24] = &arm11_gdb_dummy_fps_reg;
 
-    {size_t i;
-    for (i = 0; i < ARM11_REGCACHE_COUNT; i++)
-    {
-       if (arm11_reg_defs[i].gdb_num == -1)
-           continue;
+       for (size_t i = 0; i < ARM11_REGCACHE_COUNT; i++)
+       {
+               if (arm11_reg_defs[i].gdb_num == -1)
+                       continue;
 
-       (*reg_list)[arm11_reg_defs[i].gdb_num] = arm11->reg_list + i;
-    }}
+               (*reg_list)[arm11_reg_defs[i].gdb_num] = arm11->reg_list + i;
+       }
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-
-/* target memory access 
-* size: 1 = byte (8bit), 2 = half-word (16bit), 4 = word (32bit)
-* count: number of items of <size>
-*/
-int arm11_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+/* target memory access
+ * size: 1 = byte (8bit), 2 = half-word (16bit), 4 = word (32bit)
+ * count: number of items of <size>
+ *
+ * arm11_config_memrw_no_increment - in the future we may want to be able
+ * to read/write a range of data to a "port". a "port" is an action on
+ * read memory address for some peripheral.
+ */
+static int arm11_read_memory_inner(struct target_s *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer,
+               bool arm11_config_memrw_no_increment)
 {
-    /** \todo TODO: check if buffer cast to u32* and u16* might cause alignment problems */
+       /** \todo TODO: check if buffer cast to uint32_t* and uint16_t* might cause alignment problems */
+       int retval;
 
-    FNC_INFO;
+       FNC_INFO;
 
-    DEBUG("ADDR %08x  SIZE %08x  COUNT %08x", address, size, count);
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target was not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
 
-    arm11_common_t * arm11 = target->arch_info;
+       LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "", address, size, count);
 
-    arm11_run_instr_data_prepare(arm11);
+       arm11_common_t * arm11 = target->arch_info;
 
-    /* MRC p14,0,r0,c0,c5,0 */
-    arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-    switch (size)
-    {
-    case 1:
-       /** \todo TODO: check if dirty is the right choice to force a rewrite on arm11_resume() */
-       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+       /* MRC p14,0,r0,c0,c5,0 */
+       retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
+       if (retval != ERROR_OK)
+               return retval;
 
-       while (count--)
+       switch (size)
        {
-           /* ldrb    r1, [r0], #1 */
-           arm11_run_instr_no_data1(arm11, 0xe4d01001);
+       case 1:
+               /** \todo TODO: check if dirty is the right choice to force a rewrite on arm11_resume() */
+               arm11->reg_list[ARM11_RC_R1].dirty = 1;
 
-           u32 res;
-           /* MCR p14,0,R1,c0,c5,0 */
-           arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
+               for (size_t i = 0; i < count; i++)
+               {
+                       /* ldrb    r1, [r0], #1 */
+                       /* ldrb    r1, [r0] */
+                       arm11_run_instr_no_data1(arm11,
+                                       !arm11_config_memrw_no_increment ? 0xe4d01001 : 0xe5d01000);
 
-           *buffer++ = res;
-       }
-       break;
+                       uint32_t res;
+                       /* MCR p14,0,R1,c0,c5,0 */
+                       arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
 
-    case 2:
-    {
-       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+                       *buffer++ = res;
+               }
 
-       u16 * buf16 = (u16*)buffer;
+               break;
 
-       while (count--)
-       {
-           /* ldrh    r1, [r0], #2 */
-           arm11_run_instr_no_data1(arm11, 0xe0d010b2);
+       case 2:
+               {
+                       arm11->reg_list[ARM11_RC_R1].dirty = 1;
 
-           u32 res;
+                       for (size_t i = 0; i < count; i++)
+                       {
+                               /* ldrh    r1, [r0], #2 */
+                               arm11_run_instr_no_data1(arm11,
+                                       !arm11_config_memrw_no_increment ? 0xe0d010b2 : 0xe1d010b0);
 
-           /* MCR p14,0,R1,c0,c5,0 */
-           arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
+                               uint32_t res;
 
-           *buf16++ = res;
-       }
-       break;
-    }
+                               /* MCR p14,0,R1,c0,c5,0 */
+                               arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
 
-    case 4:
+                               uint16_t svalue = res;
+                               memcpy(buffer + i * sizeof(uint16_t), &svalue, sizeof(uint16_t));
+                       }
 
-       /* LDC p14,c5,[R0],#4 */
-       arm11_run_instr_data_from_core(arm11, 0xecb05e01, (u32 *)buffer, count);
-       break;
-    }
+                       break;
+               }
 
-    arm11_run_instr_data_finish(arm11);
+       case 4:
+               {
+               uint32_t instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00;
+               /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
+               uint32_t *words = (uint32_t *)buffer;
 
-    return ERROR_OK;
+               /* LDC p14,c5,[R0],#4 */
+               /* LDC p14,c5,[R0] */
+               arm11_run_instr_data_from_core(arm11, instr, words, count);
+               break;
+               }
+       }
+
+       return arm11_run_instr_data_finish(arm11);
 }
 
-int arm11_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer)
+static int arm11_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
-    FNC_INFO;
-
-    DEBUG("ADDR %08x  SIZE %08x  COUNT %08x", address, size, count);
-
-    arm11_common_t * arm11 = target->arch_info;
+       return arm11_read_memory_inner(target, address, size, count, buffer, false);
+}
 
-    arm11_run_instr_data_prepare(arm11);
+/*
+* arm11_config_memrw_no_increment - in the future we may want to be able
+* to read/write a range of data to a "port". a "port" is an action on
+* read memory address for some peripheral.
+*/
+static int arm11_write_memory_inner(struct target_s *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer,
+               bool arm11_config_memrw_no_increment)
+{
+       int retval;
+       FNC_INFO;
 
-    /* MRC p14,0,r0,c0,c5,0 */
-    arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target was not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
 
-    switch (size)
-    {
-    case 1:
-       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+       LOG_DEBUG("ADDR %08" PRIx32 "  SIZE %08" PRIx32 "  COUNT %08" PRIx32 "", address, size, count);
 
-       while (count--)
-       {
-           /* MRC p14,0,r1,c0,c5,0 */
-           arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buffer++);
+       arm11_common_t * arm11 = target->arch_info;
 
-           /* strb    r1, [r0], #1 */
-           arm11_run_instr_no_data1(arm11, 0xe4c01001);
-       }
-       break;
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
 
-    case 2:
-    {
-       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+       /* MRC p14,0,r0,c0,c5,0 */
+       retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
+       if (retval != ERROR_OK)
+               return retval;
 
-       u16 * buf16 = (u16*)buffer;
+       /* burst writes are not used for single words as those may well be
+        * reset init script writes.
+        *
+        * The other advantage is that as burst writes are default, we'll
+        * now exercise both burst and non-burst code paths with the
+        * default settings, increasing code coverage.
+        */
+       bool burst = arm11_config_memwrite_burst && (count > 1);
 
-       while (count--)
+       switch (size)
        {
-           /* MRC p14,0,r1,c0,c5,0 */
-           arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buf16++);
+       case 1:
+               {
+                       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+
+                       for (size_t i = 0; i < count; i++)
+                       {
+                               /* MRC p14,0,r1,c0,c5,0 */
+                               retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buffer++);
+                               if (retval != ERROR_OK)
+                                       return retval;
+
+                               /* strb    r1, [r0], #1 */
+                               /* strb    r1, [r0] */
+                               retval = arm11_run_instr_no_data1(arm11,
+                                       !arm11_config_memrw_no_increment ? 0xe4c01001 : 0xe5c01000);
+                               if (retval != ERROR_OK)
+                                       return retval;
+                       }
+
+                       break;
+               }
+
+       case 2:
+               {
+                       arm11->reg_list[ARM11_RC_R1].dirty = 1;
+
+                       for (size_t i = 0; i < count; i++)
+                       {
+                               uint16_t value;
+                               memcpy(&value, buffer + i * sizeof(uint16_t), sizeof(uint16_t));
+
+                               /* MRC p14,0,r1,c0,c5,0 */
+                               retval = arm11_run_instr_data_to_core1(arm11, 0xee101e15, value);
+                               if (retval != ERROR_OK)
+                                       return retval;
+
+                               /* strh    r1, [r0], #2 */
+                               /* strh    r1, [r0] */
+                               retval = arm11_run_instr_no_data1(arm11,
+                                       !arm11_config_memrw_no_increment ? 0xe0c010b2 : 0xe1c010b0);
+                               if (retval != ERROR_OK)
+                                       return retval;
+                       }
+
+                       break;
+               }
+
+       case 4: {
+               uint32_t instr = !arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00;
+
+               /** \todo TODO: buffer cast to uint32_t* causes alignment warnings */
+               uint32_t *words = (uint32_t*)buffer;
+
+               if (!burst)
+               {
+                       /* STC p14,c5,[R0],#4 */
+                       /* STC p14,c5,[R0]*/
+                       retval = arm11_run_instr_data_to_core(arm11, instr, words, count);
+                       if (retval != ERROR_OK)
+                               return retval;
+               }
+               else
+               {
+                       /* STC p14,c5,[R0],#4 */
+                       /* STC p14,c5,[R0]*/
+                       retval = arm11_run_instr_data_to_core_noack(arm11, instr, words, count);
+                       if (retval != ERROR_OK)
+                               return retval;
+               }
 
-           /* strh    r1, [r0], #2 */
-           arm11_run_instr_no_data1(arm11, 0xe0c010b2);
+               break;
+       }
        }
-       break;
-    }
-
-    case 4:
-       /** \todo TODO: check if buffer cast to u32* might cause alignment problems */
 
-       if (!arm11_config_memwrite_burst)
+       /* r0 verification */
+       if (!arm11_config_memrw_no_increment)
        {
-           /* STC p14,c5,[R0],#4 */
-           arm11_run_instr_data_to_core(arm11, 0xeca05e01, (u32 *)buffer, count);
+               uint32_t r0;
+
+               /* MCR p14,0,R0,c0,c5,0 */
+               retval = arm11_run_instr_data_from_core(arm11, 0xEE000E15, &r0, 1);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               if (address + size * count != r0)
+               {
+                       LOG_ERROR("Data transfer failed. Expected end "
+                                       "address 0x%08x, got 0x%08x",
+                                       (unsigned) (address + size * count),
+                                       (unsigned) r0);
+
+                       if (burst)
+                               LOG_ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode");
+
+                       if (arm11_config_memwrite_error_fatal)
+                               return ERROR_FAIL;
+               }
        }
-       else
+
+       return arm11_run_instr_data_finish(arm11);
+}
+
+static int arm11_write_memory(struct target_s *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       return arm11_write_memory_inner(target, address, size, count, buffer, false);
+}
+
+/* write target memory in multiples of 4 byte, optimized for writing large quantities of data */
+static int arm11_bulk_write_memory(struct target_s *target,
+               uint32_t address, uint32_t count, uint8_t *buffer)
+{
+       FNC_INFO;
+
+       if (target->state != TARGET_HALTED)
        {
-           /* STC p14,c5,[R0],#4 */
-           arm11_run_instr_data_to_core_noack(arm11, 0xeca05e01, (u32 *)buffer, count);
+               LOG_WARNING("target was not halted");
+               return ERROR_TARGET_NOT_HALTED;
        }
 
-       break;
-    }
+       return arm11_write_memory(target, address, 4, count, buffer);
+}
 
-#if 1
-    /* r0 verification */
-    {
-       u32 r0;
+/* here we have nothing target specific to contribute, so we fail and then the
+ * fallback code will read data from the target and calculate the CRC on the
+ * host.
+ */
+static int arm11_checksum_memory(struct target_s *target,
+               uint32_t address, uint32_t count, uint32_t* checksum)
+{
+       return ERROR_FAIL;
+}
+
+/* target break-/watchpoint control
+* rw: 0 = write, 1 = read, 2 = access
+*/
+static int arm11_add_breakpoint(struct target_s *target,
+               breakpoint_t *breakpoint)
+{
+       FNC_INFO;
 
-       /* MCR p14,0,R0,c0,c5,0 */
-       arm11_run_instr_data_from_core(arm11, 0xEE000E15, &r0, 1);
+       arm11_common_t * arm11 = target->arch_info;
 
-       if (address + size * count != r0)
+#if 0
+       if (breakpoint->type == BKPT_SOFT)
        {
-           ERROR("Data transfer failed. (%d)", (r0 - address) - size * count);
+               LOG_INFO("sw breakpoint requested, but software breakpoints not enabled");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
+#endif
 
-           if (arm11_config_memwrite_burst)
-               ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode");
+       if (!arm11->free_brps)
+       {
+               LOG_DEBUG("no breakpoint unit available for hardware breakpoint");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       }
 
-           if (arm11_config_memwrite_error_fatal)
-               exit(-1);
+       if (breakpoint->length != 4)
+       {
+               LOG_DEBUG("only breakpoints of four bytes length supported");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
-    }
-#endif
 
+       arm11->free_brps--;
 
-    arm11_run_instr_data_finish(arm11);
+       return ERROR_OK;
+}
 
+static int arm11_remove_breakpoint(struct target_s *target,
+               breakpoint_t *breakpoint)
+{
+       FNC_INFO;
 
+       arm11_common_t * arm11 = target->arch_info;
 
+       arm11->free_brps++;
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-
-/* write target memory in multiples of 4 byte, optimized for writing large quantities of data */
-int arm11_bulk_write_memory(struct target_s *target, u32 address, u32 count, u8 *buffer)
+static int arm11_add_watchpoint(struct target_s *target,
+               watchpoint_t *watchpoint)
 {
-    FNC_INFO;
+       FNC_INFO_NOTIMPLEMENTED;
 
-    return arm11_write_memory(target, address, 4, count, buffer);
+       return ERROR_OK;
 }
 
-
-int arm11_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum)
+static int arm11_remove_watchpoint(struct target_s *target,
+               watchpoint_t *watchpoint)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       FNC_INFO_NOTIMPLEMENTED;
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
+// HACKHACKHACK - FIXME mode/state
+/* target algorithm support */
+static int arm11_run_algorithm(struct target_s *target,
+               int num_mem_params, mem_param_t *mem_params,
+               int num_reg_params, reg_param_t *reg_params,
+               uint32_t entry_point, uint32_t exit_point,
+               int timeout_ms, void *arch_info)
+{
+               arm11_common_t *arm11 = target->arch_info;
+//     enum armv4_5_state core_state = arm11->core_state;
+//     enum armv4_5_mode core_mode = arm11->core_mode;
+       uint32_t context[16];
+       uint32_t cpsr;
+       int exit_breakpoint_size = 0;
+       int retval = ERROR_OK;
+               LOG_DEBUG("Running algorithm");
 
-/* target break-/watchpoint control 
-* rw: 0 = write, 1 = read, 2 = access
+
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       // FIXME
+//     if (armv4_5_mode_to_number(arm11->core_mode)==-1)
+//             return ERROR_FAIL;
+
+       // Save regs
+       for (unsigned i = 0; i < 16; i++)
+       {
+               context[i] = buf_get_u32((uint8_t*)(&arm11->reg_values[i]),0,32);
+               LOG_DEBUG("Save %u: 0x%" PRIx32 "", i, context[i]);
+       }
+
+       cpsr = buf_get_u32((uint8_t*)(arm11->reg_values + ARM11_RC_CPSR),0,32);
+       LOG_DEBUG("Save CPSR: 0x%" PRIx32 "", cpsr);
+
+       for (int i = 0; i < num_mem_params; i++)
+       {
+               target_write_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value);
+       }
+
+       // Set register parameters
+       for (int i = 0; i < num_reg_params; i++)
+       {
+               reg_t *reg = register_get_by_name(arm11->core_cache, reg_params[i].reg_name, 0);
+               if (!reg)
+               {
+                       LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
+                       exit(-1);
+               }
+
+               if (reg->size != reg_params[i].size)
+               {
+                       LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
+                       exit(-1);
+               }
+               arm11_set_reg(reg,reg_params[i].value);
+//             printf("%i: Set %s =%08x\n", i, reg_params[i].reg_name,val);
+       }
+
+       exit_breakpoint_size = 4;
+
+/*     arm11->core_state = arm11_algorithm_info->core_state;
+       if (arm11->core_state == ARMV4_5_STATE_ARM)
+                               exit_breakpoint_size = 4;
+       else if (arm11->core_state == ARMV4_5_STATE_THUMB)
+               exit_breakpoint_size = 2;
+       else
+       {
+               LOG_ERROR("BUG: can't execute algorithms when not in ARM or Thumb state");
+               exit(-1);
+       }
 */
-int arm11_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
-{
-    FNC_INFO;
 
-    arm11_common_t * arm11 = target->arch_info;
 
+/* arm11 at this point only supports ARM not THUMB mode
+   however if this test needs to be reactivated the current state can be read back
+   from CPSR */
 #if 0
-    if (breakpoint->type == BKPT_SOFT)
-    {
-       INFO("sw breakpoint requested, but software breakpoints not enabled");
-       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-    }
+       if (arm11_algorithm_info->core_mode != ARMV4_5_MODE_ANY)
+       {
+               LOG_DEBUG("setting core_mode: 0x%2.2x", arm11_algorithm_info->core_mode);
+               buf_set_u32(arm11->reg_list[ARM11_RC_CPSR].value, 0, 5, arm11_algorithm_info->core_mode);
+               arm11->reg_list[ARM11_RC_CPSR].dirty = 1;
+               arm11->reg_list[ARM11_RC_CPSR].valid = 1;
+       }
 #endif
 
-    if (!arm11->free_brps)
-    {
-       INFO("no breakpoint unit available for hardware breakpoint");
-       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-    }
+       if ((retval = breakpoint_add(target, exit_point, exit_breakpoint_size, BKPT_HARD)) != ERROR_OK)
+       {
+               LOG_ERROR("can't add breakpoint to finish algorithm execution");
+               retval = ERROR_TARGET_FAILURE;
+               goto restore;
+       }
+
+       // no debug, otherwise breakpoint is not set
+       CHECK_RETVAL(target_resume(target, 0, entry_point, 1, 0));
+
+       CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, timeout_ms));
+
+       if (target->state != TARGET_HALTED)
+       {
+               CHECK_RETVAL(target_halt(target));
+
+               CHECK_RETVAL(target_wait_state(target, TARGET_HALTED, 500));
+
+               retval = ERROR_TARGET_TIMEOUT;
+
+               goto del_breakpoint;
+       }
+
+       if (buf_get_u32(arm11->reg_list[15].value, 0, 32) != exit_point)
+       {
+               LOG_WARNING("target reentered debug state, but not at the desired exit point: 0x%4.4" PRIx32 "",
+                       buf_get_u32(arm11->reg_list[15].value, 0, 32));
+               retval = ERROR_TARGET_TIMEOUT;
+               goto del_breakpoint;
+       }
+
+       for (int i = 0; i < num_mem_params; i++)
+       {
+               if (mem_params[i].direction != PARAM_OUT)
+                       target_read_buffer(target, mem_params[i].address, mem_params[i].size, mem_params[i].value);
+       }
+
+       for (int i = 0; i < num_reg_params; i++)
+       {
+               if (reg_params[i].direction != PARAM_OUT)
+               {
+                       reg_t *reg = register_get_by_name(arm11->core_cache, reg_params[i].reg_name, 0);
+                       if (!reg)
+                       {
+                               LOG_ERROR("BUG: register '%s' not found", reg_params[i].reg_name);
+                               exit(-1);
+                       }
+
+                       if (reg->size != reg_params[i].size)
+                       {
+                               LOG_ERROR("BUG: register '%s' size doesn't match reg_params[i].size", reg_params[i].reg_name);
+                               exit(-1);
+                       }
+
+                       buf_set_u32(reg_params[i].value, 0, 32, buf_get_u32(reg->value, 0, 32));
+               }
+       }
+
+del_breakpoint:
+       breakpoint_remove(target, exit_point);
 
-    if (breakpoint->length != 4)
-    {
-       INFO("only breakpoints of four bytes length supported");
-       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-    }
+restore:
+       // Restore context
+       for (size_t i = 0; i < 16; i++)
+       {
+               LOG_DEBUG("restoring register %s with value 0x%8.8" PRIx32 "",
+                        arm11->reg_list[i].name, context[i]);
+               arm11_set_reg(&arm11->reg_list[i], (uint8_t*)&context[i]);
+       }
+       LOG_DEBUG("restoring CPSR with value 0x%8.8" PRIx32 "", cpsr);
+       arm11_set_reg(&arm11->reg_list[ARM11_RC_CPSR], (uint8_t*)&cpsr);
 
-    arm11->free_brps--;
+//     arm11->core_state = core_state;
+//     arm11->core_mode = core_mode;
 
-    return ERROR_OK;
+       return retval;
 }
 
-int arm11_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
+static int arm11_target_create(struct target_s *target, Jim_Interp *interp)
 {
-    FNC_INFO;
+       FNC_INFO;
 
-    arm11_common_t * arm11 = target->arch_info;
-       
-    arm11->free_brps++;
+       NEW(arm11_common_t, arm11, 1);
+
+       arm11->target = target;
+
+       if (target->tap == NULL)
+               return ERROR_FAIL;
 
-    return ERROR_OK;
+       if (target->tap->ir_length != 5)
+       {
+               LOG_ERROR("'target arm11' expects IR LENGTH = 5");
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+
+       target->arch_info = arm11;
+
+       return ERROR_OK;
 }
 
-int arm11_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+static int arm11_init_target(struct command_context_s *cmd_ctx,
+               struct target_s *target)
 {
-    FNC_INFO_NOTIMPLEMENTED;
-
-    return ERROR_OK;
+       /* Initialize anything we can set up without talking to the target */
+       return arm11_build_reg_cache(target);
 }
 
-int arm11_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+/* talk to the target and set things up */
+static int arm11_examine(struct target_s *target)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       int retval;
 
-    return ERROR_OK;
-}
+       FNC_INFO;
 
+       arm11_common_t * arm11 = target->arch_info;
 
-/* target algorithm support */
-int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t *mem_params, int num_reg_params, reg_param_t *reg_param, u32 entry_point, u32 exit_point, int timeout_ms, void *arch_info)
-{
-    FNC_INFO_NOTIMPLEMENTED;
+       /* check IDCODE */
 
-    return ERROR_OK;
-}
+       arm11_add_IR(arm11, ARM11_IDCODE, ARM11_TAP_DEFAULT);
 
-int arm11_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
-{
-    FNC_INFO;
+       struct scan_field               idcode_field;
+
+       arm11_setup_field(arm11, 32, NULL, &arm11->device_id, &idcode_field);
+
+       arm11_add_dr_scan_vc(1, &idcode_field, TAP_DRPAUSE);
+
+       /* check DIDR */
 
-    if (argc < 4)
-    {
-       ERROR("'target arm11' 4th argument <jtag chain pos>");
-       exit(-1);
-    }
+       arm11_add_debug_SCAN_N(arm11, 0x00, ARM11_TAP_DEFAULT);
+
+       arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
+
+       struct scan_field               chain0_fields[2];
+
+       arm11_setup_field(arm11, 32, NULL,      &arm11->didr,           chain0_fields + 0);
+       arm11_setup_field(arm11,  8, NULL,      &arm11->implementor,    chain0_fields + 1);
+
+       arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_IDLE);
+
+       CHECK_RETVAL(jtag_execute_queue());
+
+       switch (arm11->device_id & 0x0FFFF000)
+       {
+       case 0x07B36000:        LOG_INFO("found ARM1136"); break;
+       case 0x07B56000:        LOG_INFO("found ARM1156"); break;
+       case 0x07B76000:        LOG_INFO("found ARM1176"); break;
+       default:
+       {
+               LOG_ERROR("'target arm11' expects IDCODE 0x*7B*7****");
+               return ERROR_FAIL;
+       }
+       }
 
-    int chain_pos = strtoul(args[3], NULL, 0);
+       arm11->debug_version = (arm11->didr >> 16) & 0x0F;
 
-    NEW(arm11_common_t, arm11, 1);
+       if (arm11->debug_version != ARM11_DEBUG_V6 &&
+               arm11->debug_version != ARM11_DEBUG_V61)
+       {
+               LOG_ERROR("Only ARMv6 v6 and v6.1 architectures supported.");
+               return ERROR_FAIL;
+       }
 
-    arm11->target = target;
+       arm11->brp      = ((arm11->didr >> 24) & 0x0F) + 1;
+       arm11->wrp      = ((arm11->didr >> 28) & 0x0F) + 1;
 
-    /* prepare JTAG information for the new target */
-    arm11->jtag_info.chain_pos = chain_pos;
-    arm11->jtag_info.scann_size        = 5;
+       /** \todo TODO: reserve one brp slot if we allow breakpoints during step */
+       arm11->free_brps = arm11->brp;
+       arm11->free_wrps = arm11->wrp;
 
-    arm_jtag_setup_connection(&arm11->jtag_info);
+       LOG_DEBUG("IDCODE %08" PRIx32 " IMPLEMENTOR %02x DIDR %08" PRIx32 "",
+               arm11->device_id,
+               (int)(arm11->implementor),
+               arm11->didr);
 
-    jtag_device_t *device = jtag_get_device(chain_pos);
+       /* as a side-effect this reads DSCR and thus
+        * clears the ARM11_DSCR_STICKY_PRECISE_DATA_ABORT / Sticky Precise Data Abort Flag
+        * as suggested by the spec.
+        */
 
-    if (device->ir_length != 5)
-    {
-       ERROR("'target arm11' expects 'jtag_device 5 0x01 0x1F 0x1E'");
-       exit(-1);
-    }
+       retval = arm11_check_init(arm11, NULL);
+       if (retval != ERROR_OK)
+               return retval;
 
-    target->arch_info = arm11;
+       target_set_examined(target);
 
-    return ERROR_OK;
+       return ERROR_OK;
 }
 
-int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
+
+/** Load a register that is marked !valid in the register cache */
+static int arm11_get_reg(reg_t *reg)
 {
-    FNC_INFO;
+       FNC_INFO;
 
-    arm11_common_t * arm11 = target->arch_info;
+       target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target;
 
-    /* check IDCODE */
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_WARNING("target was not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       /** \todo TODO: Check this. We assume that all registers are fetched at debug entry. */
+
+#if 0
+       arm11_common_t *arm11 = target->arch_info;
+       const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index;
+#endif
 
-    arm11_add_IR(arm11, ARM11_IDCODE, -1);
+       return ERROR_OK;
+}
 
-    scan_field_t               idcode_field;
+/** Change a value in the register cache */
+static int arm11_set_reg(reg_t *reg, uint8_t *buf)
+{
+       FNC_INFO;
 
-    arm11_setup_field(arm11, 32, NULL, &arm11->device_id, &idcode_field);
+       target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target;
+       arm11_common_t *arm11 = target->arch_info;
+//       const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index;
 
-    arm11_add_dr_scan_vc(1, &idcode_field, TAP_PD);
+       arm11->reg_values[((arm11_reg_state_t *)reg->arch_info)->def_index] = buf_get_u32(buf, 0, 32);
+       reg->valid      = 1;
+       reg->dirty      = 1;
 
-    /* check DIDR */
+       return ERROR_OK;
+}
 
-    arm11_add_debug_SCAN_N(arm11, 0x00, -1);
+static int arm11_build_reg_cache(target_t *target)
+{
+       arm11_common_t *arm11 = target->arch_info;
 
-    arm11_add_IR(arm11, ARM11_INTEST, -1);
+       NEW(reg_cache_t,                cache,                          1);
+       NEW(reg_t,                              reg_list,                       ARM11_REGCACHE_COUNT);
+       NEW(arm11_reg_state_t,  arm11_reg_states,       ARM11_REGCACHE_COUNT);
 
-    scan_field_t               chain0_fields[2];
+       if (arm11_regs_arch_type == -1)
+               arm11_regs_arch_type = register_reg_arch_type(arm11_get_reg, arm11_set_reg);
 
-    arm11_setup_field(arm11, 32, NULL, &arm11->didr,           chain0_fields + 0);
-    arm11_setup_field(arm11,  8, NULL, &arm11->implementor,    chain0_fields + 1);
+       register_init_dummy(&arm11_gdb_dummy_fp_reg);
+       register_init_dummy(&arm11_gdb_dummy_fps_reg);
 
-    arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_RTI);
+       arm11->reg_list = reg_list;
 
-    jtag_execute_queue();
+       /* Build the process context cache */
+       cache->name             = "arm11 registers";
+       cache->next             = NULL;
+       cache->reg_list = reg_list;
+       cache->num_regs = ARM11_REGCACHE_COUNT;
 
+       reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
+       (*cache_p) = cache;
 
-    switch (arm11->device_id & 0x0FFFF000)
-    {
-    case 0x07B36000:   INFO("found ARM1136"); break;
-    case 0x07B56000:   INFO("found ARM1156"); break;
-    case 0x07B76000:   INFO("found ARM1176"); break;
-    default:
-    {
-       ERROR("'target arm11' expects IDCODE 0x*7B*7****");
-       exit(-1);
-    }
-    }
+       arm11->core_cache = cache;
+//       armv7m->process_context = cache;
 
-    arm11->debug_version = (arm11->didr >> 16) & 0x0F;
+       size_t i;
 
-    if (arm11->debug_version != ARM11_DEBUG_V6 &&
-       arm11->debug_version != ARM11_DEBUG_V61)
-    {
-       ERROR("Only ARMv6 v6 and v6.1 architectures supported.");
-       exit(-1);
-    }
+       /* Not very elegant assertion */
+       if (ARM11_REGCACHE_COUNT != asizeof(arm11->reg_values) ||
+               ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) ||
+               ARM11_REGCACHE_COUNT != ARM11_RC_MAX)
+       {
+               LOG_ERROR("BUG: arm11->reg_values inconsistent (%d " ZU " " ZU " %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX);
+               exit(-1);
+       }
 
+       for (i = 0; i < ARM11_REGCACHE_COUNT; i++)
+       {
+               reg_t *                                         r       = reg_list                      + i;
+               const arm11_reg_defs_t *        rd      = arm11_reg_defs        + i;
+               arm11_reg_state_t *                     rs      = arm11_reg_states      + i;
+
+               r->name                         = rd->name;
+               r->size                         = 32;
+               r->value                        = (uint8_t *)(arm11->reg_values + i);
+               r->dirty                        = 0;
+               r->valid                        = 0;
+               r->bitfield_desc        = NULL;
+               r->num_bitfields        = 0;
+               r->arch_type            = arm11_regs_arch_type;
+               r->arch_info            = rs;
+
+               rs->def_index           = i;
+               rs->target                      = target;
+       }
 
-    arm11->brp = ((arm11->didr >> 24) & 0x0F) + 1;
-    arm11->wrp = ((arm11->didr >> 28) & 0x0F) + 1;
+       return ERROR_OK;
+}
 
-    /** \todo TODO: reserve one brp slot if we allow breakpoints during step */
-    arm11->free_brps = arm11->brp;
-    arm11->free_wrps = arm11->wrp;
+static COMMAND_HELPER(arm11_handle_bool, bool *var, char *name)
+{
+       if (argc == 0)
+       {
+               LOG_INFO("%s is %s.", name, *var ? "enabled" : "disabled");
+               return ERROR_OK;
+       }
 
-    DEBUG("IDCODE %08x IMPLEMENTOR %02x DIDR %08x",
-       arm11->device_id,
-       arm11->implementor,
-       arm11->didr);
+       if (argc != 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-    arm11_build_reg_cache(target);
+       switch (args[0][0])
+       {
+       case '0':       /* 0 */
+       case 'f':       /* false */
+       case 'F':
+       case 'd':       /* disable */
+       case 'D':
+               *var = false;
+               break;
 
+       case '1':       /* 1 */
+       case 't':       /* true */
+       case 'T':
+       case 'e':       /* enable */
+       case 'E':
+               *var = true;
+               break;
+       }
 
-    /* as a side-effect this reads DSCR and thus
-     * clears the ARM11_DSCR_STICKY_PRECISE_DATA_ABORT / Sticky Precise Data Abort Flag
-     * as suggested by the spec.
-     */
+       LOG_INFO("%s %s.", *var ? "Enabled" : "Disabled", name);
 
-    arm11_check_init(arm11, NULL);
+       return ERROR_OK;
+}
 
-    return ERROR_OK;
+#define BOOL_WRAPPER(name, print_name) \
+COMMAND_HANDLER(arm11_handle_bool_##name) \
+{ \
+       return CALL_COMMAND_HANDLER(arm11_handle_bool, \
+                       &arm11_config_##name, print_name); \
 }
 
-int arm11_quit(void)
+BOOL_WRAPPER(memwrite_burst,                   "memory write burst mode")
+BOOL_WRAPPER(memwrite_error_fatal,             "fatal error mode for memory writes")
+BOOL_WRAPPER(step_irq_enable,                  "IRQs while stepping")
+BOOL_WRAPPER(hardware_step,                    "hardware single step")
+
+COMMAND_HANDLER(arm11_handle_vcr)
 {
-    FNC_INFO_NOTIMPLEMENTED;
+       switch (argc) {
+       case 0:
+               break;
+       case 1:
+               COMMAND_PARSE_NUMBER(u32, args[0], arm11_vcr);
+               break;
+       default:
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
 
-    return ERROR_OK;
+       LOG_INFO("VCR 0x%08" PRIx32 "", arm11_vcr);
+       return ERROR_OK;
 }
 
-/** Load a register that is marked !valid in the register cache */
-int arm11_get_reg(reg_t *reg)
+static const uint32_t arm11_coproc_instruction_limits[] =
 {
-    FNC_INFO;
+       15,                             /* coprocessor */
+       7,                              /* opcode 1 */
+       15,                             /* CRn */
+       15,                             /* CRm */
+       7,                              /* opcode 2 */
+       0xFFFFFFFF,             /* value */
+};
 
-    target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target;
+static arm11_common_t * arm11_find_target(const char * arg)
+{
+       struct jtag_tap *       tap;
+       target_t *              t;
 
-    if (target->state != TARGET_HALTED)
-    {
-       return ERROR_TARGET_NOT_HALTED;
-    }
+       tap = jtag_tap_by_string(arg);
 
-    /** \todo TODO: Check this. We assume that all registers are fetched at debug entry. */
+       if (!tap)
+               return 0;
 
-#if 0
-    arm11_common_t *arm11 = target->arch_info;
-    const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index;
-#endif
+       for (t = all_targets; t; t = t->next)
+       {
+               if (t->tap != tap)
+                       continue;
+
+               /* if (t->type == arm11_target) */
+               if (0 == strcmp(target_get_name(t), "arm11"))
+                       return t->arch_info;
+       }
 
-    return ERROR_OK;
+       return 0;
 }
 
-/** Change a value in the register cache */
-int arm11_set_reg(reg_t *reg, u8 *buf)
+static int arm11_mrc_inner(target_t *target, int cpnum,
+               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm,
+               uint32_t *value, bool read)
 {
-    FNC_INFO;
+       int retval;
+       
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_ERROR("Target not halted");
+               return ERROR_FAIL;
+       }
+               
+       arm11_common_t * arm11 = target->arch_info;
+
+       uint32_t instr = 0xEE000010     |
+               (cpnum <<  8) |
+               (op1 << 21) |
+               (CRn << 16) |
+               (CRm <<  0) |
+               (op2 <<  5);
 
-    target_t * target = ((arm11_reg_state_t *)reg->arch_info)->target;
-    arm11_common_t *arm11 = target->arch_info;
-//    const arm11_reg_defs_t * arm11_reg_info = arm11_reg_defs + ((arm11_reg_state_t *)reg->arch_info)->def_index;
+       if (read)
+               instr |= 0x00100000;
 
-    arm11->reg_values[((arm11_reg_state_t *)reg->arch_info)->def_index] = buf_get_u32(buf, 0, 32);
-    reg->valid = 1;
-    reg->dirty = 1;
+       retval = arm11_run_instr_data_prepare(arm11);
+       if (retval != ERROR_OK)
+               return retval;
+
+       if (read)
+       {
+               retval = arm11_run_instr_data_from_core_via_r0(arm11, instr, value);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
+       else
+       {
+               retval = arm11_run_instr_data_to_core_via_r0(arm11, instr, *value);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
 
-    return ERROR_OK;
+       return arm11_run_instr_data_finish(arm11);
 }
 
+static int arm11_mrc(target_t *target, int cpnum,
+               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
+{
+       return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, value, true);
+}
 
-void arm11_build_reg_cache(target_t *target)
+static int arm11_mcr(target_t *target, int cpnum,
+               uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
 {
-    arm11_common_t *arm11 = target->arch_info;
-
-    NEW(reg_cache_t,           cache,                  1);
-    NEW(reg_t,                 reg_list,               ARM11_REGCACHE_COUNT);
-    NEW(arm11_reg_state_t,     arm11_reg_states,       ARM11_REGCACHE_COUNT);
-
-    if (arm11_regs_arch_type == -1)
-       arm11_regs_arch_type = register_reg_arch_type(arm11_get_reg, arm11_set_reg);
-
-    arm11->reg_list    = reg_list;
-
-    /* Build the process context cache */ 
-    cache->name                = "arm11 registers";
-    cache->next                = NULL;
-    cache->reg_list    = reg_list;
-    cache->num_regs    = ARM11_REGCACHE_COUNT;
-
-    reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
-    (*cache_p) = cache;
-
-//    armv7m->core_cache = cache;
-//    armv7m->process_context = cache;
-
-    size_t i;
-
-    /* Not very elegant assertion */
-    if (ARM11_REGCACHE_COUNT != asizeof(arm11->reg_values) ||
-       ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) ||
-       ARM11_REGCACHE_COUNT != ARM11_RC_MAX)
-    {
-       ERROR("arm11->reg_values inconsistent (%d %d %d %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX);
-       exit(-1);
-    }
-
-    for (i = 0; i < ARM11_REGCACHE_COUNT; i++)
-    {
-       reg_t *                         r       = reg_list              + i;
-       const arm11_reg_defs_t *        rd      = arm11_reg_defs        + i;
-       arm11_reg_state_t *             rs      = arm11_reg_states      + i;
-
-       r->name                 = rd->name;
-       r->size                 = 32;
-       r->value                = (u8 *)(arm11->reg_values + i);
-       r->dirty                = 0;
-       r->valid                = 0;
-       r->bitfield_desc        = NULL;
-       r->num_bitfields        = 0;
-       r->arch_type            = arm11_regs_arch_type;
-       r->arch_info            = rs;
-
-       rs->def_index           = i;
-       rs->target              = target;
-    }
+       return arm11_mrc_inner(target, cpnum, op1, op2, CRn, CRm, &value, false);
 }
 
+static COMMAND_HELPER(arm11_handle_etm_read_write, bool read)
+{
+       if (argc != (read ? 2 : 3))
+       {
+               LOG_ERROR("Invalid number of arguments.");
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
 
+       arm11_common_t * arm11 = arm11_find_target(args[0]);
+
+       if (!arm11)
+       {
+               LOG_ERROR("Parameter 1 is not the target name of an ARM11 device.");
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+
+       uint32_t address;
+       COMMAND_PARSE_NUMBER(u32, args[1], address);
+
+       if (!read)
+       {
+               uint32_t value;
+               COMMAND_PARSE_NUMBER(u32, args[2], value);
+
+               LOG_INFO("ETM write register 0x%02" PRIx32 " (%" PRId32 ") = 0x%08" PRIx32 " (%" PRId32 ")",
+                 address, address, value, value);
+
+               CHECK_RETVAL(arm11_write_etm(arm11, address, value));
+       }
+       else
+       {
+               uint32_t value;
+
+               CHECK_RETVAL(arm11_read_etm(arm11, address, &value));
+
+           LOG_INFO("ETM read register 0x%02" PRIx32 " (%" PRId32 ") = 0x%08" PRIx32 " (%" PRId32 ")",
+                 address, address, value, value);
+       }
 
-int arm11_handle_bool(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, int * var, char * name)
-{
-    if (argc == 0)
-    {
-       INFO("%s is %s.", name, *var ? "enabled" : "disabled");
        return ERROR_OK;
-    }
-
-    if (argc != 1)
-       return ERROR_COMMAND_SYNTAX_ERROR;
-
-    switch (args[0][0])
-    {
-    case '0':  /* 0 */
-    case 'f':  /* false */
-    case 'F':
-    case 'd':  /* disable */
-    case 'D':
-       *var = 0;
-       break;
-
-    case '1':  /* 1 */
-    case 't':  /* true */
-    case 'T':
-    case 'e':  /* enable */
-    case 'E':
-       *var = 1;
-       break;
-    }
-
-    INFO("%s %s.", *var ? "Enabled" : "Disabled", name);
-
-    return ERROR_OK;
 }
 
-
-#define BOOL_WRAPPER(name, print_name)  \
-int arm11_handle_bool_##name(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) \
-{ \
-    return arm11_handle_bool(cmd_ctx, cmd, args, argc, &arm11_config_##name, print_name); \
+COMMAND_HANDLER(arm11_handle_etmr)
+{
+       return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, true);
 }
 
-#define RC_TOP(name, descr, more)  \
-{ \
-    command_t * new_cmd = register_command(cmd_ctx, top_cmd, name, NULL, COMMAND_ANY, descr);  \
-    command_t * top_cmd = new_cmd; \
-    more \
+COMMAND_HANDLER(arm11_handle_etmw)
+{
+       return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, false);
 }
 
-#define RC_FINAL(name, descr, handler)  \
-    register_command(cmd_ctx, top_cmd, name, handler, COMMAND_ANY, descr);
+#define ARM11_HANDLER(x)       .x = arm11_##x
 
-#define RC_FINAL_BOOL(name, descr, var)  \
-    register_command(cmd_ctx, top_cmd, name, arm11_handle_bool_##var, COMMAND_ANY, descr);
+target_type_t arm11_target = {
+               .name = "arm11",
 
+               ARM11_HANDLER(poll),
+               ARM11_HANDLER(arch_state),
 
-BOOL_WRAPPER(memwrite_burst,           "memory write burst mode")
-BOOL_WRAPPER(memwrite_error_fatal,     "fatal error mode for memory writes")
+               ARM11_HANDLER(target_request_data),
 
+               ARM11_HANDLER(halt),
+               ARM11_HANDLER(resume),
+               ARM11_HANDLER(step),
 
-int arm11_handle_vcr(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-    if (argc == 1)
-    {
-       arm11_vcr = strtoul(args[0], NULL, 0);
-    }
-    else if (argc != 0)
-    {
-       return ERROR_COMMAND_SYNTAX_ERROR;
-    }
-
-    INFO("VCR 0x%08X", arm11_vcr);
-    return ERROR_OK;
-}
+               ARM11_HANDLER(assert_reset),
+               ARM11_HANDLER(deassert_reset),
+               ARM11_HANDLER(soft_reset_halt),
 
+               ARM11_HANDLER(get_gdb_reg_list),
 
-int arm11_register_commands(struct command_context_s *cmd_ctx)
-{
-    FNC_INFO;
+               ARM11_HANDLER(read_memory),
+               ARM11_HANDLER(write_memory),
 
-    command_t * top_cmd = NULL;
+               ARM11_HANDLER(bulk_write_memory),
 
-    RC_TOP(                    "arm11",        "arm11 specific commands",
+               ARM11_HANDLER(checksum_memory),
 
-       RC_TOP(                 "memwrite",     "Control memory write transfer mode",
+               ARM11_HANDLER(add_breakpoint),
+               ARM11_HANDLER(remove_breakpoint),
+               ARM11_HANDLER(add_watchpoint),
+               ARM11_HANDLER(remove_watchpoint),
 
-           RC_FINAL_BOOL(      "burst",        "Enable/Disable non-standard but fast burst mode (default: enabled)",
-                                               memwrite_burst)
+               ARM11_HANDLER(run_algorithm),
 
-           RC_FINAL_BOOL(      "error_fatal",
-                                               "Terminate program if transfer error was found (default: enabled)",
-                                               memwrite_error_fatal)
-       )
+               ARM11_HANDLER(register_commands),
+               ARM11_HANDLER(target_create),
+               ARM11_HANDLER(init_target),
+               ARM11_HANDLER(examine),
 
-       RC_FINAL(               "vcr",          "Control (Interrupt) Vector Catch Register",
-                                               arm11_handle_vcr)
-    )
+               ARM11_HANDLER(mrc),
+               ARM11_HANDLER(mcr),
+       };
 
-    return ERROR_OK;
+
+int arm11_register_commands(struct command_context_s *cmd_ctx)
+{
+       FNC_INFO;
+
+       command_t *top_cmd, *mw_cmd;
+
+       top_cmd = register_command(cmd_ctx, NULL, "arm11",
+                       NULL, COMMAND_ANY, NULL);
+
+       register_command(cmd_ctx, top_cmd, "etmr",
+                       arm11_handle_etmr, COMMAND_ANY,
+                       "Read Embedded Trace Macrocell (ETM) register. etmr <jtag_target> <ETM register address>");
+
+       register_command(cmd_ctx, top_cmd, "etmw",
+                       arm11_handle_etmw, COMMAND_ANY,
+                       "Write Embedded Trace Macrocell (ETM) register. etmr <jtag_target> <ETM register address> <value>");
+
+       /* "hardware_step" is only here to check if the default
+        * simulate + breakpoint implementation is broken.
+        * TEMPORARY! NOT DOCUMENTED!
+        */
+       register_command(cmd_ctx, top_cmd, "hardware_step",
+                       arm11_handle_bool_hardware_step, COMMAND_ANY,
+                       "DEBUG ONLY - Hardware single stepping"
+                               " (default: disabled)");
+
+       mw_cmd = register_command(cmd_ctx, top_cmd, "memwrite",
+                       NULL, COMMAND_ANY, NULL);
+       register_command(cmd_ctx, mw_cmd, "burst",
+                       arm11_handle_bool_memwrite_burst, COMMAND_ANY,
+                       "Enable/Disable non-standard but fast burst mode"
+                               " (default: enabled)");
+       register_command(cmd_ctx, mw_cmd, "error_fatal",
+                       arm11_handle_bool_memwrite_error_fatal, COMMAND_ANY,
+                       "Terminate program if transfer error was found"
+                               " (default: enabled)");
+
+       register_command(cmd_ctx, top_cmd, "step_irq_enable",
+                       arm11_handle_bool_step_irq_enable, COMMAND_ANY,
+                       "Enable interrupts while stepping"
+                               " (default: disabled)");
+       register_command(cmd_ctx, top_cmd, "vcr",
+                       arm11_handle_vcr, COMMAND_ANY,
+                       "Control (Interrupt) Vector Catch Register");
+
+       return ERROR_OK;
 }