target_type_t -> struct target_type
[fw/openocd] / src / target / feroceon.c
index bad110e061a41c8ec84846b619bb205a7868ad1a..73292e1077d9105ec9a2bc90a9d73ec7e1b002d3 100644 (file)
@@ -1,7 +1,10 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Marvell Semiconductors, Inc.                    *
+ *   Copyright (C) 2008-2009 by Marvell Semiconductors, Inc.                    *
  *   Written by Nicolas Pitre <nico@marvell.com>                           *
  *                                                                         *
+ *   Copyright (C) 2008 by Hongtao Zheng                                   *
+ *   hontor@126.com                                                        *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  ***************************************************************************/
 
 /*
- * Marvell Feroceon (88F5182, 88F5281) support.
+ * Marvell Feroceon/Dragonite support.
  *
- * The Feroceon core mimics the ARM926 ICE interface with the following
- * differences:
+ * The Feroceon core, as found in the Orion and Kirkwood SoCs amongst others,
+ * mimics the ARM926 ICE interface with the following differences:
  *
  * - the MOE (method of entry) reporting is not implemented
  *
@@ -40,6 +43,9 @@
  *
  * - the DCC channel is half duplex (only one FIFO for both directions) with
  *   seemingly no proper flow control.
+ *
+ * The Dragonite core is the non-mmu version based on the ARM966 model, and
+ * it shares the above issues as well.
  */
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #include "arm926ejs.h"
-#include "jtag.h"
-#include "log.h"
-#include "arm_simulator.h"
-
-#include <stdlib.h>
-#include <string.h>
+#include "arm966e.h"
+#include "target_type.h"
 
+int feroceon_assert_reset(target_t *target)
+{
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       int ud = arm7_9->use_dbgrq;
 
-int feroceon_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
-int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
-int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int feroceon_quit();
+       arm7_9->use_dbgrq = 0;
+       if (target->reset_halt)
+               arm7_9_halt(target);
+       arm7_9->use_dbgrq = ud;
+       return arm7_9_assert_reset(target);
+}
 
-target_type_t feroceon_target =
+int feroceon_dummy_clock_out(struct arm_jtag *jtag_info, uint32_t instr)
 {
-       .name = "feroceon",
+       struct scan_field fields[3];
+       uint8_t out_buf[4];
+       uint8_t instr_buf[4];
+       uint8_t sysspeed_buf = 0x0;
 
-       .poll = arm7_9_poll,
-       .arch_state = arm926ejs_arch_state,
+       /* prepare buffer */
+       buf_set_u32(out_buf, 0, 32, 0);
 
-       .target_request_data = arm7_9_target_request_data,
+       buf_set_u32(instr_buf, 0, 32, flip_u32(instr, 32));
 
-       .halt = arm7_9_halt,
-       .resume = arm7_9_resume,
-       .step = arm7_9_step,
+       jtag_set_end_state(TAP_DRPAUSE);
+       arm_jtag_scann(jtag_info, 0x1);
 
-       .assert_reset = arm7_9_assert_reset,
-       .deassert_reset = arm7_9_deassert_reset,
-       .soft_reset_halt = arm926ejs_soft_reset_halt,
-       .prepare_reset_halt = arm7_9_prepare_reset_halt,
-       
-       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
+       arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
-       .read_memory = arm7_9_read_memory,
-       .write_memory = arm926ejs_write_memory,
-       .bulk_write_memory = feroceon_bulk_write_memory,
-       .checksum_memory = arm7_9_checksum_memory,
-       
-       .run_algorithm = armv4_5_run_algorithm,
+       fields[0].tap = jtag_info->tap;
+       fields[0].num_bits = 32;
+       fields[0].out_value = out_buf;
+       fields[0].in_value = NULL;
 
-       .add_breakpoint = arm7_9_add_breakpoint,
-       .remove_breakpoint = arm7_9_remove_breakpoint,
-       .add_watchpoint = arm7_9_add_watchpoint,
-       .remove_watchpoint = arm7_9_remove_watchpoint,
+       fields[1].tap = jtag_info->tap;
+       fields[1].num_bits = 3;
+       fields[1].out_value = &sysspeed_buf;
+       fields[1].in_value = NULL;
 
-       .register_commands = arm926ejs_register_commands,
-       .target_command = feroceon_target_command,
-       .init_target = feroceon_init_target,
-       .quit = feroceon_quit
-};
+       fields[2].tap = jtag_info->tap;
+       fields[2].num_bits = 32;
+       fields[2].out_value = instr_buf;
+       fields[2].in_value = NULL;
+
+       jtag_add_dr_scan(3, fields, jtag_get_end_state());
 
