Message ID | 20190312085502.8203-35-david@gibson.dropbear.id.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 80F3E1669 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A33329451 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CFC92947F; Tue, 12 Mar 2019 09:28:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0589329451 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:28:11 +0000 (UTC) Received: from localhost ([127.0.0.1]:48060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1h3dhj-0004L0-8w for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Mar 2019 05:28:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dD0-0002Ta-7a for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dCz-0002Bv-An for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:26 -0400 Received: from ozlabs.org ([203.11.71.1]:37173) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dCy-0001ux-TS; Tue, 12 Mar 2019 04:56:25 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44JTMV6xCFz9sPW; Tue, 12 Mar 2019 19:55:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552380934; bh=SOuqjR73sXjFmud3vZ31oCB34YYYWp0PDi8PwfJjGmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBjPuas9YZfx3UYJaOFASD2jvABjwMZngilqiYWlqmLJ2oUPDmu5TYn60ceafplZc nQhZrJC83+rJzwnb/BJxmefaa9LSJJSEBIFQHfKyqFUDtXrUagwPKE3djAgdux0Zug +28lw5HLSPvsvNNlZ0BX/qtqIvl/QDMV80ZRfwKM= From: David Gibson <david@gibson.dropbear.id.au> To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 19:54:34 +1100 Message-Id: <20190312085502.8203-35-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 34/62] target/ppc: introduce single fpr_offset() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: lvivier@redhat.com, Richard Henderson <richard.henderson@linaro.org>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson <david@gibson.dropbear.id.au> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[PULL,01/62] vfio/spapr: Fix indirect levels calculation
|
expand
|
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 21e418d6b1..eaf4297616 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 nregs, int rx) } /* 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)); } 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); 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)); } 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)); } static inline void get_avr64(TCGv_i64 dst, int regno, bool high)