interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: use target_buffer_set_u32_array 

Attempt to use target_buffer_set_u32_array to convert to target endian
arrays rather reimplementing code.

This also removed cfi_fix_code_endian as its functionality is also
repeated.

Change-Id: I7c359dbe46ea791cd5f6fb18d8b0fb6895c599d3
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1783
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Spencer Oliver 2013-10-24 23:26:51 +01:00
parent 2ad2554e52
commit edfb677d34
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/nand/arm_io.c
View File

@ -48,7 +48,6 @@ static int arm_code_to_working_area(struct target *target,
unsigned additional, struct working_area **area) unsigned additional, struct working_area **area)
{ {
uint8_t code_buf[code_size]; uint8_t code_buf[code_size];
unsigned i;
int retval; int retval;
unsigned size = code_size + additional; unsigned size = code_size + additional;
@ -67,8 +66,7 @@ static int arm_code_to_working_area(struct target *target,
} }
/* buffer code in target endianness */ /* buffer code in target endianness */
for (i = 0; i < code_size / 4; i++) target_buffer_set_u32_array(target, code_buf, code_size / 4, code);
target_buffer_set_u32(target, code_buf + i * 4, code[i]);
/* copy code to work area */ /* copy code to work area */
retval = target_write_memory(target, (*area)->address, retval = target_write_memory(target, (*area)->address,

22
src/flash/nor/cfi.c
View File

@ -1103,19 +1103,6 @@ static int cfi_protect(struct flash_bank *bank, int set, int first, int last)
} }
} }
/* Convert code image to target endian
* FIXME create general block conversion fcts in target.c?) */
static void cfi_fix_code_endian(struct target *target, uint8_t *dest,
const uint32_t *src, uint32_t count)
{
uint32_t i;
for (i = 0; i < count; i++) {
target_buffer_set_u32(target, dest, *src);
dest += 4;
src++;
}
}
static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd) static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
{ {
struct target *target = bank->target; struct target *target = bank->target;
@ -1264,7 +1251,8 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer,
"Increase CFI_MAX_INTEL_CODESIZE and recompile."); "Increase CFI_MAX_INTEL_CODESIZE and recompile.");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
} }
cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
/* Get memory for block write handler */ /* Get memory for block write handler */
retval = target_alloc_working_area(target, retval = target_alloc_working_area(target,
@ -1504,7 +1492,8 @@ static int cfi_spansion_write_block_mips(struct flash_bank *bank, uint8_t *buffe
LOG_ERROR("Out of memory"); LOG_ERROR("Out of memory");
return ERROR_FAIL; return ERROR_FAIL;
} }
cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
/* allocate working area */ /* allocate working area */
retval = target_alloc_working_area(target, target_code_size, retval = target_alloc_working_area(target, target_code_size,
@ -1883,7 +1872,8 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer,
LOG_ERROR("Out of memory"); LOG_ERROR("Out of memory");
return ERROR_FAIL; return ERROR_FAIL;
} }
cfi_fix_code_endian(target, target_code, target_code_src, target_code_size / 4);
target_buffer_set_u32_array(target, target_code, target_code_size / 4, target_code_src);
/* allocate working area */ /* allocate working area */
retval = target_alloc_working_area(target, target_code_size, retval = target_alloc_working_area(target, target_code_size,

4
src/target/arm7_9_common.c
View File

@ -2576,7 +2576,6 @@ int arm7_9_bulk_write_memory(struct target *target,
{ {
int retval; int retval;
struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
int i;
if (address % 4 != 0) if (address % 4 != 0)
return ERROR_TARGET_UNALIGNED_ACCESS; return ERROR_TARGET_UNALIGNED_ACCESS;
@ -2595,8 +2594,7 @@ int arm7_9_bulk_write_memory(struct target *target,
} }
/* copy target instructions to target endianness */ /* copy target instructions to target endianness */
for (i = 0; i < 6; i++) target_buffer_set_u32_array(target, dcc_code_buf, ARRAY_SIZE(dcc_code), dcc_code);
target_buffer_set_u32(target, dcc_code_buf + i*4, dcc_code[i]);
/* write DCC code to working area, using the non-optimized /* write DCC code to working area, using the non-optimized
* memory write to avoid ending up here again */ * memory write to avoid ending up here again */

3
src/target/feroceon.c
View File

@ -510,8 +510,7 @@ static int feroceon_bulk_write_memory(struct target *target,
} }
/* copy target instructions to target endianness */ /* copy target instructions to target endianness */
for (i = 0; i < dcc_size/4; i++) target_buffer_set_u32_array(target, dcc_code_buf, ARRAY_SIZE(dcc_code), dcc_code);
target_buffer_set_u32(target, dcc_code_buf + i*4, dcc_code[i]);
/* write DCC code to working area, using the non-optimized /* write DCC code to working area, using the non-optimized
* memory write to avoid ending up here again */ * memory write to avoid ending up here again */