[GDB] Handle kill and detach packets.

This commit also includes a test to ensure that single stepping works,
since continue, kill, detach, and single step all share code.

diff --git a/src/core/gdbstub.c b/src/core/gdbstub.c
index 213887b557811d031265b26e79fdf12e71aeb92e..544595e6592585e5282619a927ebbb99e4a8e62f 100644 (file)
--- a/src/core/gdbstub.c
+++ b/src/core/gdbstub.c
@@ -235,11 +235,14 @@ static void gdbstub_rx_packet ( struct gdbstub *stub ) {
                case 'M':
                        gdbstub_write_mem ( stub );
                        break;
-               case 'c':
-                       gdbstub_continue ( stub, 0 );
-                       break;
-               case 's':
-                       gdbstub_continue ( stub, 1 );
+               case 'c': /* Continue */
+               case 'k': /* Kill */
+               case 's': /* Step */
+               case 'D': /* Detach */
+                       gdbstub_continue ( stub, stub->payload [ 0 ] == 's' );
+                       if ( stub->payload [ 0 ] == 'D' ) {
+                               gdbstub_send_ok ( stub );
+                       }
                        break;
                default:
                        stub->len = 0;

diff --git a/src/tests/gdbstub_test.S b/src/tests/gdbstub_test.S
index ee594ea85d7e213495c61fde674d74f1137d6377..6478308989830afc037499fdb2f4f6c7f2574be3 100644 (file)
--- a/src/tests/gdbstub_test.S
+++ b/src/tests/gdbstub_test.S
@@ -25,5 +25,9 @@ gdbstub_test:
        int     $3
        addl    $8, %esp
 
+       /* 5. Step test */
+       int     $3
+       nop
+
 1:
        jmp     1b

diff --git a/src/tests/gdbstub_test.gdb b/src/tests/gdbstub_test.gdb
index 10db863e13c91900b96fc5839ac6d62ebc52dbca..c0c596441d314698d9fcb872c03048eb3050d422 100755 (executable)
--- a/src/tests/gdbstub_test.gdb
+++ b/src/tests/gdbstub_test.gdb
@@ -71,6 +71,12 @@ define gpxe_test_mem_write
        gpxe_assert ({char}($esp)) (char)0x99 "gpxe_test_mem_write char"
 end
 
+define gpxe_test_step
+       c
+       si
+       gpxe_assert ({char}($eip-1)) (char)0x90 "gpxe_test_step" # nop = 0x90
+end
+
 gpxe_load_symbols
 gpxe_connect
 gpxe_start_tests
@@ -78,3 +84,4 @@ gpxe_test_regs_read
 gpxe_test_regs_write
 gpxe_test_mem_read
 gpxe_test_mem_write
+gpxe_test_step