jtag newtap change & huge manual update

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

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 47b069e62877e8d847bfa4cf47bd43caedec7e98..8a260a282f5ce246861158b9c75f445818a3a471 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -35,10 +35,10 @@
 
 char* mips32_core_reg_list[] =
 {
-       "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
-       "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
-       "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-       "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
+       "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3",
+       "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
+       "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
+       "t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra",
        "status", "lo", "hi", "badvaddr", "cause", "pc"
 };
 
@@ -320,12 +320,16 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
        return cache;
 }
 
-int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, int chain_pos, const char *variant)
+int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap, const char *variant)
 {
        target->arch_info = mips32;
        mips32->common_magic = MIPS32_COMMON_MAGIC;
        
-       mips32->ejtag_info.chain_pos = chain_pos;
+       /* has breakpoint/watchpint unit been scanned */
+       mips32->bp_scanned = 0;
+       mips32->data_break_list = NULL;
+       
+       mips32->ejtag_info.tap = tap;
        mips32->read_core_reg = mips32_read_core_reg;
        mips32->write_core_reg = mips32_write_core_reg;
        
@@ -342,3 +346,82 @@ int mips32_run_algorithm(struct target_s *target, int num_mem_params, mem_param_
        /*TODO*/
        return ERROR_OK;
 }
+
+int mips32_examine(struct target_s *target)
+{
+       mips32_common_t *mips32 = target->arch_info;
+       
+       if (!target->type->examined)
+       {
+               target->type->examined = 1;
+       
+               /* we will configure later */
+               mips32->bp_scanned = 0;
+               mips32->num_inst_bpoints = 0;
+               mips32->num_data_bpoints = 0;
+               mips32->num_inst_bpoints_avail = 0;
+               mips32->num_data_bpoints_avail = 0;
+       }
+               
+       return ERROR_OK;
+}
+
+int mips32_configure_break_unit(struct target_s *target)
+{
+       /* get pointers to arch-specific information */
+       mips32_common_t *mips32 = target->arch_info;
+       int retval;
+       u32 dcr, bpinfo;
+       int i;
+       
+       if (mips32->bp_scanned)
+               return ERROR_OK;
+       
+       /* get info about breakpoint support */
+       if ((retval = target_read_u32(target, EJTAG_DCR, &dcr)) != ERROR_OK)
+               return retval;
+       
+       if (dcr & (1 << 16))
+       {
+               /* get number of inst breakpoints */
+               if ((retval = target_read_u32(target, EJTAG_IBS, &bpinfo)) != ERROR_OK)
+                       return retval;
+               
+               mips32->num_inst_bpoints = (bpinfo >> 24) & 0x0F;
+               mips32->num_inst_bpoints_avail = mips32->num_inst_bpoints;
+               mips32->inst_break_list = calloc(mips32->num_inst_bpoints, sizeof(mips32_comparator_t));
+               for (i = 0; i < mips32->num_inst_bpoints; i++)
+               {
+                       mips32->inst_break_list[i].reg_address = EJTAG_IBA1 + (0x100 * i);
+               }
+               
+               /* clear IBIS reg */
+               if ((retval = target_write_u32(target, EJTAG_IBS, 0)) != ERROR_OK)
+                       return retval;
+       }
+       
+       if (dcr & (1 << 17))
+       {
+               /* get number of data breakpoints */
+               if ((retval = target_read_u32(target, EJTAG_DBS, &bpinfo)) != ERROR_OK)
+                       return retval;
+               
+               mips32->num_data_bpoints = (bpinfo >> 24) & 0x0F;
+               mips32->num_data_bpoints_avail = mips32->num_data_bpoints;
+               mips32->data_break_list = calloc(mips32->num_data_bpoints, sizeof(mips32_comparator_t));
+               for (i = 0; i < mips32->num_data_bpoints; i++)
+               {
+                       mips32->data_break_list[i].reg_address = EJTAG_DBA1 + (0x100 * i);
+               }
+               
+               /* clear DBIS reg */
+               if ((retval = target_write_u32(target, EJTAG_DBS, 0)) != ERROR_OK)
+                       return retval;
+       }
+       
+       LOG_DEBUG("DCR 0x%x numinst %i numdata %i", dcr, mips32->num_inst_bpoints, mips32->num_data_bpoints);
+       
+       mips32->bp_scanned = 1;
+       
+       return ERROR_OK;
+}