[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 28/28] gdbstub: Switch to the thread receiving a signal
From: |
Alex Bennée |
Subject: |
[PATCH v1 28/28] gdbstub: Switch to the thread receiving a signal |
Date: |
Tue, 26 Oct 2021 11:22:34 +0100 |
From: Pavel Labath <pavel@labath.sk>
Respond with Txxthread:yyyy; instead of a plain Sxx to indicate which
thread received the signal. Otherwise, the debugger will associate it
with the main one. Also automatically select this thread, as that is
what gdb expects.
Signed-off-by: Pavel Labath <pavel@labath.sk>
Message-Id: <20211019174953.36560-1-pavel@labath.sk>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
gdbstub.c | 8 ++-
tests/tcg/multiarch/Makefile.target | 10 +++-
.../gdbstub/test-thread-breakpoint.py | 60 +++++++++++++++++++
3 files changed, 75 insertions(+), 3 deletions(-)
create mode 100644 tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
diff --git a/gdbstub.c b/gdbstub.c
index 36b85aa50e..23baaef40e 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -3138,8 +3138,12 @@ gdb_handlesig(CPUState *cpu, int sig)
tb_flush(cpu);
if (sig != 0) {
- snprintf(buf, sizeof(buf), "S%02x", target_signal_to_gdb(sig));
- put_packet(buf);
+ gdb_set_stop_cpu(cpu);
+ g_string_printf(gdbserver_state.str_buf,
+ "T%02xthread:", target_signal_to_gdb(sig));
+ gdb_append_thread_id(cpu, gdbserver_state.str_buf);
+ g_string_append_c(gdbserver_state.str_buf, ';');
+ put_strbuf();
}
/* put_packet() might have detected that the peer terminated the
connection. */
diff --git a/tests/tcg/multiarch/Makefile.target
b/tests/tcg/multiarch/Makefile.target
index c0d9e638e9..b962ed8236 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -68,11 +68,19 @@ run-gdbstub-qxfer-auxv-read: sha1
--bin $< --test
$(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \
"basic gdbstub qXfer:auxv:read support")
+run-gdbstub-thread-breakpoint: testthread
+ $(call run-test, $@, $(GDB_SCRIPT) \
+ --gdb $(HAVE_GDB_BIN) \
+ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
+ --bin $< --test
$(MULTIARCH_SRC)/gdbstub/test-thread-breakpoint.py, \
+ "hitting a breakpoint on non-main thread")
+
else
run-gdbstub-%:
$(call skip-test, "gdbstub test $*", "need working gdb")
endif
-EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read
+EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read \
+ run-gdbstub-thread-breakpoint
# ARM Compatible Semi Hosting Tests
#
diff --git a/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
b/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
new file mode 100644
index 0000000000..798d508bc7
--- /dev/null
+++ b/tests/tcg/multiarch/gdbstub/test-thread-breakpoint.py
@@ -0,0 +1,60 @@
+from __future__ import print_function
+#
+# Test auxiliary vector is loaded via gdbstub
+#
+# This is launched via tests/guest-debug/run-test.py
+#
+
+import gdb
+import sys
+
+failcount = 0
+
+def report(cond, msg):
+ "Report success/fail of test"
+ if cond:
+ print ("PASS: %s" % (msg))
+ else:
+ print ("FAIL: %s" % (msg))
+ global failcount
+ failcount += 1
+
+def run_test():
+ "Run through the tests one by one"
+
+ sym, ok = gdb.lookup_symbol("thread1_func")
+ gdb.execute("b thread1_func")
+ gdb.execute("c")
+
+ frame = gdb.selected_frame()
+ report(str(frame.function()) == "thread1_func", "break @ %s"%frame)
+
+#
+# This runs as the script it sourced (via -x, via run-test.py)
+#
+try:
+ inferior = gdb.selected_inferior()
+ arch = inferior.architecture()
+ print("ATTACHED: %s" % arch.name())
+except (gdb.error, AttributeError):
+ print("SKIPPING (not connected)", file=sys.stderr)
+ exit(0)
+
+if gdb.parse_and_eval('$pc') == 0:
+ print("SKIP: PC not set")
+ exit(0)
+
+try:
+ # These are not very useful in scripts
+ gdb.execute("set pagination off")
+ gdb.execute("set confirm off")
+
+ # Run the actual tests
+ run_test()
+except (gdb.error):
+ print ("GDB Exception: %s" % (sys.exc_info()[0]))
+ failcount += 1
+ pass
+
+print("All tests complete: %d failures" % failcount)
+exit(failcount)
--
2.30.2
- [PATCH v1 09/28] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images, (continued)
- [PATCH v1 09/28] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images, Alex Bennée, 2021/10/26
- [PATCH v1 25/28] plugins: add helper functions for coverage plugins, Alex Bennée, 2021/10/26
- [PATCH v1 08/28] tests/tcg: Fix some targets default cross compiler path, Alex Bennée, 2021/10/26
- [PATCH v1 17/28] docs/tcg-plugins: add L2 arguments to cache docs, Alex Bennée, 2021/10/26
- [PATCH v1 18/28] chardev: don't exit() straight away on C-a x, Alex Bennée, 2021/10/26
- [PATCH v1 19/28] tests/plugins: extend the insn plugin to track opcode sizes, Alex Bennée, 2021/10/26
- [PATCH v1 26/28] contrib/plugins: add a drcov plugin, Alex Bennée, 2021/10/26
- [PATCH v1 28/28] gdbstub: Switch to the thread receiving a signal,
Alex Bennée <=
- [PATCH v1 15/28] plugins/cache: split command line arguments into name and value, Alex Bennée, 2021/10/26
- [PATCH v1 13/28] plugins/cache: freed heap-allocated mutexes, Alex Bennée, 2021/10/26
- [PATCH v1 23/28] tracing: remove the trace-tcg includes from the build, Alex Bennée, 2021/10/26
- [PATCH v1 24/28] tracing: excise the tcg related from tracetool, Alex Bennée, 2021/10/26
- [PATCH v1 14/28] plugins/cache: implement unified L2 cache emulation, Alex Bennée, 2021/10/26
- [PATCH v1 22/28] tracing: remove TCG memory access tracing, Alex Bennée, 2021/10/26