arm_adi_v5: add arm Neoverse N2 part numbers

[fw/openocd] / src / target / x86_32_common.c

diff --git a/src/target/x86_32_common.c b/src/target/x86_32_common.c
index 0d87ba5a2eb223ab393e621ef277a9a3384cdfd3..a009bfe92fcda8d4ed4243b4fe2607ad82cd575a 100644 (file)
--- a/src/target/x86_32_common.c
+++ b/src/target/x86_32_common.c
@@ -75,7 +75,7 @@ int x86_32_get_gdb_reg_list(struct target *t,
        *reg_list_size = x86_32->cache->num_regs;
        LOG_DEBUG("num_regs=%d, reg_class=%d", (*reg_list_size), reg_class);
        *reg_list = malloc(sizeof(struct reg *) * (*reg_list_size));
-       if (*reg_list == NULL) {
+       if (!*reg_list) {
                LOG_ERROR("%s out of memory", __func__);
                return ERROR_FAIL;
        }
@@ -95,7 +95,7 @@ int x86_32_common_init_arch_info(struct target *t, struct x86_32_common *x86_32)
        x86_32->num_hw_bpoints = MAX_DEBUG_REGS;
        x86_32->hw_break_list = calloc(x86_32->num_hw_bpoints,
                                sizeof(struct x86_32_dbg_reg));
-       if (x86_32->hw_break_list == NULL) {
+       if (!x86_32->hw_break_list) {
                LOG_ERROR("%s out of memory", __func__);
                return ERROR_FAIL;
        }
@@ -157,7 +157,7 @@ int x86_32_common_read_phys_mem(struct target *t, target_addr_t phys_address,
         * with the original instructions again.
         */
        struct swbp_mem_patch *iter = x86_32->swbbp_mem_patch_list;
-       while (iter != NULL) {
+       while (iter) {
                if (iter->physaddr >= phys_address && iter->physaddr < phys_address+(size*count)) {
                        uint32_t offset = iter->physaddr - phys_address;
                        buffer[offset] = iter->orig_byte;
@@ -209,15 +209,16 @@ static int read_phys_mem(struct target *t, uint32_t phys_address,
                        LOG_ERROR("%s invalid read size", __func__);
                        break;
                }
+               if (retval != ERROR_OK)
+                       break;
        }
        /* restore CR0.PG bit if needed (regardless of retval) */
        if (pg_disabled) {
-               retval = x86_32->enable_paging(t);
-               if (retval != ERROR_OK) {
+               int retval2 = x86_32->enable_paging(t);
+               if (retval2 != ERROR_OK) {
                        LOG_ERROR("%s could not enable paging", __func__);
-                       return retval;
+                       return retval2;
                }
-               pg_disabled = true;
        }
        /* TODO: After reading memory from target, we must replace
         * software breakpoints with the original instructions again.
@@ -244,20 +245,20 @@ int x86_32_common_write_phys_mem(struct target *t, target_addr_t phys_address,
         * breakpoint instruction.
         */
        newbuffer = malloc(size*count);
-       if (newbuffer == NULL) {
+       if (!newbuffer) {
                LOG_ERROR("%s out of memory", __func__);
                return ERROR_FAIL;
        }
        memcpy(newbuffer, buffer, size*count);
        struct swbp_mem_patch *iter = x86_32->swbbp_mem_patch_list;
-       while (iter != NULL) {
+       while (iter) {
                if (iter->physaddr >= phys_address && iter->physaddr < phys_address+(size*count)) {
                        uint32_t offset = iter->physaddr - phys_address;
                        newbuffer[offset] = SW_BP_OPCODE;
 
                        /* update the breakpoint */
                        struct breakpoint *pbiter = t->breakpoints;
-                       while (pbiter != NULL && pbiter->unique_id != iter->swbp_unique_id)
+                       while (pbiter && pbiter->unique_id != iter->swbp_unique_id)
                                pbiter = pbiter->next;
                        if (pbiter)
                                pbiter->orig_instr[0] = buffer[offset];
@@ -364,6 +365,9 @@ static int read_mem(struct target *t, uint32_t size,
                        break;
        }
 
+       if (retval != ERROR_OK)
+               return retval;
+
        /* read_hw_reg() will write to 4 bytes (uint32_t)
         * Watch out, the buffer passed into read_mem() might be 1 or 2 bytes.
         */
@@ -436,6 +440,10 @@ static int write_mem(struct target *t, uint32_t size,
                        LOG_ERROR("%s invalid write mem size", __func__);
                        return ERROR_FAIL;
        }
+
+       if (retval != ERROR_OK)
+               return retval;
+
        retval = x86_32->transaction_status(t);
        if (retval != ERROR_OK) {
                LOG_ERROR("%s error on mem write", __func__);
@@ -448,7 +456,7 @@ int calcaddr_physfromlin(struct target *t, target_addr_t addr, target_addr_t *ph
 {
        uint8_t entry_buffer[8];
 
-       if (physaddr == NULL || t == NULL)
+       if (!physaddr || !t)
                return ERROR_FAIL;
 
        struct x86_32_common *x86_32 = target_to_x86_32(t);
@@ -464,10 +472,10 @@ int calcaddr_physfromlin(struct target *t, target_addr_t addr, target_addr_t *ph
        }
 
        uint32_t cr4 = buf_get_u32(x86_32->cache->reg_list[CR4].value, 0, 32);
-       bool isPAE = cr4 & 0x00000020; /* PAE - Physical Address Extension */
+       bool is_pae = cr4 & 0x00000020; /* PAE - Physical Address Extension */
 
        uint32_t cr3 = buf_get_u32(x86_32->cache->reg_list[CR3].value, 0, 32);
-       if (isPAE) {
+       if (is_pae) {
                uint32_t pdpt_base = cr3 & 0xFFFFF000; /* lower 12 bits of CR3 must always be 0 */
                uint32_t pdpt_index = (addr & 0xC0000000) >> 30; /* A[31:30] index to PDPT */
                uint32_t pdpt_addr = pdpt_base + (8 * pdpt_index);
@@ -606,7 +614,6 @@ int x86_32_common_read_memory(struct target *t, target_addr_t addr,
                        && x86_32_common_read_phys_mem(t, physaddr, size, count, buf) != ERROR_OK) {
                        LOG_ERROR("%s failed to read memory from physical address " TARGET_ADDR_FMT,
                                          __func__, physaddr);
-                       retval = ERROR_FAIL;
                }
                /* restore PG bit if it was cleared prior (regardless of retval) */
                retval = x86_32->enable_paging(t);
@@ -662,7 +669,6 @@ int x86_32_common_write_memory(struct target *t, target_addr_t addr,
                        && x86_32_common_write_phys_mem(t, physaddr, size, count, buf) != ERROR_OK) {
                        LOG_ERROR("%s failed to write memory to physical address " TARGET_ADDR_FMT,
                                        __func__, physaddr);
-                       retval = ERROR_FAIL;
                }
                /* restore PG bit if it was cleared prior (regardless of retval) */
                retval = x86_32->enable_paging(t);
@@ -733,15 +739,19 @@ int x86_32_common_read_io(struct target *t, uint32_t addr,
                        LOG_ERROR("%s invalid read io size", __func__);
                        return ERROR_FAIL;
        }
+
        /* restore CR0.PG bit if needed */
        if (pg_disabled) {
-               retval = x86_32->enable_paging(t);
-               if (retval != ERROR_OK) {
+               int retval2 = x86_32->enable_paging(t);
+               if (retval2 != ERROR_OK) {
                        LOG_ERROR("%s could not enable paging", __func__);
-                       return retval;
+                       return retval2;
                }
-               pg_disabled = false;
        }
+
+       if (retval != ERROR_OK)
+               return retval;
+
        uint32_t regval = 0;
        retval = x86_32->read_hw_reg(t, EAX, &regval, 0);
        if (retval != ERROR_OK) {
@@ -818,15 +828,19 @@ int x86_32_common_write_io(struct target *t, uint32_t addr,
                        LOG_ERROR("%s invalid write io size", __func__);
                        return ERROR_FAIL;
        }
+
        /* restore CR0.PG bit if needed */
        if (pg_disabled) {
-               retval = x86_32->enable_paging(t);
-               if (retval != ERROR_OK) {
+               int retval2 = x86_32->enable_paging(t);
+               if (retval2 != ERROR_OK) {
                        LOG_ERROR("%s could not enable paging", __func__);
-                       return retval;
+                       return retval2;
                }
-               pg_disabled = false;
        }
+
+       if (retval != ERROR_OK)
+               return retval;
+
        retval = x86_32->transaction_status(t);
        if (retval != ERROR_OK) {
                LOG_ERROR("%s error on io write", __func__);
@@ -925,14 +939,14 @@ static int set_debug_regs(struct target *t, uint32_t address,
         * when we exit PM
        */
        buf_set_u32(x86_32->cache->reg_list[bp_num+DR0].value, 0, 32, address);
-       x86_32->cache->reg_list[bp_num+DR0].dirty = 1;
-       x86_32->cache->reg_list[bp_num+DR0].valid = 1;
+       x86_32->cache->reg_list[bp_num+DR0].dirty = true;
+       x86_32->cache->reg_list[bp_num+DR0].valid = true;
        buf_set_u32(x86_32->cache->reg_list[DR6].value, 0, 32, PM_DR6);
-       x86_32->cache->reg_list[DR6].dirty = 1;
-       x86_32->cache->reg_list[DR6].valid = 1;
+       x86_32->cache->reg_list[DR6].dirty = true;
+       x86_32->cache->reg_list[DR6].valid = true;
        buf_set_u32(x86_32->cache->reg_list[DR7].value, 0, 32, dr7);
-       x86_32->cache->reg_list[DR7].dirty = 1;
-       x86_32->cache->reg_list[DR7].valid = 1;
+       x86_32->cache->reg_list[DR7].dirty = true;
+       x86_32->cache->reg_list[DR7].valid = true;
        return ERROR_OK;
 }
 
@@ -956,14 +970,14 @@ static int unset_debug_regs(struct target *t, uint8_t bp_num)
         * when we exit PM
        */
        buf_set_u32(x86_32->cache->reg_list[bp_num+DR0].value, 0, 32, 0);
-       x86_32->cache->reg_list[bp_num+DR0].dirty = 1;
-       x86_32->cache->reg_list[bp_num+DR0].valid = 1;
+       x86_32->cache->reg_list[bp_num+DR0].dirty = true;
+       x86_32->cache->reg_list[bp_num+DR0].valid = true;
        buf_set_u32(x86_32->cache->reg_list[DR6].value, 0, 32, PM_DR6);
-       x86_32->cache->reg_list[DR6].dirty = 1;
-       x86_32->cache->reg_list[DR6].valid = 1;
+       x86_32->cache->reg_list[DR6].dirty = true;
+       x86_32->cache->reg_list[DR6].valid = true;
        buf_set_u32(x86_32->cache->reg_list[DR7].value, 0, 32, dr7);
-       x86_32->cache->reg_list[DR7].dirty = 1;
-       x86_32->cache->reg_list[DR7].valid = 1;
+       x86_32->cache->reg_list[DR7].dirty = true;
+       x86_32->cache->reg_list[DR7].valid = true;
        return ERROR_OK;
 }
 
@@ -1045,7 +1059,7 @@ static int set_swbp(struct target *t, struct breakpoint *bp)
 
        /* add the memory patch */
        struct swbp_mem_patch *new_patch = malloc(sizeof(struct swbp_mem_patch));
-       if (new_patch == NULL) {
+       if (!new_patch) {
                LOG_ERROR("%s out of memory", __func__);
                return ERROR_FAIL;
        }
@@ -1055,10 +1069,10 @@ static int set_swbp(struct target *t, struct breakpoint *bp)
        new_patch->swbp_unique_id = bp->unique_id;
 
        struct swbp_mem_patch *addto = x86_32->swbbp_mem_patch_list;
-       if (addto == NULL)
+       if (!addto)
                x86_32->swbbp_mem_patch_list = new_patch;
        else {
-               while (addto->next != NULL)
+               while (addto->next)
                        addto = addto->next;
                addto->next = new_patch;
        }
@@ -1093,15 +1107,15 @@ static int unset_swbp(struct target *t, struct breakpoint *bp)
 
        /* remove from patch */
        struct swbp_mem_patch *iter = x86_32->swbbp_mem_patch_list;
-       if (iter != NULL) {
+       if (iter) {
                if (iter->swbp_unique_id == bp->unique_id) {
                        /* it's the first item */
                        x86_32->swbbp_mem_patch_list = iter->next;
                        free(iter);
                } else {
-                       while (iter->next != NULL && iter->next->swbp_unique_id != bp->unique_id)
+                       while (iter->next && iter->next->swbp_unique_id != bp->unique_id)
                                iter = iter->next;
-                       if (iter->next != NULL) {
+                       if (iter->next) {
                                /* it's the next one */
                                struct swbp_mem_patch *freeme = iter->next;
                                iter->next = iter->next->next;
@@ -1141,7 +1155,6 @@ static int set_breakpoint(struct target *t, struct breakpoint *bp)
                        }
                } else {
                        LOG_ERROR("%s core doesn't support SW breakpoints", __func__);
-                       error = ERROR_FAIL;
                        return ERROR_FAIL;
                }
        }
@@ -1327,7 +1340,7 @@ static int write_hw_reg_from_cache(struct target *t, int num)
 }
 
 /* x86 32 commands */
-static void handle_iod_output(struct command_context *cmd_ctx,
+static void handle_iod_output(struct command_invocation *cmd,
                struct target *target, uint32_t address, unsigned size,
                unsigned count, const uint8_t *buffer)
 {
@@ -1379,7 +1392,7 @@ static void handle_iod_output(struct command_context *cmd_ctx,
                                value_fmt, value);
 
                if ((i % line_modulo == line_modulo - 1) || (i == count - 1)) {
-                       command_print(cmd_ctx, "%s", output);
+                       command_print(cmd, "%s", output);
                        output_len = 0;
                }
        }
@@ -1415,8 +1428,8 @@ COMMAND_HANDLER(handle_iod_command)
        uint8_t *buffer = calloc(count, size);
        struct target *target = get_current_target(CMD_CTX);
        int retval = x86_32_common_read_io(target, address, size, buffer);
-       if (ERROR_OK == retval)
-               handle_iod_output(CMD_CTX, target, address, size, count, buffer);
+       if (retval == ERROR_OK)
+               handle_iod_output(CMD, target, address, size, count, buffer);
        free(buffer);
        return retval;
 }