From patchwork Tue Aug 29 16:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 718231 Delivered-To: patch@linaro.org Received: by 2002:adf:d20a:0:b0:31d:da82:a3b4 with SMTP id j10csp69231wrh; Tue, 29 Aug 2023 09:19:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYJc9nbdoQWxmjXX2DM3fqZmvF2zETINJRy/AyhHBv3n9vmmKDCvXErCYbsRoUP52Zm0ru X-Received: by 2002:ac8:5acc:0:b0:410:8ac5:3084 with SMTP id d12-20020ac85acc000000b004108ac53084mr4001298qtd.7.1693325968868; Tue, 29 Aug 2023 09:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693325968; cv=none; d=google.com; s=arc-20160816; b=IbSxRSbkbSxlixs2O/b/+nTP9zfqr0llNH3x9CyXdLWTDiGpNiBjk+u06UCVQdVOSn EDwvkylTVKoCL86vVwl7kv44qnzq0QRx1FfehYJNK49e8qr0hX+btyA91GgMbhd6ohI5 242PmIiRMzMMMc5mtRiOGVU7Y8Wh8Plq9u1uH9dNq7SgVU4AiSTpsqViBO1NIHW6l6N5 J8oQID4CYpGAAVdCrs0XcNPDANhE/dVM3tAWp4MApGkzS3+Yu0h0EJliN7h7DKrcD9t8 LCpmWx6cufKBx77/tompVZ0GgiXFqduB9ZExQJsTcxfWWLMGm80+pR8aFZxjC81NaZ6h SH9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eGuSlOFUAd6anPdd5Y5MZCMek8dhfbyzWA0wz58Vex8=; fh=XRGxpyqI0YVzcp3Q9gBEMVQOmsG743peAXTGmKRj5T0=; b=fKLY+0v+NfBp/RQFObJHfkAfSm5I4fLUj6d+mm3UHqWE2QmzBzV0z+7eNrfkGdBqmC FwPdnA8kC2Phtu/mke37G3M9Rf5/77nRVw2FkzbNJWyrhBpKeeHUVUUifDJqoxYw1+8D evSna69+bfaCfkwBPawh+SpKjY0EIlQruVgw3LXfwGfi2pojXL2TYmJogT98k3f2Vh+0 AMVFhgH8kiw1G21aIg5+Smh/0Cio9HtlMx0XKfuzFCi8CwttfagiUmG8w1F1ubg6Fgtk /5PmFb10WQvYsO710gSvcX2eZzWxjt9HiwUm1jDkWjUxKj2XG1cmHjeekvhB3IC7VL1q mMcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZkemELLT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x12-20020ac85f0c000000b0040e4daf543dsi4040118qta.624.2023.08.29.09.19.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Aug 2023 09:19:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZkemELLT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb1Nq-00059M-Nv; Tue, 29 Aug 2023 12:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qb1Nk-0004zI-1t for qemu-devel@nongnu.org; Tue, 29 Aug 2023 12:15:56 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb1NT-0004Qn-Qf for qemu-devel@nongnu.org; Tue, 29 Aug 2023 12:15:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3fef56f7223so41377755e9.3 for ; Tue, 29 Aug 2023 09:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693325733; x=1693930533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eGuSlOFUAd6anPdd5Y5MZCMek8dhfbyzWA0wz58Vex8=; b=ZkemELLTwaRba0RloTHPtfkxAVroB/+6wJhKBgaKY+4/I+ckfY1JLV06QjsuUIKYHW g2MhgyDaE0+Y7huDAFwzkMQDg7N1UdwXAetKrBZBMMal1Cg7jUqW/tga8fH1iymqbCsw LmJX1vgQXdgU+Xeor8nr5OwdLmgZp8Iir9le4oLqyPrbCn1lBQK4QVdFTs4xmovtcDwV FWZ89Z7Mizwmissg2CIfK8ePo7AnF0YqfA6cQGy+RLMTlAIC0GC+xfEmxOQEhB2kc3ZL VBcr7RqN4hrsOSntNLPLCZlwVxu6gvsn2WqF2Nb9TniFqRaA1rVRRn0d6zlwG3FpG3Gk Xd/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693325733; x=1693930533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eGuSlOFUAd6anPdd5Y5MZCMek8dhfbyzWA0wz58Vex8=; b=hiFtC/aMmSzFbBoaDpwox3ODAril276HP6k5M/OSw/bbtmRwo1kdSzhm9xfXTrK2KG Z5qpgFC9DaUR13Kh/FbbB0HTJXySyf2nbyK8jiSXMZ1PMQE0OvKWPKQfB3fnWLCxFLx5 ftADuEON7GnFaeeyu6e3Gie5JQV4GGmm5mXE3PWT+0oqwVXEUjpsYlYLbjbNlLk5R7iH aP80DwyT23ZhW8pJql/2Ibe9/HYgsPUTmmzDo0D5UAzBbCnU0LBeB2w1V5KKpR+/2UMA d/Q7FBUIJZsxm0X0MxLPVq2f9iUvrRbFIfPdKi1tkiGKaEYqx8yIuAYRuiXl14USrnH7 rLWg== X-Gm-Message-State: AOJu0YxHd9wJmnDSr9RQKKB0MroO1cs9at489HSw0vNjQMWlKu+IgIk0 yHVmsVz6hdNNdNvr/d8KrtETFw== X-Received: by 2002:a1c:7303:0:b0:3fb:f0ef:4669 with SMTP id d3-20020a1c7303000000b003fbf0ef4669mr21407138wmb.17.1693325733334; Tue, 29 Aug 2023 09:15:33 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m9-20020a7bcb89000000b003fee777fd84sm14309471wmi.41.2023.08.29.09.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 09:15:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 681B11FFBC; Tue, 29 Aug 2023 17:15:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Daniel_P=2E?= =?utf-8?q?_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , David Gibson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Daniel Henrique Barboza , qemu-arm@nongnu.org, Markus Armbruster , qemu-ppc@nongnu.org, David Hildenbrand , qemu-s390x@nongnu.org, Greg Kurz , Nicholas Piggin , Akihiko Odaki , Juan Quintela , Yonggang Luo , Richard Henderson , Ilya Leoshkevich , Peter Maydell , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v3 10/12] gdbstub: refactor get_feature_xml Date: Tue, 29 Aug 2023 17:15:26 +0100 Message-Id: <20230829161528.2707696-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230829161528.2707696-1-alex.bennee@linaro.org> References: <20230829161528.2707696-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Try to bring up the code to more modern standards by: - use dynamic GString built xml over a fixed buffer - use autofree to save on explicit g_free() calls - don't hand hack strstr to find the delimiter - fix up style of xml_builtin and invert loop Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v3 - also clean-up xml_builtin loop - use strchr and defere copy for only xml case v2 - avoid needless g_strndup for copy of annex --- gdbstub/internals.h | 2 +- gdbstub/gdbstub.c | 81 +++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index f2b46cce41..4876ebd74f 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -33,7 +33,7 @@ typedef struct GDBProcess { uint32_t pid; bool attached; - char target_xml[1024]; + char *target_xml; } GDBProcess; enum RSState { diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 8e9bc17e07..729e54139a 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -354,64 +354,67 @@ static CPUState *gdb_get_cpu(uint32_t pid, uint32_t tid) static const char *get_feature_xml(const char *p, const char **newp, GDBProcess *process) { - size_t len; - int i; - const char *name; CPUState *cpu = gdb_get_first_cpu_in_process(process); CPUClass *cc = CPU_GET_CLASS(cpu); + size_t len; - len = 0; - while (p[len] && p[len] != ':') - len++; - *newp = p + len; + /* + * qXfer:features:read:ANNEX:OFFSET,LENGTH' + * ^p ^newp + */ + char *term = strchr(p, ':'); + *newp = term + 1; + len = term - p; - name = NULL; + /* Is it the main target xml? */ if (strncmp(p, "target.xml", len) == 0) { - char *buf = process->target_xml; - const size_t buf_sz = sizeof(process->target_xml); - - /* Generate the XML description for this CPU. */ - if (!buf[0]) { + if (!process->target_xml) { GDBRegisterState *r; + GString *xml = g_string_new(""); + + g_string_append(xml, + "" + ""); - pstrcat(buf, buf_sz, - "" - "" - ""); if (cc->gdb_arch_name) { - gchar *arch = cc->gdb_arch_name(cpu); - pstrcat(buf, buf_sz, ""); - pstrcat(buf, buf_sz, arch); - pstrcat(buf, buf_sz, ""); - g_free(arch); + g_autofree gchar *arch = cc->gdb_arch_name(cpu); + g_string_append_printf(xml, + "%s", + arch); } - pstrcat(buf, buf_sz, "gdb_core_xml_file); - pstrcat(buf, buf_sz, "\"/>"); + g_string_append(xml, "gdb_core_xml_file); + g_string_append(xml, "\"/>"); for (r = cpu->gdb_regs; r; r = r->next) { - pstrcat(buf, buf_sz, "xml); - pstrcat(buf, buf_sz, "\"/>"); + g_string_append(xml, "xml); + g_string_append(xml, "\"/>"); } - pstrcat(buf, buf_sz, ""); + g_string_append(xml, ""); + + process->target_xml = g_string_free(xml, false); + return process->target_xml; } - return buf; } + /* Is it dynamically generated by the target? */ if (cc->gdb_get_dynamic_xml) { - char *xmlname = g_strndup(p, len); + g_autofree char *xmlname = g_strndup(p, len); const char *xml = cc->gdb_get_dynamic_xml(cpu, xmlname); - - g_free(xmlname); if (xml) { return xml; } } - for (i = 0; ; i++) { - name = xml_builtin[i][0]; - if (!name || (strncmp(name, p, len) == 0 && strlen(name) == len)) - break; + /* Is it one of the encoded gdb-xml/ files? */ + for (int i = 0; xml_builtin[i][0]; i++) { + const char *name = xml_builtin[i][0]; + if ((strncmp(name, p, len) == 0) && + strlen(name) == len) { + return xml_builtin[i][1]; + } } - return name ? xml_builtin[i][1] : NULL; + + /* failed */ + return NULL; } static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg) @@ -2245,6 +2248,6 @@ void gdb_create_default_process(GDBState *s) process = &s->processes[s->process_num - 1]; process->pid = pid; process->attached = false; - process->target_xml[0] = '\0'; + process->target_xml = NULL; }