From patchwork Thu Jan 5 16:43:17 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: 639322 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp345473pvb; Thu, 5 Jan 2023 09:37:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5SK/Dz0OTpAzHRIOMKIw1UwZo9N2g1H0dN/CLrrvmQcMr286trrpA6ZTgSKKKz+Q61fvq X-Received: by 2002:a1f:a916:0:b0:3af:2f12:c9d2 with SMTP id s22-20020a1fa916000000b003af2f12c9d2mr21713823vke.3.1672940267353; Thu, 05 Jan 2023 09:37:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672940267; cv=none; d=google.com; s=arc-20160816; b=1H4NRJNLDEGuAaHtOnnOrH5rfz/0hcX/XZpkMOjIwKrbO1bzIuoS1NCwj37epBs+1x CQl3YLCCPSY8/m87s3T3OBvfFvoP5kywLUv2jOt3MidY/teCLBEoAdCBqyu9neuV6nL9 YPe8kvUHPun3KOiQ+RieckTF7h/T2m15tnxcvxzCDdkTV0wtFAuFpEkSQ1irHWRiiSLA q8RtMU/i1A06KQ6C10M4v4HS5i/vWr/MmWzy7L/PmDGIdhgOE/2LRxc0/GtOceCOuTi1 cM41XAVVYmqB51i13SP4Q0N8KchRty/7BAPVB28CQB98dcVDWI/u+AYn6DR5xpjZ0qbQ b5ZQ== 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=eledW64ITyXCJRysHgCO0tP2RH9YIIThzccmYjDKTt8=; b=jEsLgg8JW0zGT1P3c8AxB5bzsmKnuGflqiePedAz31jiT5keionszOz9u0FjOswoFb 7KKdenoqWFXDObWq8/RD64wqZvzt1zovSbAlUnH321j/j0ozcXZRQFwVbSuS3hi+ILKg rayP/GM8tbsWfCBKYweZmU88oTZYJ0Wqa3eclSrmjBxZAOx3YJj9DDwppjRr3Z/LNi46 L3HQfVPRJajVftC21X8tEHAIxE6sKpbsDMAvSdE0ke/ekTMX1uZqZvFYBIwLLt/G9lyr baQZY2dyOPajHNAaOwlUMdlrzYad/E5cg6FS83Cvzq71Mxuy5TFi1i7NLqtOKgpeNF52 kknA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ky/q1lnu"; 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 d6-20020a05620a240600b006feb1f7121csi21898973qkn.475.2023.01.05.09.37.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jan 2023 09:37:47 -0800 (PST) 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="Ky/q1lnu"; 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 1pDTTI-0006yx-TB; Thu, 05 Jan 2023 11:52:04 -0500 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 1pDTTH-0006wW-CY for qemu-devel@nongnu.org; Thu, 05 Jan 2023 11:52:03 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDTTC-00017B-9l for qemu-devel@nongnu.org; Thu, 05 Jan 2023 11:52:03 -0500 Received: by mail-wr1-x42c.google.com with SMTP id co23so36753118wrb.4 for ; Thu, 05 Jan 2023 08:51:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=eledW64ITyXCJRysHgCO0tP2RH9YIIThzccmYjDKTt8=; b=Ky/q1lnuWeRl0J7fyVbf/oPZRUuAPii0RjSWgKvcMe8anv2MCeTbcQoZy/9Bk+HSny m0yVpEqDM3Djjqb4+MSu/RGkbRJ6YdgzZl2JnEtbeK+aamaZDFSFG048F/5McbqcPh0H QxSkb0plvFDawJ+OF7v1pwg5NBueO0WZM3vF4gB/PLd6HslkmlO6isIV21fdJxcoPvyn 6JRx2ZX5+NIg8qM3/RBf+J6RVQ/8lb5NSZWNK5ZsuMEWeeuc4fcIINkG8drBcTs62Fhe iKY86pZlOemqR/o52/mAkBfZFi4aAZtTIIUKaGSPVo1CXiwPM9xWvBU/JMIohnRytMPK /+tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=eledW64ITyXCJRysHgCO0tP2RH9YIIThzccmYjDKTt8=; b=VODIfwBJbJ0IIaEm0srUZY9B3ARDM0nQ4wAip7tytqVqMfSOrFftiHGFCsDAzF+6Q3 pcyEtx+Vrl1kJiP1kstP92IxlqObD64trEEXpC47qEBjsWItm1TdpFFLzfyhXAp0toob IvAZ19pibg9JF+jiAVtMVHOAEjO28VG2DlT/KiLnxijZkwoMMUmXGLAc7U4m3mgCmzve T7DG7j1gHMybPbvuy3H19imj+GaSw976gQ9uWZRvrIQG26EWbcqWc9nhM1akbQiiZK6u iqzj6pUz1HH2xeeWF1etBsqMCHZ8Igp1BZ8dfEv3M50EWXK5OihRPjRVw39K5jhiYrR+ 9hLg== X-Gm-Message-State: AFqh2kqVkoLBCM/hZVphMMsGi+8tjCHGW7qn1wCEETNC3vh/7FYHNpGC aUZJ4REYblIROguHkAQMZtHayw== X-Received: by 2002:a5d:430e:0:b0:279:53e1:5178 with SMTP id h14-20020a5d430e000000b0027953e15178mr24462986wrq.45.1672937516748; Thu, 05 Jan 2023 08:51:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f1-20020a5d5681000000b002714b3d2348sm37438617wrv.25.2023.01.05.08.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 08:51:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B51E1FFC9; Thu, 5 Jan 2023 16:43:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org, alex.bennee@gmail.com Cc: David Hildenbrand , Sunil Muthuswamy , Aurelien Jarno , Michael Rolnik , Aleksandar Rikalo , Greg Kurz , Ilya Leoshkevich , Thomas Huth , qemu-ppc@nongnu.org, Laurent Vivier , Max Filippov , Yanan Wang , Marek Vasut , Stafford Horne , Peter Maydell , Daniel Henrique Barboza , Palmer Dabbelt , =?utf-8?q?Alex_Benn=C3=A9e?= , Taylor Simpson , Marcel Apfelbaum , Alexandre Iooss , Chris Wulff , Richard Henderson , Eduardo Habkost , Song Gao , Mark Cave-Ayland , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Artyom Tarasenko , Paolo Bonzini , qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Bastian Koppelmann , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Bin Meng , Mahmoud Mandour , David Gibson , Yoshinori Sato , Xiaojuan Yang , qemu-arm@nongnu.org Subject: [PATCH v2 18/21] gdbstub: don't use target_ulong while handling registers Date: Thu, 5 Jan 2023 16:43:17 +0000 Message-Id: <20230105164320.2164095-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230105164320.2164095-1-alex.bennee@linaro.org> References: <20230105164320.2164095-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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 This is a hangover from the original code. addr is misleading as it is only a really a register id. While len will never exceed MAX_PACKET_LENGTH I've used size_t as that is what strlen returns. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- gdbstub/gdbstub.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 4547ca3367..c50c2f8e0f 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1192,7 +1192,8 @@ static void handle_read_mem(GArray *params, void *user_ctx) static void handle_write_all_regs(GArray *params, void *user_ctx) { - target_ulong addr, len; + int reg_id; + size_t len; uint8_t *registers; int reg_size; @@ -1204,9 +1205,10 @@ static void handle_write_all_regs(GArray *params, void *user_ctx) len = strlen(get_param(params, 0)->data) / 2; gdb_hextomem(gdbserver_state.mem_buf, get_param(params, 0)->data, len); registers = gdbserver_state.mem_buf->data; - for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs && len > 0; - addr++) { - reg_size = gdb_write_register(gdbserver_state.g_cpu, registers, addr); + for (reg_id = 0; + reg_id < gdbserver_state.g_cpu->gdb_num_g_regs && len > 0; + reg_id++) { + reg_size = gdb_write_register(gdbserver_state.g_cpu, registers, reg_id); len -= reg_size; registers += reg_size; } @@ -1215,15 +1217,16 @@ static void handle_write_all_regs(GArray *params, void *user_ctx) static void handle_read_all_regs(GArray *params, void *user_ctx) { - target_ulong addr, len; + int reg_id; + size_t len; cpu_synchronize_state(gdbserver_state.g_cpu); g_byte_array_set_size(gdbserver_state.mem_buf, 0); len = 0; - for (addr = 0; addr < gdbserver_state.g_cpu->gdb_num_g_regs; addr++) { + for (reg_id = 0; reg_id < gdbserver_state.g_cpu->gdb_num_g_regs; reg_id++) { len += gdb_read_register(gdbserver_state.g_cpu, gdbserver_state.mem_buf, - addr); + reg_id); } g_assert(len == gdbserver_state.mem_buf->len);