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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5EC74C433EF for ; Sat, 8 Jan 2022 08:23:55 +0000 (UTC) Received: from localhost ([::1]:46450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6710-0000gZ-H4 for qemu-devel@archiver.kernel.org; Sat, 08 Jan 2022 03:23:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n66Ia-0005Jb-NT for qemu-devel@nongnu.org; Sat, 08 Jan 2022 02:38:03 -0500 Received: from [2607:f8b0:4864:20::12b] (port=43820 helo=mail-il1-x12b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n66IW-0003MC-2Q for qemu-devel@nongnu.org; Sat, 08 Jan 2022 02:37:59 -0500 Received: by mail-il1-x12b.google.com with SMTP id d3so6453013ilr.10 for ; Fri, 07 Jan 2022 23:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0CqTPJq/tJ7F8T2WyiTYooNJL76c+e8K9lgdH6FKRTc=; b=maDlcgx3gK9QtAq4NoQzdvaKSSaESa5JHzqDKyP6Hs/5mbLOhLrNp5MQ9M/Ikhy0Cp rZGNx8Mfr1NdGKxIDXrbHFtfY9So2QBnUFz6tRgQypLGv/rkZQ09xTfbWrGZxdtfql21 snf4APVrGKASFyb6BXRyS1lBldRj4D5T1cAAZLd/VsTmYHIcRhOW8pJ8JZX6oeJWnHdR s1/aqAr/woRZlDPdFju67zPhFekt91tsRThFLkAA+d5hIMsSHTCDmrOa4YdVvgehsTJQ BKWdARQ8AgLQmUKKo7NMSYtaOxWaZJ3Shl52zKS1lB1ZhrSBs9qjGP4OmEAat7pnzEQG J3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0CqTPJq/tJ7F8T2WyiTYooNJL76c+e8K9lgdH6FKRTc=; b=NIqJHihhD7xKp9xNMSsAxjfOWL0nf26NXdqLvzNio7x1R77eTxT347aSeia4/K1VIM GWjKRU7a28lQwMWTCc1k4vaPUJ6TFtwwC1NGOVClXYahLDWwgdUtW/RJk6wzaIkgE9gM yDFY/IXhbyP3wRu8/uQ80irfro1u5zupq/pPRAdjN+UmBGVfN2NgZCvw4ARMXxg8uTg8 XHx9UO5EGtQLkgQVYp38pfcI5YtZCsLm8vK0p0zcjks1JaDCYXpttNluaqxXeLHvULLR GOD4WPZdjZC3lNZMrliKLg/8hp6lfX0Vc2+7ISdWi+7qDcTKglWDyuquXcmDSfhvlCyv 8Dlg== X-Gm-Message-State: AOAM531cqUCpo/zPKH/3YXGuKzGmEPlvLpld+ctVkKbHRCW1dYmX+wNI 1+kBntwi5Ryv3Fcu/RVo5PlhgRz/mQxrAAa+ X-Google-Smtp-Source: ABdhPJwEy8K6ONN12zBymJqdUNNyA/mEjSQ+LRlFIdOYIAywhJ3kFJ9VX09WRRut7308JkECKA49OA== X-Received: by 2002:a05:6e02:1033:: with SMTP id o19mr32312874ilj.267.1641627474334; Fri, 07 Jan 2022 23:37:54 -0800 (PST) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id w19sm613022iov.12.2022.01.07.23.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 23:37:54 -0800 (PST) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL 12/37] bsd-user/target_os_signal.h: Move signal prototypes to target_os_ucontext.h Date: Sat, 8 Jan 2022 00:37:12 -0700 Message-Id: <20220108073737.5959-13-imp@bsdimp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220108073737.5959-1-imp@bsdimp.com> References: <20220108073737.5959-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::12b (failed) Received-SPF: none client-ip=2607:f8b0:4864:20::12b; envelope-from=imp@bsdimp.com; helo=mail-il1-x12b.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, kevans@freebsd.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Richard Henderson , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Switch to the CPUArchState typedef and move target-provided prototypes to target_os_ucontext.h. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson --- bsd-user/freebsd/target_os_ucontext.h | 11 +++++++++++ bsd-user/i386/target_arch_signal.h | 9 --------- bsd-user/x86_64/target_arch_signal.h | 9 --------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/bsd-user/freebsd/target_os_ucontext.h b/bsd-user/freebsd/target_os_ucontext.h index 1d0c3c4e651..dd61aec7cce 100644 --- a/bsd-user/freebsd/target_os_ucontext.h +++ b/bsd-user/freebsd/target_os_ucontext.h @@ -32,4 +32,15 @@ G_STATIC_ASSERT(TARGET_MCONTEXT_SIZE == sizeof(target_mcontext_t)); G_STATIC_ASSERT(TARGET_UCONTEXT_SIZE == sizeof(target_ucontext_t)); #endif /* TARGET_MCONTEXT_SIZE */ +struct target_sigframe; + +abi_long set_sigtramp_args(CPUArchState *env, int sig, + struct target_sigframe *frame, + abi_ulong frame_addr, + struct target_sigaction *ka); +abi_long get_mcontext(CPUArchState *regs, target_mcontext_t *mcp, int flags); +abi_long set_mcontext(CPUArchState *regs, target_mcontext_t *mcp, int srflag); +abi_long get_ucontext_sigreturn(CPUArchState *regs, abi_ulong target_sf, + abi_ulong *target_uc); + #endif /* TARGET_OS_UCONTEXT_H */ diff --git a/bsd-user/i386/target_arch_signal.h b/bsd-user/i386/target_arch_signal.h index 982c7035c75..279dadc22c7 100644 --- a/bsd-user/i386/target_arch_signal.h +++ b/bsd-user/i386/target_arch_signal.h @@ -88,13 +88,4 @@ struct target_sigframe { uint32_t __spare__[2]; }; -abi_long set_sigtramp_args(CPUX86State *env, int sig, - struct target_sigframe *frame, - abi_ulong frame_addr, - struct target_sigaction *ka); -abi_long get_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int flags); -abi_long set_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int srflag); -abi_long get_ucontext_sigreturn(CPUX86State *regs, abi_ulong target_sf, - abi_ulong *target_uc); - #endif /* TARGET_ARCH_SIGNAL_H */ diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h index b39b70466ef..b4a0ebf2bd5 100644 --- a/bsd-user/x86_64/target_arch_signal.h +++ b/bsd-user/x86_64/target_arch_signal.h @@ -96,13 +96,4 @@ struct target_sigframe { uint32_t __spare__[2]; }; -abi_long set_sigtramp_args(CPUX86State *env, int sig, - struct target_sigframe *frame, - abi_ulong frame_addr, - struct target_sigaction *ka); -abi_long get_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int flags); -abi_long set_mcontext(CPUX86State *regs, target_mcontext_t *mcp, int srflag); -abi_long get_ucontext_sigreturn(CPUX86State *regs, abi_ulong target_sf, - abi_ulong *target_uc); - #endif /* !TARGET_ARCH_SIGNAL_H_ */ -- 2.33.1