+       /* no jtag_add_runtest(0, jtag_get_end_state()) here */
 
-void feroceon_change_to_arm(target_t *target, u32 *r0, u32 *pc)
+       return ERROR_OK;
+}
+
+void feroceon_change_to_arm(target_t *target, uint32_t *r0, uint32_t *pc)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-       
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+
        /*
-        * save r0 before using it and put system in ARM state 
+        * save r0 before using it and put system in ARM state
         * to allow common handling of ARM and THUMB debugging
         */
 
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
+       feroceon_dummy_clock_out(jtag_info, ARMV4_5_T_NOP);
+       feroceon_dummy_clock_out(jtag_info, ARMV4_5_T_NOP);
+       feroceon_dummy_clock_out(jtag_info, ARMV4_5_T_NOP);
+
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_STR(0, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
@@ -138,19 +148,19 @@ void feroceon_change_to_arm(target_t *target, u32 *r0, u32 *pc)
 
        /*
         * fix program counter:
-        * MOV R0, PC was the 10th instruction (+18)
+        * MOV R0, PC was the 7th instruction (+12)
         * reading PC in Thumb state gives address of instruction + 4
         */
-       *pc -= 22;
+       *pc -= (12 + 4);
 }
 
-void feroceon_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])
+void feroceon_read_core_regs(target_t *target, uint32_t mask, uint32_t* core_regs[16])
 {
        int i;
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-               
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+
        arm9tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -163,16 +173,16 @@ void feroceon_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-void feroceon_read_core_regs_target_buffer(target_t *target, u32 mask, void* buffer, int size)
+void feroceon_read_core_regs_target_buffer(target_t *target, uint32_t mask, void* buffer, int size)
 {
        int i;
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
        int be = (target->endianness == TARGET_BIG_ENDIAN) ? 1 : 0;
-       u32 *buf_u32 = buffer;
-       u16 *buf_u16 = buffer;
-       u8 *buf_u8 = buffer;
+       uint32_t *buf_u32 = buffer;
+       uint16_t *buf_u16 = buffer;
+       uint8_t *buf_u8 = buffer;
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_STMIA(0, mask & 0xffff, 0, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -200,12 +210,12 @@ void feroceon_read_core_regs_target_buffer(target_t *target, u32 mask, void* buf
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-void feroceon_read_xpsr(target_t *target, u32 *xpsr, int spsr)
+void feroceon_read_xpsr(target_t *target, uint32_t *xpsr, int spsr)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-               
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+
        arm9tdmi_clock_out(jtag_info, ARMV4_5_MRS(0, spsr & 1), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -223,13 +233,13 @@ void feroceon_read_xpsr(target_t *target, u32 *xpsr, int spsr)
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-void feroceon_write_xpsr(target_t *target, u32 xpsr, int spsr)
+void feroceon_write_xpsr(target_t *target, uint32_t xpsr, int spsr)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-               
-       LOG_DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+
+       LOG_DEBUG("xpsr: %8.8" PRIx32 ", spsr: %i", xpsr, spsr);
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr & 0xff, 0, 1, spsr), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -264,11 +274,11 @@ void feroceon_write_xpsr(target_t *target, u32 xpsr, int spsr)
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-void feroceon_write_xpsr_im8(target_t *target, u8 xpsr_im, int rot, int spsr)
+void feroceon_write_xpsr_im8(target_t *target, uint8_t xpsr_im, int rot, int spsr)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
        LOG_DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);
 
@@ -281,13 +291,13 @@ void feroceon_write_xpsr_im8(target_t *target, u8 xpsr_im, int rot, int spsr)
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-void feroceon_write_core_regs(target_t *target, u32 mask, u32 core_regs[16])
+void feroceon_write_core_regs(target_t *target, uint32_t mask, uint32_t core_regs[16])
 {
        int i;
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-               
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+
        arm9tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, mask & 0xffff, 0, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -303,9 +313,9 @@ void feroceon_write_core_regs(target_t *target, u32 mask, u32 core_regs[16])
 
 void feroceon_branch_resume(target_t *target)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -313,42 +323,33 @@ void feroceon_branch_resume(target_t *target)
        arm9tdmi_clock_out(jtag_info, ARMV4_5_B(0xfffff9, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 1);
 
-       /* need BYPASS before RESTART */
-       jtag_add_end_state(TAP_RTI);
-       arm_jtag_set_instr(jtag_info, 0xf, NULL);
+       arm7_9->need_bypass_before_restart = 1;
 }
 
 void feroceon_branch_resume_thumb(target_t *target)
 {
        LOG_DEBUG("-");
-       
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
-       u32 r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32);
-       u32 pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
 
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 0x8000, 0, 0), 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, pc & ~3, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
+       uint32_t r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32);
+       uint32_t pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 
-       arm9tdmi_clock_out(jtag_info, 0xE28F0001, 0, NULL, 0); /* add r0,r15,#1 */
+       arm9tdmi_clock_out(jtag_info, 0xE28F0001, 0, NULL, 0); // add r0,pc,#1
        arm9tdmi_clock_out(jtag_info, ARMV4_5_BX(0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
-       
-       arm9tdmi_clock_out(jtag_info, ARMV4_5_T_LDMIA(0, 1), 0, NULL, 0);
+
+       arm9tdmi_clock_out(jtag_info, ARMV4_5_T_LDMIA(0, 0x1), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
+
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, r0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
@@ -357,16 +358,14 @@ void feroceon_branch_resume_thumb(target_t *target)
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_B(0x7e9 + pc), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 1);
 
-       /* need BYPASS before RESTART */
-       jtag_add_end_state(TAP_RTI);
-       arm_jtag_set_instr(jtag_info, 0xf, NULL);
+       arm7_9->need_bypass_before_restart = 1;
 }
 
-int feroceon_read_cp15(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 *value)
+int feroceon_read_cp15(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
        int err;
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_MRC(15, op1, 0, CRn, CRm, op2), 0, NULL, 0);
@@ -384,11 +383,11 @@ int feroceon_read_cp15(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32
        return jtag_execute_queue();
 }
 
-int feroceon_write_cp15(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 value)
+int feroceon_write_cp15(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
        arm9tdmi_clock_out(jtag_info, ARMV4_5_LDMIA(0, 1, 0, 0), 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -403,23 +402,20 @@ int feroceon_write_cp15(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u3
        return arm7_9_execute_sys_speed(target);
 }
 
-void feroceon_enable_single_step(target_t *target)
+void feroceon_set_dbgrq(target_t *target)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       u32 next_pc;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+       reg_t *dbg_ctrl = &arm7_9->eice_cache->reg_list[EICE_DBG_CTRL];
 
-        /* calculate PC of next instruction */
-       if (arm_simulate_step(target, &next_pc) != ERROR_OK)
-       {
-               u32 current_pc, current_opcode;
-               current_pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
-               target_read_u32(target, current_pc, &current_opcode);
-               LOG_ERROR("BUG: couldn't calculate PC of next instruction, "
-                     "current opcode is 0x%8.8x", current_opcode);
-               next_pc = current_pc;
-       }
-       arm7_9_restore_context(target);
+       buf_set_u32(dbg_ctrl->value, 0, 8, 2);
+       embeddedice_store_reg(dbg_ctrl);
+}
+
+void feroceon_enable_single_step(target_t *target, uint32_t next_pc)
+{
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
 
        /* set a breakpoint there */
        embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE], next_pc);
@@ -431,8 +427,8 @@ void feroceon_enable_single_step(target_t *target)
 
 void feroceon_disable_single_step(target_t *target)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
 
        embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_VALUE]);
        embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_W0_ADDR_MASK]);
