[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-533-g5c395fdef

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  5c395fdef42a5750852ea0fc0abd944cf303a39b (commit)
      from  61e19349b2b83f844e9729a76ad5698e6c77c686 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c395fdef42a5750852ea0fc0abd944cf303a39b
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Feb 25 12:22:44 2024 +0100

    mem_ap: fix GDB connections
    
    After commit d9b2607ca094 ("gdb_server: support sparse register
    maps"), GDB crashes while requesting the value of 'cpsr' because
    the fake register is tagged as not existing.
    
    Change the logic and set all register as existing, while still
    limiting the list for the initial GDB request at connect.
    
    Change-Id: I1c4e274c06147683db2a59a8920ae5ccd863e15c
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8163
    Tested-by: jenkins

diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index 5c81e3a75..61a9475e6 100644
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -194,11 +194,11 @@ static const char *mem_ap_get_gdb_arch(const struct target *target)
  * reg[24]:     32 bits, fps
  * reg[25]:     32 bits, cpsr
  *
- * Set 'exist' only to reg[0..15], so initial response to GDB is correct
+ * GDB requires only reg[0..15]
  */
 #define NUM_REGS     26
+#define NUM_GDB_REGS 16
 #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 {
@@ -218,14 +218,14 @@ static int mem_ap_get_gdb_reg_list(struct target *target, struct reg **reg_list[
 	}
 
 	*reg_list = mem_ap_alloc->reg_list;
-	*reg_list_size = NUM_REGS;
+	*reg_list_size = (reg_class == REG_CLASS_ALL) ? NUM_REGS : NUM_GDB_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].exist = true;
 		regs[i].type = &mem_ap_reg_arch_type;
 		(*reg_list)[i] = &regs[i];
 	}

-----------------------------------------------------------------------

Summary of changes:
 src/target/mem_ap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository