From patchwork Mon May 17 18:13:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1479740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4FkSRl645Qz9sWQ for ; Tue, 18 May 2021 04:32:51 +1000 (AEST) Received: from localhost ([::1]:38818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lii2r-0001dN-Ok for incoming@patchwork.ozlabs.org; Mon, 17 May 2021 14:32:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlc-0006Tt-1O for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:00 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:41699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlN-0004Rp-9l for qemu-devel@nongnu.org; Mon, 17 May 2021 14:14:59 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MEmpp-1lgBb92IfL-00GGth; Mon, 17 May 2021 20:14:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 27/59] linux-user/sparc: Clean up setup_frame Date: Mon, 17 May 2021 20:13:52 +0200 Message-Id: <20210517181424.8093-28-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 X-Provags-ID: V03:K1:XAM1LYUEgaiQWSAoIKpCHNd376jlUz53JroepIgpoix0UmgqsNa qEPXURe6GDPC7KL9uxvZb4RNmQLNsbzoSPb3U6GOEWcU0bGMMWWHvgUFNiKge/b7gbimgDP 2l6l2P3vqFzgk0iciJTJnQ41IZuKmLKWGcTp/mHyawl8wIqTp08EdMZPwYFbgZoZ3nqnI6h tVWZHGNoAb6oNFVWzgBSg== X-UI-Out-Filterresults: notjunk:1;V03:K0:QLGolkIwpDg=:T3Eo5Pfm3hekbDqyh+6PCM h3DVdv78ABMk7FyjgZXiK+GXscZ4XBzU5ayRB+SMpjldu/nywaJyA5DpOFm793R4A/knj0YM9 t4oRzEAbFBidhBb+VS8P6vmd0J8y4RWPKI3bBDsIztKx/MH6ZsIpWqwbfQCYgUpdF/NxBivDD tkSSHBMuCFaWSmSQw2DOxTApSXQTfeDbcaetrhwfhOtFxilJp9hnk6SNFJLy1xFMme+xhG/Cr hW/kczVbckTukdkqkBVP2n/3dvAbqL9k9Ap19SYnE4JuUl485SZk7MgTL7d6h2mfuPJMx1H0K EdX2RuM8FqSMmIAaFLCZnNmi1JEllqLHgsTs12ZofGlaXkLRYPdVn15XUGUSw46TMJN5gWEMK XjgVJe1RLE8/XLT95JJBgTKoWQYF9prptdjIiIBntdhZw5dOsbdk2d8/rW47P6lDMMJHPAqIC 0VB/qnmUipjUYYghyQveDrROMvqwZweE5Z0CCpOFz9zSC0L9nfzlTgjzP8zJgjmmN87URcaHc Q23tj3bFOJiM/weE6O6F+s= Received-SPF: none client-ip=212.227.17.10; 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, RCVD_IN_MSPIKE_H2=-0.001, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Clean up a goto label with a single use. Remove #if 0. Remove useless parentheses. Fold constants into __put_user. Signed-off-by: Richard Henderson Message-Id: <20210426025334.1168495-21-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/sparc/signal.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c index 4a0578ebf37b..f0f614a3af7a 100644 --- a/linux-user/sparc/signal.c +++ b/linux-user/sparc/signal.c @@ -192,14 +192,13 @@ void setup_frame(int sig, struct target_sigaction *ka, size_t sf_size = sizeof(*sf) + sizeof(struct target_siginfo_fpu); int i; - /* 1. Make sure everything is clean */ - sf_addr = get_sigframe(ka, env, sf_size); trace_user_setup_frame(env, sf_addr); sf = lock_user(VERIFY_WRITE, sf_addr, sf_size, 0); if (!sf) { - goto sigsegv; + force_sigsegv(sig); + return; } /* 2. Save the current process state */ @@ -228,33 +227,21 @@ void setup_frame(int sig, struct target_sigaction *ka, /* 4. signal handler */ env->pc = ka->_sa_handler; - env->npc = (env->pc + 4); + env->npc = env->pc + 4; + /* 5. return to kernel instructions */ if (ka->ka_restorer) { env->regwptr[WREG_O7] = ka->ka_restorer; } else { - uint32_t val32; - env->regwptr[WREG_O7] = sf_addr + offsetof(struct target_signal_frame, insns) - 2 * 4; /* mov __NR_sigreturn, %g1 */ - val32 = 0x821020d8; - __put_user(val32, &sf->insns[0]); - + __put_user(0x821020d8u, &sf->insns[0]); /* t 0x10 */ - val32 = 0x91d02010; - __put_user(val32, &sf->insns[1]); + __put_user(0x91d02010u, &sf->insns[1]); } unlock_user(sf, sf_addr, sf_size); - return; -#if 0 -sigill_and_return: - force_sig(TARGET_SIGILL); -#endif -sigsegv: - unlock_user(sf, sf_addr, sizeof(struct target_signal_frame)); - force_sigsegv(sig); } void setup_rt_frame(int sig, struct target_sigaction *ka,