Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
openocd: fix simple cases of NULL comparison
[openocd.git] / src / target / mem_ap.c
diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index ade48b6d7695806c9de0da1124a949f06cd01852..424d6e71674a81420ea61c20d8e19a2d01d4c485 100644 (file)
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -18,13 +18,16 @@
 
 #include "target.h"
 #include "target_type.h"
-#include "arm.h"
 #include "arm_adi_v5.h"
+#include "register.h"
 
 #include <jtag/jtag.h>
 
+#define MEM_AP_COMMON_MAGIC 0x4DE4DA50
+
 struct mem_ap {
-       struct arm arm;
+       int common_magic;
+       struct adiv5_dap *dap;
        struct adiv5_ap *ap;
        int ap_num;
 };
@@ -35,7 +38,7 @@ static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
        struct adiv5_private_config *pc;
 
        pc = (struct adiv5_private_config *)target->private_config;
-       if (pc == NULL)
+       if (!pc)
                return ERROR_FAIL;
 
        if (pc->ap_num == DP_APSEL_INVALID) {
@@ -44,17 +47,20 @@ static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
        }
 
        mem_ap = calloc(1, sizeof(struct mem_ap));
-       if (mem_ap == NULL) {
+       if (!mem_ap) {
                LOG_ERROR("Out of memory");
                return ERROR_FAIL;
        }
 
        mem_ap->ap_num = pc->ap_num;
-       mem_ap->arm.common_magic = ARM_COMMON_MAGIC;
-       mem_ap->arm.dap = pc->dap;
+       mem_ap->common_magic = MEM_AP_COMMON_MAGIC;
+       mem_ap->dap = pc->dap;
 
        target->arch_info = mem_ap;
 
+       if (!target->gdb_port_override)
+               target->gdb_port_override = strdup("disabled");
+
        return ERROR_OK;
 }
 
