Changes:
- delay jtag queue excecution to decrease memory read/write times
- fix an early queue excecution in once interface
diff --git a/src/target/dsp563xx.c b/src/target/dsp563xx.c
index 4371d0a..9bfb9a1 100644
--- a/src/target/dsp563xx.c
+++ b/src/target/dsp563xx.c
@@ -29,8 +29,6 @@
#include "dsp563xx.h"
#include "dsp563xx_once.h"
-//#define DSP563XX_JTAG_INS_LEN 4
-
#define ASM_REG_W_R0 0x60F400
#define ASM_REG_W_R1 0x61F400
#define ASM_REG_W_R2 0x62F400
@@ -1129,6 +1127,7 @@ static int dsp563xx_read_memory(struct target *target,
int mem_type, uint32_t ad
uint32_t i, x;
uint32_t data, move_cmd;
uint8_t *b;
+ int flush_cnt;
LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count:
0x%8.8" PRIx32, address, size, count);
@@ -1141,6 +1140,7 @@ static int dsp563xx_read_memory(struct target *target,
int mem_type, uint32_t ad
switch (mem_type)
{
case MEM_X:
+ /* TODO: mark effected queued registers */
move_cmd = 0x61d800;
break;
case MEM_Y:
@@ -1167,23 +1167,43 @@ static int dsp563xx_read_memory(struct target *target,
int mem_type, uint32_t ad
x = count;
b = buffer;
+ flush_cnt = 0;
if ((err = dsp563xx_once_execute_dw_ir(target->tap, 0x60F400, address))
!= ERROR_OK)
return err;
for (i = 0; i < x; i++)
{
- data = 0;
if ((err = dsp563xx_once_execute_sw_ir_nq(target->tap,
move_cmd)) != ERROR_OK)
return err;
- if ((err = dsp563xx_once_execute_sw_ir(target->tap, 0x08D13C))
!= ERROR_OK)
+ if ((err = dsp563xx_once_execute_sw_ir_nq(target->tap,
0x08D13C)) != ERROR_OK)
return err;
- if ((err = dsp563xx_once_reg_read(target->tap,
DSP563XX_ONCE_OGDBR, &data)) != ERROR_OK)
+ if ((err = dsp563xx_once_reg_read_nq(target->tap,
DSP563XX_ONCE_OGDBR, (uint32_t*)b)) != ERROR_OK)
return err;
- target_buffer_set_u32(target, b, data);
b += 4;
- LOG_DEBUG("R: %08X", data);
+ /* delay jtag queue excecution */
+ if ( ++flush_cnt >= 20 )
+ {
+ if ((err = jtag_execute_queue()) != ERROR_OK)
+ return err;
+ flush_cnt = 0;
+ }
+ }
+
+ /* flush the jtag queue */
+ if ((err = jtag_execute_queue()) != ERROR_OK)
+ return err;
+
+ /* walk over the buffer and fix target endianness */
+ b = buffer;
+
+ for (i = 0; i < x; i++)
+ {
+ data = *((uint32_t*)b) & 0x00FFFFFF;
+// LOG_DEBUG("R: %08X", *((uint32_t*)b));
+ target_buffer_set_u32(target, b, data);
+ b += 4;
}
return ERROR_OK;
@@ -1201,6 +1221,7 @@ static int dsp563xx_write_memory(struct target *target,
int mem_type, uint32_t a
uint32_t i, x;
uint32_t data, move_cmd;
uint8_t *b;
+ int flush_cnt;
LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count:
0x%8.8" PRIx32 "", address, size, count);
@@ -1239,6 +1260,7 @@ static int dsp563xx_write_memory(struct target *target,
int mem_type, uint32_t a
x = count;
b = buffer;
+ flush_cnt = 0;
if ((err = dsp563xx_once_execute_dw_ir(target->tap, 0x60F400, address))
!= ERROR_OK)
return err;
@@ -1246,18 +1268,30 @@ static int dsp563xx_write_memory(struct target *target,
int mem_type, uint32_t a
for (i = 0; i < x; i++)
{
data = target_buffer_get_u32(target, b);
- data &= 0x00ffffff;
- LOG_DEBUG("W: %08X", data);
+// LOG_DEBUG("W: %08X", data);
+
+ data &= 0x00ffffff;
if ((err = dsp563xx_once_execute_dw_ir_nq(target->tap,
0x61F400, data)) != ERROR_OK)
return err;
- if ((err = dsp563xx_once_execute_sw_ir(target->tap, move_cmd))
!= ERROR_OK)
+ if ((err = dsp563xx_once_execute_sw_ir_nq(target->tap,
move_cmd)) != ERROR_OK)
return err;
-
b += 4;
+
+ /* delay jtag queue excecution */
+ if ( flush_cnt++ >= 20 )
+ {
+ if ((err = jtag_execute_queue()) != ERROR_OK)
+ return err;
+ flush_cnt = 0;
+ }
}
+ /* flush the jtag queue */
+ if ((err = jtag_execute_queue()) != ERROR_OK)
+ return err;
+
return ERROR_OK;
}
@@ -1266,6 +1300,11 @@ static int dsp563xx_write_memory_p(struct target
*target, uint32_t address, uint
return dsp563xx_write_memory(target, MEM_P, address, size, count,
buffer);
}
+static int dsp563xx_bulk_write_memory_p(struct target *target, uint32_t
address, uint32_t count, uint8_t *buffer)
+{
+ return dsp563xx_write_memory(target, MEM_P, address, 4, count, buffer);
+}
+
static void handle_md_output(struct command_context *cmd_ctx, struct target
*target, uint32_t address, unsigned size, unsigned count, const uint8_t *
buffer)
{
const unsigned line_bytecnt = 32;
@@ -1485,6 +1524,7 @@ struct target_type dsp563xx_target = {
.read_memory = dsp563xx_read_memory_p,
.write_memory = dsp563xx_write_memory_p,
+ .bulk_write_memory = dsp563xx_bulk_write_memory_p,
.commands = dsp563xx_command_handlers,
.target_create = dsp563xx_target_create,
diff --git a/src/target/dsp563xx_once.c b/src/target/dsp563xx_once.c
index df43ed6..e6b2f6d 100644
--- a/src/target/dsp563xx_once.c
+++ b/src/target/dsp563xx_once.c
@@ -45,12 +45,6 @@
static inline int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t * dr_in,
uint8_t * dr_out, int dr_len, int rti)
{
- if (NULL == tap)
- {
- LOG_ERROR("invalid tap");
- return ERROR_FAIL;
- }
-
jtag_add_plain_dr_scan(dr_len, dr_out, dr_in, TAP_IDLE);
return ERROR_OK;
@@ -58,23 +52,11 @@ static inline int dsp563xx_write_dr(struct jtag_tap *tap,
uint8_t * dr_in, uint8
static inline int dsp563xx_write_dr_u8(struct jtag_tap *tap, uint8_t * dr_in,
uint8_t dr_out, int dr_len, int rti)
{
- if (dr_len > 8)
- {
- LOG_ERROR("dr_len overflow, maxium is 8");
- return ERROR_FAIL;
- }
-
return dsp563xx_write_dr(tap, dr_in, &dr_out, dr_len, rti);
}
static inline int dsp563xx_write_dr_u32(struct jtag_tap *tap, uint32_t *
dr_in, uint32_t dr_out, int dr_len, int rti)
{
- if (dr_len > 32)
- {
- LOG_ERROR("dr_len overflow, maxium is 32");
- return ERROR_FAIL;
- }
-
return dsp563xx_write_dr(tap, (uint8_t *) dr_in, (uint8_t *) & dr_out,
dr_len, rti);
}
@@ -98,17 +80,6 @@ static inline inline int dsp563xx_once_ir_exec_nq(struct
jtag_tap *tap, uint8_t
/* IR and DR functions */
static inline int dsp563xx_write_ir(struct jtag_tap *tap, uint8_t * ir_in,
uint8_t * ir_out, int ir_len, int rti)
{
- if (NULL == tap)
- {
- LOG_ERROR("invalid tap");
- return ERROR_FAIL;
- }
- if (ir_len != tap->ir_length)
- {
- LOG_ERROR("invalid ir_len");
- return ERROR_FAIL;
- }
-
jtag_add_plain_ir_scan(tap->ir_length, ir_out, ir_in, TAP_IDLE);
return ERROR_OK;
@@ -116,12 +87,6 @@ static inline int dsp563xx_write_ir(struct jtag_tap *tap,
uint8_t * ir_in, uint8
static inline int dsp563xx_write_ir_u8(struct jtag_tap *tap, uint8_t * ir_in,
uint8_t ir_out, int ir_len, int rti)
{
- if (ir_len > 8)
- {
- LOG_ERROR("ir_len overflow, maxium is 8");
- return ERROR_FAIL;
- }
-
return dsp563xx_write_ir(tap, ir_in, &ir_out, ir_len, rti);
}
@@ -234,12 +199,6 @@ int dsp563xx_once_read_register(struct jtag_tap *tap,
struct once_reg *regs, int
}
return jtag_execute_queue();
-/*
- for(i=0;i<len;i++)
- {
- printf("%08X\n",regs[i].reg);
- }
-*/
}
/** once read register */
@@ -269,13 +228,25 @@ int dsp563xx_once_reg_read(struct jtag_tap *tap, uint8_t
reg, uint32_t * data)
{
int err;
- if ((err = dsp563xx_once_ir_exec(tap, reg, 1, 0, 0)) != ERROR_OK)
+ if ((err = dsp563xx_once_ir_exec_nq(tap, reg, 1, 0, 0)) != ERROR_OK)
return err;
if ((err = dsp563xx_write_dr_u32(tap, data, 0x00, 24, 0)) != ERROR_OK)
return err;
return jtag_execute_queue();
}
+/** once read register */
+int dsp563xx_once_reg_read_nq(struct jtag_tap *tap, uint8_t reg, uint32_t *
data)
+{
+ int err;
+
+ if ((err = dsp563xx_once_ir_exec_nq(tap, reg, 1, 0, 0)) != ERROR_OK)
+ return err;
+ if ((err = dsp563xx_write_dr_u32(tap, data, 0x00, 24, 0)) != ERROR_OK)
+ return err;
+ return err;
+}
+
/** once write register */
int dsp563xx_once_reg_write(struct jtag_tap *tap, uint8_t reg, uint32_t data)
{
diff --git a/src/target/dsp563xx_once.h b/src/target/dsp563xx_once.h
index 6b27694..2fa1648 100644
--- a/src/target/dsp563xx_once.h
+++ b/src/target/dsp563xx_once.h
@@ -73,21 +73,25 @@ int dsp563xx_once_target_status(struct jtag_tap *tap);
/** once read registers */
int dsp563xx_once_read_register(struct jtag_tap *tap, struct once_reg *regs,
int len);
-/** once read register */
-int dsp563xx_once_reg_read_ex_nq(struct jtag_tap *tap, uint8_t reg, uint8_t
len, uint32_t * data);
+/** once read registers */
+int dsp563xx_once_read_register_nq(struct jtag_tap *tap, struct once_reg
*regs, int len);
/** once read register */
int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, uint8_t reg, uint8_t len,
uint32_t * data);
/** once read register */
+int dsp563xx_once_reg_read_ex_nq(struct jtag_tap *tap, uint8_t reg, uint8_t
len, uint32_t * data);
+/** once read register */
int dsp563xx_once_reg_read(struct jtag_tap *tap, uint8_t reg, uint32_t * data);
+/** once read register */
+int dsp563xx_once_reg_read_nq(struct jtag_tap *tap, uint8_t reg, uint32_t *
data);
/** once write register */
int dsp563xx_once_reg_write(struct jtag_tap *tap, uint8_t reg, uint32_t data);
/** single word instruction */
int dsp563xx_once_execute_sw_ir(struct jtag_tap *tap, uint32_t opcode);
-/** double word instruction */
-int dsp563xx_once_execute_dw_ir(struct jtag_tap *tap, uint32_t opcode,
uint32_t operand);
/** single word instruction */
int dsp563xx_once_execute_sw_ir_nq(struct jtag_tap *tap, uint32_t opcode);
/** double word instruction */
+int dsp563xx_once_execute_dw_ir(struct jtag_tap *tap, uint32_t opcode,
uint32_t operand);
+/** double word instruction */
int dsp563xx_once_execute_dw_ir_nq(struct jtag_tap *tap, uint32_t opcode,
uint32_t operand);
#endif /* DSP563XX_ONCE_H */
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
