zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armv4_5: Integrate build of erase check code 

Add rules to build armv4_5_erase_check.inc, and convert the code to
target endianness the least intrusive way.

Drop an unused word from the assembler sources to make the ARM bytecode
fully match that of armv4_5.c and to not break ARMv4 assumptions.

This completes the build rules for contrib/loaders/erase_check directory.

Change-Id: I36be7a944e26142088195fa3fb072d4e577bf328
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3135
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
__archive__
Andreas Färber 2015-11-29 04:15:57 +01:00 committed by Andreas Fritiofson
parent e0ba93d018
commit 18f7a2d072
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/loaders/erase_check/Makefile
View File

@ -4,7 +4,16 @@ ARM_CROSS_COMPILE ?= arm-none-eabi-
ARM_AS ?= $(ARM_CROSS_COMPILE)as ARM_AS ?= $(ARM_CROSS_COMPILE)as
ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy
arm: armv7m_erase_check.inc armv7m_0_erase_check.inc arm: armv4_5_erase_check.inc armv7m_erase_check.inc armv7m_0_erase_check.inc
armv4_5_%.elf: armv4_5_%.s
$(ARM_AS) $< -o $@
armv4_5_%.bin: armv4_5_%.elf
$(ARM_OBJCOPY) -Obinary $< $@
armv4_5_%.inc: armv4_5_%.bin
$(BIN2C) < $< > $@
armv7m_%.elf: armv7m_%.s armv7m_%.elf: armv7m_%.s
$(ARM_AS) $< -o $@ $(ARM_AS) $< -o $@

3
contrib/loaders/erase_check/armv4_5_erase_check.inc Normal file
View File

@ -0,0 +1,3 @@
/* Autogenerated with ../../../src/helper/bin2char.sh */
0x01,0x30,0xd0,0xe4,0x03,0x20,0x02,0xe0,0x01,0x10,0x51,0xe2,0xfb,0xff,0xff,0x1a,
0x70,0x00,0x20,0xe1,

2
contrib/loaders/erase_check/armv4_5_erase_check.s
View File

@ -36,6 +36,4 @@ loop:
end: end:
bkpt #0 bkpt #0
CRC32XOR: .word 0x04c11db7
.end .end

22
src/target/armv4_5.c
View File

@ -1523,30 +1523,24 @@ int arm_blank_check_memory(struct target *target,
uint32_t i; uint32_t i;
uint32_t exit_var = 0; uint32_t exit_var = 0;
/* see contrib/loaders/erase_check/armv4_5_erase_check.s for src */ static const uint8_t check_code_le[] = {
#include "../../contrib/loaders/erase_check/armv4_5_erase_check.inc"
static const uint32_t check_code[] = {
/* loop: */
0xe4d03001, /* ldrb r3, [r0], #1 */
0xe0022003, /* and r2, r2, r3 */
0xe2511001, /* subs r1, r1, #1 */
0x1afffffb, /* bne loop */
/* end: */
0xe1200070, /* bkpt #0 */
}; };
assert(sizeof(check_code_le) % 4 == 0);
/* make sure we have a working area */ /* make sure we have a working area */
retval = target_alloc_working_area(target, retval = target_alloc_working_area(target,
sizeof(check_code), &check_algorithm); sizeof(check_code_le), &check_algorithm);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* convert code into a buffer in target endianness */ /* convert code into a buffer in target endianness */
for (i = 0; i < ARRAY_SIZE(check_code); i++) { for (i = 0; i < ARRAY_SIZE(check_code_le) / 4; i++) {
retval = target_write_u32(target, retval = target_write_u32(target,
check_algorithm->address check_algorithm->address
+ i * sizeof(uint32_t), + i * sizeof(uint32_t),
check_code[i]); le_to_h_u32(&check_code_le[i * 4]));
if (retval != ERROR_OK) if (retval != ERROR_OK)
goto cleanup; goto cleanup;
} }
@ -1566,7 +1560,7 @@ int arm_blank_check_memory(struct target *target,
/* armv4 must exit using a hardware breakpoint */ /* armv4 must exit using a hardware breakpoint */
if (arm->is_armv4) if (arm->is_armv4)
exit_var = check_algorithm->address + sizeof(check_code) - 4; exit_var = check_algorithm->address + sizeof(check_code_le) - 4;
retval = target_run_algorithm(target, 0, NULL, 3, reg_params, retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
check_algorithm->address, check_algorithm->address,