From patchwork Thu Apr 25 13:26:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CtCXRcwE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qddN41fXz9s7T for ; Thu, 25 Apr 2019 23:41:44 +1000 (AEST) Received: from localhost ([127.0.0.1]:57401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJedB-0002La-7V for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:41:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeP3-0007ju-43 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeP1-00007U-Vg for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:05 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33995) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeP1-00006V-PZ for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:03 -0400 Received: by mail-wm1-x344.google.com with SMTP id r186so1692588wmf.1 for ; Thu, 25 Apr 2019 06:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IiZwt5zDLPIRu6kHlSDJ1N64973ynZWO1IliJrwiIQ0=; b=CtCXRcwEwI4vdDD1uwDqTs8VwjuZXI+ytXyuSYaJBm6Ka/PFZGM4SEVnxMQBdoEMMa oHio1ejeuipzsjPDxjoFJzPJa/Y3GXMV3vMXTaSVyShi6IVe6Hrvy5Cy6po/4iU3wGy0 DgB25f/FzXzt2ua/c0U3Nf0cuQcDQvywYQ9JsWp69tc8cHTe4VEc5BIlMHtbz6uGWvUm sJiGXbusnHq5AOFZkSutsnmIouUNsEwj3F0ixNQfVqBBosJjlc0qqw+OhJKVmQffGS2E siA9dLDEyDMXhdFz7fzXRRnQidQ+j5d/dW1/zMxiuV1ojDrY2a9yPs2iGgwsM3DfQurh yB+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IiZwt5zDLPIRu6kHlSDJ1N64973ynZWO1IliJrwiIQ0=; b=W/aW5nC2dPK9hN2DYw7fyZUQsg1BvQhmQddH9Dk717jWzwyYpXKwTujxnS7JNDCnyG AJH/xDp955fyFvvhwXrbqCE5qDZpLSrp1Qaujcrd4sZ5lTV9n+JZfQUWtCRKPimLs1qV DgZ2mNJTZFDnLZHt0UcVzc5PXq1Itya52AH76XB4CvgqcW/NefgALeFiwWaphn/N5PRF vWli9Zfk80gbFHL2v5aVDz3OtoTiVBHxTQLNrgXoHrdhevXGr9VmL0DJp4ykXGvgEzC1 R055q4W9dxVioqoHNqWzvXeYc9rzfNDS8BxuBPFT5Mz9ro9h7WrFs15RX6bmlfAweo2W 4Sdg== X-Gm-Message-State: APjAAAU3rXmjq4HTXq/6/dmpxXnkAy4n387B/le7bghsvzRu0c4vWD+O mVJ2S4+T4GB2YpWKi6UuVNC/rS2X X-Google-Smtp-Source: APXvYqxIEsjh2f+ySZxAOYd2NLXNV0l/Pi+FjnNLPzYC63OCM8YURNSBP6bj3LdK2wo2GlDK4sFpnA== X-Received: by 2002:a1c:f311:: with SMTP id q17mr3616459wmq.144.1556198820974; Thu, 25 Apr 2019 06:27:00 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.26.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:26:57 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:16 +0300 Message-Id: <20190425132636.31636-2-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v6 01/21] gdbstub: Add infrastructure to parse cmd packets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/gdbstub.c b/gdbstub.c index d54abd17cc..3308279fa8 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1268,6 +1268,206 @@ 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, + ¶ms[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 *)¶ms[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, + ¶ms[curr_param].thread_id.pid, + ¶ms[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 + * cmd_full_match -> cmd is compared using strcmp + * + * + * 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; + union { + int flags; + struct { + int cmd_startswith:1; + int cmd_full_match:1; + }; + }; + const char *schema; +} GdbCmdParseEntry; + +static inline int startswith(const char *string, const char *pattern) +{ + return !strncmp(string, pattern, strlen(pattern)); +} + +__attribute__((unused)) static int process_string_cmd( + GDBState *s, void *user_ctx, const char *data, + const GdbCmdParseEntry *cmds, int num_cmds); + +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; + GdbCmdContext gdb_ctx; + + if (!cmds) { + return -1; + } + + for (i = 0; i < num_cmds; i++) { + if (!cmds[i].handler || !cmds[i].cmd || + (cmds[i].cmd_startswith && !startswith(data, cmds[i].cmd)) || + (cmds[i].cmd_full_match && strcmp(data, cmds[i].cmd))) { + continue; + } + + max_num_params = 0; + if (cmds[i].schema) { + schema_len = strlen(cmds[i].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(cmds[i].cmd)], cmds[i].schema, + gdb_ctx.params, &gdb_ctx.num_params)) { + return -1; + } + + gdb_ctx.s = s; + cmds[i].handler(&gdb_ctx, user_ctx); + return 0; + } + + return -1; +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; From patchwork Thu Apr 25 13:26:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fO7HYjY8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdZP52SBz9s70 for ; Thu, 25 Apr 2019 23:39:09 +1000 (AEST) Received: from localhost ([127.0.0.1]:57338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeah-0000Ca-LZ for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:39:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeP9-0007qT-PK for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeP8-0000E7-Qz for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:11 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39401) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeP8-0000DM-Hr for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:10 -0400 Received: by mail-wr1-x444.google.com with SMTP id a9so12753737wrp.6 for ; Thu, 25 Apr 2019 06:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0qJN6185ODZeDOdkkrEIq0s8E30UIRJZdf625wY6AUY=; b=fO7HYjY82UVmKOil/lWyIAlhCNBZ29MfJra14Ipq9RbgmAi+s9XQuoQKrLw8s52vlm g5vKQtgPFTGSfmgtP/AgspuKwDMRDgrNn3SzNRM2qxs7I3yvehQQDzoDpVH9RzzO6I+Y 6B7/4+oduqxBn6Dy1NvyKd6SG/VEoMMygo0/zOeTkAM+3SAhQyrCowcHMFjwJi0/ITPl idR6kc6gZ6z09SJFfRMxGGRwOMT5S2BUIMuBKgrMWyS91IlG89KxRY7xaAq1bRfhUgVU L/hD+6M+Js6ettErgbHEA9Y/SmEOvoUrrbH8qJVy06Be4RznrxzoIpNLt5zEgMfzT67/ FfwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0qJN6185ODZeDOdkkrEIq0s8E30UIRJZdf625wY6AUY=; b=pglC5YAJHFYcEICasNeZmt72zdcaqUH635xcs+RdHIfwjSzKMJnD9nmLc4sqAb+ja9 55eRHkLp5x9d6BgS8ZHJw/lx2IkX2UPTPCTU1qdOefr1rU2b2v4UbeXCCRFyn/lMIOb7 M9WxpNK/D1u7+EYl8ZKPnegAHM3OcVUZ5unAwRDZJ/GeqFdAZR98oMdohNcEprJSnbZt Pp0fIhOqgBr0UPqAa/GGgjg5qkLzwwOGrbVHmskyw14VtUIQh1R2Vb7CwMmCySeZZV+s 2jiI2daHkOO0iUZAJKi4CbK7uE21qFWwmjwDZZ1EKCkJkPx00CvdSJmnf/uARiHv0zU3 QAJg== X-Gm-Message-State: APjAAAX2Xgoy15ixEe5tNMJLqMlNpFY6f7UQTvci3Hwu3E/mESHhkCRa a0FkLtXxgj0ClfqqPZbkjgjcnRFk X-Google-Smtp-Source: APXvYqyl15FW02wG7SgyWX/z7F+38nWONHWZHQtwUEidoyZ2CnXy/ob9vs88ZCbgD4GMZaabGi30VA== X-Received: by 2002:a5d:4707:: with SMTP id y7mr9646983wrq.185.1556198828097; Thu, 25 Apr 2019 06:27:08 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:03 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:17 +0300 Message-Id: <20190425132636.31636-3-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v6 02/21] gdbstub: Implement deatch (D pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-otff-by: Jon Doron --- gdbstub.c | 89 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 3308279fa8..fdad1ac466 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1420,10 +1420,6 @@ static inline int startswith(const char *string, const char *pattern) return !strncmp(string, pattern, strlen(pattern)); } -__attribute__((unused)) static int process_string_cmd( - GDBState *s, void *user_ctx, const char *data, - const GdbCmdParseEntry *cmds, int num_cmds); - static int process_string_cmd(GDBState *s, void *user_ctx, const char *data, const GdbCmdParseEntry *cmds, int num_cmds) { @@ -1468,6 +1464,41 @@ static int process_string_cmd(GDBState *s, void *user_ctx, const char *data, return -1; } +static void handle_detach(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + GDBProcess *process; + GDBState *s = gdb_ctx->s; + uint32_t pid = 1; + + if (s->multiprocess) { + if (!gdb_ctx->num_params) { + put_packet(s, "E22"); + return; + } + + pid = gdb_ctx->params[0].val_ul; + } + + process = gdb_get_process(s, pid); + gdb_process_breakpoint_remove_all(s, process); + process->attached = false; + + if (pid == gdb_get_cpu_pid(s, s->c_cpu)) { + s->c_cpu = gdb_first_attached_cpu(s); + } + + if (pid == gdb_get_cpu_pid(s, s->g_cpu)) { + s->g_cpu = gdb_first_attached_cpu(s); + } + + if (!s->c_cpu) { + /* No more process attached */ + gdb_syscall_mode = GDB_SYS_DISABLED; + gdb_continue(s); + } + put_packet(s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1482,6 +1513,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) uint8_t *registers; target_ulong addr, len; GDBThreadIdKind thread_kind; + const GdbCmdParseEntry *cmd_parser = NULL; trace_gdbstub_io_command(line_buf); @@ -1582,42 +1614,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) error_report("QEMU: Terminated via GDBstub"); exit(0); case 'D': - /* Detach packet */ - pid = 1; - - if (s->multiprocess) { - unsigned long lpid; - if (*p != ';') { - put_packet(s, "E22"); - break; - } - - if (qemu_strtoul(p + 1, &p, 16, &lpid)) { - put_packet(s, "E22"); - break; - } - - pid = lpid; - } - - process = gdb_get_process(s, pid); - gdb_process_breakpoint_remove_all(s, process); - process->attached = false; - - if (pid == gdb_get_cpu_pid(s, s->c_cpu)) { - s->c_cpu = gdb_first_attached_cpu(s); - } - - if (pid == gdb_get_cpu_pid(s, s->g_cpu)) { - s->g_cpu = gdb_first_attached_cpu(s); - } - - if (s->c_cpu == NULL) { - /* No more process attached */ - gdb_syscall_mode = GDB_SYS_DISABLED; - gdb_continue(s); + { + static const GdbCmdParseEntry detach_cmd_desc = { + .handler = handle_detach, + .cmd = "D", + .cmd_startswith = 1, + .schema = "?.l0" + }; + cmd_parser = &detach_cmd_desc; } - put_packet(s, "OK"); break; case 's': if (*p != '\0') { @@ -1990,6 +1995,12 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, buf); break; } + + if (cmd_parser && + process_string_cmd(s, NULL, line_buf, cmd_parser, 1)) { + put_packet(s, ""); + } + return RS_IDLE; } From patchwork Thu Apr 25 13:26:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SLInGwCH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdQM0trwz9s70 for ; Thu, 25 Apr 2019 23:32:10 +1000 (AEST) Received: from localhost ([127.0.0.1]:57236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeTw-0002po-Nx for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:32:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePE-0007vO-W9 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePE-0000Lc-2C for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:16 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePD-0000KJ-Sa for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:16 -0400 Received: by mail-wr1-x441.google.com with SMTP id b1so19006421wru.3 for ; Thu, 25 Apr 2019 06:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=38LnIcypIDjektyoZrBn3/LYujk4iHNznA1yMdifAQQ=; b=SLInGwCHS2AJXE9JsEM6osK40eY4yqqIv5R/9G0bybLnxQIkZ7mzIPhyPOx9+9ZJ8H 7TfsDmqn3vyQGertoQqIImFd+3pIlnR3phKEvGZgjxS+9ME+Uwjx57kjk8y05F9aKb6O F7bRZQ2V3ZJ9vESq9/hxB8Lag51ePbIqngkM21hIJrZocQOChKEam0cY5wmK7RPWyt+W PSN3D334Zjp1zgrxC/NalDZEI+P8I57SuGweLy8KyDa+RTGan2LT6N3W7Uy82wSETLrr BzUHNKdMRlY0j1ui0vTpYch5U7HUpKNDe5qZjuhyIewX4GVaEfhbB/m2jyJipOQ0YT4n tJCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=38LnIcypIDjektyoZrBn3/LYujk4iHNznA1yMdifAQQ=; b=hTA0sj8Pnv6N0ihGFhrlhpOLSZX3PQrDNgHscZS+JKv2RBymtuzXtqJZ7Mf+hahwJW k3TkVlRizGvf2i7ebrjdUd+IBY1CyHVX921yObdGAEyxuCxYZLvXFk2qGAhgICT++BpU aeldwijthAp970anU5fXg4hYegBU0LGF8vgV1YP9Rgny3W9VNwoea16jIxXH++aeZp77 QSlscXSiMFHJ5PA/HlEycyx/sD2K/KXR3tFGWH7JeC44mwzVMJJSHA2NVMUlddy4+HG9 54WoXy7c92QdYhip0CFeiHkzSfnlkpFskFDvMMND9TyzPcDD4GXU9L2Xq0wsSFOgzKG1 od4w== X-Gm-Message-State: APjAAAUA3Q8Yu0gHTZvNHZsK0aTMN3j2euv+/VOxQoBFrWFm/pU1pEFv 80N1sVuxCNawdRvtHsCwTmgbIZuS X-Google-Smtp-Source: APXvYqwyMZLL2T/WD06/YLGIXQdadpi7pFh3wLTbRd7Se08BIuJYl+Wnl+EMn0bF0vgc7JIE5izwRQ== X-Received: by 2002:adf:dbce:: with SMTP id e14mr25490860wrj.249.1556198832793; Thu, 25 Apr 2019 06:27:12 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:10 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:18 +0300 Message-Id: <20190425132636.31636-4-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v6 03/21] gdbstub: Implement thread_alive (T pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index fdad1ac466..29ca6be3df 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1499,6 +1499,30 @@ static void handle_detach(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(s, "OK"); } +static void handle_thread_alive(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + CPUState *cpu; + + if (!gdb_ctx->num_params) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + if (gdb_ctx->params[0].thread_id.kind == GDB_READ_THREAD_ERR) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + cpu = gdb_get_cpu(gdb_ctx->s, gdb_ctx->params[0].thread_id.pid, + gdb_ctx->params[0].thread_id.tid); + if (!cpu) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + put_packet(gdb_ctx->s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1799,17 +1823,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'T': - thread_kind = read_thread_id(p, &p, &pid, &tid); - if (thread_kind == GDB_READ_THREAD_ERR) { - put_packet(s, "E22"); - break; - } - cpu = gdb_get_cpu(s, pid, tid); - - if (cpu != NULL) { - put_packet(s, "OK"); - } else { - put_packet(s, "E22"); + { + static const GdbCmdParseEntry thread_alive_cmd_desc = { + .handler = handle_thread_alive, + .cmd = "T", + .cmd_startswith = 1, + .schema = "t0" + }; + cmd_parser = &thread_alive_cmd_desc; } break; case 'q': From patchwork Thu Apr 25 13:26:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ihhUK6RD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdf34BXpz9s70 for ; Thu, 25 Apr 2019 23:42:19 +1000 (AEST) Received: from localhost ([127.0.0.1]:57408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJedl-0002ro-IV for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:42:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePJ-0007zQ-5v for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePI-0000Th-8W for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:21 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePI-0000SK-2H for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:20 -0400 Received: by mail-wm1-x344.google.com with SMTP id 10so9372350wmk.0 for ; Thu, 25 Apr 2019 06:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bTkKvUXe+vJFlObggYTIw/quvUXexqXsMjWKRIC3GfM=; b=ihhUK6RDAZh4WQ3g4tUu3L3Tybx9rZXQNXTEmVJQEWKAK6nFJhsA/K3dyPkLqgcGng RCkxVjZF0YL7HvfBnuq8rsUtDpRLqtHWkoioRBJpDvtOqVSPxoq5X5YGwK4qFwXtUlfu X44WpfH8lNwQoYL+q9MnFaCVL4lhHpeFGjozYcENMXH2PbBo0aZOOMPAdr7/TpzP+BRY KGQB5RPoT1KM4YG8s9TZGCls76tzeLe8n/Aw+PJiYK56s1+Yx86WcSmsvh8Ia5nN/AEa JnvYEsmiZmeHJghcl+62brO12jNvILihIF/U6THmNFwxmXz/9eyvx1KDiTEH2zUchBDq sPow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bTkKvUXe+vJFlObggYTIw/quvUXexqXsMjWKRIC3GfM=; b=t0PyPUCPkhTvIvmb8X3KaFDiwIRacNH+9fBLejRuDSWDpc55Y4uC0kZ1w738nKNyat KUD4w8zGq9LeJJVqBIqPjNLq7cAgNdrDJmziuU2MXTsSSYCIaKxPHWyWj0OtFYW24dm7 zcP64y47hAoNLk5Uh/1YrfDG7HjD5p3RYsq7HSZqOm6MCElM9CXKs2UdI5fmy2T+8Ial +gLpf6w0KbrjhRJFGhdl9a96FkY3gCEzw7XwsknMekAF1mJvai0ZhSA/qHvbFLyi5VSl Ya8OvOqXUnMJRXgJKiw0tlzK5MnmDZ1VykZOQtlDeWgXq8fH0rSQKRKhBrsfMGanYchD iZwg== X-Gm-Message-State: APjAAAUi+Wo3htx3+UnPkcklpP231bAQJ4jKVDIzYh3z9DMKWFPgsCgP 3MPH3zFpnx8eS35eubUnrcfcuOXM X-Google-Smtp-Source: APXvYqx54OANFaYbvbhubYcRgl8dZf9EHKn68dDldF3z8WWLWjLIKPk55DvZUzRgy2JAWzXNceN+jQ== X-Received: by 2002:a1c:c7c9:: with SMTP id x192mr3610756wmf.151.1556198837806; Thu, 25 Apr 2019 06:27:17 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:15 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:19 +0300 Message-Id: <20190425132636.31636-5-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v6 04/21] gdbstub: Implement continue (c pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 29ca6be3df..a38f9d4ef9 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1523,6 +1523,16 @@ static void handle_thread_alive(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "OK"); } +static void handle_continue(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (gdb_ctx->num_params) { + gdb_set_cpu_pc(gdb_ctx->s, gdb_ctx->params[0].val_ull); + } + + gdb_ctx->s->signal = 0; + gdb_continue(gdb_ctx->s); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1559,13 +1569,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) gdb_breakpoint_remove_all(); break; case 'c': - if (*p != '\0') { - addr = strtoull(p, (char **)&p, 16); - gdb_set_cpu_pc(s, addr); + { + static const GdbCmdParseEntry continue_cmd_desc = { + .handler = handle_continue, + .cmd = "c", + .cmd_startswith = 1, + .schema = "L0" + }; + cmd_parser = &continue_cmd_desc; } - s->signal = 0; - gdb_continue(s); - return RS_IDLE; + break; case 'C': s->signal = gdb_signal_to_target (strtoul(p, (char **)&p, 16)); if (s->signal == -1) From patchwork Thu Apr 25 13:26:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X63v34Yu"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdlD48Hsz9s70 for ; Thu, 25 Apr 2019 23:46:46 +1000 (AEST) Received: from localhost ([127.0.0.1]:57491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJei2-0006TF-9H for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:46:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePN-00083V-JL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePM-0000Zg-PL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:25 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePM-0000Yh-Jd for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:24 -0400 Received: by mail-wm1-x342.google.com with SMTP id j13so9368910wmh.2 for ; Thu, 25 Apr 2019 06:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kSEspp+nMht4rw3L2fHKWXdmIbCLDhlRtKrruE9yvWY=; b=X63v34YuS0aGNhzdZdQ4TsRoLLr/sJ5vidr1h6KVLDlEzNimEa29UwUsXaN8N4FPU3 Cjry6HR982WKBpeph84G3iq5/5kV6+4fNzCLVxiPaUIa4d8S/piuJj3XHxDAwDIKXwaM MHtCnM5XST2PAlco48kqiQ0E/eUj7cSYoeZ+Rb3r6mNCf+FZhvpYpTQnEnKj2eaSHSGN zImr6e+jr4rZNsnG3jDH/BNuPBXpWziTU3g33xWNk0O6JX9Li7GvBZF6l4d5yl2q5uyv eiqtksmVL2M4zoHSpZdrc4KQId+CmbVVeWemZw0BIiZMOiTKXxr/JN49l9kETb3fj++S 5+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kSEspp+nMht4rw3L2fHKWXdmIbCLDhlRtKrruE9yvWY=; b=GINVuhygCZDU/jji51+I1GkbRyzEzslGml2g8YNHJIOZjsL1JHZiHtdOapqgtWTGus Yy0dxAx14z1EgKBV9GnZox7SPewsRV7kIxNhHonuQxtCVuKkIE9A0A2Ww/8+3Sokct70 7cLF4crCsWL4akfQHceus0hTZwOZgvyyDbBqfj6K6qtXzW4LnKXt3K5p3JQmpyos6JA5 ciZqSnbxpMtK/GqNXE720zawzHtTYsZ+Zt+e9E80X7hSoJH61vpBRguYqYEkpafoTN93 jDZV2KK8SAt6SEq8kc6ZiCZS78ABN91JntxT0/nQOucS2L1dE8GJU7EHlLTIVl7KSXpl YrWA== X-Gm-Message-State: APjAAAVR2uDWSXxNRA7mWKZkR/trCWUw2P1FCkUxx2l19K2F1v5CAVPf CUEyOay1GNes3PgZ6TTWqIdn/bKL X-Google-Smtp-Source: APXvYqyrpDqtCQP10RtKrbcjRqcf7FFYoX2cR7YERAVBTqEfI8jU4qeZTl6OlXWZ7oHI2f/M9X6Evg== X-Received: by 2002:a1c:14:: with SMTP id 20mr3793002wma.66.1556198842040; Thu, 25 Apr 2019 06:27:22 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:19 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:20 +0300 Message-Id: <20190425132636.31636-6-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v6 05/21] gdbstub: Implement continue with signal (C pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index a38f9d4ef9..8e922a2df4 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1533,6 +1533,21 @@ static void handle_continue(GdbCmdContext *gdb_ctx, void *user_ctx) gdb_continue(gdb_ctx->s); } +static void handle_cont_with_sig(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + unsigned long signal = 0; + + if (gdb_ctx->num_params) { + signal = gdb_ctx->params[0].val_ul; + } + + gdb_ctx->s->signal = gdb_signal_to_target(signal); + if (gdb_ctx->s->signal == -1) { + gdb_ctx->s->signal = 0; + } + gdb_continue(gdb_ctx->s); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1580,11 +1595,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'C': - s->signal = gdb_signal_to_target (strtoul(p, (char **)&p, 16)); - if (s->signal == -1) - s->signal = 0; - gdb_continue(s); - return RS_IDLE; + { + static const GdbCmdParseEntry cont_with_sig_cmd_desc = { + .handler = handle_cont_with_sig, + .cmd = "C", + .cmd_startswith = 1, + .schema = "l0" + }; + cmd_parser = &cont_with_sig_cmd_desc; + } + break; case 'v': if (strncmp(p, "Cont", 4) == 0) { p += 4; From patchwork Thu Apr 25 13:26:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YFlTWUuy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdq600M7z9s7T for ; Thu, 25 Apr 2019 23:50:09 +1000 (AEST) Received: from localhost ([127.0.0.1]:57520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJelL-00010m-IK for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:50:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePT-00088Q-2q for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePQ-0000gM-H0 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:31 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:56213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePQ-0000em-9F for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:28 -0400 Received: by mail-wm1-x344.google.com with SMTP id o25so9273200wmf.5 for ; Thu, 25 Apr 2019 06:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M4+5FDQ/6x+srBv3D1SqFY72lf8MIyrhQkAf/Mt9fsY=; b=YFlTWUuyu/OX566JRAFqJQFm5V15zL6nrPJDKBZORXWzQXazBB+CN2VTbg7K9dWJJF uFxxoZx4nxtQ+DT/4ptmyxAjSrgb6jjc9DlZXJ71RPVG0I9ZMz0UW8RDeHb5bBtbdNX8 piMEI4QMZqx/I4fYTiKYoF1Lr+8HTpZG3LzIRrmq//5oKXi1B720i09Gob0VhOi7etsV B9PWKcXIR8auuNxpOHkaoCqkkFT48EtMfD+ySdB1nA5Cp6DabTlpgGW1KxXehBPXDst9 6OCdDoymWA4T5hXY670bAUnEoEkGWyqNA+HDpBGHi0fBhrAKOftJ8hlL45+i1x0kn1Sf 6paw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M4+5FDQ/6x+srBv3D1SqFY72lf8MIyrhQkAf/Mt9fsY=; b=gaxIh8SanQmjdfrgdUn0wM/lpxIunZOImfsXF6nduFvhEL09N37n0Gdg2cLwHn+SPB c+rSV6d+yllWjJD9rbaag05noMqedZJVSDrFAONyp/OM0Qph1ijNZ4EYG1luVtcI7akE SkOHQTOM+LfPHsFyKCOJ3b6p0LvUXaf/MgDUrmJZaiwTHHfMIIK21sRgSsNyVgjRaKbS E3urM90vCcTrgrtpEir3xuzALdcO2KZWAq/1kTQuLBNFLlJxMjeZGPnOpEC9n3l6KX5/ UDob9LuTVIHPOqAWo95cnZBlTga/NqmEPUIlW/07PQ4K+8CCRomTozASZ2o/5pe5r9b/ cWHw== X-Gm-Message-State: APjAAAWBQPC/etCk3KaLD2DXoOZRe6dqgRLQmDXPsBaYvrdEsj/fPP5H 6fuHVQ0JXmnaqX8uHQnB2IlirIFN X-Google-Smtp-Source: APXvYqwXCz5UYcNYedt8ck9JvvKBK7XWl5TAOw0Ed3+VTZWsbeudX7XjHV/+5yxfZJSVPvsGmEWscA== X-Received: by 2002:a1c:9e96:: with SMTP id h144mr3745198wme.33.1556198845910; Thu, 25 Apr 2019 06:27:25 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:24 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:21 +0300 Message-Id: <20190425132636.31636-7-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v6 06/21] gdbstub: Implement set_thread (H pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 79 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 8e922a2df4..83757def9b 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1548,6 +1548,47 @@ static void handle_cont_with_sig(GdbCmdContext *gdb_ctx, void *user_ctx) gdb_continue(gdb_ctx->s); } +static void handle_set_thread(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + CPUState *cpu; + + if (gdb_ctx->num_params < 2) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + if (gdb_ctx->params[1].thread_id.kind == GDB_READ_THREAD_ERR) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + if (gdb_ctx->params[1].thread_id.kind != GDB_ONE_THREAD) { + put_packet(gdb_ctx->s, "OK"); + return; + } + + cpu = gdb_get_cpu(gdb_ctx->s, gdb_ctx->params[1].thread_id.pid, + gdb_ctx->params[1].thread_id.tid); + if (!cpu) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + switch (gdb_ctx->params[0].opcode) { + case 'c': + gdb_ctx->s->c_cpu = cpu; + put_packet(gdb_ctx->s, "OK"); + break; + case 'g': + gdb_ctx->s->g_cpu = cpu; + put_packet(gdb_ctx->s, "OK"); + break; + default: + put_packet(gdb_ctx->s, "E22"); + break; + } +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1561,7 +1602,6 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) char thread_id[16]; uint8_t *registers; target_ulong addr, len; - GDBThreadIdKind thread_kind; const GdbCmdParseEntry *cmd_parser = NULL; trace_gdbstub_io_command(line_buf); @@ -1824,35 +1864,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, "E22"); break; case 'H': - type = *p++; - - thread_kind = read_thread_id(p, &p, &pid, &tid); - if (thread_kind == GDB_READ_THREAD_ERR) { - put_packet(s, "E22"); - break; - } - - if (thread_kind != GDB_ONE_THREAD) { - put_packet(s, "OK"); - break; - } - cpu = gdb_get_cpu(s, pid, tid); - if (cpu == NULL) { - put_packet(s, "E22"); - break; - } - switch (type) { - case 'c': - s->c_cpu = cpu; - put_packet(s, "OK"); - break; - case 'g': - s->g_cpu = cpu; - put_packet(s, "OK"); - break; - default: - put_packet(s, "E22"); - break; + { + static const GdbCmdParseEntry set_thread_cmd_desc = { + .handler = handle_set_thread, + .cmd = "H", + .cmd_startswith = 1, + .schema = "o.t0" + }; + cmd_parser = &set_thread_cmd_desc; } break; case 'T': From patchwork Thu Apr 25 13:26:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VwLvIXl8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdn30bG2z9s70 for ; Thu, 25 Apr 2019 23:48:23 +1000 (AEST) Received: from localhost ([127.0.0.1]:57501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJejc-0007nI-Ig for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:48:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePa-0008Ba-Fj for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePW-0000q4-RB for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:37 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42942) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePU-0000k0-U3 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:34 -0400 Received: by mail-wr1-x442.google.com with SMTP id g3so30319226wrx.9 for ; Thu, 25 Apr 2019 06:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BRVpNhgZ5WsnuwctywQjKEVF66tNSOqIEVrbKsmJ4bY=; b=VwLvIXl8gKntSex7O/QPDq/UESFBZxic0rJvdrBHJGD6jE9sO+dR1s2WtA19A8m++/ NH87VhR5fBMSiOwGSCr0WqcaUv3Lh3oFuSo0i4s/ByC+EPDQzOC19dByHS11Phsvh9mF kXPv8sfiPy4aiytiJ9kqUr7b5yNVsZ1z4oXkQmXS/lFdpnlWT2gzwXk2My5lxV5fPdy5 2A70LWYRHb2SXZlpIophYl9UtL6SPWDwqymXZrYdkLGapzeBWqx964zbkxWIVXw2enW7 5K71fJLLLFLCqK1K0J92PZYQD+oGayIliQU1ZIYau8smFeby00weHYfmPcPTyA2t58w1 uF5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BRVpNhgZ5WsnuwctywQjKEVF66tNSOqIEVrbKsmJ4bY=; b=kdCVaNYlxblBOajor82oQV3wQz7bwAuIuFDYCYg7oUNJuVG1EZwQTso2cSSm/INPAR TL3AHRwlzzYfpfqxqQBpws6vo/bCkSQUFfPAcb8oGGw+O47WSC9AQHQDLgu7dfuHvEa5 t6BOFRBW5v8nxR8dbKt91qXDKE2RD/piJazG7mGM9/w70Jk1usOUSDJ4krjPIQDW40gQ LL1CFiH8BQiVp81pngToXjcqA0jJHVb7IZxDh1OgUTQsdZa7jKzbRwfTQilvwtTxsixF ykwZstwTw+n1OOsGGrhwEAa5NE31C1g2XD9LMIjsKAeCD4C5nRHc0mC9yfGqNqhwfx6H nqhQ== X-Gm-Message-State: APjAAAWSB6qDBhlMg2ID+MkNW9hYyg4xbFj9nnO2WoJwYnxrNiyV8plA 9liBrnTDE3fTAukAxP0cXtKSccg2 X-Google-Smtp-Source: APXvYqzBG85ilqufPMzJfPi4WY0QBsPJjpbmIVeUski0cQQOyS1MONTszmKxyEIqGwiIBX2AUGyJ5Q== X-Received: by 2002:adf:dbce:: with SMTP id e14mr25491923wrj.249.1556198849303; Thu, 25 Apr 2019 06:27:29 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:27 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:22 +0300 Message-Id: <20190425132636.31636-8-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v6 07/21] gdbstub: Implement insert breakpoint (Z pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gdbstub.c b/gdbstub.c index 83757def9b..8e0446d305 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1589,6 +1589,29 @@ static void handle_set_thread(GdbCmdContext *gdb_ctx, void *user_ctx) } } +static void handle_insert_bp(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int res; + + if (gdb_ctx->num_params < 3) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + res = gdb_breakpoint_insert(gdb_ctx->params[1].val_ull, + gdb_ctx->params[2].val_ull, + gdb_ctx->params[0].val_ul); + if (res >= 0) { + put_packet(gdb_ctx->s, "OK"); + return; + } else if (res == -ENOSYS) { + put_packet(gdb_ctx->s, ""); + return; + } + + put_packet(gdb_ctx->s, "E22"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1844,6 +1867,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, "OK"); break; case 'Z': + { + static const GdbCmdParseEntry insert_bp_cmd_desc = { + .handler = handle_insert_bp, + .cmd = "Z", + .cmd_startswith = 1, + .schema = "l?L?L0" + }; + cmd_parser = &insert_bp_cmd_desc; + } + break; case 'z': type = strtoul(p, (char **)&p, 16); if (*p == ',') From patchwork Thu Apr 25 13:26:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EQ9x3BX8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdt62R51z9s7T for ; Thu, 25 Apr 2019 23:52:41 +1000 (AEST) Received: from localhost ([127.0.0.1]:57565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJenm-0004cr-DE for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:52:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePe-0008Ev-9A for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePc-0000xG-0A for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:42 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:47050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePa-0000pV-E6 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:38 -0400 Received: by mail-wr1-x443.google.com with SMTP id t17so30292125wrw.13 for ; Thu, 25 Apr 2019 06:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=14VPjA11kd7BNRAewIUYoLzDl7QlL5dAdw5dQ8aqYZo=; b=EQ9x3BX8jvDHXr7ahkoFy6GLKpEIu5UVPKOvmNR2HvE+w/kvv/NBR0cY29+qkT20t+ ovVil29wdl7HpaQPoohQ2NVAqdU889qPKPS/inhOCg8HK+wS8ffCPuXf9XE3kR8fZv20 1hpp8oB42ShGQoWNk48X1QROYpG5NOkKvf/2PZ9QwNlKky2Khs/af8y99giCVJiQdn1C 6xZS8XqCmpfLImiJ7hE5UesV4SFg2U83uXnLfLorfMidphqaAKYN70ArFGbMpkYmEGLc v+aaGM7LJt9ZZjUMSQrlZ80mtPuv1MLUVUF75J/gEphR5+lw/uFwudJuZG7SG3+3Wq/8 ztMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=14VPjA11kd7BNRAewIUYoLzDl7QlL5dAdw5dQ8aqYZo=; b=XqDmKatIi5EUgHrSwYxXaVkFLSyfBiUuWDv5J7DD6SFTCyB88IX09P8CbepJwryGUF Zxf4ivhObwTolwoi2VysFx8EEaJt1dA5EXHTrONo+Bv1N7Y6/BTSOhDFTOJR0ZqXkYMO HTJYUf/S5ODA2vsmikjnVQPgXcOWGhqrluru+t/ZxZoNCsL755dTzKfGfHjjvUjKtlGy 17NiBkIi+vsL/WWzc9lZQry2Sy+wUusAsGTEpX8mnlZCLrseeb9lX2ld7+dea+ZawYoE nO4c52TjVLbI4Sbegvbs06sUojHSJzr+iZRqQxMCM4Ze2Owyhyf+mCUKqx+t6eUZV8+w Ov6A== X-Gm-Message-State: APjAAAXuuG6YbfsMsV7FVqvFs1sq9N6Wi0GnSfD3NRSoSO8/ePXFKkYn 6wvEhh/Jl+HtESVJWpTUB2/Un6Hf X-Google-Smtp-Source: APXvYqzZ1PYp7F9RnEny29x2lRUz9/RAI5cjv9rjQzqoRQanBIIYPWsLoz/GA5l0i2I9ptiZ1upIQQ== X-Received: by 2002:a5d:4707:: with SMTP id y7mr9648503wrq.185.1556198852822; Thu, 25 Apr 2019 06:27:32 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:30 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:23 +0300 Message-Id: <20190425132636.31636-9-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v6 08/21] gdbstub: Implement remove breakpoint (z pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 8e0446d305..80f2a92da6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1612,6 +1612,29 @@ static void handle_insert_bp(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "E22"); } +static void handle_remove_bp(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int res; + + if (gdb_ctx->num_params < 3) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + res = gdb_breakpoint_remove(gdb_ctx->params[1].val_ull, + gdb_ctx->params[2].val_ull, + gdb_ctx->params[0].val_ul); + if (res >= 0) { + put_packet(gdb_ctx->s, "OK"); + return; + } else if (res == -ENOSYS) { + put_packet(gdb_ctx->s, ""); + return; + } + + put_packet(gdb_ctx->s, "E22"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1878,23 +1901,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'z': - type = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - addr = strtoull(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoull(p, (char **)&p, 16); - if (ch == 'Z') - res = gdb_breakpoint_insert(addr, len, type); - else - res = gdb_breakpoint_remove(addr, len, type); - if (res >= 0) - put_packet(s, "OK"); - else if (res == -ENOSYS) - put_packet(s, ""); - else - put_packet(s, "E22"); + { + static const GdbCmdParseEntry remove_bp_cmd_desc = { + .handler = handle_remove_bp, + .cmd = "z", + .cmd_startswith = 1, + .schema = "l?L?L0" + }; + cmd_parser = &remove_bp_cmd_desc; + } break; case 'H': { From patchwork Thu Apr 25 13:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090812 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OmqiRjlH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdV35zfWz9s7T for ; Thu, 25 Apr 2019 23:35:23 +1000 (AEST) Received: from localhost ([127.0.0.1]:57267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeX3-0005eB-Nx for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:35:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePe-0008Ew-9G for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePc-0000xj-6n for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:42 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePc-0000ve-0I for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:40 -0400 Received: by mail-wm1-x344.google.com with SMTP id 26so3495448wmj.3 for ; Thu, 25 Apr 2019 06:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LvIqpLQh02Z6zWGECKaQkZCTeV0B0aLuGDQwChSB8dY=; b=OmqiRjlHCCJkSfJZOh8YAhoFWD5SuIpAIJmuOWmq9eLdoJqcjT6zDGjnwhwPvv4yjS JDCnnGxKBIy7/Fp69DdMLRSPm6iMtI3nS1zBy6p6rVmhBnVK42jXPQhrDnlbfbQ6dKRC 5EKk6UR+7QZ1bnt8NDLtjhX528QqOOoE+qedLuqtmMNCAJ3RUYKlUbkyntZp/a9p6Mzj nJT2Ytpvhlb3mhlQNtpNDpmGmdSYRkZzy7GBI6AK0QTmB932LN/fRJvsyOYTo975ncLR eOs3x0xN+29aXKD2RbJD1koL2ypk1I4qejdsq0/3kGwO0N5+tAVqHn3Oyt8l09cs1xMU TGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LvIqpLQh02Z6zWGECKaQkZCTeV0B0aLuGDQwChSB8dY=; b=HgEfbuwKIxNKYXx17bu7zArK9r26Mr2Lp3y+StWhyl8hPG9v4i9ABgbuAdJ87XZfxi fMMh4Am/97tU6zXgUMRlpOaGNEPxgJoEKzg0MKWy6wycGHJvoSvrN3iC87NUJcy6I+Cx ghSftsXE8OFjNIDbPZEbd7RZgE2VWaEFU6UF1I3hpBJVFzPuB4YMP42jnKjChMnVaeGR aVVJqK2pq6HHzigTc44VcTs23rVVAQVX+BtSQX1DwhUilgUyvy79YPyBP/UjGbSGOFrn 5jSKrPSzBjdx6C5/DeYB+EtCJZIuzE7/O4ra9UizqGr4HYNp18/c3yiL5iPskZmrHVVA 7DQQ== X-Gm-Message-State: APjAAAW8qf/BHe2MHo/1plk7LfxPz4jsuXdBHmcATQ7DQoCJ7MBEwhIP 0Dd8Jn/uCAgo2/qT7sUcojXNYPvV X-Google-Smtp-Source: APXvYqzWAgqswWCPuCCzICarXAsqXoZ/onaKpudnaaGT56mreAyLH4Bf0Rgp1HozRQ07xjKgrIcAxg== X-Received: by 2002:a05:600c:2293:: with SMTP id 19mr3451217wmf.77.1556198856770; Thu, 25 Apr 2019 06:27:36 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:34 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:24 +0300 Message-Id: <20190425132636.31636-10-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v6 09/21] gdbstub: Implement set register (P pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 80f2a92da6..49db09ef52 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1635,6 +1635,27 @@ static void handle_remove_bp(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "E22"); } +static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int reg_size; + + if (!gdb_has_xml) { + put_packet(gdb_ctx->s, ""); + return; + } + + if (gdb_ctx->num_params < 2) { + put_packet(gdb_ctx->s, ""); + return; + } + + reg_size = strlen(gdb_ctx->params[1].data) / 2; + hextomem(gdb_ctx->mem_buf, gdb_ctx->params[1].data, reg_size); + gdb_write_register(gdb_ctx->s->g_cpu, gdb_ctx->mem_buf, + gdb_ctx->params[0].val_ull); + put_packet(gdb_ctx->s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1879,15 +1900,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'P': - if (!gdb_has_xml) - goto unknown_command; - addr = strtoull(p, (char **)&p, 16); - if (*p == '=') - p++; - reg_size = strlen(p) / 2; - hextomem(mem_buf, p, reg_size); - gdb_write_register(s->g_cpu, mem_buf, addr); - put_packet(s, "OK"); + { + static const GdbCmdParseEntry set_reg_cmd_desc = { + .handler = handle_set_reg, + .cmd = "P", + .cmd_startswith = 1, + .schema = "L?s0" + }; + cmd_parser = &set_reg_cmd_desc; + } break; case 'Z': { From patchwork Thu Apr 25 13:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aO2wIQPX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdhy2pv8z9s7T for ; Thu, 25 Apr 2019 23:44:50 +1000 (AEST) Received: from localhost ([127.0.0.1]:57433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJegC-000562-3T for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:44:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePj-0008K9-D0 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePi-00014H-DS for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:47 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePi-00011e-61 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:46 -0400 Received: by mail-wr1-x444.google.com with SMTP id c6so24654912wrm.1 for ; Thu, 25 Apr 2019 06:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2X/EqHRQzIkKd3q6L4ImeXDT9TueqP/ctRgcXeSvAEY=; b=aO2wIQPXxnh/Ff0BIeVEDE90jpMWwbUR4eocHkhW1WCHmemJjBVW+u9qB4k/rp95qf lm2c6Qsb3UWU6ZcocG4WzYTEaZ3dHp7W0pJyi2uYo8vZYC2Yw3gXKGUdarfN5KGF3vn3 aFdUpqS3Ia02oLeD7FaJByWdhjs8P9PJ7pkJYr1jdbIEI4mBG7SIEqsqPJlVwYkg/d5D Rgjpn4wYctsKRE+TmIRD9VDRhPrFHj52cLS24SXpf24Ely8zMfb9b0QUnKySNihNFFFZ DZ9kOlk4M3I2HhzHy9/IMPLxqosKQd3Zm5dYTr7aE3CUKWU2yUPrhxBfceqlwSGFJymG is4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2X/EqHRQzIkKd3q6L4ImeXDT9TueqP/ctRgcXeSvAEY=; b=EB+47gF9LAc9om3p9KqiLOvj2UAh7JqDUfkL6TN5elEdP4K+YJG2yBiblPzSMQfY74 ToQRfEy9O4igHkafEtL/eNyI6mZWDOvFf3cM3zkKQQ5lgaoJloSgkSXkxNt66ndrDjuk I/s3LK5lkKUgPcN+YDFe2p8xMSj/MXZCiUYy7jvMUjKbxwtrz2t+nlYDvAwvP6n+s4nS VUFlzvIQSXTIlHyBMguPIvRYuEdi3XCVJkCNGnQ22Sz+6fjbF8TCQhyM/ERww6TG16my PuLSZhFUltlxbRgeyr+kaJu034po/DXD8ClBtFRrsqenQr8nCY9QMxCy0i9BcyPFim3q THaw== X-Gm-Message-State: APjAAAWJjAR7plzOi4iumf8oQhE+aovbGlLt76poe2yy8F0pE+kqFvu9 Gkrm5nmxLa7JcWFKlPL6L4A/z64k X-Google-Smtp-Source: APXvYqyHzVQXPQfCrwPWS6zc8OavzndOsUZWguxCsdo9jrCawdwmb8HV7HR5gmjBvHeUksUtjuxB0A== X-Received: by 2002:adf:ed82:: with SMTP id c2mr24871185wro.176.1556198860894; Thu, 25 Apr 2019 06:27:40 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:38 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:25 +0300 Message-Id: <20190425132636.31636-11-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v6 10/21] gdbstub: Implement get register (p pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 49db09ef52..c439b8e796 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1656,6 +1656,36 @@ static void handle_set_reg(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "OK"); } +static void handle_get_reg(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int reg_size; + + /* + * Older gdb are really dumb, and don't use 'g' if 'p' is avaialable. + * This works, but can be very slow. Anything new enough to + * understand XML also knows how to use this properly. + */ + if (!gdb_has_xml) { + put_packet(gdb_ctx->s, ""); + return; + } + + if (!gdb_ctx->num_params) { + put_packet(gdb_ctx->s, "E14"); + return; + } + + reg_size = gdb_read_register(gdb_ctx->s->g_cpu, gdb_ctx->mem_buf, + gdb_ctx->params[0].val_ull); + if (!reg_size) { + put_packet(gdb_ctx->s, "E14"); + return; + } + + memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, reg_size); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1885,18 +1915,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'p': - /* Older gdb are really dumb, and don't use 'g' if 'p' is avaialable. - This works, but can be very slow. Anything new enough to - understand XML also knows how to use this properly. */ - if (!gdb_has_xml) - goto unknown_command; - addr = strtoull(p, (char **)&p, 16); - reg_size = gdb_read_register(s->g_cpu, mem_buf, addr); - if (reg_size) { - memtohex(buf, mem_buf, reg_size); - put_packet(s, buf); - } else { - put_packet(s, "E14"); + { + static const GdbCmdParseEntry get_reg_cmd_desc = { + .handler = handle_get_reg, + .cmd = "p", + .cmd_startswith = 1, + .schema = "L0" + }; + cmd_parser = &get_reg_cmd_desc; } break; case 'P': From patchwork Thu Apr 25 13:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vJiHJxTo"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdx523CDz9s7T for ; Thu, 25 Apr 2019 23:55:21 +1000 (AEST) Received: from localhost ([127.0.0.1]:57595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeqN-0006im-3x for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:55:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePk-0008Mi-VP for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePj-00016q-UA for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:48 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePj-00015o-NU for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:47 -0400 Received: by mail-wm1-x344.google.com with SMTP id w15so263317wmc.3 for ; Thu, 25 Apr 2019 06:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TENOL3r5yUJno6/S+4IYhfkNIUwUbfzGmKX97CyU0qA=; b=vJiHJxToCoPm5r3cfhYGfH2xqOxJaX3HRI7OsCRXpO66a4kjQdcaBBbPv8Hs0+Ujms 4O6VwOODJLm0zx7iT642r2ytnwTklpOfXwMytpOw4vCiphBnB4OCRcMrKtaUMsq3RBPn xMWL0VpLIk8pQwWzjDg4CDwzQZJeaYS64ZWRcOUJehgS/GC7ULY7HZCkl6LvIkDYXRf9 /0ddt1PAZBjlhnCqeQYYArrHJ5O3HETRuOzIgEi81zN4NKH2wyntapTJm5qyLgfY2f/g f2ZFrYFDj2JmEucDgyhci18x/LGhYPdNSBJwb/gtBxhldmFZm7A0ecuSdZ6DLvb4QwKH qNyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TENOL3r5yUJno6/S+4IYhfkNIUwUbfzGmKX97CyU0qA=; b=a0bII53+xwNkF5OH2oKuhELT+qIxG3Wynl90G3WYm0+qNQIvNfUMNGb1zeJ1DziqJW xytjbWAxTYO6QKei9hO3SpOePBbRO6AfhP5GQsyfp8joKIgsOEl5wcIefMzS5LnnZiGf fW2YxdwQQSluHNc0dhLm9GVGN0KvODIhSlRyOhdeQE+u4gxyQ/GBFa6Jf60KfIdOj8oT wY8zmU7H10Id+CZEfiKOQacERBe9mUNgq8zzBMRPz48Jnj/K5elJ4QmqV0WHJ8wyT8r9 vJ+KCZplydRR7xD0DhXIeaI9I2/m2exA/VKE+8MseJ8xcUBztRj2Pu22rYF7FTeWmO4J NdwQ== X-Gm-Message-State: APjAAAVck/rqDKdvOm3QWDpHMHsaNpYTnOtPCsJMPBX6JPUphlxtSadM ZwsmqLDF1gKcrCDn8mHrgs0PMiUG X-Google-Smtp-Source: APXvYqxL1ISXMH43hYmRmUQlxFcCFh82cuJfFWz8mkp0s8lHM9BLaqGm29eIfuXrVlXd3gdHip4GWQ== X-Received: by 2002:a7b:c844:: with SMTP id c4mr3522248wml.108.1556198865451; Thu, 25 Apr 2019 06:27:45 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:43 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:26 +0300 Message-Id: <20190425132636.31636-12-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v6 11/21] gdbstub: Implement write memory (M pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index c439b8e796..4522c93fa2 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1686,6 +1686,31 @@ static void handle_get_reg(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, gdb_ctx->str_buf); } +static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (gdb_ctx->num_params < 3) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + /* hextomem() reads 2*len bytes */ + if (gdb_ctx->params[1].val_ull > strlen(gdb_ctx->params[2].data) / 2) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + hextomem(gdb_ctx->mem_buf, gdb_ctx->params[2].data, + gdb_ctx->params[1].val_ull); + if (target_memory_rw_debug(gdb_ctx->s->g_cpu, gdb_ctx->params[0].val_ull, + gdb_ctx->mem_buf, + gdb_ctx->params[1].val_ull, true)) { + put_packet(gdb_ctx->s, "E14"); + return; + } + + put_packet(gdb_ctx->s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1894,24 +1919,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'M': - addr = strtoull(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoull(p, (char **)&p, 16); - if (*p == ':') - p++; - - /* hextomem() reads 2*len bytes */ - if (len > strlen(p) / 2) { - put_packet (s, "E22"); - break; - } - hextomem(mem_buf, p, len); - if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, - true) != 0) { - put_packet(s, "E14"); - } else { - put_packet(s, "OK"); + { + static const GdbCmdParseEntry write_mem_cmd_desc = { + .handler = handle_write_mem, + .cmd = "M", + .cmd_startswith = 1, + .schema = "L,L:s0" + }; + cmd_parser = &write_mem_cmd_desc; } break; case 'p': From patchwork Thu Apr 25 13:26:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X4b4bzI8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qf0Q0Tbtz9s7T for ; Thu, 25 Apr 2019 23:58:12 +1000 (AEST) Received: from localhost ([127.0.0.1]:57661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJet4-0000Dj-9Y for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:58:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePo-0008Rw-VL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePn-0001Ek-QX for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:52 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePn-0001B3-KH for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:51 -0400 Received: by mail-wm1-x342.google.com with SMTP id c1so9273123wml.4 for ; Thu, 25 Apr 2019 06:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FfGjSJV+pgCWpgIFev/Vk6a07sEAiskpgdyLpP9ye7A=; b=X4b4bzI88Xbp3B/xRkT6eotobR2V/sv5QoKORyzfikh3V2SXXNu8hckVOlf5BYv30L viRNebOL/BJtAetZ8Mc5l0K1Kfp3vjyHzObBgSWZBdJUhmHaUaiU6JIC/lR9hRBYkGZM oaDDp8jL9/JdEKY08e+7zKkSFIDY498fPKAaNhrSEI33YmQQwNcN+U0efajrQ1Ulc8k7 h3PhH0IKDIdv8n6LOowHapK/krWT1vbJ4syMncrXrb5DkP5/5h7LyZLCe3KAwPUlF0pI kCuBrlxp+x6p7WQYeFGKClFWjrntw1Ieyavo760c++4ow+L8WrzK1XwJh1RDHfrWn7Vh bYlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FfGjSJV+pgCWpgIFev/Vk6a07sEAiskpgdyLpP9ye7A=; b=WJmQhqr+iNTChUQo66YSloAgLFPXjt/3QjRu5T0J8IQu1aHttLQb/oWZWq9GIJepGf RA6+uTeVLKcnlnZymvg7myUmKEq4A59B+Y4R7nKS/hIxJky73Orpp0+VJtXdXn0yL4tG SNzf2+wqZbI/Wdv+fmEA9xfdyr7/PEHR1d/bWpp93LZ74+LPNBs9EDuaeJZkdWrXV64r TcqHv431c8ozIArrZB9gfTlbKQ5MzuY8BIS4YrGxM8R8bKIs0MbclVTSPcqc9p8GxZQz EMoMfTRRFHSITFtnVRgdr18i1pWR5AbFD3B370NVG/2cPtbhX+7YQGcSew7DgzXM5VOg 1X8w== X-Gm-Message-State: APjAAAX/BvqwmQUmgkq9O2+JsClJPR+szrRu1RH1QEbyBCa8iZzjG2cv TZGb+6Cuo/IQhNVlkbmGgRd4n0f/ X-Google-Smtp-Source: APXvYqwmLXPFZN2OBBMfYI/3ihKawAiaedlrlvDTnHlKXXESlzl3WfGN7bLCsK2fUN0t5dbLSWk0Kw== X-Received: by 2002:a05:600c:203:: with SMTP id 3mr3518858wmi.77.1556198869198; Thu, 25 Apr 2019 06:27:49 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:47 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:27 +0300 Message-Id: <20190425132636.31636-13-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v6 12/21] gdbstub: Implement read memory (m pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 4522c93fa2..5b60c1369c 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1711,6 +1711,30 @@ static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "OK"); } +static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (gdb_ctx->num_params < 2) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + /* memtohex() doubles the required space */ + if (gdb_ctx->params[1].val_ull > MAX_PACKET_LENGTH / 2) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + if (target_memory_rw_debug(gdb_ctx->s->g_cpu, gdb_ctx->params[0].val_ull, + gdb_ctx->mem_buf, + gdb_ctx->params[1].val_ull, false)) { + put_packet(gdb_ctx->s, "E14"); + return; + } + + memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, gdb_ctx->params[1].val_ull); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1900,22 +1924,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, "OK"); break; case 'm': - addr = strtoull(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoull(p, NULL, 16); - - /* memtohex() doubles the required space */ - if (len > MAX_PACKET_LENGTH / 2) { - put_packet (s, "E22"); - break; - } - - if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, false) != 0) { - put_packet (s, "E14"); - } else { - memtohex(buf, mem_buf, len); - put_packet(s, buf); + { + static const GdbCmdParseEntry read_mem_cmd_desc = { + .handler = handle_read_mem, + .cmd = "m", + .cmd_startswith = 1, + .schema = "L,L0" + }; + cmd_parser = &read_mem_cmd_desc; } break; case 'M': From patchwork Thu Apr 25 13:26:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y4WTXY8g"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdtl3WDdz9s7T for ; Thu, 25 Apr 2019 23:53:19 +1000 (AEST) Received: from localhost ([127.0.0.1]:57573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeoP-00056d-4w for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:53:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePu-00005E-8B for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePs-0001Ns-73 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:58 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35566) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePq-0001Ix-D2 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:27:56 -0400 Received: by mail-wm1-x342.google.com with SMTP id y197so10622632wmd.0 for ; Thu, 25 Apr 2019 06:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=92zmbHtmaWdJBn6Gzt10L0qHEe/LVcd35bviZ9obj/o=; b=Y4WTXY8gvPrIAUgJYa3I73PnuKUzw1lfd3+XIzPNBOSbyVUV8LgBBHrngxXweDjMD8 /N2WYY9lkJME2EvLfmRFEVNS+yLmLBovtPLvk3PuOKQ63xvulpynFCVf71UW4KwvxyWc 1BDw0IWHVVKfs9DPpAP24r7YHkKLne3sFqGIPjDH11yKi3XlkCxvaAIfq4xWRG3hR973 DkV0T5EYpiUP68o6F+iLQHf0nrOzU1/qjrYxgxzZwcZ3ArJBeKz614B5vdXbGHu6BOLH LgNGdEikBYQG86orWGJQwpbNztyVGDvR3osNz6ejueGtUvMh6c+MAXkRM2vt3boQJE+a kimQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=92zmbHtmaWdJBn6Gzt10L0qHEe/LVcd35bviZ9obj/o=; b=J/1vWBeWVhioZLx71O5tzWoXIXs7Zmf2KqeV0UoDmbsAlB21tlbh0Jc1GBSSerU8Kj /mbmOe2pDa2dCzYUlwWf9ahe+JV16mWa7QuqZzcc61HDWbeV2Tg8IQ4+tTtgax3ecGaf 3x6AZUwmFsn2QrI2tGsRHdN5ddvg4zFAjB6MEvjMQB4hK45QlCTNT5Ga+tLCxpQEkRAi RNTnGeG6PKgU0W0sTU/VPBhEKm+wQbMDVjZ82SgZBTmGOkdA7QY+Pa1exqcakeuUpiFa 6zeIoqAVEsnrho/80RCrjy7qADflEZ1ojSKbdu1DFf7yiaYqSipX8QqqZMx1bLibwblU FGOg== X-Gm-Message-State: APjAAAVrBnHzxKEniXCGkoJTSoqM/MTs9siv2ZadEVk5NRE/NhD9VLRP MdJcoeRG+nZ8sW99Tf4nbZuYX4xT X-Google-Smtp-Source: APXvYqzXDD58IXwhECZcoQFkMBlvfHG1Wc4Xh2Cwpno5cPhYv3IoFOpwgoYtnnR4ezuHm28EBePxZw== X-Received: by 2002:a7b:cc96:: with SMTP id p22mr3729239wma.17.1556198872314; Thu, 25 Apr 2019 06:27:52 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:49 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:28 +0300 Message-Id: <20190425132636.31636-14-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v6 13/21] gdbstub: Implement write all registers (G pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 5b60c1369c..acf0e75908 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1735,6 +1735,29 @@ static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, gdb_ctx->str_buf); } +static void handle_write_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + target_ulong addr, len; + uint8_t *registers; + int reg_size; + + if (!gdb_ctx->num_params) { + return; + } + + cpu_synchronize_state(gdb_ctx->s->g_cpu); + registers = gdb_ctx->mem_buf; + len = strlen(gdb_ctx->params[0].data) / 2; + hextomem(registers, gdb_ctx->params[0].data, len); + for (addr = 0; addr < gdb_ctx->s->g_cpu->gdb_num_g_regs && len > 0; + addr++) { + reg_size = gdb_write_register(gdb_ctx->s->g_cpu, registers, addr); + len -= reg_size; + registers += reg_size; + } + put_packet(gdb_ctx->s, "OK"); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1746,7 +1769,6 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; char thread_id[16]; - uint8_t *registers; target_ulong addr, len; const GdbCmdParseEntry *cmd_parser = NULL; @@ -1912,16 +1934,15 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, buf); break; case 'G': - cpu_synchronize_state(s->g_cpu); - registers = mem_buf; - len = strlen(p) / 2; - hextomem((uint8_t *)registers, p, len); - for (addr = 0; addr < s->g_cpu->gdb_num_g_regs && len > 0; addr++) { - reg_size = gdb_write_register(s->g_cpu, registers, addr); - len -= reg_size; - registers += reg_size; + { + static const GdbCmdParseEntry write_all_regs_cmd_desc = { + .handler = handle_write_all_regs, + .cmd = "G", + .cmd_startswith = 1, + .schema = "s0" + }; + cmd_parser = &write_all_regs_cmd_desc; } - put_packet(s, "OK"); break; case 'm': { From patchwork Thu Apr 25 13:26:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B73Mlehl"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdxj6nX2z9s7T for ; Thu, 25 Apr 2019 23:55:53 +1000 (AEST) Received: from localhost ([127.0.0.1]:57636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeqt-00075Y-Hh for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:55:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJePy-00008x-6Z for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJePw-0001Sf-82 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:02 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJePv-0001Qh-4V for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:00 -0400 Received: by mail-wm1-x341.google.com with SMTP id 4so9299713wmf.1 for ; Thu, 25 Apr 2019 06:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3i2BqbPIZu3pJ1q7oaT6KMUZ5ADbICItlHWHixBftQQ=; b=B73MlehlyXJdcFaBz8Qj5G60CH3pQObavR3NCyld7o95j2UGUXoU66rntXtWC0VqHa ml+QVKLBxSq8XnCc00SZWJuOnU6ON49hQ05eN+UzPjjAokRAkOEFqW3VBlFagrwm9eTe p4/Ph89Ioq+xR/zF3LJ1PrG69ntVlxk6ADRdVDhnxOivNIz2Qx7iw5v4Pwl3TLLehqSU hnFBZA9Bs/dHitJwzbMozD6XD7b9HAaWHQ//5Q0QJad3vLPm6N6YAZde9Fnuhf8A9RpF JjsQjPYmiuevc8DnVI3Q9X7Tl0FN67Kp7MZj0KvzoYdiEuX6282jzq7iJ8rQIqasKBz0 ZPNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3i2BqbPIZu3pJ1q7oaT6KMUZ5ADbICItlHWHixBftQQ=; b=rBiwGuD0/DNuqO7kH2ZOxiWHt5QgCQa5rG1ChFDTJw8DqWcqSrSZ18Vu3ljYpCrDEL InMhT36yS4/3dCQox/ajpyfJcrTIwnitSOlsowZf5n6pA53LDVI6Yyu6vsZbN+eDxnJs jOTZdBK0tQ9txoar3mRqoKOlH3hqmMHXjzuXvud1Hh9g6fV3OpYVlT4tbwNL3IHfCJSM I3RYGI45zulZFPVG32iDPXJq2lRXnueMfswpWW3nf6ORzEGQoZTTdiZ99NvbB8OvidU4 f9M0GRZYbC2nvIsdD7eDsm9iSkwboP8nP2i5slJO6WOgpx5X2AKv7RehNWiBlv/Sxt77 qLCA== X-Gm-Message-State: APjAAAVFXN7xIznNjU/07MOpDUWoCV9u39W38G9j1D2HYXGhtrkqLad0 TadKvEs8u0GlvJ3FIia/R0bIpp38 X-Google-Smtp-Source: APXvYqz36xK5R7XhBeH+Go/q++uO99iewu/qxhupHOtZYeGcYxhzuy4IxAu5xCjTO+Iq/Zpf4fAgHg== X-Received: by 2002:a7b:cb16:: with SMTP id u22mr3582662wmj.60.1556198876841; Thu, 25 Apr 2019 06:27:56 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:54 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:29 +0300 Message-Id: <20190425132636.31636-15-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v6 14/21] gdbstub: Implement read all registers (g pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index acf0e75908..3a7ef5eea6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1758,6 +1758,21 @@ static void handle_write_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, "OK"); } +static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + target_ulong addr, len; + + cpu_synchronize_state(gdb_ctx->s->g_cpu); + len = 0; + for (addr = 0; addr < gdb_ctx->s->g_cpu->gdb_num_g_regs; addr++) { + len += gdb_read_register(gdb_ctx->s->g_cpu, gdb_ctx->mem_buf + len, + addr); + } + + memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, len); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1765,7 +1780,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) CPUClass *cc; const char *p; uint32_t pid, tid; - int ch, reg_size, type, res; + int ch, type, res; uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; char thread_id[16]; @@ -1924,14 +1939,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'g': - cpu_synchronize_state(s->g_cpu); - len = 0; - for (addr = 0; addr < s->g_cpu->gdb_num_g_regs; addr++) { - reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr); - len += reg_size; + { + static const GdbCmdParseEntry read_all_regs_cmd_desc = { + .handler = handle_read_all_regs, + .cmd = "g", + .cmd_startswith = 1 + }; + cmd_parser = &read_all_regs_cmd_desc; } - memtohex(buf, mem_buf, len); - put_packet(s, buf); break; case 'G': { From patchwork Thu Apr 25 13:26:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fl4W7Bz9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qf1247Tqz9s9N for ; Thu, 25 Apr 2019 23:58:46 +1000 (AEST) Received: from localhost ([127.0.0.1]:57697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJetg-0000wJ-Do for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:58:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQ1-0000Cb-Ok for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQ0-0001bW-Q0 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:05 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQ0-0001Ya-Jl for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:04 -0400 Received: by mail-wr1-x443.google.com with SMTP id s18so5518351wrp.0 for ; Thu, 25 Apr 2019 06:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EG9sk85M4LsflXbUNBRhLCHZfOCHF6EVSbclOy8vwek=; b=Fl4W7Bz9JRJCeiJlRbCZowy+PZtRd+Z2Rp8Yv7dx+tCYW4O6lvJgBtk/UsEVL5ClF8 h7tCyBWLdY35Wf+djmC6kqOj85nuI7E/j9idjWuXadpccKJG29DysXnPpaAElsj5gQOh tXBnPZwkgaTAhz+ZKYpBRnPemGisT5FSbp5krV4beIGMp9K0aDl4yWFwXfjLwETBDc9Q snoJ6UtIN7IbKyDWWViB/ZXEblUJZ/VNLsSO4QyKsvaFKW+AHc/3SJee638RxGZ8QKuS 22RyN4a4BgCXbKTjU3SfIFj2+0PkXk4g88GLMJZJYzRuyMTQBX2roagtMUFqDY3Kzv2z jPlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EG9sk85M4LsflXbUNBRhLCHZfOCHF6EVSbclOy8vwek=; b=aeKdjMwBy0uUi8a78jZwn7SHegYmZvBZSdS3hfsiT+Je0T9s7EsgmjpUCUDhtPJHSy WILRq7AMMKP9IcLvdI1jzX7Kn6VEc2TehHv06Y4Sf6uKbNtcr5LKkxGbY3pMsqIPWsAk Hop03kLrKHt4X6HClriLpmoSG/kuIwdBRHUdmesZ+UZqKtKfIwVbY5UDludgBcIWeevw IfqfLV8aLMXbVpOYyVqPLPcwb7VxAeuHExptt2j0VDzfqnyZdbWj6ABYvffFbflQm9XB M45cehpDtrD+LoTTo4zZRhvUwqkzr0j53lWBIhcgPO/4GRa/hXSSSjtXf6h0SmoAMdsc Hqlg== X-Gm-Message-State: APjAAAWTnRT8udlRbjFRIazxXPSmwHEBPAyKF0GQgyS/hrJi16TOnfa9 QYKAQUiT7TIQAXaQMN3WkRM9nNZ+ X-Google-Smtp-Source: APXvYqwqvV6PzMDXgwuvUU54LppW3a+4iyKgT/n/x1tmDRxJg2mRPQ21LLBVb/K3mnq8kBvgL6mUDA== X-Received: by 2002:adf:f309:: with SMTP id i9mr25304648wro.258.1556198882187; Thu, 25 Apr 2019 06:28:02 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.27.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:27:59 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:30 +0300 Message-Id: <20190425132636.31636-16-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v6 15/21] gdbstub: Implement file io (F pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 62 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 3a7ef5eea6..18949120be 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1773,6 +1773,39 @@ static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, gdb_ctx->str_buf); } +static void handle_file_io(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int num_syscall_params; + GdbCmdVariant syscall_params[3] = {}; + + if (!gdb_ctx->num_params) { + return; + } + + if (cmd_parse_params(gdb_ctx->params[0].data, "L,L,o0", syscall_params, + &num_syscall_params)) { + return; + } + + if (!num_syscall_params) { + return; + } + + if (gdb_ctx->s->current_syscall_cb) { + gdb_ctx->s->current_syscall_cb(gdb_ctx->s->c_cpu, + (target_ulong)syscall_params[0].val_ull, + (target_ulong)syscall_params[1].val_ull); + gdb_ctx->s->current_syscall_cb = NULL; + } + + if (syscall_params[2].opcode == (uint8_t)'C') { + put_packet(gdb_ctx->s, "T02"); + return; + } + + gdb_continue(gdb_ctx->s); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1914,28 +1947,13 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) return RS_IDLE; case 'F': { - target_ulong ret; - target_ulong err; - - ret = strtoull(p, (char **)&p, 16); - if (*p == ',') { - p++; - err = strtoull(p, (char **)&p, 16); - } else { - err = 0; - } - if (*p == ',') - p++; - type = *p; - if (s->current_syscall_cb) { - s->current_syscall_cb(s->c_cpu, ret, err); - s->current_syscall_cb = NULL; - } - if (type == 'C') { - put_packet(s, "T02"); - } else { - gdb_continue(s); - } + static const GdbCmdParseEntry file_io_cmd_desc = { + .handler = handle_file_io, + .cmd = "F", + .cmd_startswith = 1, + .schema = "s0" + }; + cmd_parser = &file_io_cmd_desc; } break; case 'g': From patchwork Thu Apr 25 13:26:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090855 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lAZItkvB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qf3r3600z9s9N for ; Fri, 26 Apr 2019 00:01:12 +1000 (AEST) Received: from localhost ([127.0.0.1]:57904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJew1-0003Ka-CW for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 10:01:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQ6-0000EG-Ex for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQ5-0001og-LJ for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:10 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQ5-0001ln-Et for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:09 -0400 Received: by mail-wm1-x342.google.com with SMTP id n25so10602140wmk.4 for ; Thu, 25 Apr 2019 06:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L0b6ekwQ+2V0lpxiU3U4YMDKi4QNx+8EvSzJuNBfha8=; b=lAZItkvBwUDzADEYBIM0LD0VXSdPc27TXEQdB+TsWijWJMAKVB94dQXnw7Fqa8FNBy zG8iHbsmpCxsfyBy0q7srAA/QpV6sHplZIEJX1rGj/AqjOHnYSOFEa/upp9h66R5zZh9 cCRLEA1YTgrP/GST63qNFyd8CFwJH7KVjqfqMCOhjNEb63b++hQNdGOOIJdvTL3Q9EcC haYVvVazGGdAa3yMwqcYV/3AWGhe5wmwgo3YVWaMfJsqDqSg9+5otOL1C4XOX7c2N3Ga giLFpHoiWR6U7SsxAS8kikcTkxEAllGjsraDrmafa6eEVI5H7i1n7mkiKVCT3RZMXUDw u9Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L0b6ekwQ+2V0lpxiU3U4YMDKi4QNx+8EvSzJuNBfha8=; b=M86oPHkRYe6OgVmK89wNZE5EDPdTpvjpNa+0FHU5pazelmQwGURIDYG/V6B+cdewu8 fFKFnDL2Gh/o4JGWF1qzWm73x7xBL7BhTolKLITdFhrDyfV4evGiZeSu6ukjVKn2JAhr 6Rd3nqZf2BQTqazcsGcPhI8E/gv2qXajQWkBSOEBhOwGCLo7xtO9AJXXIIJlkkyXPguV RDsTjHwf2ldQ0Ftm9xZXRhjl4/nsC1lcTd/OcH0QBvHoWtElztGdF7PJXu939HU6T42R N4DfXmUEvma8SbwgOPoRFil+ptUJoLgzp3a7dqhLiSaps0Vp7nBz2nRurD0xPMFMM2yl HhFQ== X-Gm-Message-State: APjAAAWqHPfcWTxcvl2c685ZoaT1mmqlvLpGuIGxqrJ4OKdz0YZp+VOL kXDnd/dLbhFVxbU8u84gTZ+fyNTq X-Google-Smtp-Source: APXvYqzThWOtFlFpsk5ipejYzlW8N2CD3582XXpON+/+Dcsyfr/dT/4XH9lFSYbZWswj7fguVubznQ== X-Received: by 2002:a7b:cc96:: with SMTP id p22mr3730153wma.17.1556198887241; Thu, 25 Apr 2019 06:28:07 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:04 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:31 +0300 Message-Id: <20190425132636.31636-17-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v6 16/21] gdbstub: Implement step (s pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 18949120be..809503c20a 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1806,6 +1806,16 @@ static void handle_file_io(GdbCmdContext *gdb_ctx, void *user_ctx) gdb_continue(gdb_ctx->s); } +static void handle_step(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (gdb_ctx->num_params) { + gdb_set_cpu_pc(gdb_ctx->s, (target_ulong)gdb_ctx->params[0].val_ull); + } + + cpu_single_step(gdb_ctx->s->c_cpu, sstep_flags); + gdb_continue(gdb_ctx->s); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1938,13 +1948,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 's': - if (*p != '\0') { - addr = strtoull(p, (char **)&p, 16); - gdb_set_cpu_pc(s, addr); + { + static const GdbCmdParseEntry step_cmd_desc = { + .handler = handle_step, + .cmd = "s", + .cmd_startswith = 1, + .schema = "L0" + }; + cmd_parser = &step_cmd_desc; } - cpu_single_step(s->c_cpu, sstep_flags); - gdb_continue(s); - return RS_IDLE; + break; case 'F': { static const GdbCmdParseEntry file_io_cmd_desc = { From patchwork Thu Apr 25 13:26:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ODiSpjI9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qfHd4RNBz9sB3 for ; Fri, 26 Apr 2019 00:11:25 +1000 (AEST) Received: from localhost ([127.0.0.1]:57930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJexw-0004sz-K1 for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 10:03:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQA-0000IH-Ra for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQ9-0001uz-LY for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:14 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:45884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQ9-0001to-Ey for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:13 -0400 Received: by mail-wr1-x442.google.com with SMTP id s15so30299514wra.12 for ; Thu, 25 Apr 2019 06:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ARCXn+8Wo0U+oiTppL+C49FLsYT2QmTKL0yfmugVNz8=; b=ODiSpjI9Y8k0yDJxezKEU06KXYr8ZFiTnDhNHEXOlrya6CQoB/Twe0yL9EuvD6kTCf HsCOEt8RvPKDiTyYWGtkEOaREU/2m3znhy8hlINdXIxGZ6sht40etleNPvdpDbVHTDmE R2yqJUATdkTPqkYNEwina9uJUFZ3ZpPtVzOvqvHfk6Rt6wjWqNXAG4lQ2Xj1XiQyD85c 5s4LTneP4tYXI2SP4IDvvZD0Kiq7ZpdU8GyXHvh9FnL9QjOkIikD2uYESa2MbRm1lJy4 NxeJusTEyxkRK7lBgp93Ble36yO1qH3DR4lBwB5YzsvfhpzN9HQjVvEKHPRt0OvPizVb lBmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ARCXn+8Wo0U+oiTppL+C49FLsYT2QmTKL0yfmugVNz8=; b=Vhz11+eeixlq3+ZrOFTIkhXgJXjJpzfrih4qkghuKOx/xoVOnSiVZS59LxMHmw4fEQ yZCnziIDDpnZcAM8zc6lvJwXb3hFiWqnxB5dwanTVHpdJNII/7+rO3ax9HMsFdI8Xr6x sjoprR95snhoNk5nWJGbfTkL4nIuZiMC9dkrnXo9KXXuH+ICBPO9xUDBgK+ULudKz6d9 qKeRRe1+T0FMnLdHmEA5sszH9xcST7k6tMH0I39djqd5DDJi9OnheyhiEeaaLvw1xhZd mXqVTOrKHhWzAXYGlduPVEyX+Rud9JDp6baCrUJ9/H1Iy7z00jA9j+cCQrr/IygB60i/ KAVw== X-Gm-Message-State: APjAAAXUQELTKXx1zoQJdofJ0J7IYNTKqX57KvcSKGc3DEw3v1oDFkgn XZbpIkro6czhmpnN5lqCh0szz2Qs X-Google-Smtp-Source: APXvYqz2OndiAsiMrMso/fm2bZL8ZGsqoQns7iogsAzTq5JNCuO98nbmwr2Xf47L1RgZ/CvBtEyEUg== X-Received: by 2002:a5d:4b4e:: with SMTP id w14mr21412924wrs.15.1556198891322; Thu, 25 Apr 2019 06:28:11 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:08 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:32 +0300 Message-Id: <20190425132636.31636-18-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v6 17/21] gdbstub: Implement v commands with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 170 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 110 insertions(+), 60 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 809503c20a..7bc00d7f77 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1816,6 +1816,106 @@ static void handle_step(GdbCmdContext *gdb_ctx, void *user_ctx) gdb_continue(gdb_ctx->s); } +static void handle_v_cont_query(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + put_packet(gdb_ctx->s, "vCont;c;C;s;S"); +} + +static void handle_v_cont(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int res; + + if (!gdb_ctx->num_params) { + return; + } + + res = gdb_handle_vcont(gdb_ctx->s, gdb_ctx->params[0].data); + if ((res == -EINVAL) || (res == -ERANGE)) { + put_packet(gdb_ctx->s, "E22"); + } else if (res) { + put_packet(gdb_ctx->s, "\0"); + } +} + +static void handle_v_attach(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + GDBProcess *process; + CPUState *cpu; + char thread_id[16]; + + strcpy(gdb_ctx->str_buf, "E22"); + if (!gdb_ctx->num_params) { + goto cleanup; + } + + process = gdb_get_process(gdb_ctx->s, gdb_ctx->params[0].val_ul); + if (!process) { + goto cleanup; + } + + cpu = get_first_cpu_in_process(gdb_ctx->s, process); + if (!cpu) { + goto cleanup; + } + + process->attached = true; + gdb_ctx->s->g_cpu = cpu; + gdb_ctx->s->c_cpu = cpu; + + gdb_fmt_thread_id(gdb_ctx->s, cpu, thread_id, sizeof(thread_id)); + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "T%02xthread:%s;", + GDB_SIGNAL_TRAP, thread_id); +cleanup: + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +static void handle_v_kill(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + /* Kill the target */ + put_packet(gdb_ctx->s, "OK"); + error_report("QEMU: Terminated via GDBstub"); + exit(0); +} + +static GdbCmdParseEntry gdb_v_commands_table[] = { + /* Order is important if has same prefix */ + { + .handler = handle_v_cont_query, + .cmd = "Cont?", + .cmd_startswith = 1 + }, + { + .handler = handle_v_cont, + .cmd = "Cont", + .cmd_startswith = 1, + .schema = "s0" + }, + { + .handler = handle_v_attach, + .cmd = "Attach;", + .cmd_startswith = 1, + .schema = "l0" + }, + { + .handler = handle_v_kill, + .cmd = "Kill;", + .cmd_startswith = 1 + }, +}; + +static void handle_v_commands(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (!gdb_ctx->num_params) { + return; + } + + if (process_string_cmd(gdb_ctx->s, NULL, gdb_ctx->params[0].data, + gdb_v_commands_table, + ARRAY_SIZE(gdb_v_commands_table))) { + put_packet(gdb_ctx->s, ""); + } +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -1823,7 +1923,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) CPUClass *cc; const char *p; uint32_t pid, tid; - int ch, type, res; + int ch, type; uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; char thread_id[16]; @@ -1872,66 +1972,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'v': - if (strncmp(p, "Cont", 4) == 0) { - p += 4; - if (*p == '?') { - put_packet(s, "vCont;c;C;s;S"); - break; - } - - res = gdb_handle_vcont(s, p); - - if (res) { - if ((res == -EINVAL) || (res == -ERANGE)) { - put_packet(s, "E22"); - break; - } - goto unknown_command; - } - break; - } else if (strncmp(p, "Attach;", 7) == 0) { - unsigned long pid; - - p += 7; - - if (qemu_strtoul(p, &p, 16, &pid)) { - put_packet(s, "E22"); - break; - } - - process = gdb_get_process(s, pid); - - if (process == NULL) { - put_packet(s, "E22"); - break; - } - - cpu = get_first_cpu_in_process(s, process); - - if (cpu == NULL) { - /* Refuse to attach an empty process */ - put_packet(s, "E22"); - break; - } - - process->attached = true; - - s->g_cpu = cpu; - s->c_cpu = cpu; - - snprintf(buf, sizeof(buf), "T%02xthread:%s;", GDB_SIGNAL_TRAP, - gdb_fmt_thread_id(s, cpu, thread_id, sizeof(thread_id))); - - put_packet(s, buf); - break; - } else if (strncmp(p, "Kill;", 5) == 0) { - /* Kill the target */ - put_packet(s, "OK"); - error_report("QEMU: Terminated via GDBstub"); - exit(0); - } else { - goto unknown_command; + { + static const GdbCmdParseEntry v_cmd_desc = { + .handler = handle_v_commands, + .cmd = "v", + .cmd_startswith = 1, + .schema = "s0" + }; + cmd_parser = &v_cmd_desc; } + break; case 'k': /* Kill the target */ error_report("QEMU: Terminated via GDBstub"); From patchwork Thu Apr 25 13:26:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tKld0IuL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qf826f7Rz9sB3 for ; Fri, 26 Apr 2019 00:04:50 +1000 (AEST) Received: from localhost ([127.0.0.1]:58030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJezY-0006Oj-Iq for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 10:04:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQF-0000Mx-DH for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQD-00020e-TZ for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:19 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQD-0001zu-N0 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:17 -0400 Received: by mail-wm1-x343.google.com with SMTP id 26so3498241wmj.3 for ; Thu, 25 Apr 2019 06:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Iz5SrYAXu7VpCoWsP3e/cvDID9SYRQ00R50I33AURg=; b=tKld0IuLm8DI3f7gUS4HBkoZnHruU/xXlnJeInytgY95OB0TuoMfQ1QjpOeD55B2eZ Z3D8/taq37PSWHsEvf6zSEsSoaB1Btzr37fhL3mUC6zU1piH4gupsy8CInWYIiZmcXNu fhmHzzrw85bfhSqJPAnL8kfyR+qFQwXQr2n8BujFaOp6YwscogE1NjhFIU6dZxgk39yv Bc1g1p3GuAhlFxN/Vd0xtQi/QLSv2sO1I7SFNhzWMwDHUHfoHwIYy/J4bQkDbMjVtp7q Cpm0ptbGaIcZkbncaPKY17CpIpH6AFlHA1QcyLxOHu2RJl40lVBbEQO295/RUEIL+jqH XvKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Iz5SrYAXu7VpCoWsP3e/cvDID9SYRQ00R50I33AURg=; b=EOpf+pMxnrs11LY3R3ZHiPSZ8kUYYpL0MUHrj3L68oo4uWCV2wuvCRWYYoz8QgqmFl HNTmWvyFqVf+ljBbJbX59CHG4uk8QlxK6mhaLm1fv7ERbhmDPjCTyh8VGuiCs1nN+pRF zKCbURdgQ7El7WHdwogPHIXbcmLvYr+eKLdbC7BJQ0HjezfaPl8Du3stoVx1XDhfyVdv 7DRms8i54M6wZjk2j6Ts2bJVk47oQlBYNj0yV6t7KIUZwL1XSrFHyqASz2aqlhZWHkRi xSuY1ta7Kj7CkfFI59YdVIGJoGhgGgz699cLv3cb5xg7rLADEJ63SsSCOnFgfo7QO9HY J5HQ== X-Gm-Message-State: APjAAAWK33bYwj/J/i5taABPC1/okhpTRrdUgZK5kljX53x1zIg7NaYN t5xApJOj0cfbBRmKds4WHxaZnN5Q X-Google-Smtp-Source: APXvYqxIa7LWxca8uO1Rb2/PpQL4lvQ/UYGVLVckTNmNfG+xLGhikGjJ2CNbJ9BH/41ZYDA+nGs1QQ== X-Received: by 2002:a1c:9e96:: with SMTP id h144mr3748274wme.33.1556198895179; Thu, 25 Apr 2019 06:28:15 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:12 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:33 +0300 Message-Id: <20190425132636.31636-19-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v6 18/21] gdbstub: Implement generic query (q pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 335 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 335 insertions(+) diff --git a/gdbstub.c b/gdbstub.c index 7bc00d7f77..a2db1ec661 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1916,6 +1916,331 @@ static void handle_v_commands(GdbCmdContext *gdb_ctx, void *user_ctx) } } +static void handle_query_qemu_sstepbits(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), + "ENABLE=%x,NOIRQ=%x,NOTIMER=%x", SSTEP_ENABLE, + SSTEP_NOIRQ, SSTEP_NOTIMER); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +static void handle_set_qemu_sstep(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (!gdb_ctx->num_params) { + return; + } + + sstep_flags = gdb_ctx->params[0].val_ul; + put_packet(gdb_ctx->s, "OK"); +} + +static void handle_query_qemu_sstep(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "0x%x", sstep_flags); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +static void handle_query_curr_tid(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + CPUState *cpu; + GDBProcess *process; + char thread_id[16]; + + /* + * "Current thread" remains vague in the spec, so always return + * the first thread of the current process (gdb returns the + * first thread). + */ + process = gdb_get_cpu_process(gdb_ctx->s, gdb_ctx->s->g_cpu); + cpu = get_first_cpu_in_process(gdb_ctx->s, process); + gdb_fmt_thread_id(gdb_ctx->s, cpu, thread_id, sizeof(thread_id)); + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "QC%s", thread_id); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +static void handle_query_threads(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + char thread_id[16]; + + if (!gdb_ctx->s->query_cpu) { + put_packet(gdb_ctx->s, "l"); + return; + } + + gdb_fmt_thread_id(gdb_ctx->s, gdb_ctx->s->query_cpu, thread_id, + sizeof(thread_id)); + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "m%s", thread_id); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); + gdb_ctx->s->query_cpu = + gdb_next_attached_cpu(gdb_ctx->s, gdb_ctx->s->query_cpu); +} + +static void handle_query_first_threads(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + gdb_ctx->s->query_cpu = gdb_first_attached_cpu(gdb_ctx->s); + handle_query_threads(gdb_ctx, user_ctx); +} + +static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + CPUState *cpu; + int len; + + if (!gdb_ctx->num_params || + gdb_ctx->params[0].thread_id.kind == GDB_READ_THREAD_ERR) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + cpu = gdb_get_cpu(gdb_ctx->s, gdb_ctx->params[0].thread_id.pid, + gdb_ctx->params[0].thread_id.tid); + if (!cpu) { + return; + } + + cpu_synchronize_state(cpu); + + if (gdb_ctx->s->multiprocess && (gdb_ctx->s->process_num > 1)) { + /* Print the CPU model and name in multiprocess mode */ + ObjectClass *oc = object_get_class(OBJECT(cpu)); + const char *cpu_model = object_class_get_name(oc); + char *cpu_name = object_get_canonical_path_component(OBJECT(cpu)); + len = snprintf((char *)gdb_ctx->mem_buf, sizeof(gdb_ctx->str_buf) / 2, + "%s %s [%s]", cpu_model, cpu_name, + cpu->halted ? "halted " : "running"); + g_free(cpu_name); + } else { + /* memtohex() doubles the required space */ + len = snprintf((char *)gdb_ctx->mem_buf, sizeof(gdb_ctx->str_buf) / 2, + "CPU#%d [%s]", cpu->cpu_index, + cpu->halted ? "halted " : "running"); + } + trace_gdbstub_op_extra_info((char *)gdb_ctx->mem_buf); + memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, len); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +#ifdef CONFIG_USER_ONLY +static void handle_query_offsets(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + TaskState *ts; + + ts = gdb_ctx->s->c_cpu->opaque; + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), + "Text=" TARGET_ABI_FMT_lx ";Data=" TARGET_ABI_FMT_lx + ";Bss=" TARGET_ABI_FMT_lx, + ts->info->code_offset, + ts->info->data_offset, + ts->info->data_offset); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} +#else +static void handle_query_rcmd(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + int len; + + if (!gdb_ctx->num_params) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + len = strlen(gdb_ctx->params[0].data); + if (len % 2) { + put_packet(gdb_ctx->s, "E01"); + return; + } + + len = len / 2; + hextomem(gdb_ctx->mem_buf, gdb_ctx->params[0].data, len); + gdb_ctx->mem_buf[len++] = 0; + qemu_chr_be_write(gdb_ctx->s->mon_chr, gdb_ctx->mem_buf, len); + put_packet(gdb_ctx->s, "OK"); + +} +#endif + +static void handle_query_supported(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + CPUClass *cc; + + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "PacketSize=%x", + MAX_PACKET_LENGTH); + cc = CPU_GET_CLASS(first_cpu); + if (cc->gdb_core_xml_file) { + pstrcat(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), + ";qXfer:features:read+"); + } + + if (gdb_ctx->num_params && + strstr(gdb_ctx->params[0].data, "multiprocess+")) { + gdb_ctx->s->multiprocess = true; + } + + pstrcat(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), ";multiprocess+"); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); +} + +static void handle_query_xfer_features(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + GDBProcess *process; + CPUClass *cc; + unsigned long len, total_len, addr; + const char *xml; + const char *p; + + if (gdb_ctx->num_params < 3) { + put_packet(gdb_ctx->s, "E22"); + return; + } + + process = gdb_get_cpu_process(gdb_ctx->s, gdb_ctx->s->g_cpu); + cc = CPU_GET_CLASS(gdb_ctx->s->g_cpu); + if (!cc->gdb_core_xml_file) { + put_packet(gdb_ctx->s, ""); + return; + } + + gdb_has_xml = true; + p = gdb_ctx->params[0].data; + xml = get_feature_xml(gdb_ctx->s, p, &p, process); + if (!xml) { + put_packet(gdb_ctx->s, "E00"); + return; + } + + addr = gdb_ctx->params[1].val_ul; + len = gdb_ctx->params[2].val_ul; + total_len = strlen(xml); + if (addr > total_len) { + put_packet(gdb_ctx->s, "E00"); + return; + } + + if (len > (MAX_PACKET_LENGTH - 5) / 2) { + len = (MAX_PACKET_LENGTH - 5) / 2; + } + + if (len < total_len - addr) { + gdb_ctx->str_buf[0] = 'm'; + len = memtox(gdb_ctx->str_buf + 1, xml + addr, len); + } else { + gdb_ctx->str_buf[0] = 'l'; + len = memtox(gdb_ctx->str_buf + 1, xml + addr, total_len - addr); + } + + put_packet_binary(gdb_ctx->s, gdb_ctx->str_buf, len + 1, true); +} + +static void handle_query_attached(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + put_packet(gdb_ctx->s, GDB_ATTACHED); +} + +static GdbCmdParseEntry gdb_gen_query_set_common_table[] = { + /* Order is important if has same prefix */ + { + .handler = handle_query_qemu_sstepbits, + .cmd = "qemu.sstepbits", + .cmd_full_match = 1 + }, + { + .handler = handle_query_qemu_sstep, + .cmd = "qemu.sstep", + .cmd_full_match = 1, + }, + { + .handler = handle_set_qemu_sstep, + .cmd = "qemu.sstep=", + .cmd_startswith = 1, + .schema = "l0" + }, +}; + +static GdbCmdParseEntry gdb_gen_query_table[] = { + { + .handler = handle_query_curr_tid, + .cmd = "C", + .cmd_full_match = 1 + }, + { + .handler = handle_query_threads, + .cmd = "sThreadInfo", + .cmd_full_match = 1 + }, + { + .handler = handle_query_first_threads, + .cmd = "fThreadInfo", + .cmd_full_match = 1 + }, + { + .handler = handle_query_thread_extra, + .cmd = "ThreadExtraInfo,", + .cmd_startswith = 1, + .schema = "t0" + }, +#ifdef CONFIG_USER_ONLY + { + .handler = handle_query_offsets, + .cmd = "Offsets", + .cmd_full_match = 1 + }, +#else + { + .handler = handle_query_rcmd, + .cmd = "Rcmd,", + .cmd_startswith = 1, + .schema = "s0" + }, +#endif + { + .handler = handle_query_supported, + .cmd = "Supported:", + .cmd_startswith = 1, + .schema = "s0" + }, + { + .handler = handle_query_supported, + .cmd = "Supported", + .cmd_full_match = 1, + .schema = "s0" + }, + { + .handler = handle_query_xfer_features, + .cmd = "Xfer:features:read:", + .cmd_startswith = 1, + .schema = "s:l,l0" + }, + { + .handler = handle_query_attached, + .cmd = "Attached:", + .cmd_startswith = 1 + }, + { + .handler = handle_query_attached, + .cmd = "Attached", + .cmd_full_match = 1 + }, +}; + +static void handle_gen_query(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (!gdb_ctx->num_params) { + return; + } + + if (!process_string_cmd(gdb_ctx->s, NULL, gdb_ctx->params[0].data, + gdb_gen_query_set_common_table, + ARRAY_SIZE(gdb_gen_query_set_common_table))) { + return; + } + + if (process_string_cmd(gdb_ctx->s, NULL, gdb_ctx->params[0].data, + gdb_gen_query_table, + ARRAY_SIZE(gdb_gen_query_table))) { + put_packet(gdb_ctx->s, ""); + } +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -2129,6 +2454,16 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'q': + { + static const GdbCmdParseEntry gen_query_cmd_desc = { + .handler = handle_gen_query, + .cmd = "q", + .cmd_startswith = 1, + .schema = "s0" + }; + cmd_parser = &gen_query_cmd_desc; + } + break; case 'Q': /* parse any 'q' packets here */ if (!strcmp(p,"qemu.sstepbits")) { From patchwork Thu Apr 25 13:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gTXWvvOA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qf9s60JPz9s7T for ; Fri, 26 Apr 2019 00:06:25 +1000 (AEST) Received: from localhost ([127.0.0.1]:58072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJf15-0007Vp-GX for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 10:06:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQL-0000S3-V7 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQK-00025l-JD for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:25 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37664) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQK-00025L-9n for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:24 -0400 Received: by mail-wm1-x342.google.com with SMTP id v14so10625084wmf.2 for ; Thu, 25 Apr 2019 06:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8oEFDKxbCtKm7exNUDzwxsBAyq4ksqjhK1GGeb9omBg=; b=gTXWvvOA+n4EG0gVKSJSJQ9QRLs8a0EnN4LQdNUBX+o9l2HyHWTaTwKkBQftQBfau0 OK16Lq0bsrRRQu7i6kD+B2Nd+bDJaEjfOF4J4y2oFHOnG+eT5ybF2J3ic4twgBNOwIt3 r0+sHisuQennV9BfUBp/Hid0JTwTZ/FsuA9mdGhYvIfs3ChqV4kmeENC0lqb3mE8tLEP A0V/a/e9XbG+dL8xBSLkLK9e5je3p4LYcUWux7gZY8uzTpxcsNvT8VAcJl9n4CyzBZ7N m4OVJgFw2jB01h0l47IJ9jd3Izo5rr7hJda3RrIpwV2RoDfPRRXijxmmcn0x+NcYGYPc YG+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8oEFDKxbCtKm7exNUDzwxsBAyq4ksqjhK1GGeb9omBg=; b=fJzAJX/82GzcWp7H834Vtc8y7aQD/SWhn8GEM8K8Hb/ncC8UziV/VD1tmmoxltsQYe W65u18AvjvuJsy+4k1E+aPdTRI8HuIirl7IRGA7GRe7cNweUnojPo3h4BAWIS/wFKHFS ZicKKT0HOIrj+TpoCYIXs1Bf+FZT/Zo6JNslADPF8Y0r6ERCfVJ7hnWOTKiKROSqS+UN yLGR6mcssoX6TBFwJEMapRJhVFJZtIyeuxVEbiQGPfwmV6A3kgDrljVbidhvyF1op33N DJPv+M43lj2WDbCLQO6+2ictOVLaHJVaDUhEGdb+encAKSi3lQiexMBm0ys8ye3MgU8o 1hCw== X-Gm-Message-State: APjAAAUjJUBoB51kfjtcrTJ4mlWPPbUw9hPX7wnN8nFL+tSJc3hQrvOS FC+JqKS5JVlCiMXUVwO1HjaIsPXp X-Google-Smtp-Source: APXvYqzcgY5c2K7LbtNyKqfcYc+CfTcE4wTuhHdMZvU4ykO3ZIV0oRG3ucu9QpkjOBcnJStGpGDBWA== X-Received: by 2002:a1c:c7c9:: with SMTP id x192mr3614546wmf.151.1556198901545; Thu, 25 Apr 2019 06:28:21 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:18 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:34 +0300 Message-Id: <20190425132636.31636-20-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v6 19/21] gdbstub: Implement generic set (Q pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 213 +++++++----------------------------------------------- 1 file changed, 25 insertions(+), 188 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index a2db1ec661..779da2aa77 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1130,14 +1130,6 @@ static GDBThreadIdKind read_thread_id(const char *buf, const char **end_buf, return GDB_ONE_THREAD; } -static int is_query_packet(const char *p, const char *query, char separator) -{ - unsigned int query_len = strlen(query); - - return strncmp(p, query, query_len) == 0 && - (p[query_len] == '\0' || p[query_len] == separator); -} - /** * gdb_handle_vcont - Parses and handles a vCont packet. * returns -ENOTSUP if a command is unsupported, -EINVAL or -ERANGE if there is @@ -2241,18 +2233,28 @@ static void handle_gen_query(GdbCmdContext *gdb_ctx, void *user_ctx) } } +static void handle_gen_set(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + if (!gdb_ctx->num_params) { + return; + } + + if (!process_string_cmd(gdb_ctx->s, NULL, gdb_ctx->params[0].data, + gdb_gen_query_set_common_table, + ARRAY_SIZE(gdb_gen_query_set_common_table))) { + return; + } + + put_packet(gdb_ctx->s, ""); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { - CPUState *cpu; - GDBProcess *process; - CPUClass *cc; const char *p; - uint32_t pid, tid; - int ch, type; + int ch; uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; char thread_id[16]; - target_ulong addr, len; const GdbCmdParseEntry *cmd_parser = NULL; trace_gdbstub_io_command(line_buf); @@ -2465,182 +2467,17 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } break; case 'Q': - /* parse any 'q' packets here */ - if (!strcmp(p,"qemu.sstepbits")) { - /* Query Breakpoint bit definitions */ - snprintf(buf, sizeof(buf), "ENABLE=%x,NOIRQ=%x,NOTIMER=%x", - SSTEP_ENABLE, - SSTEP_NOIRQ, - SSTEP_NOTIMER); - put_packet(s, buf); - break; - } else if (is_query_packet(p, "qemu.sstep", '=')) { - /* Display or change the sstep_flags */ - p += 10; - if (*p != '=') { - /* Display current setting */ - snprintf(buf, sizeof(buf), "0x%x", sstep_flags); - put_packet(s, buf); - break; - } - p++; - type = strtoul(p, (char **)&p, 16); - sstep_flags = type; - put_packet(s, "OK"); - break; - } else if (strcmp(p,"C") == 0) { - /* - * "Current thread" remains vague in the spec, so always return - * the first thread of the current process (gdb returns the - * first thread). - */ - cpu = get_first_cpu_in_process(s, gdb_get_cpu_process(s, s->g_cpu)); - snprintf(buf, sizeof(buf), "QC%s", - gdb_fmt_thread_id(s, cpu, thread_id, sizeof(thread_id))); - put_packet(s, buf); - break; - } else if (strcmp(p,"fThreadInfo") == 0) { - s->query_cpu = gdb_first_attached_cpu(s); - goto report_cpuinfo; - } else if (strcmp(p,"sThreadInfo") == 0) { - report_cpuinfo: - if (s->query_cpu) { - snprintf(buf, sizeof(buf), "m%s", - gdb_fmt_thread_id(s, s->query_cpu, - thread_id, sizeof(thread_id))); - put_packet(s, buf); - s->query_cpu = gdb_next_attached_cpu(s, s->query_cpu); - } else - put_packet(s, "l"); - break; - } else if (strncmp(p,"ThreadExtraInfo,", 16) == 0) { - if (read_thread_id(p + 16, &p, &pid, &tid) == GDB_READ_THREAD_ERR) { - put_packet(s, "E22"); - break; - } - cpu = gdb_get_cpu(s, pid, tid); - if (cpu != NULL) { - cpu_synchronize_state(cpu); - - if (s->multiprocess && (s->process_num > 1)) { - /* Print the CPU model and name in multiprocess mode */ - ObjectClass *oc = object_get_class(OBJECT(cpu)); - const char *cpu_model = object_class_get_name(oc); - char *cpu_name = - object_get_canonical_path_component(OBJECT(cpu)); - len = snprintf((char *)mem_buf, sizeof(buf) / 2, - "%s %s [%s]", cpu_model, cpu_name, - cpu->halted ? "halted " : "running"); - g_free(cpu_name); - } else { - /* memtohex() doubles the required space */ - len = snprintf((char *)mem_buf, sizeof(buf) / 2, - "CPU#%d [%s]", cpu->cpu_index, - cpu->halted ? "halted " : "running"); - } - trace_gdbstub_op_extra_info((char *)mem_buf); - memtohex(buf, mem_buf, len); - put_packet(s, buf); - } - break; - } -#ifdef CONFIG_USER_ONLY - else if (strcmp(p, "Offsets") == 0) { - TaskState *ts = s->c_cpu->opaque; - - snprintf(buf, sizeof(buf), - "Text=" TARGET_ABI_FMT_lx ";Data=" TARGET_ABI_FMT_lx - ";Bss=" TARGET_ABI_FMT_lx, - ts->info->code_offset, - ts->info->data_offset, - ts->info->data_offset); - put_packet(s, buf); - break; - } -#else /* !CONFIG_USER_ONLY */ - else if (strncmp(p, "Rcmd,", 5) == 0) { - int len = strlen(p + 5); - - if ((len % 2) != 0) { - put_packet(s, "E01"); - break; - } - len = len / 2; - hextomem(mem_buf, p + 5, len); - mem_buf[len++] = 0; - qemu_chr_be_write(s->mon_chr, mem_buf, len); - put_packet(s, "OK"); - break; - } -#endif /* !CONFIG_USER_ONLY */ - if (is_query_packet(p, "Supported", ':')) { - snprintf(buf, sizeof(buf), "PacketSize=%x", MAX_PACKET_LENGTH); - cc = CPU_GET_CLASS(first_cpu); - if (cc->gdb_core_xml_file != NULL) { - pstrcat(buf, sizeof(buf), ";qXfer:features:read+"); - } - - if (strstr(p, "multiprocess+")) { - s->multiprocess = true; - } - pstrcat(buf, sizeof(buf), ";multiprocess+"); - - put_packet(s, buf); - break; - } - if (strncmp(p, "Xfer:features:read:", 19) == 0) { - const char *xml; - target_ulong total_len; - - process = gdb_get_cpu_process(s, s->g_cpu); - cc = CPU_GET_CLASS(s->g_cpu); - if (cc->gdb_core_xml_file == NULL) { - goto unknown_command; - } - - gdb_has_xml = true; - p += 19; - xml = get_feature_xml(s, p, &p, process); - if (!xml) { - snprintf(buf, sizeof(buf), "E00"); - put_packet(s, buf); - break; - } - - if (*p == ':') - p++; - addr = strtoul(p, (char **)&p, 16); - if (*p == ',') - p++; - len = strtoul(p, (char **)&p, 16); - - total_len = strlen(xml); - if (addr > total_len) { - snprintf(buf, sizeof(buf), "E00"); - put_packet(s, buf); - break; - } - if (len > (MAX_PACKET_LENGTH - 5) / 2) - len = (MAX_PACKET_LENGTH - 5) / 2; - if (len < total_len - addr) { - buf[0] = 'm'; - len = memtox(buf + 1, xml + addr, len); - } else { - buf[0] = 'l'; - len = memtox(buf + 1, xml + addr, total_len - addr); - } - put_packet_binary(s, buf, len + 1, true); - break; - } - if (is_query_packet(p, "Attached", ':')) { - put_packet(s, GDB_ATTACHED); - break; + { + static const GdbCmdParseEntry gen_set_cmd_desc = { + .handler = handle_gen_set, + .cmd = "Q", + .cmd_startswith = 1, + .schema = "s0" + }; + cmd_parser = &gen_set_cmd_desc; } - /* Unrecognised 'q' command. */ - goto unknown_command; - + break; default: - unknown_command: /* put empty packet */ buf[0] = '\0'; put_packet(s, buf); From patchwork Thu Apr 25 13:26:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wj2ZYKeE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qdYq0qFLz9s70 for ; Thu, 25 Apr 2019 23:38:39 +1000 (AEST) Received: from localhost ([127.0.0.1]:57334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeaC-00089Z-UM for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:38:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQS-0000Yc-S6 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQR-0002BB-Ty for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:32 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQR-0002A9-O2 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:31 -0400 Received: by mail-wm1-x343.google.com with SMTP id h18so10619551wml.1 for ; Thu, 25 Apr 2019 06:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vbRIrSe2/0YQKchHifA9WtEnR/rS78BpaRVSv6nPF1c=; b=Wj2ZYKeEYhvs0AbLnRezIJjZr0ZEFn8VJ33D/V4kbcQD11GEKR7FcRxrULxFmrF+xt M94RT8ihBXgCCjae78FFh7TQqA7miZ7wWquUw9Vxs5MPADcwDQmM0peafGFjPgERg6CU /PCNPfECo9mzeLKOWGYVZ0X0DO4h3I/dey/hZzy6TuYK7B6jEB8ipJ/sNObE40T274LE yG45IL1NRvss4COJbJk+DNZLK9AlJ/VzwgiVoY7U4tU7Uyg6G+c45FsroXIxrKCtRn6V 7Rc8hYe4tT6tpTS7srrTinxO1hSoTgL3s5CfQt6jlvOzXM9rvrEcunL97sYBlj+cWqBt aORg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vbRIrSe2/0YQKchHifA9WtEnR/rS78BpaRVSv6nPF1c=; b=Dr+DOl+S+JyjVZKjjzKIt3zMxLJtQt8F9wMsl3TmbaFLrjgXIw1k45XdHe9MYDyDcR b9Qy8MnzQbAPAhcpROxLuHSP4e/PshAtLO9XunjUKVdSdcemaetFTf//TlMwiOKJWDFe N9CH3vDsDAQef5YRe0PqVjHa4BzbRvWhDdENkAAlO+OWJHg9H6hOLyrt3w7UTOGW7UC9 2vHnkdv0VBx/ue7e1SEndMXBENDiZTlF7lL3uNGDn5sRufZYGv3w5DUsBp7gHPPHRyYq kXvWmcxzqKANj2456ApSDO7ruaaJVLo2zrQi8dFSgSwo9tRoINJbqncZqXoKdBgYrXYl tn1Q== X-Gm-Message-State: APjAAAVvVrN+FA+hBI4Hv6uuTi2jgyruCxlopZBErESHqQL9rM67obS8 cX6Wf4IX+xFTYNci5v3xvCzjfX4r X-Google-Smtp-Source: APXvYqwwSE4tqwjute0/qYP9NcDdKYzm40aQAAhd44fjUNtZEFUxqSi6LT3S8AejQIUGOOZhIvmpag== X-Received: by 2002:a1c:9e96:: with SMTP id h144mr3749144wme.33.1556198908867; Thu, 25 Apr 2019 06:28:28 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:25 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:35 +0300 Message-Id: <20190425132636.31636-21-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v6 20/21] gdbstub: Implement target halted (? pkt) with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 779da2aa77..8838241209 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2248,13 +2248,30 @@ static void handle_gen_set(GdbCmdContext *gdb_ctx, void *user_ctx) put_packet(gdb_ctx->s, ""); } +static void handle_target_halt(GdbCmdContext *gdb_ctx, void *user_ctx) +{ + char thread_id[16]; + + /* TODO: Make this return the correct value for user-mode. */ + gdb_fmt_thread_id(gdb_ctx->s, gdb_ctx->s->c_cpu, thread_id, + sizeof(thread_id)); + snprintf(gdb_ctx->str_buf, sizeof(gdb_ctx->str_buf), "T%02xthread:%s;", + GDB_SIGNAL_TRAP, thread_id); + put_packet(gdb_ctx->s, gdb_ctx->str_buf); + /* + * Remove all the breakpoints when this query is issued, + * because gdb is doing and initial connect and the state + * should be cleaned up. + */ + gdb_breakpoint_remove_all(); +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { const char *p; int ch; uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; - char thread_id[16]; const GdbCmdParseEntry *cmd_parser = NULL; trace_gdbstub_io_command(line_buf); @@ -2266,15 +2283,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) put_packet(s, "OK"); break; case '?': - /* TODO: Make this return the correct value for user-mode. */ - snprintf(buf, sizeof(buf), "T%02xthread:%s;", GDB_SIGNAL_TRAP, - gdb_fmt_thread_id(s, s->c_cpu, thread_id, sizeof(thread_id))); - put_packet(s, buf); - /* Remove all the breakpoints when this query is issued, - * because gdb is doing and initial connect and the state - * should be cleaned up. - */ - gdb_breakpoint_remove_all(); + { + static const GdbCmdParseEntry target_halted_cmd_desc = { + .handler = handle_target_halt, + .cmd = "?", + .cmd_startswith = 1 + }; + cmd_parser = &target_halted_cmd_desc; + } break; case 'c': { From patchwork Thu Apr 25 13:26:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1090821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z9s4XetU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qddP5fHdz9s9N for ; Thu, 25 Apr 2019 23:41:44 +1000 (AEST) Received: from localhost ([127.0.0.1]:57403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJedC-0002NX-7p for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2019 09:41:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeQe-0000hQ-Ao for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeQc-0002Uc-Vb for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:44 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJeQc-0002PM-NU for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:28:42 -0400 Received: by mail-wr1-x441.google.com with SMTP id a9so12760929wrp.6 for ; Thu, 25 Apr 2019 06:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ug7lH5JQX2D1LVe7jW+RIkoeBivN61kq/FZwpsv0F+4=; b=Z9s4XetUHNtU/OTIWh9Ep61jW6f2J+1NNSYnWzNfYvDpPKv6hCfAFgAMI4NFqZwW/N 6VfOG/T7zZH+Hrmuto2UCRkuGE2Fr8J0xpqf9Kl7SJz8JLlvtuPgDzTiXo4u5bdeePHF ai3+YxjYJkHXVZrtz7HuBdvf6B8TK9J87G/5mJakstmkMUtNcvyixdYZ4T1HNd8XL6xY c6bXIh8EBZD+0Ykl2pOuRMTK1MeVBwlrQN9f9I9Q8Qc3WC+oF99iUQ9UJb17VgOsuzol KZAFA3K4Rw+YePmusQiSjJgMkvhsFsuSx9vmpj8QHtNumeBfYrqaSlCTLUxkHe4j5KuF vTng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ug7lH5JQX2D1LVe7jW+RIkoeBivN61kq/FZwpsv0F+4=; b=kFlJlj2R8MewLizK06Lk+H5AkvRN7IIfULYXGxArCSpl/rfAYgsrKrwNqdQ07e9Wzc ZMOMwzdS2SdBzvqKzvNvZggM7Xr6MX1mV3c4AWMFBXuDJ9mCmfcvolUvsB9UU7tzbseF 7uGU8bJpUgkj86E/muxtSGCwHhJ3Q+i/63R41tcuk3T9dhJNnEoDRb17yVLBb4pZMuxY KHsAjyJfnSNdMJt5o7knbQYXwAnBEu+L+3nJKgu76BtnF7a+Ip87Kw2xbZJoAOcE4Lyd +I2iQxr3Tz5I+tJyKJuoJWiyU3lOEPslNKf4VHiLieUYxXrsljqU6ZM4bveCzWY5Hq9q /lZQ== X-Gm-Message-State: APjAAAVJ8T34pbEoX25LWtNMEDDBj6d6QFhZoA0BNCUUWbNgZjLZy/KS v4sYctI6b+cBgOVVLyzLck1jeGjJ X-Google-Smtp-Source: APXvYqwhf/dTH3Nb/k2PjnBmxK20exO1mzv58TmGvVBX0fGGOHXrh8koEDn6ZVO/LoWJm+BQxIuM7w== X-Received: by 2002:adf:dbce:: with SMTP id e14mr25495974wrj.249.1556198917147; Thu, 25 Apr 2019 06:28:37 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-247-46.red.bezeqint.net. [79.178.247.46]) by smtp.gmail.com with ESMTPSA id y4sm2316540wrt.34.2019.04.25.06.28.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 06:28:33 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 16:26:36 +0300 Message-Id: <20190425132636.31636-22-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425132636.31636-1-arilou@gmail.com> References: <20190425132636.31636-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v6 21/21] gdbstub: Clear unused variables in gdb_handle_packet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- gdbstub.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 8838241209..32aeefbbe6 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2268,17 +2268,11 @@ static void handle_target_halt(GdbCmdContext *gdb_ctx, void *user_ctx) static int gdb_handle_packet(GDBState *s, const char *line_buf) { - const char *p; - int ch; - uint8_t mem_buf[MAX_PACKET_LENGTH]; - char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; const GdbCmdParseEntry *cmd_parser = NULL; trace_gdbstub_io_command(line_buf); - p = line_buf; - ch = *p++; - switch(ch) { + switch(line_buf[0]) { case '!': put_packet(s, "OK"); break; @@ -2495,8 +2489,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) break; default: /* put empty packet */ - buf[0] = '\0'; - put_packet(s, buf); + put_packet(s, ""); break; }