MIPS: pracc access tweaks

[fw/openocd] / src / target / mips_ejtag.c

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 6f06d9a3afc79b2b0964e797459307ac3035d158..bebad9ace3de3785c7565cc3a06d2357769a0abf 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -4,6 +4,8 @@
  *                                                                         *
  *   Copyright (C) 2008 by David T.L. Wong                                 *
  *                                                                         *
+ *   Copyright (C) 2009 by David N. Claffey <dnclaffey@gmail.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     *
@@ -137,13 +139,11 @@ int mips_ejtag_step_enable(struct mips_ejtag *ejtag_info)
                        MIPS32_MFC0(1,23,0),                    /* move COP0 Debug to $1 */
                        MIPS32_ORI(1,1,0x0100),                 /* set SSt bit in debug reg */
                        MIPS32_MTC0(1,23,0),                    /* move $1 to COP0 Debug */
+                       MIPS32_B(NEG16(5)),
                        MIPS32_MFC0(1,31,0),                    /* move COP0 DeSave to $1 */
-                       MIPS32_NOP,
-                       MIPS32_B(NEG16(7)),
-                       MIPS32_NOP,
        };
 
-       mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
+       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
                0, NULL, 0, NULL, 1);
 
        return ERROR_OK;
@@ -163,13 +163,11 @@ int mips_ejtag_step_disable(struct mips_ejtag *ejtag_info)
                        MIPS32_MTC0(1,23,0),                                                    /* move $1 to COP0 Debug */
                        MIPS32_LW(2,0,15),
                        MIPS32_LW(1,0,15),
+                       MIPS32_B(NEG16(13)),
                        MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
-                       MIPS32_NOP,
-                       MIPS32_B(NEG16(15)),
-                       MIPS32_NOP,
        };
 
-       mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
+       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
                0, NULL, 0, NULL, 1);
 
        return ERROR_OK;
@@ -228,13 +226,11 @@ int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg)
                        MIPS32_SW(2,0,1),
                        MIPS32_LW(2,0,15),
                        MIPS32_LW(1,0,15),
+                       MIPS32_B(NEG16(12)),
                        MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
-                       MIPS32_NOP,
-                       MIPS32_B(NEG16(14)),
-                       MIPS32_NOP,
        };
 
-       mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
+       mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code, \
                0, NULL, 1, debug_reg, 1);
 
        return ERROR_OK;
@@ -286,3 +282,42 @@ int mips_ejtag_init(struct mips_ejtag *ejtag_info)
 
        return ERROR_OK;
 }
+
+int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write, uint32_t *data)
+{
+       struct jtag_tap *tap;
+       tap = ejtag_info->tap;
+
+       if (tap == NULL)
+               return ERROR_FAIL;
+
+       struct scan_field fields[2];
+       uint8_t spracc = 0;
+       uint8_t t[4] = {0, 0, 0, 0};
+
+       /* fastdata 1-bit register */
+       fields[0].tap = tap;
+       fields[0].num_bits = 1;
+       fields[0].out_value = &spracc;
+       fields[0].in_value = NULL;
+
+       /* processor access data register 32 bit */
+       fields[1].tap = tap;
+       fields[1].num_bits = 32;
+       fields[1].out_value = t;
+
+       if (write)
+       {
+               fields[1].in_value = NULL;
+               buf_set_u32(t, 0, 32, *data);
+       }
+       else
+       {
+               fields[1].in_value = (uint8_t *) data;
+       }
+
+       jtag_add_dr_scan(2, fields, jtag_get_end_state());
+       keep_alive();
+
+       return ERROR_OK;
+}