@@ -62,6 +68,7 @@ static int mem_ap_init_target(struct command_context *cmd_ctx, struct target *ta
 {
        LOG_DEBUG("%s", __func__);
        target->state = TARGET_UNKNOWN;
+       target->debug_reason = DBG_REASON_UNDEFINED;
        return ERROR_OK;
 }
 
@@ -82,8 +89,10 @@ static int mem_ap_arch_state(struct target *target)
 
 static int mem_ap_poll(struct target *target)
 {
-       if (target->state == TARGET_UNKNOWN)
+       if (target->state == TARGET_UNKNOWN) {
                target->state = TARGET_RUNNING;
+               target->debug_reason = DBG_REASON_NOTHALTED;
+       }
 
        return ERROR_OK;
 }
@@ -92,6 +101,8 @@ static int mem_ap_halt(struct target *target)
 {
        LOG_DEBUG("%s", __func__);
        target->state = TARGET_HALTED;
+       target->debug_reason = DBG_REASON_DBGRQ;
+       target_call_event_callbacks(target, TARGET_EVENT_HALTED);
        return ERROR_OK;
 }
 
@@ -100,6 +111,7 @@ static int mem_ap_resume(struct target *target, int current, target_addr_t addre
 {
        LOG_DEBUG("%s", __func__);
        target->state = TARGET_RUNNING;
+       target->debug_reason = DBG_REASON_NOTHALTED;
        return ERROR_OK;
 }
 
@@ -108,12 +120,15 @@ static int mem_ap_step(struct target *target, int current, target_addr_t address
 {
        LOG_DEBUG("%s", __func__);
        target->state = TARGET_HALTED;
+       target->debug_reason = DBG_REASON_DBGRQ;
+       target_call_event_callbacks(target, TARGET_EVENT_HALTED);
        return ERROR_OK;
 }
 
 static int mem_ap_assert_reset(struct target *target)
 {
        target->state = TARGET_RESET;
+       target->debug_reason = DBG_REASON_UNDEFINED;
 
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
@@ -124,9 +139,10 @@ static int mem_ap_examine(struct target *target)
        struct mem_ap *mem_ap = target->arch_info;
 
        if (!target_was_examined(target)) {
-               mem_ap->ap = dap_ap(mem_ap->arm.dap, mem_ap->ap_num);
+               mem_ap->ap = dap_ap(mem_ap->dap, mem_ap->ap_num);
                target_set_examined(target);
                target->state = TARGET_UNKNOWN;
+               target->debug_reason = DBG_REASON_UNDEFINED;
                return mem_ap_init(mem_ap->ap);
        }
 
@@ -135,22 +151,92 @@ static int mem_ap_examine(struct target *target)
 
 static int mem_ap_deassert_reset(struct target *target)
 {
-       if (target->reset_halt)
+       if (target->reset_halt) {
                target->state = TARGET_HALTED;
-       else
+               target->debug_reason = DBG_REASON_DBGRQ;
+               target_call_event_callbacks(target, TARGET_EVENT_HALTED);
+       } else {
                target->state = TARGET_RUNNING;
+               target->debug_reason = DBG_REASON_NOTHALTED;
+       }
 
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
 }
 
+static int mem_ap_reg_get(struct reg *reg)
+{
+       return ERROR_OK;
+}
+
+static int mem_ap_reg_set(struct reg *reg, uint8_t *buf)
+{
+       return ERROR_OK;
+}
+
+static struct reg_arch_type mem_ap_reg_arch_type = {
+       .get = mem_ap_reg_get,
+       .set = mem_ap_reg_set,
+};
+
+const char *mem_ap_get_gdb_arch(struct target *target)
+{
+       return "arm";
+}
+
+/*
+ * Dummy ARM register emulation:
+ * reg[0..15]:  32 bits, r0~r12, sp, lr, pc
+ * reg[16..23]: 96 bits, f0~f7
+ * reg[24]:     32 bits, fps
+ * reg[25]:     32 bits, cpsr
+ *
+ * Set 'exist' only to reg[0..15], so initial response to GDB is correct
+ */
+#define NUM_REGS     26
+#define MAX_REG_SIZE 96
+#define REG_EXIST(n) ((n) < 16)
+#define REG_SIZE(n)  ((((n) >= 16) && ((n) < 24)) ? 96 : 32)
+
+struct mem_ap_alloc_reg_list {
+       /* reg_list must be the first field */
+       struct reg *reg_list[NUM_REGS];
+       struct reg regs[NUM_REGS];
+       uint8_t regs_value[MAX_REG_SIZE / 8];
+};
+
+static int mem_ap_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
+                               int *reg_list_size, enum target_register_class reg_class)
+{
+       struct mem_ap_alloc_reg_list *mem_ap_alloc = calloc(1, sizeof(struct mem_ap_alloc_reg_list));
+       if (!mem_ap_alloc) {
+               LOG_ERROR("Out of memory");
+               return ERROR_FAIL;
+       }
+
+       *reg_list = mem_ap_alloc->reg_list;
+       *reg_list_size = NUM_REGS;
+       struct reg *regs = mem_ap_alloc->regs;
+
+       for (int i = 0; i < NUM_REGS; i++) {
+               regs[i].number = i;
+               regs[i].value = mem_ap_alloc->regs_value;
+               regs[i].size = REG_SIZE(i);
+               regs[i].exist = REG_EXIST(i);
+               regs[i].type = &mem_ap_reg_arch_type;
+               (*reg_list)[i] = &regs[i];
+       }
+
+       return ERROR_OK;
+}
+
 static int mem_ap_read_memory(struct target *target, target_addr_t address,
                               uint32_t size, uint32_t count, uint8_t *buffer)
 {
        struct mem_ap *mem_ap = target->arch_info;
 
        LOG_DEBUG("Reading memory at physical address " TARGET_ADDR_FMT
-                 "; size %" PRId32 "; count %" PRId32, address, size, count);
+                 "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
        if (count == 0 || buffer == NULL)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -165,7 +251,7 @@ static int mem_ap_write_memory(struct target *target, target_addr_t address,
        struct mem_ap *mem_ap = target->arch_info;
 
        LOG_DEBUG("Writing memory at physical address " TARGET_ADDR_FMT
-                 "; size %" PRId32 "; count %" PRId32, address, size, count);
+                 "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
        if (count == 0 || buffer == NULL)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -192,6 +278,9 @@ struct target_type mem_ap_target = {
        .assert_reset = mem_ap_assert_reset,
        .deassert_reset = mem_ap_deassert_reset,
 
+       .get_gdb_arch = mem_ap_get_gdb_arch,
+       .get_gdb_reg_list = mem_ap_get_gdb_reg_list,
+
        .read_memory = mem_ap_read_memory,
        .write_memory = mem_ap_write_memory,
 };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)