From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50FA9C433B4 for ; Mon, 17 May 2021 18:30:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7364611BF for ; Mon, 17 May 2021 18:30:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7364611BF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lii0r-0006ye-W9 for qemu-devel@archiver.kernel.org; Mon, 17 May 2021 14:30:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlU-0006E0-F1 for qemu-devel@nongnu.org; Mon, 17 May 2021 14:14:52 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:34435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlM-0004Rz-Ng for qemu-devel@nongnu.org; Mon, 17 May 2021 14:14:52 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBV2f-1lcuLe1YVj-00Cz6X; Mon, 17 May 2021 20:14:41 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 29/59] linux-user/sparc: Add 64-bit support to fpu save/restore Date: Mon, 17 May 2021 20:13:54 +0200 Message-Id: <20210517181424.8093-30-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:KXJ/0d5omk5Juih4Xw2n9mycDavHf0bPOWrPEy2XQBy/XbYJNnk Bk+ZBDNoqaZog5NG3Vnqu9BRfSjnoplTin1vUwYwcRKcN2vdsVPIT7t0uHmZxyvUK22nSi2 b0tpKdlUftOq2LhbkLgQ5gFxfjBUlONe+URRLNTC1laqTRJSgxwWco+XhawLiDGfLpHnaeo p/1IETYDZ5uWjO11YXz8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:htoltKhZhEY=:KQkyuhBW6okJSLniV2A2p5 IFZi+dEz+4UeoB5N4itTrVoP3fnpDoPtvT0f7wYU7z0Jq9YLnFIIoK2uFknbxdsQmfjv+jg9k twsL7EO+9uFKw4vhJ4dp8FbIzKHuKCsa7t6FPY2NI7Q+wzmo+zpozsxxWeTEzf1eMiG5hTT8f Ulq68VQBKG3tzg9//vzJtKmr6v2aH8f01i3oFL7VLFCkPTbGp7TYclyyvF20hPI4GRXZWCHZj /XOChRhbyzjEb7XhRmK61AOMdaea3WdgyTPlEakuZtiOMBjfxfkNSUqOzsV/EyA6zC8gtiQ2n Nt/rlsvp8s8cbNEgspNYLZrSh7LTFAX4BNURhS13EEs4O6sglfJ9rvH+akgcnTT9j+38GM72j 0I8MnzFfwDSIRTX3wjURqXI0RumbNDM0hgw2ZYGrT7kD1ADbfQniU9WcKGY3zH5PpOfw8Lzzf Mt+hyZK5cTukonHPxSRCh8lTHFTMC6PGTVPoa68ZSg4DduLyfYMUHpOx9Wt2xhcMuV0R6RZkG WHnyIjfgu0BpC2RGF/dNnU= Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The shape of the kernel's __siginfo_fpu_t is dependent on the cpu type, not the abi. Which is weird, but there ya go. Signed-off-by: Richard Henderson Message-Id: <20210426025334.1168495-23-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/sparc/signal.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c index 0ff57af43d1e..41a8b33bac3c 100644 --- a/linux-user/sparc/signal.c +++ b/linux-user/sparc/signal.c @@ -44,6 +44,12 @@ struct target_stackf { }; struct target_siginfo_fpu { +#ifdef TARGET_SPARC64 + uint64_t si_double_regs[32]; + uint64_t si_fsr; + uint64_t si_gsr; + uint64_t si_fprs; +#else /* It is more convenient for qemu to move doubles, not singles. */ uint64_t si_double_regs[16]; uint32_t si_fsr; @@ -52,6 +58,7 @@ struct target_siginfo_fpu { uint32_t insn_addr; uint32_t insn; } si_fpqueue [16]; +#endif }; struct target_signal_frame { @@ -167,21 +174,50 @@ static void save_fpu(struct target_siginfo_fpu *fpu, CPUSPARCState *env) { int i; +#ifdef TARGET_SPARC64 + for (i = 0; i < 32; ++i) { + __put_user(env->fpr[i].ll, &fpu->si_double_regs[i]); + } + __put_user(env->fsr, &fpu->si_fsr); + __put_user(env->gsr, &fpu->si_gsr); + __put_user(env->fprs, &fpu->si_fprs); +#else for (i = 0; i < 16; ++i) { __put_user(env->fpr[i].ll, &fpu->si_double_regs[i]); } __put_user(env->fsr, &fpu->si_fsr); __put_user(0, &fpu->si_fpqdepth); +#endif } static void restore_fpu(struct target_siginfo_fpu *fpu, CPUSPARCState *env) { int i; +#ifdef TARGET_SPARC64 + uint64_t fprs; + __get_user(fprs, &fpu->si_fprs); + + /* In case the user mucks about with FPRS, restore as directed. */ + if (fprs & FPRS_DL) { + for (i = 0; i < 16; ++i) { + __get_user(env->fpr[i].ll, &fpu->si_double_regs[i]); + } + } + if (fprs & FPRS_DU) { + for (i = 16; i < 32; ++i) { + __get_user(env->fpr[i].ll, &fpu->si_double_regs[i]); + } + } + __get_user(env->fsr, &fpu->si_fsr); + __get_user(env->gsr, &fpu->si_gsr); + env->fprs |= fprs; +#else for (i = 0; i < 16; ++i) { __get_user(env->fpr[i].ll, &fpu->si_double_regs[i]); } __get_user(env->fsr, &fpu->si_fsr); +#endif } void setup_frame(int sig, struct target_sigaction *ka, -- 2.31.1