armv4_5: Integrate build of erase check code

[openocd.git] / src / target / armv4_5.c

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e75fe99c4dd9b0c71a2c2da5870fe2769ee9e6d7..e6bfca688b8c8ac9a38086403a5d865ba947724c 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -140,6 +140,12 @@ static const struct {
                .n_indices = ARRAY_SIZE(arm_mon_indices),
                .indices = arm_mon_indices,
        },
+       {
+               .name = "Secure Monitor ARM1176JZF-S",
+               .psr = ARM_MODE_1176_MON,
+               .n_indices = ARRAY_SIZE(arm_mon_indices),
+               .indices = arm_mon_indices,
+       },
 
        /* These special modes are currently only supported
         * by ARMv6M and ARMv7M profiles */
@@ -199,6 +205,7 @@ int arm_mode_to_number(enum arm_mode mode)
                case ARM_MODE_SYS:
                        return 6;
                case ARM_MODE_MON:
+               case ARM_MODE_1176_MON:
                        return 7;
                default:
                        LOG_ERROR("invalid mode value encountered %d", mode);
@@ -1460,7 +1467,7 @@ int arm_checksum_memory(struct target *target,
                                crc_algorithm->address + i * sizeof(uint32_t),
                                arm_crc_code[i]);
                if (retval != ERROR_OK)
-                       return retval;
+                       goto cleanup;
        }
 
        arm_algo.common_magic = ARM_COMMON_MAGIC;
@@ -1484,22 +1491,19 @@ int arm_checksum_memory(struct target *target,
                        crc_algorithm->address,
                        exit_var,
                        timeout, &arm_algo);
-       if (retval != ERROR_OK) {
-               LOG_ERROR("error executing ARM crc algorithm");
-               destroy_reg_param(&reg_params[0]);
-               destroy_reg_param(&reg_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(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
 
+cleanup:
        target_free_working_area(target, crc_algorithm);
 
-       return ERROR_OK;
+       return retval;
 }
 
 /**
@@ -1519,32 +1523,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;
@@ -1562,29 +1560,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(&reg_params[0]);
-               destroy_reg_param(&reg_params[1]);
-               destroy_reg_param(&reg_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(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
 
+cleanup:
        target_free_working_area(target, check_algorithm);
 
-       return ERROR_OK;
+       return retval;
 }
 
 static int arm_full_context(struct target *target)