From nobody Sat Sep 28 22:09:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1556782394; cv=none; d=zoho.com; s=zohoarc; b=oMVzyadQfyFsjku4DkryYq9KbCR9arDM+UstErdH1GHmYI4ErUqY4Hf78Ybuu0BpBzMUW+WteuVALj8hcGizYlLsY/jCJawDdSAxS5L/UOxPmf9EqImg96ejB4GSj8i1zxiYI7ffgMuLkyWXMr+VL5nEW+X1CzLSUsC3q2dkC30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556782394; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=kKebEya2GiWvJfCSlb0vx4oLqKZ12SF6Am+XqCA7M8o=; b=YRYcoygqDIsRvNAudJbIyHyGAGTXpWRv5w9YJ4g5ezzKVRgAc9+f3JsQ3sHBx0MzDDveZaXMHIhr743Ck4YyPLU+tSGQaVgLVeprKnqDBW6g/iO2OTOeLUqep7Sj9mFMLUBuuwqGBnzrfYil+zODFak5Sx1cnDtCZrvxtf816kI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556782394780461.26289554095524; Thu, 2 May 2019 00:33:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:46564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hM6DN-0007ZJ-Hi for importer@patchew.org; Thu, 02 May 2019 03:33:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hM69V-0004My-Fd for qemu-devel@nongnu.org; Thu, 02 May 2019 03:29:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hM69Q-0002SI-4a for qemu-devel@nongnu.org; Thu, 02 May 2019 03:29:05 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hM69G-0000fX-CL for qemu-devel@nongnu.org; Thu, 02 May 2019 03:28:58 -0400 Received: by mail-wr1-x442.google.com with SMTP id c5so1772998wrs.11 for ; Thu, 02 May 2019 00:27:25 -0700 (PDT) Received: from localhost.localdomain ([176.230.64.186]) by smtp.gmail.com with ESMTPSA id z5sm8769289wre.70.2019.05.02.00.27.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 00:27:23 -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=kKebEya2GiWvJfCSlb0vx4oLqKZ12SF6Am+XqCA7M8o=; b=dxLBN2BZgcehKKaiJmkaZDx1eULbYxZe8+coSIQSezuubnH2lq2xTg7SRKIXuVoar2 YYR80xhSgteY4XrdDibsYYOwg8E4ScGF69IboO8QfiBUygYxyXgsZ/Jx4aZ7YkFKR9ov MWibr8AaQdG/7JZqennHcv2bPEwUF2dv5e+WzpC9Dh5RqBbJN79bcjkGoUhzND+GxaWN SSLUnANfQappqiZ7w+eIETpTsZuytm7E+zBiJfDgZ4gXAjMU7ke1aoR4YFMGgokBjAnm /WbpCiFUuA2saDMRCD6WCCPzyHXnnMAb5zXOhbJfzS7Gkg6H6LnZXuwtSq9okoZKybUs 8HqA== 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=kKebEya2GiWvJfCSlb0vx4oLqKZ12SF6Am+XqCA7M8o=; b=M5SXCpWI4HyOV0lMSm2nxGjfBEGt8m6QvIKbaa0oO1L1CwE73ZNT6CulyxUjDPfq6g VpNtiF1+cWsIbKzp+RnqNPLOfCTvhMDmhMPDRTYFUXzBDXoZS+FkYxQJcmVuVZQOR5DJ ROS8lnQ4uAAGFnd573+crivrkZlfuNIouStntLvUVS4mRCqL2xM8XB2dhe8/DYDjoMVd SmidL5N8s/0pLxhRiQvvDGSN1sOiS82RHY9nzO5xz7861Aow1SqT/w+FXbYFdh1cd3sa bnM1USY74Sx3wP4Cb81dc0HUyPM+D0Djmvm6zMN5vDYkFLTvDC26CYcsXxpS2GiVaVOg APJw== X-Gm-Message-State: APjAAAVw0ntem5BnmARtmN9iTl0ZaL5jU9Gny+DJ9KD/Zoq2MyWkhlI9 1ZQzvyPebqQoEOM+G9dObDG1v77u X-Google-Smtp-Source: APXvYqxWJr8UZnSnuGJQ6SyMOdgw5mihaxt4r2IFagyrpPli9fRaOBBRIM9s9+NKdqO2y+HbXPBIEg== X-Received: by 2002:a5d:4b92:: with SMTP id b18mr1498527wrt.11.1556782044172; Thu, 02 May 2019 00:27:24 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 10:26:31 +0300 Message-Id: <20190502072641.4667-18-arilou@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502072641.4667-1-arilou@gmail.com> References: <20190502072641.4667-1-arilou@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 v8 17/27] 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: liran.alon@oracle.com, alex.bennee@linaro.org, Jon Doron Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jon Doron --- gdbstub.c | 170 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 110 insertions(+), 60 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 9b0556f8be..d56d0fd235 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1815,6 +1815,106 @@ static void handle_step(GdbCmdContext *gdb_ctx, voi= d *user_ctx) gdb_continue(gdb_ctx->s); } =20 +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 =3D gdb_handle_vcont(gdb_ctx->s, gdb_ctx->params[0].data); + if ((res =3D=3D -EINVAL) || (res =3D=3D -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 =3D gdb_get_process(gdb_ctx->s, gdb_ctx->params[0].val_ul); + if (!process) { + goto cleanup; + } + + cpu =3D get_first_cpu_in_process(gdb_ctx->s, process); + if (!cpu) { + goto cleanup; + } + + process->attached =3D true; + gdb_ctx->s->g_cpu =3D cpu; + gdb_ctx->s->c_cpu =3D 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[] =3D { + /* Order is important if has same prefix */ + { + .handler =3D handle_v_cont_query, + .cmd =3D "Cont?", + .cmd_startswith =3D 1 + }, + { + .handler =3D handle_v_cont, + .cmd =3D "Cont", + .cmd_startswith =3D 1, + .schema =3D "s0" + }, + { + .handler =3D handle_v_attach, + .cmd =3D "Attach;", + .cmd_startswith =3D 1, + .schema =3D "l0" + }, + { + .handler =3D handle_v_kill, + .cmd =3D "Kill;", + .cmd_startswith =3D 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; @@ -1822,7 +1922,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]; @@ -1871,66 +1971,16 @@ static int gdb_handle_packet(GDBState *s, const cha= r *line_buf) } break; case 'v': - if (strncmp(p, "Cont", 4) =3D=3D 0) { - p +=3D 4; - if (*p =3D=3D '?') { - put_packet(s, "vCont;c;C;s;S"); - break; - } - - res =3D gdb_handle_vcont(s, p); - - if (res) { - if ((res =3D=3D -EINVAL) || (res =3D=3D -ERANGE)) { - put_packet(s, "E22"); - break; - } - goto unknown_command; - } - break; - } else if (strncmp(p, "Attach;", 7) =3D=3D 0) { - unsigned long pid; - - p +=3D 7; - - if (qemu_strtoul(p, &p, 16, &pid)) { - put_packet(s, "E22"); - break; - } - - process =3D gdb_get_process(s, pid); - - if (process =3D=3D NULL) { - put_packet(s, "E22"); - break; - } - - cpu =3D get_first_cpu_in_process(s, process); - - if (cpu =3D=3D NULL) { - /* Refuse to attach an empty process */ - put_packet(s, "E22"); - break; - } - - process->attached =3D true; - - s->g_cpu =3D cpu; - s->c_cpu =3D 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) =3D=3D 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 =3D { + .handler =3D handle_v_commands, + .cmd =3D "v", + .cmd_startswith =3D 1, + .schema =3D "s0" + }; + cmd_parser =3D &v_cmd_desc; } + break; case 'k': /* Kill the target */ error_report("QEMU: Terminated via GDBstub"); --=20 2.20.1