@@ -452,19 +448,20 @@ int feroceon_examine_debug_reason(target_t *target)
        return ERROR_OK;
 }
 
-int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer)
+int feroceon_bulk_write_memory(target_t *target, uint32_t address, uint32_t count, uint8_t *buffer)
 {
-       armv4_5_common_t *armv4_5 = target->arch_info;
-       arm7_9_common_t *arm7_9 = armv4_5->arch_info;
+       int retval;
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
        enum armv4_5_state core_state = armv4_5->core_state;
-       u32 x, flip, shift, save[7];
-       int i;
+       uint32_t x, flip, shift, save[7];
+       uint32_t i;
 
        /*
         * We can't use the dcc flow control bits, so let's transfer data
         * with 31 bits and flip the MSB each time a new data word is sent.
         */
-       static u32 dcc_code[] = 
+       static uint32_t dcc_code[] =
        {
                0xee115e10,     /* 3:   mrc     p14, 0, r5, c1, c0, 0   */
                0xe3a0301e,     /* 1:   mov     r3, #30                 */
@@ -488,21 +485,21 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
                0xeafffff3,     /*      b       3b                      */
        };
 
-       int dcc_size = sizeof(dcc_code);
+       uint32_t dcc_size = sizeof(dcc_code);
 
        if (!arm7_9->dcc_downloads)
-               return target->type->write_memory(target, address, 4, count, buffer);
+               return target_write_memory(target, address, 4, count, buffer);
 
        /* regrab previously allocated working_area, or allocate a new one */
        if (!arm7_9->dcc_working_area)
        {
-               u8 dcc_code_buf[dcc_size];
+               uint8_t dcc_code_buf[dcc_size];
 
                /* make sure we have a working area */
                if (target_alloc_working_area(target, dcc_size, &arm7_9->dcc_working_area) != ERROR_OK)
                {
                        LOG_INFO("no working area available, falling back to memory writes");
-                       return target->type->write_memory(target, address, 4, count, buffer);
+                       return target_write_memory(target, address, 4, count, buffer);
                }
 
                /* copy target instructions to target endianness */
@@ -510,7 +507,10 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
                        target_buffer_set_u32(target, dcc_code_buf + i*4, dcc_code[i]);
 
                /* write DCC code to working area */
-               target->type->write_memory(target, arm7_9->dcc_working_area->address, 4, dcc_size, dcc_code_buf);
+               if ((retval = target_write_memory(target, arm7_9->dcc_working_area->address, 4, dcc_size/4, dcc_code_buf)) != ERROR_OK)
+               {
+                       return retval;
+               }
        }
 
        /* backup clobbered processor state */
@@ -524,7 +524,7 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
        armv4_5->core_cache->reg_list[0].dirty = 1;
        armv4_5->core_state = ARMV4_5_STATE_ARM;
 
-       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], 0); 
+       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], 0);
        arm7_9_resume(target, 0, arm7_9->dcc_working_area->address, 1, 1);
 
        /* send data over */
