X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5.c;h=e6ecfc88467d73044e83cd4bf37c25cff3b02478;hb=03942f867a0de1eff13828e15b9798a1e589b169;hp=5b24e69a9bd650530bc1c379a7e2eddd8c73f2ff;hpb=fed713104904bfc4884e748ef4160be4ab7e4575;p=openocd.git diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 5b24e69a9b..e6ecfc8846 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -19,9 +19,7 @@ * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -1425,49 +1423,24 @@ int arm_checksum_memory(struct target *target, uint32_t i; uint32_t exit_var = 0; - /* see contrib/loaders/checksum/armv4_5_crc.s for src */ - - static const uint32_t arm_crc_code[] = { - 0xE1A02000, /* mov r2, r0 */ - 0xE3E00000, /* mov r0, #0xffffffff */ - 0xE1A03001, /* mov r3, r1 */ - 0xE3A04000, /* mov r4, #0 */ - 0xEA00000B, /* b ncomp */ - /* nbyte: */ - 0xE7D21004, /* ldrb r1, [r2, r4] */ - 0xE59F7030, /* ldr r7, CRC32XOR */ - 0xE0200C01, /* eor r0, r0, r1, asl 24 */ - 0xE3A05000, /* mov r5, #0 */ - /* loop: */ - 0xE3500000, /* cmp r0, #0 */ - 0xE1A06080, /* mov r6, r0, asl #1 */ - 0xE2855001, /* add r5, r5, #1 */ - 0xE1A00006, /* mov r0, r6 */ - 0xB0260007, /* eorlt r0, r6, r7 */ - 0xE3550008, /* cmp r5, #8 */ - 0x1AFFFFF8, /* bne loop */ - 0xE2844001, /* add r4, r4, #1 */ - /* ncomp: */ - 0xE1540003, /* cmp r4, r3 */ - 0x1AFFFFF1, /* bne nbyte */ - /* end: */ - 0xe1200070, /* bkpt #0 */ - /* CRC32XOR: */ - 0x04C11DB7 /* .word 0x04C11DB7 */ + static const uint8_t arm_crc_code_le[] = { +#include "../../contrib/loaders/checksum/armv4_5_crc.inc" }; + assert(sizeof(arm_crc_code_le) % 4 == 0); + retval = target_alloc_working_area(target, - sizeof(arm_crc_code), &crc_algorithm); + sizeof(arm_crc_code_le), &crc_algorithm); if (retval != ERROR_OK) return retval; /* convert code into a buffer in target endianness */ - for (i = 0; i < ARRAY_SIZE(arm_crc_code); i++) { + for (i = 0; i < ARRAY_SIZE(arm_crc_code_le) / 4; i++) { retval = target_write_u32(target, crc_algorithm->address + i * sizeof(uint32_t), - arm_crc_code[i]); + le_to_h_u32(&arm_crc_code_le[i * 4])); if (retval != ERROR_OK) - return retval; + goto cleanup; } arm_algo.common_magic = ARM_COMMON_MAGIC; @@ -1485,28 +1458,25 @@ int arm_checksum_memory(struct target *target, /* armv4 must exit using a hardware breakpoint */ if (arm->is_armv4) - exit_var = crc_algorithm->address + sizeof(arm_crc_code) - 8; + exit_var = crc_algorithm->address + sizeof(arm_crc_code_le) - 8; retval = target_run_algorithm(target, 0, NULL, 2, reg_params, crc_algorithm->address, exit_var, timeout, &arm_algo); - if (retval != ERROR_OK) { - LOG_ERROR("error executing ARM crc algorithm"); - destroy_reg_param(®_params[0]); - destroy_reg_param(®_params[1]); - target_free_working_area(target, crc_algorithm); - return retval; - } - *checksum = buf_get_u32(reg_params[0].value, 0, 32); + if (retval == ERROR_OK) + *checksum = buf_get_u32(reg_params[0].value, 0, 32); + else + LOG_ERROR("error executing ARM crc algorithm"); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); +cleanup: target_free_working_area(target, crc_algorithm); - return ERROR_OK; + return retval; } /** @@ -1526,32 +1496,26 @@ int arm_blank_check_memory(struct target *target, uint32_t i; uint32_t exit_var = 0; - /* see contrib/loaders/erase_check/armv4_5_erase_check.s for src */ - - 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 */ + static const uint8_t check_code_le[] = { +#include "../../contrib/loaders/erase_check/armv4_5_erase_check.inc" }; + assert(sizeof(check_code_le) % 4 == 0); + /* make sure we have a working area */ retval = target_alloc_working_area(target, - sizeof(check_code), &check_algorithm); + sizeof(check_code_le), &check_algorithm); if (retval != ERROR_OK) return retval; /* 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, check_algorithm->address + i * sizeof(uint32_t), - check_code[i]); + le_to_h_u32(&check_code_le[i * 4])); if (retval != ERROR_OK) - return retval; + goto cleanup; } arm_algo.common_magic = ARM_COMMON_MAGIC; @@ -1569,29 +1533,24 @@ int arm_blank_check_memory(struct target *target, /* armv4 must exit using a hardware breakpoint */ 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, check_algorithm->address, exit_var, 10000, &arm_algo); - if (retval != ERROR_OK) { - destroy_reg_param(®_params[0]); - destroy_reg_param(®_params[1]); - destroy_reg_param(®_params[2]); - target_free_working_area(target, check_algorithm); - return retval; - } - *blank = buf_get_u32(reg_params[2].value, 0, 32); + if (retval == ERROR_OK) + *blank = buf_get_u32(reg_params[2].value, 0, 32); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); destroy_reg_param(®_params[2]); +cleanup: target_free_working_area(target, check_algorithm); - return ERROR_OK; + return retval; } static int arm_full_context(struct target *target)