qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Jon Doron" <arilou@gmail.com>
Subject: [Qemu-devel] [PULL 33/52] gdbstub: Add infrastructure to parse cmd packets
Date: Fri,  7 Jun 2019 10:05:32 +0100	[thread overview]
Message-ID: <20190607090552.12434-34-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org>

From: Jon Doron <arilou@gmail.com>

Signed-off-by: Jon Doron <arilou@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20190529064148.19856-2-arilou@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/gdbstub.c b/gdbstub.c
index 462f89edfe..09fe5a4b99 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1268,6 +1268,201 @@ out:
     return res;
 }
 
+typedef union GdbCmdVariant {
+    const char *data;
+    uint8_t opcode;
+    unsigned long val_ul;
+    unsigned long long val_ull;
+    struct {
+        GDBThreadIdKind kind;
+        uint32_t pid;
+        uint32_t tid;
+    } thread_id;
+} GdbCmdVariant;
+
+static const char *cmd_next_param(const char *param, const char delimiter)
+{
+    static const char all_delimiters[] = ",;:=";
+    char curr_delimiters[2] = {0};
+    const char *delimiters;
+
+    if (delimiter == '?') {
+        delimiters = all_delimiters;
+    } else if (delimiter == '0') {
+        return strchr(param, '\0');
+    } else if (delimiter == '.' && *param) {
+        return param + 1;
+    } else {
+        curr_delimiters[0] = delimiter;
+        delimiters = curr_delimiters;
+    }
+
+    param += strcspn(param, delimiters);
+    if (*param) {
+        param++;
+    }
+    return param;
+}
+
+static int cmd_parse_params(const char *data, const char *schema,
+                            GdbCmdVariant *params, int *num_params)
+{
+    int curr_param;
+    const char *curr_schema, *curr_data;
+
+    *num_params = 0;
+
+    if (!schema) {
+        return 0;
+    }
+
+    curr_schema = schema;
+    curr_param = 0;
+    curr_data = data;
+    while (curr_schema[0] && curr_schema[1] && *curr_data) {
+        switch (curr_schema[0]) {
+        case 'l':
+            if (qemu_strtoul(curr_data, &curr_data, 16,
+                             &params[curr_param].val_ul)) {
+                return -EINVAL;
+            }
+            curr_param++;
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        case 'L':
+            if (qemu_strtou64(curr_data, &curr_data, 16,
+                              (uint64_t *)&params[curr_param].val_ull)) {
+                return -EINVAL;
+            }
+            curr_param++;
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        case 's':
+            params[curr_param].data = curr_data;
+            curr_param++;
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        case 'o':
+            params[curr_param].opcode = *(uint8_t *)curr_data;
+            curr_param++;
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        case 't':
+            params[curr_param].thread_id.kind =
+                read_thread_id(curr_data, &curr_data,
+                               &params[curr_param].thread_id.pid,
+                               &params[curr_param].thread_id.tid);
+            curr_param++;
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        case '?':
+            curr_data = cmd_next_param(curr_data, curr_schema[1]);
+            break;
+        default:
+            return -EINVAL;
+        }
+        curr_schema += 2;
+    }
+
+    *num_params = curr_param;
+    return 0;
+}
+
+typedef struct GdbCmdContext {
+    GDBState *s;
+    GdbCmdVariant *params;
+    int num_params;
+    uint8_t mem_buf[MAX_PACKET_LENGTH];
+    char str_buf[MAX_PACKET_LENGTH + 1];
+} GdbCmdContext;
+
+typedef void (*GdbCmdHandler)(GdbCmdContext *gdb_ctx, void *user_ctx);
+
+/*
+ * cmd_startswith -> cmd is compared using startswith
+ *
+ *
+ * schema definitions:
+ * Each schema parameter entry consists of 2 chars,
+ * the first char represents the parameter type handling
+ * the second char represents the delimiter for the next parameter
+ *
+ * Currently supported schema types:
+ * 'l' -> unsigned long (stored in .val_ul)
+ * 'L' -> unsigned long long (stored in .val_ull)
+ * 's' -> string (stored in .data)
+ * 'o' -> single char (stored in .opcode)
+ * 't' -> thread id (stored in .thread_id)
+ * '?' -> skip according to delimiter
+ *
+ * Currently supported delimiters:
+ * '?' -> Stop at any delimiter (",;:=\0")
+ * '0' -> Stop at "\0"
+ * '.' -> Skip 1 char unless reached "\0"
+ * Any other value is treated as the delimiter value itself
+ */
+typedef struct GdbCmdParseEntry {
+    GdbCmdHandler handler;
+    const char *cmd;
+    bool cmd_startswith;
+    const char *schema;
+} GdbCmdParseEntry;
+
+static inline int startswith(const char *string, const char *pattern)
+{
+  return !strncmp(string, pattern, strlen(pattern));
+}
+
+static int process_string_cmd(
+        GDBState *s, void *user_ctx, const char *data,
+        const GdbCmdParseEntry *cmds, int num_cmds)
+        __attribute__((unused));
+
+static int process_string_cmd(GDBState *s, void *user_ctx, const char *data,
+                              const GdbCmdParseEntry *cmds, int num_cmds)
+{
+    int i, schema_len, max_num_params = 0;
+    GdbCmdContext gdb_ctx;
+
+    if (!cmds) {
+        return -1;
+    }
+
+    for (i = 0; i < num_cmds; i++) {
+        const GdbCmdParseEntry *cmd = &cmds[i];
+        g_assert(cmd->handler && cmd->cmd);
+
+        if ((cmd->cmd_startswith && !startswith(data, cmd->cmd)) ||
+            (!cmd->cmd_startswith && strcmp(cmd->cmd, data))) {
+            continue;
+        }
+
+        if (cmd->schema) {
+            schema_len = strlen(cmd->schema);
+            if (schema_len % 2) {
+                return -2;
+            }
+
+            max_num_params = schema_len / 2;
+        }
+
+        gdb_ctx.params =
+            (GdbCmdVariant *)alloca(sizeof(*gdb_ctx.params) * max_num_params);
+        memset(gdb_ctx.params, 0, sizeof(*gdb_ctx.params) * max_num_params);
+
+        if (cmd_parse_params(&data[strlen(cmd->cmd)], cmd->schema,
+                             gdb_ctx.params, &gdb_ctx.num_params)) {
+            return -1;
+        }
+
+        gdb_ctx.s = s;
+        cmd->handler(&gdb_ctx, user_ctx);
+        return 0;
+    }
+
+    return -1;
+}
+
 static int gdb_handle_packet(GDBState *s, const char *line_buf)
 {
     CPUState *cpu;
-- 
2.20.1



  parent reply	other threads:[~2019-06-07 10:14 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-07  9:04 [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 01/52] editorconfig: add setting for shell scripts Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 02/52] qemu-io-cmds: use clock_gettime for benchmarking Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 03/52] tests/docker: Update the Fedora image to Fedora 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 04/52] tests/docker: Update the Fedora cross compile images to 30 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 05/52] tests/docker: Update the Ubuntu image to 19.04 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 06/52] .travis.yml: bump gcc sanitiser job to gcc-9 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 07/52] .travis.yml: add clang ubsan job Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 08/52] tests/vm: Use python configured on build Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 10/52] tests/vm: Fix build-centos docker-based tests run Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 11/52] tests/vm: Add missing variables on help Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 12/52] scripts: use git archive in archive-source Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 13/52] tests/vm: python3 fixes Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 14/52] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 15/52] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 16/52] tests/vm: run test builds on snapshot Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 17/52] tests/vm: proper guest shutdown Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 18/52] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 19/52] tests/vm: add DEBUG=1 to help text Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 20/52] tests/vm: serial console support helpers Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 21/52] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 22/52] tests/vm: freebsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 23/52] tests/vm: netbsd " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 24/52] tests/vm: fedora " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 25/52] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 26/52] semihosting: split console_out into string and char versions Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 27/52] cputlb: use uint64_t for interim values for unaligned load Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 28/52] tests/tcg: better detect truncated reads Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386 Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 30/52] tests/tcg/x86_64: add a PVH crt.o for x86_64 system tests Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 31/52] MAINTAINERS: put myself forward for gdbstub Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 32/52] cputlb: cast size_t to target_ulong before using for address masks Alex Bennée
