From patchwork Tue Feb 21 22:52:21 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: 655399 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp374855wrb; Tue, 21 Feb 2023 15:04:36 -0800 (PST) X-Google-Smtp-Source: AK7set9W26Zw4UljUqh8wQOGu1jEriOz6xrF/ERSEPmTuM+m7ooHzSWMKhv++9NuolJKUxWFlLnJ X-Received: by 2002:a2e:b4ac:0:b0:294:6e85:6268 with SMTP id q12-20020a2eb4ac000000b002946e856268mr1860296ljm.47.1677020675847; Tue, 21 Feb 2023 15:04:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677020675; cv=none; d=google.com; s=arc-20160816; b=zkhYQQ1Uft5VQofm1D9+fvAjxYPMV55AbRYT20yIhYdbhaswsW81Ut8DpI7HTq8ehb tNnpgQcMO0ckUIgHcKjs02c3Whn6IpZli4t2OjxVyaqyY3SWMVGEXApaNgQGYeBvz2Og 0EacCc/nKGp5WaXGxc+QlgB/2S0OXP09jodwSka5A6Oj3HCtSMgMtDYDUe6jS2fnfQ2m 9CMfRmTgShRKtLz7qk4snD1PN2xu4fuH6Rlv8ICJdX4po1KHQJRSpUNC3c90ryxa8kkY mAQCKXEyQwSi6NPPTERIrVAn9a7g228KQFeYCD2Y2RJOJYs+DCLLk7BqwqNsDiXGgj+V UsOQ== 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=FfDpSMP5aWzt33/jAq10zExN9Iaj9WqvgIV129lkgug=; b=YRtYQ6phYNvIm/+TkK7KysyaKJPIhtJmPHnI8l3ttne59d5niSN/vggSyEcHQ91xaB Bv8+d2kbOgHZkx5O37BXdLcADF5n1znuctANEwUIe3WJ+NPNAROYw93mEOFMmYEmPbpP i3MD99zP0hD5+tTjfbCOY46JZ8KRF7x4sX+Kkz2mHfLHrZPhpzPpO1Shs/7zhZZagQsB GgstYFHiRcRBaLWtjIYiKM/ZihvydKqojat/iUDsCgY0IdYNLfQQDTSo3vUkNoIn8cou ggTEcWzmupiQlvcZKHE9N7RBskq4ujhu9R4R61LD4y84bf+wasi3Rxv46NO4i4XM8DE3 +FIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aOC7ZWS4; 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 c5-20020a2e9d85000000b002932ed9efbesi3664119ljj.133.2023.02.21.15.04.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 15:04:35 -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=aOC7ZWS4; 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 1pUbeT-0006cR-BH; Tue, 21 Feb 2023 18:02:25 -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 1pUbeG-0006Rq-P3 for qemu-devel@nongnu.org; Tue, 21 Feb 2023 18:02:14 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUbe6-0006Fg-TT for qemu-devel@nongnu.org; Tue, 21 Feb 2023 18:02:12 -0500 Received: by mail-wm1-x331.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so2320015wmi.3 for ; Tue, 21 Feb 2023 15:02:00 -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=FfDpSMP5aWzt33/jAq10zExN9Iaj9WqvgIV129lkgug=; b=aOC7ZWS43Exy9YdqxvIsOdKTahIfg3ZI1HHPFIARiDPni4VicA/3/MAqDwo7kguETw aldhqJqHpNTnFc2BDrQW2/1IVJUOCLBb4NYX33GFiYmeqHoG4FRP6gQ3P2U8uOCB3nex aL3qb4lCVv4VILVaZDREWf2eSHUQbvfFs03csqawCFQQSk394v1pcWr5gq01tiEq8L/I wE8wXrls5rFnxRgroZ96sDsQj1/HQgEWo8lqdEaOcslHao3KivB5IQ9V4JgZLiPG074X H83uV8P0iwTfq+6AMBuTD0BkmIlMsAzf+d2zlVkuW3766fNoGTG/jr9tMRRF3ZjkTZX7 Q+9w== 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=FfDpSMP5aWzt33/jAq10zExN9Iaj9WqvgIV129lkgug=; b=sbRTt0FgX9Zi9EMv25q3jH5+rxPkmMky7z5copcst1akONl3fHK9FEUAC0dZxubQxS tXayQi35URLc9uKszH0uO3S8rTUPW/l/EoqmtcIEz9iR/eER+xn3MdBdzEQZ6WJvSebQ XOZzm9G8Zb9QKPrpzttVfgAxSpdoxVX1jhfvhfpR8ZxQiTzJ3nMMBLTktP6tfC1VtEC8 7lXKi47kwiDJo6dyzCOjQpsAhiDeCDcjNWeQ28gzLzHUhTGBh13EjBrDSMRAkZCmBAWX 3u4n0N24TbUwe1NwziwTL5sbeDgZP5JzCKPr23xOWROMYs6SjU1tCtzg1u3eZsWjJKqz KaEA== X-Gm-Message-State: AO0yUKU/qYRvoVk+eJ8uPHtjfWvd7Ltw+KfOrzLfnf1+cMJnmrJ54Uto gUYvod6Z8SV/oiWrNCvwONQXyQ== X-Received: by 2002:a05:600c:30d3:b0:3da:db4:6105 with SMTP id h19-20020a05600c30d300b003da0db46105mr9586919wmn.37.1677020519150; Tue, 21 Feb 2023 15:01:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u7-20020a05600c19c700b003e21f20b646sm6996506wmq.21.2023.02.21.15.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 15:01:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C04BE1FFC6; Tue, 21 Feb 2023 22:52:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, Yoshinori Sato , nicolas.eder@lauterbach.com, Stafford Horne , Daniel Henrique Barboza , Mahmoud Mandour , Taylor Simpson , mads@ynddal.dk, Marek Vasut , Artyom Tarasenko , Alistair Francis , qemu-ppc@nongnu.org, Yanan Wang , Sunil Muthuswamy , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Eduardo Habkost , Bin Meng , Bastian Koppelmann , Palmer Dabbelt , Marcel Apfelbaum , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Rolnik , Aleksandar Rikalo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Xiaojuan Yang , Richard Henderson , Peter Maydell , Alexandre Iooss , Chris Wulff , Jiaxun Yang , David Gibson , "Edgar E. Iglesias" , Greg Kurz , David Hildenbrand , Song Gao , Ilya Leoshkevich , Max Filippov , Mark Cave-Ayland Subject: [PATCH v3 18/24] gdbstub: don't use target_ulong while handling registers Date: Tue, 21 Feb 2023 22:52:21 +0000 Message-Id: <20230221225227.3735319-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221225227.3735319-1-alex.bennee@linaro.org> References: <20230221225227.3735319-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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 really a register id. While len will never exceed MAX_PACKET_LENGTH I've used size_t as that is what strlen returns. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- v3 - fix commit message - use unsigned for regid --- gdbstub/gdbstub.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 4814e8fbf3..7ae3ff52b3 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; + unsigned 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);