From patchwork Thu Apr 9 21:15:27 2020 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: 185330 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp2324138ilr; Thu, 9 Apr 2020 14:21:22 -0700 (PDT) X-Google-Smtp-Source: APiQypIBppoi2p9+f0866mflk0x0RvmEErwvFzurJZXWhPUv1mi6lafBO1mFojtMK+fl3Dbhx4pY X-Received: by 2002:a05:620a:16c2:: with SMTP id a2mr911480qkn.245.1586467281937; Thu, 09 Apr 2020 14:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586467281; cv=none; d=google.com; s=arc-20160816; b=pmf/FZbYovg7WOVOIq4mgyb9wxbr7C3VsZCui9G7mj9RZy0VYwRGx6DEZw/ijQhvJJ 3lScObxBE9BRmnAXFUSjumiwOYWCCl5Z6aNJ4qginPJtnclfNmppjhRPAVarOKKs/W/Z h+kI1OvEpftRxUMHYqjzDGZKwIAle+bKKmMG4b8hY4MSoYRqqq9InTKHuho7vZ+geFfq MhTfCXR3UEwyz4ZRyaB4x8m5mzjgCWBTMKxqrs4anD5aBxCiMGkk4MwtrOQne+H69PxL lF+bMA9hkqKVuXPsPNbyFsux93y2tV046im3RYJxrMkUGqrTVmplbQgmJT2s4iOxqAts le5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=nVauCqAe02ZVV85VxJmPfUpt8hQkj2V7/kcfJf/XgeM=; b=mGbMDUfloiPZMJmewCCvt+uw/9fudlktEzib71KR2ftr2UhtjI6rt1hFX2aF775tk3 Fa9NtNJP2Uz2IVlx3qLaMXhrljR2jrqvk8yDLfHm02cIXYEcejVNQYXhp4um++glKlsZ kvRuiVsDQFWSn4Rx5g9sFFWzjSC3eEfPhZc/m0yj6cORAcsne5gBDE4c5DcJ8HUMMaKv DJBuAhTgLZhhMFGdicLUCCNXdQG8R03pAL6Kb4qyrSLKEvJWqlT/jhXqK83u3iNU1qcq DlHdHjARrqXdOqLJqnVCSpXbZzYvlJDSqq8yWgXLnxJyLUY/P8Z/r8LPS2UBn8FonasP v/fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cC1P2vPJ; 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=fail (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 l203si154090qke.210.2020.04.09.14.21.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Apr 2020 14:21:21 -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=fail header.i=@linaro.org header.s=google header.b=cC1P2vPJ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMebx-0001x5-FI for patch@linaro.org; Thu, 09 Apr 2020 17:21:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42394) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMeWY-0002CA-15 for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMeWW-0005p8-1a for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:44 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53436) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMeWV-0005nA-Rs for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:43 -0400 Received: by mail-wm1-x341.google.com with SMTP id d77so272869wmd.3 for ; Thu, 09 Apr 2020 14:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nVauCqAe02ZVV85VxJmPfUpt8hQkj2V7/kcfJf/XgeM=; b=cC1P2vPJJVf9RW/DyIIR90z4563W7+d9n5a+q5sh2AmPheKzS/sbazYOi1eQ8q9CEI MSD0p5Zi2L/1pqUFdzrLP4LWOnbvMyFYmtBsge+KZ00wQHUhTwWv+rZdx9v5RbVm6hXt IYrJ0gU53DYYUg/WKuwJ/HyUXcHBwhahh+wo4R+2uWqa8ViAA59I34TS+fJ8CQxQ42Gk 77GLAiRdbECed+RPxh6VXq2UW+6R7cMNS++vOe9wEKJdCAZ7TkJjTybZefC93c5aMRe2 0tb041iYA5CAXqPOAyz2KvJ6owFJAngVxMfku/T7w0D9sDo06DLKVlno6YXfnkEDJY7T yn/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=nVauCqAe02ZVV85VxJmPfUpt8hQkj2V7/kcfJf/XgeM=; b=T+dGWtm8mDAvu5Wxo8JPdKKqkupzbBybz8BB2HQvleBY/6t6KIdYu1X6l4UIuS+3ia 50X/TjsQI/YWGAmPykwRvozhX1bUZgj7MD5gJVWvpucYV0wIOTiMShXC5CdWvO8qlfEs DLPiXfpcDUJTA3bsxlnBE4IEaGSKCkaPoYtAZTzcqlBIE598g1he3zfAEY99MpHM86pX 7TFdEBjW5os8Bm7UrL4cQdhpFR9eovy1Rq45xhlJsRQ6JsZiT/D+FxDzq8R+1Mq9kzMA oAGAIpL6qqBtOJUwYn3ymajUOmLuSNWXbIQxkWMjevi6gIAerf2ZkDcu0o5M4VaJettt PUZw== X-Gm-Message-State: AGi0PubzkEuN6Mov1ZEuudUE0tT+hktxesVo1/Y0DdgpBie/wObzBipt 5aTevF1vLEnTJsl11n2DGauh8Q== X-Received: by 2002:a1c:6787:: with SMTP id b129mr1822353wmc.165.1586466942652; Thu, 09 Apr 2020 14:15:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a15sm4914213wme.17.2020.04.09.14.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 14:15:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D6EF61FF98; Thu, 9 Apr 2020 22:15:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/11] gdbstub: i386: Fix gdb_get_reg16() parameter to unbreak gdb Date: Thu, 9 Apr 2020 22:15:27 +0100 Message-Id: <20200409211529.5269-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200409211529.5269-1-alex.bennee@linaro.org> References: <20200409211529.5269-1-alex.bennee@linaro.org> 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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Peter Xu , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu We should only pass in gdb_get_reg16() with the GByteArray* object itself, no need to shift. Without this patch, gdb remote attach will crash QEMU. Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Signed-off-by: Peter Xu Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200409164954.36902-3-peterx@redhat.com> --- target/i386/gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Tested-by: Stefano Garzarella Reviewed-by: Richard Henderson diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index f3d23b614ee..b98a99500ae 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -106,7 +106,7 @@ int x86_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) } else if (n >= IDX_FP_REGS && n < IDX_FP_REGS + 8) { floatx80 *fp = (floatx80 *) &env->fpregs[n - IDX_FP_REGS]; int len = gdb_get_reg64(mem_buf, cpu_to_le64(fp->low)); - len += gdb_get_reg16(mem_buf + len, cpu_to_le16(fp->high)); + len += gdb_get_reg16(mem_buf, cpu_to_le16(fp->high)); return len; } else if (n >= IDX_XMM_REGS && n < IDX_XMM_REGS + CPU_NB_REGS) { n -= IDX_XMM_REGS;