gdbstub: monitor fixes v3

@@ -205,9 +205,9 @@ static void hextomem(uint8_t *mem, const
 }
 
 /* return -1 if error, 0 if OK */
-static int put_packet(GDBState *s, char *buf)
+static int put_packet_hex(GDBState *s, const char *buf, int len, int isHex)
 {
-    int len, csum, i;
+    int csum, i;
     uint8_t *p;
 
 #ifdef DEBUG_GDB

@@ -217,13 +217,19 @@ static int put_packet(GDBState *s, char 
     for(;;) {
         p = s->last_packet;
         *(p++) = '$';
-        len = strlen(buf);
-        memcpy(p, buf, len);
-        p += len;
+        if (isHex) {
+            p[0] = 'O';
+            memtohex(p + 1, buf, len);
+            len = strlen(p);
+        } else {
+            memcpy(p, buf, len);
+        }
+
         csum = 0;
         for(i = 0; i < len; i++) {
-            csum += buf[i];
+            csum += p[i];
         }
+        p += len;
         *(p++) = '#';
         *(p++) = tohex((csum >> 4) & 0xf);
         *(p++) = tohex((csum) & 0xf);

@@ -244,6 +250,24 @@ static int put_packet(GDBState *s, char 
     return 0;
 }
 
+/* return -1 if error, 0 if OK */
+static int put_packet(GDBState *s, const char *buf) {
+    return put_packet_hex(s, buf, strlen(buf), 0);
+}
+
+static void monitor_output(GDBState *s, const char *msg)
+{
+    put_packet_hex(s, msg, strlen(msg), 1);
+}
+
+static void monitor_help(GDBState *s)
+{
+    monitor_output(s, "gdbstub specific monitor commands:\n");
+    monitor_output(s, "show <sirqs|stimers> -- Show gdbstub Single Stepping variables\n");
+    monitor_output(s, "set sirqs <0|1> --  Single Stepping with qemu irq handlers enabled\n");
+    monitor_output(s, "set stimers <0|1> -- Single Stepping with qemu timers enabled\n");
+}
+
 #if defined(TARGET_I386)
 
 #ifdef TARGET_X86_64

@@ -948,6 +972,37 @@ static void cpu_gdb_write_registers(CPUS
 
 #endif
 
+static void gdb_rcmd(GDBState *s, const char *p, char *buf, char *mem_buf)
+{
+    int len = strlen(p);
+
+    if ((len % 2) != 0) {
+        put_packet(s, "E01");
+        return;
+    }
+    hextomem(mem_buf, p, len);
+    mem_buf[(len >> 1)] = 0;
+
+    if (!strcmp(mem_buf, "show sirqs")) {
+        sprintf(buf, "sirqs == %i\n", (sstep_flags & SSTEP_NOIRQ) == 0);
+        monitor_output(s, buf);
+    } else if (!strcmp(mem_buf, "show stimers")) {
+        sprintf(buf, "stimers == %i\n", (sstep_flags & SSTEP_NOTIMER) == 0);
+        monitor_output(s, buf);
+    } else if (!strcmp(mem_buf, "set sirqs 1")) {
+        sstep_flags &= ~SSTEP_NOIRQ;
+    } else if (!strcmp(mem_buf, "set sirqs 0")) {
+        sstep_flags |= SSTEP_NOIRQ;
+    } else if (!strcmp(mem_buf, "set stimers 1")) {
+        sstep_flags &= ~SSTEP_NOTIMER;
+    } else if (!strcmp(mem_buf, "set stimers 0")) {
+        sstep_flags |= SSTEP_NOTIMER;
+    } else if (!strcmp(mem_buf, "help") || !strcmp(mem_buf, "?")) {
+        monitor_help(s);
+    }
+    put_packet(s, "OK");
+}
+
 static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf)
 {
     const char *p;

@@ -1139,29 +1194,8 @@ static int gdb_handle_packet(GDBState *s
         }
         break;
     case 'q':
-    case 'Q':
-        /* parse any 'q' packets here */
-        if (!strcmp(p,"qemu.sstepbits")) {
-            /* Query Breakpoint bit definitions */
-            sprintf(buf,"ENABLE=%x,NOIRQ=%x,NOTIMER=%x",
-                    SSTEP_ENABLE,
-                    SSTEP_NOIRQ,
-                    SSTEP_NOTIMER);
-            put_packet(s, buf);
-            break;
-        } else if (strncmp(p,"qemu.sstep",10) == 0) {
-            /* Display or change the sstep_flags */
-            p += 10;
-            if (*p != '=') {
-                /* Display current setting */
-                sprintf(buf,"0x%x", sstep_flags);
-                put_packet(s, buf);
-                break;
-            }
-            p++;
-            type = strtoul(p, (char **)&p, 16);
-            sstep_flags = type;
-            put_packet(s, "OK");
+        if (!strncmp(p, "Rcmd,", 5)) {
+            gdb_rcmd(s, p + 5, buf, mem_buf);
             break;
         }
 #ifdef CONFIG_LINUX_USER

100 lines not on this page · raw message

@@ -69,8 +69,9 @@ typedef struct term_cmd_t {
     const char *help;
 } term_cmd_t;
 
-#define MAX_MON 4
+#define MAX_MON 5
 static CharDriverState *monitor_hd[MAX_MON];
+static CharDriverState *mon_active;
 static int hide_banner;
 
 static term_cmd_t term_cmds[];

@@ -85,13 +86,11 @@ CPUState *mon_cpu = NULL;
 
 void term_flush(void)
 {
-    int i;
-    if (term_outbuf_index > 0) {
-        for (i = 0; i < MAX_MON; i++)
-            if (monitor_hd[i] && monitor_hd[i]->focus == 0)
-                qemu_chr_write(monitor_hd[i], term_outbuf, term_outbuf_index);
-        term_outbuf_index = 0;
-    }
+    if (term_outbuf_index <= 0)
+        return;
+    if (mon_active)
+        qemu_chr_write(mon_active, term_outbuf, term_outbuf_index);
+    term_outbuf_index = 0;
 }
 
 /* flush at every end of line or if the buffer is full */

@@ -2603,12 +2602,19 @@ static int term_can_read(void *opaque)
 static void term_read(void *opaque, const uint8_t *buf, int size)
 {
     int i;
+    mon_active = opaque;
     for(i = 0; i < size; i++)
         readline_handle_byte(buf[i]);
 }
 
 static void monitor_start_input(void);
 
+void monitor_handle_ext_command(void *opaque, const char *cmdline)
+{
+    mon_active = opaque;
+    monitor_handle_command(cmdline);
+}
+
 static void monitor_handle_command1(void *opaque, const char *cmdline)
 {
     monitor_handle_command(cmdline);

@@ -2625,6 +2631,7 @@ static void term_event(void *opaque, int
     if (event != CHR_EVENT_RESET)
 	return;
 
+    mon_active = opaque;
     if (!hide_banner)
 	    term_printf("QEMU %s monitor - type 'help' for more information\n",
 			QEMU_VERSION);

@@ -2646,13 +2653,18 @@ void monitor_init(CharDriverState *hd, i
     for (i = 0; i < MAX_MON; i++) {
         if (monitor_hd[i] == NULL) {
             monitor_hd[i] = hd;
+            mon_active = hd;
             break;
         }
     }
+    if (i >= MAX_MON) {
+        fprintf(stderr, "ERROR too many monitor connections requested\n");
+        exit(0);
+    }
 
     hide_banner = !show_banner;
 
-    qemu_chr_add_handlers(hd, term_can_read, term_read, term_event, NULL);
+    qemu_chr_add_handlers(hd, term_can_read, term_read, term_event, hd);
 
     readline_start("", 0, monitor_handle_command1, NULL);
 }

@@ -2672,12 +2684,8 @@ static void monitor_readline_cb(void *op
 void monitor_readline(const char *prompt, int is_password,
                       char *buf, int buf_size)
 {
-    int i;
-
-    if (is_password) {
-        for (i = 0; i < MAX_MON; i++)
-            if (monitor_hd[i] && monitor_hd[i]->focus == 0)
-                qemu_chr_send_event(monitor_hd[i], CHR_EVENT_FOCUS);
+    if (is_password && mon_active) {
+        qemu_chr_send_event(mon_active, CHR_EVENT_FOCUS);
     }
     readline_start(prompt, is_password, monitor_readline_cb, NULL);
     monitor_readline_buf = buf;

@@ -159,6 +159,7 @@ extern uint8_t _translate_keycode(const 
    does not need to include console.h  */
 /* monitor.c */
 void monitor_init(CharDriverState *hd, int show_banner);
+void monitor_handle_ext_command(void *opaque, const char *cmdline);
 void term_puts(const char *str);
 void term_vprintf(const char *fmt, va_list ap);
 void term_printf(const char *fmt, ...) __attribute__ ((__format__ (__printf__, 1, 2)));