@@ -533,23 +533,34 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
        shift = 1;
        for (i = 0; i < count; i++)
        {
-               u32 y = target_buffer_get_u32(target, buffer);
-               u32 z = (x >> 1) | (y >> shift) | (flip ^= 0x80000000);
-               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], z); 
+               uint32_t y = target_buffer_get_u32(target, buffer);
+               uint32_t z = (x >> 1) | (y >> shift) | (flip ^= 0x80000000);
+               embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], z);
                x = y << (32 - shift);
                if (++shift >= 32 || i + 1 >= count)
                {
                        z = (x >> 1) | (flip ^= 0x80000000);
-                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], z); 
+                       embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], z);
                        x = 0;
                        shift = 1;
                }
                buffer += 4;
        }
 
-       target->type->halt(target);
-       while (target->state != TARGET_HALTED)
-               target->type->poll(target);
+       retval = target_halt(target);
+       if (retval == ERROR_OK)
+               retval = target_wait_state(target, TARGET_HALTED, 500);
+       if (retval == ERROR_OK) {
+                uint32_t endaddress =
+                       buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32);
+               if (endaddress != address + count*4) {
+                       LOG_ERROR("DCC write failed,"
+                               " expected end address 0x%08" PRIx32
+                               " got 0x%0" PRIx32 "",
+                               address + count*4, endaddress);
+                       retval = ERROR_FAIL;
+               }
+       }
 
        /* restore target state */
        for (i = 0; i <= 5; i++)
@@ -563,15 +574,81 @@ int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buf
        armv4_5->core_cache->reg_list[15].dirty = 1;
        armv4_5->core_state = core_state;
 
