auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- This speeds up dcc arm7_9 bulk write a little bit and exercises the jtag_add_dr_out() codepath

Browse Source 
- added a check to jtag_add_pathmove() for legal path transitions
- tweaked jtag.h docs a little bit
- made some jtag bypass tests _DEBUG_JTAG_IO_


git-svn-id: svn://svn.berlios.de/openocd/trunk@448 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-03-05 19:29:41 +00:00
parent 9b25f5eba2
commit 01a5d87d5f
5 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/target/arm7_9_common.c
View File

@@ -2165,10 +2165,44 @@ int arm7_9_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffe
arm7_9_resume(target, 0, arm7_9->dcc_working_area->address, 1, 1);
for (i = 0; i < count; i++)
int little=target->endianness==TARGET_LITTLE_ENDIAN;
if (count>2)
{
embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], target_buffer_get_u32(target, buffer));
buffer += 4;
/* Handle first & last using standard embeddedice_write_reg and the middle ones w/the
core function repeated.
*/
embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
buffer+=4;
embeddedice_reg_t *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
u8 reg_addr = ice_reg->addr & 0x1f;
int chain_pos = ice_reg->jtag_info->chain_pos;
/* we want the compiler to duplicate the code, which it does not
* do automatically.
*/
if (little)
{
for (i = 1; i < count - 1; i++)
{
embeddedice_write_reg_inner(chain_pos, reg_addr, fast_target_buffer_get_u32(buffer, little));
buffer += 4;
}
} else
{
for (i = 1; i < count - 1; i++)
{
embeddedice_write_reg_inner(chain_pos, reg_addr, fast_target_buffer_get_u32(buffer, little));
buffer += 4;
}
}
embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
} else
{
for (i = 0; i < count; i++)
{
embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
buffer += 4;
}
}
target->type->halt(target);

3
src/target/embeddedice.c
View File

@@ -382,7 +382,8 @@ int embeddedice_write_reg(reg_t *reg, u32 value)
arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
embeddedice_write_reg_inner(reg, value);
u8 reg_addr = ice_reg->addr & 0x1f;
embeddedice_write_reg_inner(ice_reg->jtag_info->chain_pos, reg_addr, value);
return ERROR_OK;
}

6
src/target/embeddedice.h
View File

@@ -104,10 +104,8 @@ extern int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout);
/* If many embeddedice_write_reg() follow eachother, then the >1 invocations can be this faster version of
* embeddedice_write_reg
*/
static __inline__ void embeddedice_write_reg_inner(reg_t *reg, u32 value)
static __inline__ void embeddedice_write_reg_inner(int chain_pos, int reg_addr, u32 value)
{
embeddedice_reg_t *ice_reg = reg->arch_info;
u8 reg_addr = ice_reg->addr & 0x1f;
#if 1
u32 values[3];
int num_bits[3];
@@ -119,7 +117,7 @@ static __inline__ void embeddedice_write_reg_inner(reg_t *reg, u32 value)
values[2]=1;
num_bits[2]=1;
jtag_add_dr_out(ice_reg->jtag_info->chain_pos,
jtag_add_dr_out(chain_pos,
3,
num_bits,
values,