[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-297-g41efc6c41

[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  41efc6c419cf5c63a1f555dc5b7634a2e18d9c04 (commit)
       via  69eabf9d61d98e63d68257525e4dca86b17541d9 (commit)
      from  16eee77c10c186e83914a0da86a6aea9870d8144 (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 41efc6c419cf5c63a1f555dc5b7634a2e18d9c04
Author: Jan Matyas <ma...@co...>
Date:   Thu Jun 3 16:55:50 2021 +0200

    rtos: add debug prints for qSymbol lookup
    
    - Added two debug prints that allow to inspect the symbol
      lookup process (carried out via the qSymbol packets).
    
    - Added a check for an edge situation when the debugger
      would send us different symbol than what we asked for
      (avoids NULL dereference).
    
    Change-Id: I84ae1b2b66473eab76a7966c678d2777b6ef48d6
    Signed-off-by: Jan Matyas <ma...@co...>
    Reviewed-on: http://openocd.zylin.com/6287
    Tested-by: jenkins
    Reviewed-by: Tim Newsome <ti...@si...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index c9c4efd41..0e747e3e4 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -266,8 +266,17 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
 			cur_sym[0] = '\x00';
 		}
 	}
+
+	LOG_DEBUG("RTOS: Address of symbol '%s' is 0x%" PRIx64, cur_sym, addr);
+
 	next_sym = next_symbol(os, cur_sym, addr);
 
+	/* Should never happen unless the debugger misbehaves */
+	if (next_sym == NULL) {
+		LOG_WARNING("RTOS: Debugger sent us qSymbol with '%s' that we did not ask for", cur_sym);
+		goto done;
+	}
+
 	if (!next_sym->symbol_name) {
 		/* No more symbols need looking up */
 
@@ -291,6 +300,8 @@ int rtos_qsymbol(struct connection *connection, char const *packet, int packet_s
 		goto done;
 	}
 
+	LOG_DEBUG("RTOS: Requesting symbol lookup of '%s' from the debugger", next_sym->symbol_name);
+
 	reply_len = snprintf(reply, sizeof(reply), "qSymbol:");
 	reply_len += hexify(reply + reply_len,
 		(const uint8_t *)next_sym->symbol_name, strlen(next_sym->symbol_name),

commit 69eabf9d61d98e63d68257525e4dca86b17541d9
Author: Jan Matyas <ma...@co...>
Date:   Fri Jun 4 10:19:29 2021 +0200

    flash/nor/atsamv: fixed "maybe uninitialized" compiler warning
    
    This warning about "maybe uninitialized" variable
    used to pop up on certain versions of GCC.
    
    Change-Id: I1cf43b9600885d507afc1dc042322a06751fe146
    Signed-off-by: Jan Matyas <ma...@co...>
    Reviewed-on: http://openocd.zylin.com/6290
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index a64c2b4cc..efc242395 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -661,7 +661,7 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	unsigned v;
+	unsigned v = 0;
 	if (!strcmp("show", CMD_ARGV[0])) {
 		if (who == -1) {
 showall:

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

Summary of changes:
 src/flash/nor/atsamv.c |  2 +-
 src/rtos/rtos.c        | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository