- fixed arm926 cp15 command bug (thanks to Vincent Palatin for this patch)

[openocd.git] / src / target / arm9tdmi.c

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index ccd30312d253af77b7d817cf9620d8d64621f1a3..e3302cf686d30c36c5dafbfb311c8a2393eb9185 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -28,6 +28,8 @@
 #include "target.h"
 #include "armv4_5.h"
 #include "embeddedice.h"
+#include "etm.h"
+#include "etb.h"
 #include "log.h"
 #include "jtag.h"
 #include "arm_jtag.h"
@@ -722,7 +724,7 @@ void arm9tdmi_branch_resume(target_t *target)
 
 void arm9tdmi_branch_resume_thumb(target_t *target)
 {
-       DEBUG("");
+       DEBUG("-");
        
        /* get pointers to arch-specific information */
        armv4_5_common_t *armv4_5 = target->arch_info;
@@ -786,9 +788,8 @@ void arm9tdmi_enable_single_step(target_t *target)
        /* get pointers to arch-specific information */
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm9tdmi_common_t *arm9 = arm7_9->arch_info;
        
-       if (arm9->has_single_step)
+       if (arm7_9->has_single_step)
        {
                buf_set_u32(arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].value, 3, 1, 1);
                embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]);
@@ -804,9 +805,8 @@ void arm9tdmi_disable_single_step(target_t *target)
        /* get pointers to arch-specific information */
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       arm9tdmi_common_t *arm9 = arm7_9->arch_info;
        
-       if (arm9->has_single_step)
+       if (arm7_9->has_single_step)
        {
                buf_set_u32(arm7_9->eice_cache->reg_list[EICE_DBG_CTRL].value, 3, 1, 0);
                embeddedice_store_reg(&arm7_9->eice_cache->reg_list[EICE_DBG_CTRL]);
@@ -824,34 +824,25 @@ void arm9tdmi_build_reg_cache(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;
-       arm9tdmi_common_t *arm9tdmi = arm7_9->arch_info;
-
-       embeddedice_reg_t *vec_catch_arch_info;
 
        (*cache_p) = armv4_5_build_reg_cache(target, armv4_5);
        armv4_5->core_cache = (*cache_p);
        
        /* one extra register (vector catch) */
-       (*cache_p)->next = embeddedice_build_reg_cache(target, jtag_info, 1);
+       (*cache_p)->next = embeddedice_build_reg_cache(target, arm7_9);
        arm7_9->eice_cache = (*cache_p)->next;
-       
-       if (arm9tdmi->has_monitor_mode)
-               (*cache_p)->next->reg_list[EICE_DBG_CTRL].size = 6;
-       else
-               (*cache_p)->next->reg_list[EICE_DBG_CTRL].size = 4;
-       
-       (*cache_p)->next->reg_list[EICE_DBG_STAT].size = 5;
 
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].name = "vector catch";
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].dirty = 0;
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].valid = 0;
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].bitfield_desc = NULL;
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].num_bitfields = 0;
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].size = 8;
-       (*cache_p)->next->reg_list[EICE_VEC_CATCH].value = calloc(1, 4);
-       vec_catch_arch_info = (*cache_p)->next->reg_list[EICE_VEC_CATCH].arch_info;
-       vec_catch_arch_info->addr = 0x2;
+       if (arm7_9->has_etm)
+       {
+               (*cache_p)->next->next = etm_build_reg_cache(target, jtag_info, 0);
+               arm7_9->etm_cache = (*cache_p)->next->next;
+       }
        
+       if (arm7_9->etb)
+       {
+               (*cache_p)->next->next->next = etb_build_reg_cache(arm7_9->etb);
+               arm7_9->etb->reg_cache = (*cache_p)->next->next->next;
+       }
 }
 
 int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
@@ -923,27 +914,24 @@ int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, int c
        arm7_9->arch_info = arm9tdmi;
        
        arm9tdmi->common_magic = ARM9TDMI_COMMON_MAGIC;
-       arm9tdmi->has_monitor_mode = 0;
-       arm9tdmi->has_single_step = 0;
        arm9tdmi->arch_info = NULL;
 
        if (variant)
        {
-               if (strcmp(variant, "arm920t") == 0)
-                       arm9tdmi->has_single_step = 1;
-               else if (strcmp(variant, "arm922t") == 0)
-                       arm9tdmi->has_single_step = 1;
-               else if (strcmp(variant, "arm940t") == 0)
-                       arm9tdmi->has_single_step = 1;
                arm9tdmi->variant = strdup(variant);
        }
        else
+       {
                arm9tdmi->variant = strdup("");
+       }
        
        arm7_9_init_arch_info(target, arm7_9);
 
        /* override use of DBGRQ, this is safe on ARM9TDMI */
        arm7_9->use_dbgrq = 1;
+
+       /* all ARM9s have the vector catch register */
+       arm7_9->has_vector_catch = 1;
        
        return ERROR_OK;
 }