From patchwork Wed Apr 15 10:42:08 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: 185473 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295718ecu; Wed, 15 Apr 2020 03:44:33 -0700 (PDT) X-Google-Smtp-Source: APiQypI1KZCsbk24LWJaWDlu+Kl+SjFHJ4yCtlQdOUIAjHoB4fdhS+zC5Sx8yJ8q+Q7y5DzSvOoU X-Received: by 2002:a37:a9c7:: with SMTP id s190mr4538915qke.75.1586947473356; Wed, 15 Apr 2020 03:44:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947473; cv=none; d=google.com; s=arc-20160816; b=EuAHe9J0HiUyRK6uWiFybhLXJ8tV9o5tazUXLMf8lZ64Rdp/XDbyxJG2IU+TbnQwr5 mLUXHWBAKNld20W+tb0Wbv1AZanDPi5VAQPZz28FVgAPU01Zyn8IJRZKmMy+v2zzhGPx dMRs6q2YbeLM/EvgPU9F2zPYBHvdhsydds4VL+T4K8nswsdUGxqWmLExi96uubJ02bDy xz0nvQkgBFHiiNNmY2CHKu+rgxwSDCcebmNvuEdVqvvOVCZWDu4HR9i7QzmUJkz43dvp zYKSPrAUXXR1ljvsP40D6aPZ9kUljjF+X7pEmsUrcCdLRfIfsPYXb+a0YDBQxfV/m8yN xrOw== 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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=v7OeCobLSwkgDDUASaAN6uqUfWoEHQtK3zEQJfGd8rpRcXjVFfjmQ2A82mp69hGpve O7OzXs2YpCQvedstdyZqUq/lZh0xOaKo4htjDzeNuQ/TDWdMxcjWAWqxmjVnSkR1HC3N wlmE9lTP8Ut4227FhcksGmSjYiNiVhDny1fNx15tzwkiKGoNoqEuW+KIiOYSs336bSGC YS45CX0TI+gpl1kWx0DWzjAiAGjRFHDButUi2cA680lZ3PlvRBb3jgJLLNczXQyT3fj+ EX8loMjc+sbv7aJlBlTmD/zfF8A3YmeE6SdfBjuDIZoLDOtLbkPjDfpCjT3+8UPHf/xs OZEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kVn17K3R; 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 c10si8945504qtp.248.2020.04.15.03.44.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:44:33 -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=kVn17K3R; 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]:47662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfWy-0005im-R6 for patch@linaro.org; Wed, 15 Apr 2020 06:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUw-0002Pw-CT for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUr-00038m-Mb for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:26 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53113) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUr-00038K-Gm for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:21 -0400 Received: by mail-wm1-x32a.google.com with SMTP id o81so11243878wmo.2 for ; Wed, 15 Apr 2020 03:42:21 -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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=kVn17K3RRpWAUiMVy8jLloOQ73Uzb/t3cz8e3frYLgH5nHxI5YVgqZnJ1FhIh+h5LS OYOgUdoj/egm1rChyWkXP9tunqhrEpma9q4NPthI+C20c9DMuOfbyTpXw5SiDY4qmBI/ nzuPgQMjEOQ65MpT/8E2Pe3Z79axe423n3nLM0YXt2sjX4d50EZblNkCC+BGHI0Uil9a 75k84yJfySKba0BZSvL4DXc5YIBHC4hwn/k61+qU2+gcX9B9SMiBp+x4aQdifhOWk8Fm tjyJLtkNtop8mHXLXKWqhFjGOA53CVg7gcrk9PHhGTwEhBK6t2YZect2qFupHkJky3A7 Z+sg== 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=lUvP8ILsx2IDdEAZ5yyYY9/3My9j0MLorL0tokHSiKc=; b=kjabjz9PhEbc/HwMN4b2QPCIlaT1U4F8zPSDGrbOlkJJjkQoU1JIeNuP3++2H8uySx aXC2QDSf8ix0yPXQV7rjj5wVECgj6JhEVQwhn6U7PDCuRRwh7CQtA840EWBYvyKjwwdp 9Qdqz+joedppXdVTlVTrwFIRF9e2AdVx6ctXaeBbJEWbKvVRrePJrMsIDmQVyeO0iot1 mSQrjKcDhRsTGHXQ/j7ECRISi6cWBON+TXPDi68PXdv5akQjm7oCtenOHP/3ACws/zaE JjW67+fzFbWnyNNDsy/JrLXWasNPNM8KgDgyrI+2GCr3St2G4UzXtTjcM+lnubFolgJ9 IjnA== X-Gm-Message-State: AGi0PuZjA//74iwTRABHDHhYHBanKsuv+EGdemsjzJoZ/zlH6VAqzmKJ 6WqOZrNMAqxab+LIFSZBHQfjPg== X-Received: by 2002:a1c:4409:: with SMTP id r9mr4712601wma.165.1586947340337; Wed, 15 Apr 2020 03:42:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w17sm14375640wru.20.2020.04.15.03.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6C2B91FF91; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/8] target/m68k/helper: Fix m68k_fpu_gdb_get_reg() use of GByteArray Date: Wed, 15 Apr 2020 11:42:08 +0100 Message-Id: <20200415104211.9388-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415104211.9388-1-alex.bennee@linaro.org> References: <20200415104211.9388-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::32a 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Peter Xu , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since a010bdbe719 the gdbstub API takes a GByteArray*. Unfortunately we forgot to update the gdb_get_reg*() calls. Do it now. Fixes: a010bdbe719 ("extend GByteArray to read register helpers") Reported-by: Peter Xu Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200409172509.4078-1-philmd@redhat.com> Message-Id: <20200414200631.12799-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 014657c6372..cad40838956 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -109,8 +109,8 @@ static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n) { if (n < 8) { int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper); - len += gdb_get_reg16(mem_buf + len, 0); - len += gdb_get_reg64(mem_buf + len, env->fregs[n].l.lower); + len += gdb_get_reg16(mem_buf, 0); + len += gdb_get_reg64(mem_buf, env->fregs[n].l.lower); return len; } switch (n) {