From nobody Sun May 12 04:39:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1602351625; cv=none; d=zohomail.com; s=zohoarc; b=lTCINwsnRKUs8T9llF7NySnJ+BQJ+0MC16Z6HFCfZynzCfiU0YXsPG5J/V8/GtDvJ3wk2ijAzA9nL8kwsOZts+kvc3Uai1sIeeYMV/YK3a15JWaa2E/bu1DpeFoNMLtiGxH6FgdmcKu+jforU0OCY5GuU4WJdPRK9Je1Nr9JHno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602351625; h=Content-Transfer-Encoding:Cc: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; bh=tWwxwtj7BMWnBZPqROiASwhlhUSCyv+roj4cQ6E4cUE=; b=V8c0gQjdii6zz85wqiDAJvNCWywXnGHP9TXSDw4lHILBDpiTXnl9nt1hvIN1QLxBBDdYZp+am0QqB3KYWttjKqJ+qJcHa7rZiuwimyJ5naR8IxNY/M0vvELzegctYzUsLhwx51sN4XAFlpHkcmekhybJfmNv6dEjE9tO/DF6M8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602351625228233.5304730869692; Sat, 10 Oct 2020 10:40:25 -0700 (PDT) Received: from localhost ([::1]:40606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRIr0-0007rD-8t for importer@patchew.org; Sat, 10 Oct 2020 13:40:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRIiX-0005Wu-P2 for qemu-devel@nongnu.org; Sat, 10 Oct 2020 13:31:37 -0400 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:37316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRIiV-0004Ut-S9 for qemu-devel@nongnu.org; Sat, 10 Oct 2020 13:31:37 -0400 Received: by mail-oi1-x242.google.com with SMTP id t77so13862889oie.4 for ; Sat, 10 Oct 2020 10:31:35 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n185sm7415032oia.28.2020.10.10.10.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 10:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tWwxwtj7BMWnBZPqROiASwhlhUSCyv+roj4cQ6E4cUE=; b=InzNKlbMQZ/Sxoe9XugVIF6WWZr6Xh1nhXdSDBBr/OcNwQLo/dks6sIj3Nn4y/kRc1 rwfv5jEEfICUiPkT0yblV8qIR4TZ+GbRqZOZtT56ScuUJPDhLf6jFtWf2p3FpyDuJ9Vw YBfaaRlFOuIJ5HUNOkvSFAA7+2MGDhg6tk5TKm6bmdht0fAKF87564XsJN7ab64EgQ4y aaurVi3iyGy+oSVWbP3g0V4qh5eFrwLD/NfQgfOQE3sk4BHZU2Q8b0RyhGgf6Dskmx2/ NR8vQio5FUJgcgxj5CNfQlZGRuG3xGMsmkuQmX1NMmkp8aQ9+qiOmjrbu7ThxySBtxNV CIfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tWwxwtj7BMWnBZPqROiASwhlhUSCyv+roj4cQ6E4cUE=; b=FPtNMMvrsxSeoZ9Cle5LvVGbYPmejkAccTjAXx8FXIfAnSI5ppzvxyeScR7W1DOEkQ bU3EkS8FpqwurlcFs8M7vKTaZrnioREg8OH7F4rEvwMYw8L68XgX0IkrBUdWLRoK6/aI ldJuGnqrruwcIxivONSMlarhdhR7lJqFEENZ+0+kFrCPll4WL4fv9Hb6oYtq5MBY8CvM LyFTNxv8VVby5FhL3uviNP+KE8NxvBG1wbLzTu10HWGEmJXcHss7DvSaNNHMbJtspyla d1a1Yey5y6fl+MQGmcw4oDflExMOTV69K9U9l6QVK0TwCBEUGPC7ERSPTcxvehEMAhPr JziA== X-Gm-Message-State: AOAM531yLUNWkhskhyKT4csEKvrsh0ftho14pSlbmsKur0MXORx85MFa vSZ+gcDI3wLuifVhe07ST1Nn4sHC92HOX9CN X-Google-Smtp-Source: ABdhPJy8qYl9AjBMU3X0CXNeIDZCYTDe+OwUvHOYJ40FJkBU34y+FL8eWxBkaT0pqF7T7tMRnIT11g== X-Received: by 2002:a05:6808:605:: with SMTP id y5mr6314969oih.172.1602351094268; Sat, 10 Oct 2020 10:31:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/2] linux-user/microblaze: Implement rt signal frames Date: Sat, 10 Oct 2020 12:31:29 -0500 Message-Id: <20201010173130.99652-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201010173130.99652-1-richard.henderson@linaro.org> References: <20201010173130.99652-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::242; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x242.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: edgar.iglesias@gmail.com, laurent@vivier.eu 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" Allows microblaze to pass tests/tcg/multiarch/linux-test.c. Signed-off-by: Richard Henderson Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias --- linux-user/microblaze/signal.c | 91 ++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 9 deletions(-) diff --git a/linux-user/microblaze/signal.c b/linux-user/microblaze/signal.c index b4eeef4673..3d316a22f1 100644 --- a/linux-user/microblaze/signal.c +++ b/linux-user/microblaze/signal.c @@ -35,9 +35,9 @@ struct target_stack_t { struct target_ucontext { abi_ulong tuc_flags; abi_ulong tuc_link; - struct target_stack_t tuc_stack; + target_stack_t tuc_stack; struct target_sigcontext tuc_mcontext; - uint32_t tuc_extramask[TARGET_NSIG_WORDS - 1]; + target_sigset_t tuc_sigmask; }; =20 /* Signal frames. */ @@ -47,9 +47,9 @@ struct target_signal_frame { uint32_t tramp[2]; }; =20 -struct rt_signal_frame { - siginfo_t info; - ucontext_t uc; +struct target_rt_sigframe { + target_siginfo_t info; + struct target_ucontext uc; uint32_t tramp[2]; }; =20 @@ -200,7 +200,55 @@ void setup_rt_frame(int sig, struct target_sigaction *= ka, target_siginfo_t *info, target_sigset_t *set, CPUMBState *env) { - qemu_log_mask(LOG_UNIMP, "setup_rt_frame: not implemented\n"); + struct target_rt_sigframe *frame; + abi_ulong frame_addr; + + frame_addr =3D get_sigframe(ka, env, sizeof *frame); + trace_user_setup_rt_frame(env, frame_addr); + + if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { + force_sigsegv(sig); + return; + } + + tswap_siginfo(&frame->info, info); + + __put_user(0, &frame->uc.tuc_flags); + __put_user(0, &frame->uc.tuc_link); + + target_save_altstack(&frame->uc.tuc_stack, env); + setup_sigcontext(&frame->uc.tuc_mcontext, env); + + for (int i =3D 0; i < TARGET_NSIG_WORDS; i++) { + __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]); + } + + /* Kernel does not use SA_RESTORER. */ + + /* addi r12, r0, __NR_sigreturn */ + __put_user(0x31800000U | TARGET_NR_rt_sigreturn, frame->tramp + 0); + /* brki r14, 0x8 */ + __put_user(0xb9cc0008U, frame->tramp + 1); + + /* + * Return from sighandler will jump to the tramp. + * Negative 8 offset because return is rtsd r15, 8 + */ + env->regs[15] =3D + frame_addr + offsetof(struct target_rt_sigframe, tramp) - 8; + + /* Set up registers for signal handler */ + env->regs[1] =3D frame_addr; + + /* Signal handler args: */ + env->regs[5] =3D sig; + env->regs[6] =3D frame_addr + offsetof(struct target_rt_sigframe, info= ); + env->regs[7] =3D frame_addr + offsetof(struct target_rt_sigframe, uc); + + /* Offset to handle microblaze rtid r14, 0 */ + env->pc =3D (unsigned long)ka->_sa_handler; + + unlock_user_struct(frame, frame_addr, 1); } =20 long do_sigreturn(CPUMBState *env) @@ -239,7 +287,32 @@ badframe: =20 long do_rt_sigreturn(CPUMBState *env) { - trace_user_do_rt_sigreturn(env, 0); - qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; + struct target_rt_sigframe *frame =3D NULL; + abi_ulong frame_addr =3D env->regs[1]; + sigset_t set; + + trace_user_do_rt_sigreturn(env, frame_addr); + + if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { + goto badframe; + } + + target_to_host_sigset(&set, &frame->uc.tuc_sigmask); + set_sigmask(&set); + + restore_sigcontext(&frame->uc.tuc_mcontext, env); + + if (do_sigaltstack(frame_addr + + offsetof(struct target_rt_sigframe, uc.tuc_stack), + 0, get_sp_from_cpustate(env)) =3D=3D -EFAULT) { + goto badframe; + } + + unlock_user_struct(frame, frame_addr, 0); + return -TARGET_QEMU_ESIGRETURN; + + badframe: + unlock_user_struct(frame, frame_addr, 0); + force_sig(TARGET_SIGSEGV); + return -TARGET_QEMU_ESIGRETURN; } --=20 2.25.1 From nobody Sun May 12 04:39:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1602351804; cv=none; d=zohomail.com; s=zohoarc; b=EgM/J5Ung8k+nPKdvYyXvx9iXJQ9ikbI+wVRGH5syzMVCSiizJq93FJ9KQh3Bzr3g2A89UbIsHDw6IWgDsOLuHsEnrOMe+AGbjax6BrwqrQJbaaPtuMeXGVbegbYILRCHzLGHrc6N7auescPxCj1zWJAd3rmKy916QeH3P7relo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602351804; h=Content-Transfer-Encoding:Cc: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; bh=Kn5WPxqThdnmIcBVCW8ao4PGn435N4Ntdy35Xe3SELI=; b=FZAL4mG9P9SRS4NWz5c65ewnesNM2K83BhJu/laYj/k2+Z/iOQpDpAfwd527jgxu0b578Rm0azphBPqy7feWQeW84e2GdOEJmYeYE676zdUrSF2c6WHW4mFJIbblZYBQTg9/YmP7IuF8deAFu6hAw23qZUHcqEvzgfqQMiKOwvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602351804458496.3338516047868; Sat, 10 Oct 2020 10:43:24 -0700 (PDT) Received: from localhost ([::1]:47808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRItv-0002Wd-4s for importer@patchew.org; Sat, 10 Oct 2020 13:43:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRIia-0005Yw-J8 for qemu-devel@nongnu.org; Sat, 10 Oct 2020 13:31:42 -0400 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:45661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRIiX-0004Uz-3i for qemu-devel@nongnu.org; Sat, 10 Oct 2020 13:31:39 -0400 Received: by mail-oi1-x241.google.com with SMTP id z26so13789601oih.12 for ; Sat, 10 Oct 2020 10:31:36 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n185sm7415032oia.28.2020.10.10.10.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 10:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kn5WPxqThdnmIcBVCW8ao4PGn435N4Ntdy35Xe3SELI=; b=jcQ4RziQH0EYM73/S+Fpv4O8UlnivqwhqSDkXq3vX5AibOyMRMh6Jxzfyl6EfeZKBB k7sIv6SYIJHjZtLgTIwsd9OeyO98CfPnE+XMs8jNRqCjX/WCLFl/Isu82H+62nq5SYfc URCTrwTzeb4T0odwvZH5DCKvkAEvrTSLwlpQCWt0OiZycsFMt6Z3FmGQzxVCnW9LjFza aiEaUXRGFoSPYStCDiYeR8RM7ZLgToNMsfxy27BkcL1OO/RYfV8giA44rYj6GtP6qyTy 8SuP15elQwuYI9SGadGNkNCyL4dNiDbzgC4Yz6PQ3Y6c5Awcb+qJwnXTxPtBdH+8vLAV y+zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kn5WPxqThdnmIcBVCW8ao4PGn435N4Ntdy35Xe3SELI=; b=gzjJik/PJVxXrHaJTRvSjqRfXNV2zH//AeqwuaDTSwAsOic0HoMFpBUm3M7KGhPIAn KN2MT4TpCgtIB5sACiVkKaSfXFXLtrCs50LaMWTTaz406/x/DJb4szf0lkJCSVlxelyA dK4SBdc61mb5nfmsKgfuBRy1AVWeIrYWLd7lPBmszMYsvdEIHAn3D5MZNc44ngPRBENC y11/EOTYdHHlGQudb78PSJ8xW5Et97/rm+qGeHMXo00C1G/Ver8sKGtlGogvg215XEYj EDSvUSgVa4P8AxgtthZDBZYG9r/kk17QKtpxPyo2BgYg5VeyuamYhTYUL/Qj0O0T7yOd /NfA== X-Gm-Message-State: AOAM532IkvBmgdQVER7arJZdiio1hVPyZ1V6CaDFqytGFzXMtoDtu/vr 5l6vBE38NPCilkGatqZMmQbwEhKByYD2x6VP X-Google-Smtp-Source: ABdhPJzCsI97cvAUvAO+40Xl8WzQGc/TZiRoub0hUNCzuGiqR+RybirLvFkZvwn26bcz6I+L7enItg== X-Received: by 2002:aca:4d88:: with SMTP id a130mr6238895oib.28.1602351095660; Sat, 10 Oct 2020 10:31:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/2] linux-user/microblaze: Remove non-rt signal frames Date: Sat, 10 Oct 2020 12:31:30 -0500 Message-Id: <20201010173130.99652-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201010173130.99652-1-richard.henderson@linaro.org> References: <20201010173130.99652-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::241; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x241.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: edgar.iglesias@gmail.com, laurent@vivier.eu 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" The microblaze kernel does not support these, and uses only rt style signal frames. Signed-off-by: Richard Henderson Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias --- linux-user/microblaze/target_signal.h | 1 - linux-user/microblaze/signal.c | 97 +-------------------------- 2 files changed, 2 insertions(+), 96 deletions(-) diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/= target_signal.h index 35efd5e928..08bcf24b9d 100644 --- a/linux-user/microblaze/target_signal.h +++ b/linux-user/microblaze/target_signal.h @@ -21,5 +21,4 @@ typedef struct target_sigaltstack { =20 #include "../generic/signal.h" =20 -#define TARGET_ARCH_HAS_SETUP_FRAME #endif /* MICROBLAZE_TARGET_SIGNAL_H */ diff --git a/linux-user/microblaze/signal.c b/linux-user/microblaze/signal.c index 3d316a22f1..cf0707b556 100644 --- a/linux-user/microblaze/signal.c +++ b/linux-user/microblaze/signal.c @@ -41,12 +41,6 @@ struct target_ucontext { }; =20 /* Signal frames. */ -struct target_signal_frame { - struct target_ucontext uc; - uint32_t extramask[TARGET_NSIG_WORDS - 1]; - uint32_t tramp[2]; -}; - struct target_rt_sigframe { target_siginfo_t info; struct target_ucontext uc; @@ -137,65 +131,6 @@ static abi_ulong get_sigframe(struct target_sigaction = *ka, return ((sp - frame_size) & -8UL); } =20 -void setup_frame(int sig, struct target_sigaction *ka, - target_sigset_t *set, CPUMBState *env) -{ - struct target_signal_frame *frame; - abi_ulong frame_addr; - int i; - - frame_addr =3D get_sigframe(ka, env, sizeof *frame); - trace_user_setup_frame(env, frame_addr); - if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) - goto badframe; - - /* Save the mask. */ - __put_user(set->sig[0], &frame->uc.tuc_mcontext.oldmask); - - for(i =3D 1; i < TARGET_NSIG_WORDS; i++) { - __put_user(set->sig[i], &frame->extramask[i - 1]); - } - - setup_sigcontext(&frame->uc.tuc_mcontext, env); - - /* Set up to return from userspace. If provided, use a stub - already in userspace. */ - /* minus 8 is offset to cater for "rtsd r15,8" offset */ - if (ka->sa_flags & TARGET_SA_RESTORER) { - env->regs[15] =3D ((unsigned long)ka->sa_restorer)-8; - } else { - uint32_t t; - /* Note, these encodings are _big endian_! */ - /* addi r12, r0, __NR_sigreturn */ - t =3D 0x31800000UL | TARGET_NR_sigreturn; - __put_user(t, frame->tramp + 0); - /* brki r14, 0x8 */ - t =3D 0xb9cc0008UL; - __put_user(t, frame->tramp + 1); - - /* Return from sighandler will jump to the tramp. - Negative 8 offset because return is rtsd r15, 8 */ - env->regs[15] =3D frame_addr + offsetof(struct target_signal_frame= , tramp) - - 8; - } - - /* Set up registers for signal handler */ - env->regs[1] =3D frame_addr; - /* Signal handler args: */ - env->regs[5] =3D sig; /* Arg 0: signum */ - env->regs[6] =3D 0; - /* arg 1: sigcontext */ - env->regs[7] =3D frame_addr +=3D offsetof(typeof(*frame), uc); - - /* Offset of 4 to handle microblaze rtid r14, 0 */ - env->pc =3D (unsigned long)ka->_sa_handler; - - unlock_user_struct(frame, frame_addr, 1); - return; -badframe: - force_sigsegv(sig); -} - void setup_rt_frame(int sig, struct target_sigaction *ka, target_siginfo_t *info, target_sigset_t *set, CPUMBState *env) @@ -251,38 +186,10 @@ void setup_rt_frame(int sig, struct target_sigaction = *ka, unlock_user_struct(frame, frame_addr, 1); } =20 + long do_sigreturn(CPUMBState *env) { - struct target_signal_frame *frame; - abi_ulong frame_addr; - target_sigset_t target_set; - sigset_t set; - int i; - - frame_addr =3D env->regs[R_SP]; - trace_user_do_sigreturn(env, frame_addr); - /* Make sure the guest isn't playing games. */ - if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 1)) - goto badframe; - - /* Restore blocked signals */ - __get_user(target_set.sig[0], &frame->uc.tuc_mcontext.oldmask); - for(i =3D 1; i < TARGET_NSIG_WORDS; i++) { - __get_user(target_set.sig[i], &frame->extramask[i - 1]); - } - target_to_host_sigset_internal(&set, &target_set); - set_sigmask(&set); - - restore_sigcontext(&frame->uc.tuc_mcontext, env); - /* We got here through a sigreturn syscall, our path back is via an - rtb insn so setup r14 for that. */ - env->regs[14] =3D env->pc; - - unlock_user_struct(frame, frame_addr, 0); - return -TARGET_QEMU_ESIGRETURN; -badframe: - force_sig(TARGET_SIGSEGV); - return -TARGET_QEMU_ESIGRETURN; + return -TARGET_ENOSYS; } =20 long do_rt_sigreturn(CPUMBState *env) --=20 2.25.1