This is an automated email from Gerrit.
Elta Era (elta....@gmail.com) just uploaded a new patch set to Gerrit, which
you can find at http://openocd.zylin.com/1653
-- gerrit
commit c88b52c20b4df509babde89a45fd7bc7ecf1bd19
Author: Dongxue Zhang <elta....@gmail.com>
Date: Mon Sep 23 16:51:14 2013 +0800
targets: Add mips64 ejtag commands patch 4
Add mips64 ejtag commands handling functions into mips_ejtag.c and
mips_ejtag.h
Add mips64 stubs into Makefile.am
Change-Id: I18c9f5c27907f149e35c87f63502c7da649237ff
Signed-off-by: Dongxue Zhang <elta....@gmail.com>
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 443e8d3..cf86f6f 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -32,6 +32,7 @@ libtarget_la_SOURCES = \
$(AVR32_SRC) \
$(MIPS_COMMON_SRC) \
$(MIPS32_SRC) \
+ $(MIPS64_SRC) \
$(NDS32_SRC) \
avrt.c \
dsp563xx.c \
diff --git a/src/target/mips64_pracc.c b/src/target/mips64_pracc.c
index 0bfe47d..10daa88 100644
--- a/src/target/mips64_pracc.c
+++ b/src/target/mips64_pracc.c
@@ -403,8 +403,8 @@ int mips64_pracc_queue_exec(struct mips_ejtag *ejtag_info,
struct mips64_pracc_q
goto exit;
}
if (addr != fetch_addr) {
- LOG_ERROR("Fetch addr mismatch, read: 0x%16.16"
PRIx64 "
- expected: %16.16" PRIx64 " count:
%d", addr, fetch_addr, scan_count);
+ LOG_ERROR("Fetch addr mismatch, read: 0x%16.16"
PRIx64 " expected: %16.16" PRIx64 "count: %d",
+ addr, fetch_addr, scan_count);
retval = ERROR_FAIL;
goto exit;
}
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 3457b78..2c41a73 100644
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -27,6 +27,7 @@
#endif
#include "mips32.h"
+#include "mips64.h"
#include "mips_ejtag.h"
#include "mips32_dmaacc.h"
@@ -36,8 +37,9 @@ void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, int
new_instr)
tap = ejtag_info->tap;
assert(tap != NULL);
-
+#ifndef BUILD_TARGET64
if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) !=
(uint32_t)new_instr) {
+#endif
struct scan_field field;
uint8_t t[4];
@@ -47,7 +49,9 @@ void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, int
new_instr)
field.in_value = NULL;
jtag_add_ir_scan(tap, &field, TAP_IDLE);
+#ifndef BUILD_TARGET64
}
+#endif
}
int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)
@@ -123,6 +127,35 @@ void mips_ejtag_add_scan_96(struct mips_ejtag *ejtag_info,
uint32_t ctrl, uint32
keep_alive();
}
+int mips_ejtag_drscan_64(struct mips_ejtag *ejtag_info, uint64_t *data)
+{
+ struct jtag_tap *tap;
+ tap = ejtag_info->tap;
+ assert(tap != NULL);
+
+ struct scan_field field;
+ uint8_t t[8], r[8];
+ int retval;
+
+ field.num_bits = 64;
+ field.out_value = t;
+ buf_set_u64(t, 0, field.num_bits, *data);
+ field.in_value = r;
+ jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
+
+ retval = jtag_execute_queue();
+ if (retval != ERROR_OK) {
+ LOG_ERROR("register read failed");
+ return retval;
+ }
+
+ *data = buf_get_u64(field.in_value, 0, 64);
+
+ keep_alive();
+
+ return ERROR_OK;
+}
+
int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data)
{
struct jtag_tap *tap;
@@ -153,6 +186,24 @@ int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info,
uint32_t *data)
return ERROR_OK;
}
+void mips_ejtag_drscan_64_out(struct mips_ejtag *ejtag_info, uint64_t data)
+{
+ uint8_t t[8];
+ struct jtag_tap *tap;
+ tap = ejtag_info->tap;
+ assert(tap != NULL);
+
+ struct scan_field field;
+
+ field.num_bits = 64;
+ field.out_value = t;
+ buf_set_u64(t, 0, field.num_bits, data);
+
+ field.in_value = NULL;
+
+ jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
+}
+
void mips_ejtag_drscan_32_out(struct mips_ejtag *ejtag_info, uint32_t data)
{
uint8_t t[4];
@@ -215,6 +266,30 @@ void mips_ejtag_drscan_8_out(struct mips_ejtag
*ejtag_info, uint8_t data)
}
/* Set (to enable) or clear (to disable stepping) the SSt bit (bit 8) in Cp0
Debug reg (reg 23, sel 0) */
+int mips64_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step)
+{
+ struct mips64_pracc_queue_info ctx = {.max_code = 7};
+ mips64_pracc_queue_init(&ctx);
+ if (ctx.retval != ERROR_OK)
+ goto exit;
+
+ mips64_pracc_add(&ctx, 0, MIPS64_MFC0(8, 23, 0));
/* move COP0 Debug to $8 */
+ mips64_pracc_add(&ctx, 0, MIPS64_ORI(8, 8, 0x0100));
/* set SSt bit in debug reg */
+ if (!enable_step)
+ mips64_pracc_add(&ctx, 0, MIPS64_XORI(8, 8, 0x0100));
/* clear SSt bit in debug reg */
+
+ mips64_pracc_add(&ctx, 0, MIPS64_MTC0(8, 23, 0));
/* move $8 to COP0 Debug */
+ mips64_pracc_add(&ctx, 0, MIPS64_LUI(8, UPPER64_16(ejtag_info->reg8)));
/* restore upper 16 bits of $8 */
+ mips64_pracc_add(&ctx, 0, MIPS64_B(NEG16((ctx.code_count + 1))));
/* jump to start */
+ mips64_pracc_add(&ctx, 0, MIPS64_ORI(8, 8,
LOWER64_16(ejtag_info->reg8))); /* restore lower 16 bits of $8 */
+
+ ctx.retval = mips64_pracc_queue_exec(ejtag_info, &ctx, NULL);
+exit:
+ mips64_pracc_queue_free(&ctx);
+ return ctx.retval;
+}
+
+/* Set (to enable) or clear (to disable stepping) the SSt bit (bit 8) in Cp0
Debug reg (reg 23, sel 0) */
int mips_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step)
{
struct pracc_queue_info ctx = {.max_code = 7};
@@ -290,6 +365,18 @@ error:
return ERROR_FAIL;
}
+int mips64_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
+{
+ uint32_t instr = MIPS64_DRET;
+ struct mips64_pracc_queue_info ctx = {.max_code = 1, .pracc_list =
&instr, .code_count = 1, .store_count = 0};
+
+ /* execute our dret instruction */
+ ctx.retval = mips64_pracc_queue_exec(ejtag_info, &ctx, NULL);
+
+ jtag_add_sleep(1000);
+ return ctx.retval;
+}
+
int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
{
uint32_t instr = MIPS32_DRET;
@@ -398,6 +485,43 @@ int mips_ejtag_init(struct mips_ejtag *ejtag_info)
return ERROR_OK;
}
+int mips64_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t,
uint64_t *data)
+{
+ struct jtag_tap *tap;
+
+ tap = ejtag_info->tap;
+ assert(tap != NULL);
+
+ struct scan_field fields[2];
+ uint8_t spracc = 0;
+ uint8_t t[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+
+ /* fastdata 1-bit register */
+ fields[0].num_bits = 1;
+ fields[0].out_value = &spracc;
+ fields[0].in_value = NULL;
+
+ /* processor access data register 32 bit */
+ fields[1].num_bits = 64;
+ fields[1].out_value = t;
+
+ if (write_t) {
+ fields[1].in_value = NULL;
+ buf_set_u64(t, 0, 64, *data);
+ } else
+ fields[1].in_value = (void *) data;
+
+ jtag_add_dr_scan(tap, 2, fields, TAP_IDLE);
+
+ if (!write_t && data)
+ jtag_add_callback(mips_le_to_h_u64,
+ (jtag_callback_data_t) data);
+
+ keep_alive();
+
+ return ERROR_OK;
+}
+
int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t,
uint32_t *data)
{
struct jtag_tap *tap;
diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index db20e9d..cdb014d 100644
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -160,8 +160,8 @@ struct mips_ejtag {
uint32_t idcode;
uint32_t ejtag_ctrl;
int fast_access_save;
- uint32_t reg8;
- uint32_t reg9;
+ target_ulong reg8;
+ target_ulong reg9;
unsigned scan_delay;
int mode;
unsigned int ejtag_version;
@@ -189,10 +189,13 @@ struct mips_ejtag {
void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info,
int new_instr);
int mips_ejtag_enter_debug(struct mips_ejtag *ejtag_info);
+int mips64_ejtag_exit_debug(struct mips_ejtag *ejtag_info);
int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info);
int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode);
void mips_ejtag_add_scan_96(struct mips_ejtag *ejtag_info,
uint32_t ctrl, uint32_t data, uint8_t *in_scan_buf);
+void mips_ejtag_drscan_64_out(struct mips_ejtag *ejtag_info, uint64_t data);
+int mips_ejtag_drscan_64(struct mips_ejtag *ejtag_info, uint64_t *data);
void mips_ejtag_drscan_32_out(struct mips_ejtag *ejtag_info, uint32_t data);
int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data);
void mips_ejtag_drscan_8_out(struct mips_ejtag *ejtag_info, uint8_t data);
@@ -200,6 +203,7 @@ int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info,
uint32_t *data);
int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t,
uint32_t *data);
int mips_ejtag_init(struct mips_ejtag *ejtag_info);
+int mips64_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step);
int mips_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step);
static inline void mips_le_to_h_u32(jtag_callback_data_t arg)
@@ -208,4 +212,10 @@ static inline void mips_le_to_h_u32(jtag_callback_data_t
arg)
*((uint32_t *)arg) = le_to_h_u32(in);
}
+static inline void mips_le_to_h_u64(jtag_callback_data_t arg)
+{
+ uint8_t *in = (uint8_t *)arg;
+ *((uint64_t *)arg) = le_to_h_u64(in);
+}
+
#endif /* MIPS_EJTAG */
--
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