-       return ERROR_OK;
+       return retval;
 }
 
 int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
 {
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-
        arm9tdmi_init_target(cmd_ctx, target);
+       return ERROR_OK;
+}
+
+void feroceon_common_setup(struct target_s *target)
+{
+       struct arm *armv4_5 = target->arch_info;
+       struct arm7_9_common *arm7_9 = armv4_5->arch_info;
+
+       /* override some insn sequence functions */
+       arm7_9->change_to_arm = feroceon_change_to_arm;
+       arm7_9->read_core_regs = feroceon_read_core_regs;
+       arm7_9->read_core_regs_target_buffer = feroceon_read_core_regs_target_buffer;
+       arm7_9->read_xpsr = feroceon_read_xpsr;
+       arm7_9->write_xpsr = feroceon_write_xpsr;
+       arm7_9->write_xpsr_im8 = feroceon_write_xpsr_im8;
+       arm7_9->write_core_regs = feroceon_write_core_regs;
+       arm7_9->branch_resume = feroceon_branch_resume;
+       arm7_9->branch_resume_thumb = feroceon_branch_resume_thumb;
+
+       /* must be implemented with only one comparator */
+       arm7_9->enable_single_step = feroceon_enable_single_step;
+       arm7_9->disable_single_step = feroceon_disable_single_step;
+
+       /* MOE is not implemented */
+       arm7_9->examine_debug_reason = feroceon_examine_debug_reason;
+
+       /* Note: asserting DBGRQ might not win over the undef exception.
+          If that happens then just use "arm7_9 dbgrq disable". */
+       arm7_9->use_dbgrq = 1;
+       arm7_9->set_special_dbgrq = feroceon_set_dbgrq;
+
+       /* only one working comparator */
+       arm7_9->wp_available_max = 1;
+       arm7_9->wp1_used_default = -1;
+}
+
+int feroceon_target_create(struct target_s *target, Jim_Interp *interp)
+{
+       struct arm926ejs_common *arm926ejs = calloc(1,sizeof(struct arm926ejs_common));
+
+       arm926ejs_init_arch_info(target, arm926ejs, target->tap);
+       feroceon_common_setup(target);
+
+       /* the standard ARM926 methods don't always work (don't ask...) */
+       arm926ejs->read_cp15 = feroceon_read_cp15;
+       arm926ejs->write_cp15 = feroceon_write_cp15;
+
+       return ERROR_OK;
+}
+
+int dragonite_target_create(struct target_s *target, Jim_Interp *interp)
+{
+       struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
+
+       arm966e_init_arch_info(target, arm966e, target->tap);
+       feroceon_common_setup(target);
+
+       return ERROR_OK;
+}
+
+int feroceon_examine(struct target_s *target)
+{
+       struct arm *armv4_5;
+       struct arm7_9_common *arm7_9;
+       int retval;
+
+       retval = arm9tdmi_examine(target);
+       if (retval != ERROR_OK)
+               return retval;
 
        armv4_5 = target->arch_info;
        arm7_9 = armv4_5->arch_info;
@@ -580,8 +657,8 @@ int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
        if (buf_get_u32(arm7_9->eice_cache->reg_list[EICE_COMMS_CTRL].value, 2, 4) != 6)
                LOG_ERROR("unexpected Feroceon EICE version signature");
 
-       arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].size = 6; 
-       arm7_9->eice_cache->reg_list[EICE_DBG_STAT].size = 5; 
+       arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].size = 6;
+       arm7_9->eice_cache->reg_list[EICE_DBG_STAT].size = 5;
        arm7_9->has_monitor_mode = 1;
 
        /* vector catch reg is not initialized on reset */
@@ -589,74 +666,87 @@ int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 
        /* clear monitor mode, enable comparators */
        embeddedice_read_reg(&arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]);
-       jtag_execute_queue(); 
+       jtag_execute_queue();
        buf_set_u32(arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].value, 4, 1, 0);
-       buf_set_u32(arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].value, 5, 1, 0); 
+       buf_set_u32(arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].value, 5, 1, 0);
        embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]);
 
        return ERROR_OK;
 }
 
-int feroceon_quit()
+struct target_type feroceon_target =
 {
-       return ERROR_OK;
-}
+       .name = "feroceon",
+
+       .poll = arm7_9_poll,
+       .arch_state = arm926ejs_arch_state,
+
+       .target_request_data = arm7_9_target_request_data,
+
+       .halt = arm7_9_halt,
+       .resume = arm7_9_resume,
+       .step = arm7_9_step,
+
+       .assert_reset = feroceon_assert_reset,
+       .deassert_reset = arm7_9_deassert_reset,
+       .soft_reset_halt = arm926ejs_soft_reset_halt,
+
+       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
+
+       .read_memory = arm7_9_read_memory,
+       .write_memory = arm926ejs_write_memory,
+       .bulk_write_memory = feroceon_bulk_write_memory,
+       .checksum_memory = arm7_9_checksum_memory,
+       .blank_check_memory = arm7_9_blank_check_memory,
+
+       .run_algorithm = armv4_5_run_algorithm,
+
+       .add_breakpoint = arm7_9_add_breakpoint,
+       .remove_breakpoint = arm7_9_remove_breakpoint,
+       .add_watchpoint = arm7_9_add_watchpoint,
+       .remove_watchpoint = arm7_9_remove_watchpoint,
+
+       .register_commands = arm926ejs_register_commands,
+       .target_create = feroceon_target_create,
+       .init_target = feroceon_init_target,
+       .examine = feroceon_examine,
+};
 
