From nobody Wed Nov 12 08:40:00 2025 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1569341179; cv=none; d=zoho.com; s=zohoarc; b=USfYi4ZKZXicU2hz844NGdjRE3fgIPayyaAnWBcHcxNYbCX0UYgr8DdgvNRMzXaiNTF1p2gvWzI06wGrMZ3y9Y3xynjJueqOkWZY4Vyw/R9cr+02dYZiew5BF7jjJLPXCOez0MGybaejweTHuEHftoVZBMNQzsNyB8F5WXtsy+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569341179; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ELBb6TjvJ6ae7e2Bth14ToGJnIcqHesRn3lmfeq4msc=; b=QyYReL7QXK3XiR6/bxDnTDEiHWzzkQri94KNDU/0xXG50FTAdoFINhr+iRZjgSUoVwtJjNLEF4uxPIRYAHcTq3r76RVMOr9/HnjHToTcJUrPWQ01JpBEwNBQ+FhpWW9VBP7KCwLDIYbc9YFlNbwhuZOeVD+lJ5gwbbjZoIP3koc= ARC-Authentication-Results: i=1; mx.zoho.com; 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 156934117919771.272854245757; Tue, 24 Sep 2019 09:06:19 -0700 (PDT) Received: from localhost ([::1]:47706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCnKR-0007xH-Jk for importer@patchew.org; Tue, 24 Sep 2019 12:06:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51149) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCmuO-0008FD-0B for qemu-devel@nongnu.org; Tue, 24 Sep 2019 11:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCmuM-0006C5-BZ for qemu-devel@nongnu.org; Tue, 24 Sep 2019 11:39:19 -0400 Received: from mail.ilande.co.uk ([46.43.2.167]:35698 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCmuM-0005dK-2L; Tue, 24 Sep 2019 11:39:18 -0400 Received: from host86-138-245-63.range86-138.btcentralplus.com ([86.138.245.63] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1iCmrU-0007WZ-V5; Tue, 24 Sep 2019 16:36:22 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, pc@us.ibm.com, david@gibson.dropbear.id.au Date: Tue, 24 Sep 2019 16:35:51 +0100 Message-Id: <20190924153556.27575-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924153556.27575-1-mark.cave-ayland@ilande.co.uk> References: <20190924153556.27575-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.138.245.63 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/7] target/ppc: introduce set_dfp{64,128}() helper functions X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.43.2.167 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The existing functions (now incorrectly) assume that the MSB and LSB of DFP numbers are stored as consecutive 64-bit words in memory. Instead of access= ing the DFP numbers directly, introduce set_dfp{64,128}() helper functions to e= ase the switch to the correct representation. Signed-off-by: Mark Cave-Ayland --- target/ppc/dfp_helper.c | 90 ++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/target/ppc/dfp_helper.c b/target/ppc/dfp_helper.c index 354a4aa877..cb98780d20 100644 --- a/target/ppc/dfp_helper.c +++ b/target/ppc/dfp_helper.c @@ -47,6 +47,17 @@ static void get_dfp128(uint64_t *dst, uint64_t *dfp) dst[1] =3D dfp[LO_IDX]; } =20 +static void set_dfp64(uint64_t *dfp, uint64_t *src) +{ + dfp[0] =3D src[0]; +} + +static void set_dfp128(uint64_t *dfp, uint64_t *src) +{ + dfp[0] =3D src[HI_IDX]; + dfp[1] =3D src[LO_IDX]; +} + struct PPC_DFP { CPUPPCState *env; uint64_t t64[2], a64[2], b64[2]; @@ -413,10 +424,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *a, uint64_t *b) \ decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, &dfp.conte= xt); \ postprocs(&dfp); = \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); = \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); = \ } = \ } =20 @@ -735,10 +745,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *b, \ QUA_PPs(&dfp); \ \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; \ + set_dfp64(t, dfp.t64); \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; \ - t[1] =3D dfp.t64[LO_IDX]; \ + set_dfp128(t, dfp.t64); \ } \ } =20 @@ -759,10 +768,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *a, \ QUA_PPs(&dfp); \ \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; \ + set_dfp64(t, dfp.t64); \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; \ - t[1] =3D dfp.t64[LO_IDX]; \ + set_dfp128(t, dfp.t64); \ } \ } =20 @@ -843,10 +851,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *a, \ QUA_PPs(&dfp); \ \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; \ + set_dfp64(t, dfp.t64); \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; \ - t[1] =3D dfp.t64[LO_IDX]; \ + set_dfp128(t, dfp.t64); \ } \ } =20 @@ -867,10 +874,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *b, \ postprocs(&dfp); = \ = \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); = \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); = \ } = \ } =20 @@ -904,7 +910,8 @@ void helper_dctdp(CPUPPCState *env, uint64_t *t, uint64= _t *b) =20 dfp_prepare_decimal64(&dfp, 0, 0, env); decimal32ToNumber((decimal32 *)&b_short, &dfp.t); - decimal64FromNumber((decimal64 *)t, &dfp.t, &dfp.context); + decimal64FromNumber((decimal64 *)&dfp.t64, &dfp.t, &dfp.context); + set_dfp64(t, dfp.t64); dfp_set_FPRF_from_FRT(&dfp); } =20 @@ -920,14 +927,14 @@ void helper_dctqpq(CPUPPCState *env, uint64_t *t, uin= t64_t *b) dfp_set_FPRF_from_FRT(&dfp); =20 decimal128FromNumber((decimal128 *)&dfp.t64, &dfp.t, &dfp.context); - t[0] =3D dfp.t64[HI_IDX]; - t[1] =3D dfp.t64[LO_IDX]; + set_dfp128(t, dfp.t64); } =20 void helper_drsp(CPUPPCState *env, uint64_t *t, uint64_t *b) { struct PPC_DFP dfp; uint32_t t_short =3D 0; + uint64_t t64; dfp_prepare_decimal64(&dfp, 0, b, env); decimal32FromNumber((decimal32 *)&t_short, &dfp.b, &dfp.context); decimal32ToNumber((decimal32 *)&t_short, &dfp.t); @@ -937,7 +944,8 @@ void helper_drsp(CPUPPCState *env, uint64_t *t, uint64_= t *b) dfp_check_for_UX(&dfp); dfp_check_for_XX(&dfp); =20 - *t =3D t_short; + t64 =3D (uint64_t)t_short; + set_dfp64(t, &t64); } =20 void helper_drdpq(CPUPPCState *env, uint64_t *t, uint64_t *b) @@ -953,9 +961,9 @@ void helper_drdpq(CPUPPCState *env, uint64_t *t, uint64= _t *b) dfp_check_for_UX(&dfp); dfp_check_for_XX(&dfp); =20 + dfp.t64[0] =3D dfp.t64[1] =3D 0; decimal64FromNumber((decimal64 *)dfp.t64, &dfp.t, &dfp.context); - t[0] =3D dfp.t64[0]; - t[1] =3D 0; + set_dfp128(t, dfp.t64); } =20 #define DFP_HELPER_CFFIX(op, size) = \ @@ -970,10 +978,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint64= _t *b) \ CFFIX_PPs(&dfp); = \ = \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); = \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); = \ } = \ } =20 @@ -1016,7 +1023,7 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint6= 4_t *b) \ } = \ } = \ = \ - *t =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); = \ } =20 DFP_HELPER_CTFIX(dctfix, 64) @@ -1078,10 +1085,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint= 64_t *b, uint32_t sp) \ } \ \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); \ } \ } =20 @@ -1150,10 +1156,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint= 64_t *b, uint32_t s) \ &dfp.context); = \ dfp_set_FPRF_from_FRT(&dfp); = \ if ((size) =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); = \ } else if ((size) =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); = \ } = \ } =20 @@ -1164,27 +1169,30 @@ DFP_HELPER_ENBCD(denbcdq, 128) void helper_##op(CPUPPCState *env, uint64_t *t, uint64_t *b) \ { \ struct PPC_DFP dfp; \ + uint64_t t64; \ \ dfp_prepare_decimal##size(&dfp, 0, b, env); \ \ if (unlikely(decNumberIsSpecial(&dfp.b))) { \ if (decNumberIsInfinite(&dfp.b)) { \ - *t =3D -1; \ + t64 =3D -1; \ } else if (decNumberIsSNaN(&dfp.b)) { \ - *t =3D -3; \ + t64 =3D -3; \ } else if (decNumberIsQNaN(&dfp.b)) { \ - *t =3D -2; \ + t64 =3D -2; \ } else { \ assert(0); \ } \ + set_dfp64(t, &t64); \ } else { \ if ((size) =3D=3D 64) { \ - *t =3D dfp.b.exponent + 398; \ + t64 =3D dfp.b.exponent + 398; \ } else if ((size) =3D=3D 128) { \ - *t =3D dfp.b.exponent + 6176; \ + t64 =3D dfp.b.exponent + 6176; \ } else { \ assert(0); \ } \ + set_dfp64(t, &t64); \ } \ } =20 @@ -1251,10 +1259,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint= 64_t *a, uint64_t *b) \ &dfp.context); \ } \ if (size =3D=3D 64) { = \ - t[0] =3D dfp.t64[0]; = \ + set_dfp64(t, dfp.t64); \ } else if (size =3D=3D 128) { = \ - t[0] =3D dfp.t64[HI_IDX]; = \ - t[1] =3D dfp.t64[LO_IDX]; = \ + set_dfp128(t, dfp.t64); \ } \ } =20 @@ -1344,10 +1351,9 @@ void helper_##op(CPUPPCState *env, uint64_t *t, uint= 64_t *a, \ } \ \ if ((size) =3D=3D 64) { \ - t[0] =3D dfp.t64[0]; \ + set_dfp64(t, dfp.t64); \ } else { \ - t[0] =3D dfp.t64[HI_IDX]; \ - t[1] =3D dfp.t64[LO_IDX]; \ + set_dfp128(t, dfp.t64); \ } \ } =20 --=20 2.20.1