From nobody Tue Feb 10 05:44:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552382935261501.30637591717175; Tue, 12 Mar 2019 02:28:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:48062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3diN-0004Yj-6B for importer@patchew.org; Tue, 12 Mar 2019 05:28:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3dD8-0002dy-TO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3dD7-0002J1-TG for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:34 -0400 Received: from ozlabs.org ([203.11.71.1]:44915) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3dD7-00023h-7S; Tue, 12 Mar 2019 04:56:33 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44JTMc3wfvz9sBp; Tue, 12 Mar 2019 19:55:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552380940; bh=ar2ZpziWXyWyvtTQQnLyP4+oHMt9O0y9AfY0sMFWzpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DLuFD89ieQoIqg6LwAcgGPLIUyfywXaq2112T6W5r2jIe0DfVUrUlthRXaspMcEix kRpVBbtUOiMxL10UaGtVXg13atn1FQaGHFQGEsGI+mEaGxqJ0hGpmFJeCY/r0VDuOp lloKAgTriU0P5y3DFbzfeJFWyBSPy/T4d5h+u4wk= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 19:54:39 +1100 Message-Id: <20190312085502.8203-40-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312085502.8203-1-david@gibson.dropbear.id.au> References: <20190312085502.8203-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 39/62] target/ppc: switch fpr/vsrl registers so all VSX registers are in host endian order X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Richard Henderson , Mark Cave-Ayland , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland When VSX support was initially added, the fpr registers were added at offset 0 of the VSR register and the vsrl registers were added at offset 1. This is in contrast to the VMX registers (the last 32 VSX registers) whi= ch are stored in host-endian order. Switch the fpr/vsrl registers so that the lower 32 VSX registers are now al= so stored in host endian order to match the VMX registers. This ensures that T= CG vector operations involving mixed VMX and VSX registers will function correctly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20190307180520.13868-7-mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson --- target/ppc/cpu.h | 4 ++-- target/ppc/internal.h | 8 ++++---- target/ppc/machine.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 7e18866ee2..612dd05e94 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2585,7 +2585,7 @@ static inline bool lsw_reg_in_range(int start, int nr= egs, int rx) =20 static inline int fpr_offset(int i) { - return offsetof(CPUPPCState, vsr[i].u64[0]); + return offsetof(CPUPPCState, vsr[i].VsrD(0)); } =20 static inline uint64_t *cpu_fpr_ptr(CPUPPCState *env, int i) @@ -2595,7 +2595,7 @@ static inline uint64_t *cpu_fpr_ptr(CPUPPCState *env,= int i) =20 static inline int vsrl_offset(int i) { - return offsetof(CPUPPCState, vsr[i].u64[1]); + return offsetof(CPUPPCState, vsr[i].VsrD(1)); } =20 static inline int vsr_full_offset(int i) diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 3ebbdf4da4..fb6f64ed1e 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -206,14 +206,14 @@ EXTRACT_HELPER_SPLIT_3(DCMX_XV, 5, 16, 0, 1, 2, 5, 1,= 6, 6); =20 static inline void getVSR(int n, ppc_vsr_t *vsr, CPUPPCState *env) { - vsr->VsrD(0) =3D env->vsr[n].u64[0]; - vsr->VsrD(1) =3D env->vsr[n].u64[1]; + vsr->VsrD(0) =3D env->vsr[n].VsrD(0); + vsr->VsrD(1) =3D env->vsr[n].VsrD(1); } =20 static inline void putVSR(int n, ppc_vsr_t *vsr, CPUPPCState *env) { - env->vsr[n].u64[0] =3D vsr->VsrD(0); - env->vsr[n].u64[1] =3D vsr->VsrD(1); + env->vsr[n].VsrD(0) =3D vsr->VsrD(0); + env->vsr[n].VsrD(1) =3D vsr->VsrD(1); } =20 void helper_compute_fprf_float16(CPUPPCState *env, float16 arg); diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 756b6d2971..a92d0ad3a3 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -150,7 +150,7 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size, { ppc_vsr_t *v =3D pv; =20 - v->u64[0] =3D qemu_get_be64(f); + v->VsrD(0) =3D qemu_get_be64(f); =20 return 0; } @@ -160,7 +160,7 @@ static int put_fpr(QEMUFile *f, void *pv, size_t size, { ppc_vsr_t *v =3D pv; =20 - qemu_put_be64(f, v->u64[0]); + qemu_put_be64(f, v->VsrD(0)); return 0; } =20 @@ -181,7 +181,7 @@ static int get_vsr(QEMUFile *f, void *pv, size_t size, { ppc_vsr_t *v =3D pv; =20 - v->u64[1] =3D qemu_get_be64(f); + v->VsrD(1) =3D qemu_get_be64(f); =20 return 0; } @@ -191,7 +191,7 @@ static int put_vsr(QEMUFile *f, void *pv, size_t size, { ppc_vsr_t *v =3D pv; =20 - qemu_put_be64(f, v->u64[1]); + qemu_put_be64(f, v->VsrD(1)); return 0; } =20 --=20 2.20.1