From nobody Mon Feb 9 22:38:05 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 1552208416318143.30880432090237; Sun, 10 Mar 2019 01:00:16 -0800 (PST) Received: from localhost ([127.0.0.1]:42212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2uJX-0004UJ-8y for importer@patchew.org; Sun, 10 Mar 2019 05:00:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2tor-0001gf-0E for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2toq-0001ny-15 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:28:28 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:60777) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2top-0001aM-I2; Sun, 10 Mar 2019 04:28:27 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44HDqr5L3Pz9sPh; Sun, 10 Mar 2019 19:27:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552206440; bh=ahJSzvBkrrC8KV0JUjtypJEAgVrZxxeVqzrAVh4BlHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlAKUCD8Gzen0KQKXHDDXXBy4q+kWCYQFvUzydmkVoNNJDeXRBn0wMeGwYxi4HANR 4DstCujrssEVmpcAEB1I6GyFP1rMoHT2VMxsVnlAhPuQiE1sOarnKqz7vUSQieb27e ZY9FmgywGM00yfPXLq612Rbk1OFkGbco2vGotaXk= From: David Gibson To: peter.maydell@linaro.org Date: Sun, 10 Mar 2019 19:26:37 +1100 Message-Id: <20190310082703.1245-35-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190310082703.1245-1-david@gibson.dropbear.id.au> References: <20190310082703.1245-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 34/60] target/ppc: introduce single fpr_offset() function 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 , groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.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 Instead of having multiple copies of the offset calculation logic, move it = to a single fpr_offset() function. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20190307180520.13868-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson --- target/ppc/cpu.h | 7 ++++++- target/ppc/translate.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 81763d72f9..15e053becd 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2563,9 +2563,14 @@ static inline bool lsw_reg_in_range(int start, int n= regs, int rx) } =20 /* Accessors for FP, VMX and VSX registers */ +static inline int fpr_offset(int i) +{ + return offsetof(CPUPPCState, vsr[i].u64[0]); +} + static inline uint64_t *cpu_fpr_ptr(CPUPPCState *env, int i) { - return &env->vsr[i].u64[0]; + return (uint64_t *)((uintptr_t)env + fpr_offset(i)); } =20 static inline uint64_t *cpu_vsrl_ptr(CPUPPCState *env, int i) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index b156be4d98..668d4cf75a 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -6677,12 +6677,12 @@ GEN_TM_PRIV_NOOP(trechkpt); =20 static inline void get_fpr(TCGv_i64 dst, int regno) { - tcg_gen_ld_i64(dst, cpu_env, offsetof(CPUPPCState, vsr[regno].u64[0])); + tcg_gen_ld_i64(dst, cpu_env, fpr_offset(regno)); } =20 static inline void set_fpr(int regno, TCGv_i64 src) { - tcg_gen_st_i64(src, cpu_env, offsetof(CPUPPCState, vsr[regno].u64[0])); + tcg_gen_st_i64(src, cpu_env, fpr_offset(regno)); } =20 static inline void get_avr64(TCGv_i64 dst, int regno, bool high) --=20 2.20.1