2019-06-07  9:05 ` Alex Bennée [this message]
2019-06-07  9:05 ` [Qemu-devel] [PULL 34/52] gdbstub: Implement deatch (D pkt) with new infra Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 35/52] gdbstub: Implement thread_alive (T " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 36/52] gdbstub: Implement continue (c " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 37/52] gdbstub: Implement continue with signal (C " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 38/52] gdbstub: Implement set_thread (H " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 39/52] gdbstub: Implement breakpoint commands (Z/z " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 40/52] gdbstub: Implement set register (P " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 41/52] gdbstub: Implement get register (p " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 42/52] gdbstub: Implement write memory (M " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 43/52] gdbstub: Implement read memory (m " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 44/52] gdbstub: Implement write all registers (G " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 45/52] gdbstub: Implement read all registers (g " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 46/52] gdbstub: Implement file io (F " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 47/52] gdbstub: Implement step (s " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 48/52] gdbstub: Implement v commands " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 49/52] gdbstub: Implement generic set/query (Q/q pkt) " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 50/52] gdbstub: Implement target halted (? " Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 51/52] gdbstub: Clear unused variables in gdb_handle_packet Alex Bennée
2019-06-07  9:05 ` [Qemu-devel] [PULL 52/52] gdbstub: Implement qemu physical memory mode Alex Bennée
2019-06-07  9:50 ` [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes Peter Maydell
2019-06-07 13:25   ` Alex Bennée
2019-06-11 14:18   ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190607090552.12434-34-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=arilou@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).