Merge 0acbfa0ca7 into 5e8beb3ab7

fix a typo
Fix XML information in GdbCmds.cpp and add support for the 'vCont;' command.
2024-11-14 05:17:40 -07:00 · 2024-11-13 18:13:13 +02:00 · 2024-11-13 15:23:59 +01:00 · 2024-06-21 00:54:10 +08:00
3 changed files with 3 additions and 2 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -47,7 +47,7 @@
     1. Install Qt: `pacman -S <prefix>-{qt6-base,qt6-svg,qt6-multimedia,qt6-svg,qt6-tools}`
     2. Set up the build directory with `cmake -B build`
   * Static builds (without DLLs, standalone executable)
-     1. Install Qt: `pacman -S <prefi>-qt5-static`  
+     1. Install Qt: `pacman -S <prefix>-qt5-static`  
        (Note: As of writing, the `qt6-static` package does not work.)
     2. Set up the build directory with `cmake -B build -DBUILD_STATIC=ON -DUSE_QT6=OFF -DCMAKE_PREFIX_PATH=$MSYSTEM_PREFIX/qt5-static`
 7. Compile: `cmake --build build`
--- a/src/debug/GdbCmds.cpp
+++ b/src/debug/GdbCmds.cpp
@ -47,7 +47,7 @@ const char* TARGET_INFO_ARM9 = "cputype:12;cpusubtype:7;triple:arm-none-eabi;ost
 	"<reg name=\"r11\" bitsize=\"32\" type=\"uint32\"/>" \
 	"<reg name=\"r12\" bitsize=\"32\" type=\"uint32\"/>" \
 	"<reg name=\"sp\" bitsize=\"32\" type=\"data_ptr\"/>" \
-	"<reg name=\"lr\" bitsize=\"32\" type=\"code_ptr\"/>" \
+	"<reg name=\"lr\" bitsize=\"32\"/>" \
 	"<reg name=\"pc\" bitsize=\"32\" type=\"code_ptr\"/>" \
 	/* 16 regs */ \

--- a/src/debug/GdbStub.cpp
+++ b/src/debug/GdbStub.cpp
@ -175,6 +175,7 @@ SubcmdHandler GdbStub::Handlers_v[] = {
 	{ .MainCmd = 'v', .SubStr = "Stopped"       , .Handler = GdbStub::Handle_v_Stopped },
 	{ .MainCmd = 'v', .SubStr = "MustReplyEmpty", .Handler = GdbStub::Handle_v_MustReplyEmpty },
 	{ .MainCmd = 'v', .SubStr = "Cont?"         , .Handler = GdbStub::Handle_v_ContQuery },
+	{ .MainCmd = 'v', .SubStr = "Cont;"         , .Handler = GdbStub::Handle_v_Cont },
 	{ .MainCmd = 'v', .SubStr = "Cont"          , .Handler = GdbStub::Handle_v_Cont },

 	{ .MainCmd = 'v', .SubStr = NULL, .Handler = NULL }
Author	SHA1	Message	Date
enler	92eba7f9f1	Merge `0acbfa0ca7` into `5e8beb3ab7`	2024-11-13 18:13:13 +02:00
Nadia Holmquist Pedersen	5e8beb3ab7	fix a typo Some checks are pending macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run Details macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run Details macOS / Universal binary (push) Blocked by required conditions Details Ubuntu / x86_64 (push) Waiting to run Details Ubuntu / aarch64 (push) Waiting to run Details Windows / build (push) Waiting to run Details	2024-11-13 15:23:59 +01:00
enler	0acbfa0ca7	Fix XML information in GdbCmds.cpp and add support for the 'vCont;' command.	2024-06-21 00:54:10 +08:00