-int feroceon_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
+struct target_type dragonite_target =
 {
-       int chain_pos;
-       char *variant = NULL;
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
-       arm926ejs_common_t *arm926ejs = malloc(sizeof(arm926ejs_common_t));
-       memset(arm926ejs, 0, sizeof(*arm926ejs));
-       
-       if (argc < 4)
-       {
-               LOG_ERROR("'target arm926ejs' requires at least one additional argument");
-               exit(-1);
-       }
-       
-       chain_pos = strtoul(args[3], NULL, 0);
-       
-       if (argc >= 5)
-               variant = args[4];
-       
-       LOG_DEBUG("chain_pos: %i, variant: %s", chain_pos, variant);
-       
-       arm926ejs_init_arch_info(target, arm926ejs, chain_pos, variant);
+       .name = "dragonite",
 
-       armv4_5 = target->arch_info;
-       arm7_9 = armv4_5->arch_info;
+       .poll = arm7_9_poll,
+       .arch_state = armv4_5_arch_state,
 
-       /* override some insn sequence functions */
-       arm7_9->change_to_arm = feroceon_change_to_arm;
-       arm7_9->read_core_regs = feroceon_read_core_regs;
-       arm7_9->read_core_regs_target_buffer = feroceon_read_core_regs_target_buffer;
-       arm7_9->read_xpsr = feroceon_read_xpsr;
-       arm7_9->write_xpsr = feroceon_write_xpsr;
-       arm7_9->write_xpsr_im8 = feroceon_write_xpsr_im8;
-       arm7_9->write_core_regs = feroceon_write_core_regs;
-       arm7_9->branch_resume = feroceon_branch_resume;
-       arm7_9->branch_resume_thumb = feroceon_branch_resume_thumb;
+       .target_request_data = arm7_9_target_request_data,
 
-       /* must be implemented with only one comparator */
-       arm7_9->enable_single_step = feroceon_enable_single_step;
-       arm7_9->disable_single_step = feroceon_disable_single_step;
+       .halt = arm7_9_halt,
+       .resume = arm7_9_resume,
+       .step = arm7_9_step,
 
-       /* MOE is not implemented */
-       arm7_9->examine_debug_reason = feroceon_examine_debug_reason;
+       .assert_reset = feroceon_assert_reset,
+       .deassert_reset = arm7_9_deassert_reset,
+       .soft_reset_halt = arm7_9_soft_reset_halt,
 
-       /* the standard ARM926 methods don't always work (don't ask...) */
-       arm926ejs->read_cp15 = feroceon_read_cp15;
-       arm926ejs->write_cp15 = feroceon_write_cp15;
+       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
 
-       /* asserting DBGRQ won't win over the undef exception */
-       arm7_9->use_dbgrq = 0;
+       .read_memory = arm7_9_read_memory,
+       .write_memory = arm7_9_write_memory,
+       .bulk_write_memory = feroceon_bulk_write_memory,
+       .checksum_memory = arm7_9_checksum_memory,
+       .blank_check_memory = arm7_9_blank_check_memory,
 
-       /* only one working comparator */
-       arm7_9->wp_available = 1; 
-       arm7_9->wp1_used = -1; 
+       .run_algorithm = armv4_5_run_algorithm,
+
+       .add_breakpoint = arm7_9_add_breakpoint,
+       .remove_breakpoint = arm7_9_remove_breakpoint,
+       .add_watchpoint = arm7_9_add_watchpoint,
+       .remove_watchpoint = arm7_9_remove_watchpoint,
+
+       .register_commands = arm966e_register_commands,
+       .target_create = dragonite_target_create,
+       .init_target = feroceon_init_target,
+       .examine = feroceon_examine,
+};
 
-       return ERROR_OK;
-}