From nobody Fri Jan 14 01:18:07 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 86918195BB82; Fri, 14 Jan 2022 01:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZk27720fz4sth; Fri, 14 Jan 2022 01:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCDh8L1LN20fcRHgdmXh0OZVIM2Gk5IY4vgssKSINEc=; b=YvFaTlQnPn5D1f3xMuwjyj3++qkGhQ5nsoposo2qQmUrCkjuNFDd2dIxDoWfEKUMchtJkQ 0ROBY8yC77DvMuTRtXTck1IINiEopBYTgxV2pf6g3M2eJwRdr2oWbsMqqFnn08BFICBjx1 GS5+JRQH3d0pUY2AwFGsoa5JoTbQBKRH6jNzRIFMmw0lTmylcBiYaaMC4HFY5h4yfq0CYP FOZe4WhGe4oUPwaBBAEgbcY2kmpRPJExnAuIYl4VRr3F4n9ioxtDEJPiUxRtOKfR/CN+uW XtIorbOl+6VNFPzHHN02hNN83FEpRXJYACaddqkdTgb9RKFIqJh3Vy5fs7W7Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B24C32CFC; Fri, 14 Jan 2022 01:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20E1I7er037287; Fri, 14 Jan 2022 01:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E1I7U8037286; Fri, 14 Jan 2022 01:18:07 GMT (envelope-from git) Date: Fri, 14 Jan 2022 01:18:07 GMT Message-Id: <202201140118.20E1I7U8037286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bd7630ef6198 - main - ia32: Sync signal context type names with i386. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd7630ef6198f54690e8d3ed21e1b58397ff2f2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCDh8L1LN20fcRHgdmXh0OZVIM2Gk5IY4vgssKSINEc=; b=uEgS5zMdbUQy53ew6UPbluxSvRHI4z1BQISntmuZB5qzG/11yigyHQ8v6LOTir+/faF0LF 9qWQTqAVkcUcHV14v2Ef/0pN1iPUA/VvfFv6JHYATMq9TgfkE47w7qNCY49Nfgvamu2QC2 1V/vlvFhaodOTXikzSpV+uPagzP2+HkS2TP36TFliTLIOZhhU+OC7qRmt5UKWwsnQfXOcT 6vE1PXvgVS/PPpJtNc5/gTCbsfRWAI4vXEDSQ5sUrv/42siE3i4yID+rpHLUn8zeT35HsR Jm1W4pD26bi4Vdaj3hwff6yYiqO/hxS+9xRDU+v+Krzd2HNZaPT/pnMKpCIvPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642123088; a=rsa-sha256; cv=none; b=xQT3G+oQl0lLnu6sgyW9mgDNuosZf6K6vJjZe6DEJ4sjAkuXbuAu0kl846xzPKixwXDsUX XfW6ehz0/FaSnPfRk91FfQcJfZO6tt5wGRh/8rD00TumK/m6gi2tPjoVYCa575dPt4wTsI iq10pRh5dT+bDnN08/o5+qcWNWIhfdteo7u2elRs5NkRlGvYgLF62pm11/7ovCfcRHzDdF uHbVB/djg0jtpCWiNEPmL3plZkvzhxY7jFaLWDfrSfhP7dLemfsk2ZWwK4Ylwv/fQdYckf 1kc+rdoPiVTFbAHUWp7ft/Qpe3oYvyd21XDodlCT5uZiNDA73rKjt6DpKXFWhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7630ef6198f54690e8d3ed21e1b58397ff2f2b commit bd7630ef6198f54690e8d3ed21e1b58397ff2f2b Author: John Baldwin AuthorDate: 2022-01-14 01:17:21 +0000 Commit: John Baldwin CommitDate: 2022-01-14 01:17:21 +0000 ia32: Sync signal context type names with i386. - Use ia32_freebsd4_* instead of ia32_*4. - Use ia32_o* instead of ia32_*3. Reviewed by: brooks, imp, kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33882 --- sys/amd64/ia32/ia32_signal.c | 18 +++++++++--------- sys/compat/ia32/ia32_genassym.c | 12 ++++++------ sys/compat/ia32/ia32_signal.h | 18 +++++++++--------- sys/compat/ia32/ia32_sysvec.c | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c index 1349954f40a7..220a34d70347 100644 --- a/sys/amd64/ia32/ia32_signal.c +++ b/sys/amd64/ia32/ia32_signal.c @@ -339,7 +339,7 @@ freebsd32_swapcontext(struct thread *td, struct freebsd32_swapcontext_args *uap) static void ia32_osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { - struct ia32_sigframe3 sf, *fp; + struct ia32_osigframe sf, *fp; struct proc *p; struct thread *td; struct sigacts *psp; @@ -359,11 +359,11 @@ ia32_osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - fp = (struct ia32_sigframe3 *)((uintptr_t)td->td_sigstk.ss_sp + + fp = (struct ia32_osigframe *)((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(sf)); td->td_sigstk.ss_flags |= SS_ONSTACK; } else - fp = (struct ia32_sigframe3 *)regs->tf_rsp - 1; + fp = (struct ia32_osigframe *)regs->tf_rsp - 1; /* Build the argument list for the signal handler. */ sf.sf_signum = sig; @@ -441,7 +441,7 @@ ia32_osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) static void freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { - struct ia32_sigframe4 sf, *sfp; + struct ia32_freebsd4_sigframe sf, *sfp; struct siginfo32 siginfo; struct proc *p; struct thread *td; @@ -497,10 +497,10 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct ia32_sigframe4 *)((uintptr_t)td->td_sigstk.ss_sp + + sfp = (struct ia32_freebsd4_sigframe *)((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(sf)); } else - sfp = (struct ia32_sigframe4 *)regs->tf_rsp - 1; + sfp = (struct ia32_freebsd4_sigframe *)regs->tf_rsp - 1; PROC_UNLOCK(p); /* Build the argument list for the signal handler. */ @@ -696,7 +696,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) int ofreebsd32_sigreturn(struct thread *td, struct ofreebsd32_sigreturn_args *uap) { - struct ia32_sigcontext3 sc, *scp; + struct ia32_osigcontext sc, *scp; struct trapframe *regs; int eflags, error; ksiginfo_t ksi; @@ -754,9 +754,9 @@ int freebsd4_freebsd32_sigreturn(struct thread *td, struct freebsd4_freebsd32_sigreturn_args *uap) { - struct ia32_ucontext4 uc; + struct ia32_freebsd4_ucontext uc; struct trapframe *regs; - struct ia32_ucontext4 *ucp; + struct ia32_freebsd4_ucontext *ucp; int cs, eflags, error; ksiginfo_t ksi; diff --git a/sys/compat/ia32/ia32_genassym.c b/sys/compat/ia32/ia32_genassym.c index cb15529aacf6..2b46500c95cc 100644 --- a/sys/compat/ia32/ia32_genassym.c +++ b/sys/compat/ia32/ia32_genassym.c @@ -30,12 +30,12 @@ ASSYM(IA32_UC_SS, offsetof(struct ia32_ucontext, uc_mcontext.mc_ss)); ASSYM(IA32_UC_FSBASE, offsetof(struct ia32_ucontext, uc_mcontext.mc_fsbase)); ASSYM(IA32_UC_GSBASE, offsetof(struct ia32_ucontext, uc_mcontext.mc_gsbase)); #ifdef COMPAT_43 -ASSYM(IA32_SIGF_SC, offsetof(struct ia32_sigframe3, sf_siginfo.si_sc)); +ASSYM(IA32_SIGF_SC, offsetof(struct ia32_osigframe, sf_siginfo.si_sc)); #endif #ifdef COMPAT_FREEBSD4 -ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_sigframe4, sf_uc)); -ASSYM(IA32_UC4_GS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_gs)); -ASSYM(IA32_UC4_FS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_fs)); -ASSYM(IA32_UC4_ES, offsetof(struct ia32_ucontext4, uc_mcontext.mc_es)); -ASSYM(IA32_UC4_DS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_ds)); +ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_freebsd4_sigframe, sf_uc)); +ASSYM(IA32_UC4_GS, offsetof(struct ia32_freebsd4_ucontext, uc_mcontext.mc_gs)); +ASSYM(IA32_UC4_FS, offsetof(struct ia32_freebsd4_ucontext, uc_mcontext.mc_fs)); +ASSYM(IA32_UC4_ES, offsetof(struct ia32_freebsd4_ucontext, uc_mcontext.mc_es)); +ASSYM(IA32_UC4_DS, offsetof(struct ia32_freebsd4_ucontext, uc_mcontext.mc_ds)); #endif diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h index 647ec4f690cf..01b1d8d40b03 100644 --- a/sys/compat/ia32/ia32_signal.h +++ b/sys/compat/ia32/ia32_signal.h @@ -89,7 +89,7 @@ struct ia32_ucontext { }; #if defined(COMPAT_FREEBSD4) -struct ia32_mcontext4 { +struct ia32_freebsd4_mcontext { uint32_t mc_onstack; /* XXX - sigcontext compat. */ uint32_t mc_gs; /* machine state (struct trapframe) */ uint32_t mc_fs; @@ -114,9 +114,9 @@ struct ia32_mcontext4 { uint32_t __spare__[17]; }; -struct ia32_ucontext4 { +struct ia32_freebsd4_ucontext { sigset_t uc_sigmask; - struct ia32_mcontext4 uc_mcontext; + struct ia32_freebsd4_mcontext uc_mcontext; uint32_t uc_link; struct sigaltstack32 uc_stack; uint32_t __spare__[8]; @@ -124,7 +124,7 @@ struct ia32_ucontext4 { #endif #ifdef COMPAT_43 -struct ia32_sigcontext3 { +struct ia32_osigcontext { uint32_t sc_onstack; uint32_t sc_mask; uint32_t sc_esp; @@ -154,13 +154,13 @@ struct ia32_sigcontext3 { */ #ifdef COMPAT_FREEBSD4 -struct ia32_sigframe4 { +struct ia32_freebsd4_sigframe { uint32_t sf_signum; uint32_t sf_siginfo; /* code or pointer to sf_si */ uint32_t sf_ucontext; /* points to sf_uc */ uint32_t sf_addr; /* undocumented 4th arg */ uint32_t sf_ah; /* action/handler pointer */ - struct ia32_ucontext4 sf_uc; /* = *sf_ucontext */ + struct ia32_freebsd4_ucontext sf_uc; /* = *sf_ucontext */ struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ }; #endif @@ -177,19 +177,19 @@ struct ia32_sigframe { }; #ifdef COMPAT_43 -struct ia32_siginfo3 { +struct ia32_osiginfo { struct ia32_sigcontext3 si_sc; int si_signo; int si_code; union sigval32 si_value; }; -struct ia32_sigframe3 { +struct ia32_osigframe { int sf_signum; uint32_t sf_arg2; /* int or siginfo_t */ uint32_t sf_scp; uint32_t sf_addr; uint32_t sf_ah; /* action/handler pointer */ - struct ia32_siginfo3 sf_siginfo; + struct ia32_osiginfo sf_siginfo; }; #endif diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c index 46e75f361bb1..b882720da119 100644 --- a/sys/compat/ia32/ia32_sysvec.c +++ b/sys/compat/ia32/ia32_sysvec.c @@ -78,9 +78,9 @@ CTASSERT(sizeof(struct ia32_ucontext) == 704); CTASSERT(sizeof(struct ia32_sigframe) == 800); CTASSERT(sizeof(struct siginfo32) == 64); #ifdef COMPAT_FREEBSD4 -CTASSERT(sizeof(struct ia32_mcontext4) == 260); -CTASSERT(sizeof(struct ia32_ucontext4) == 324); -CTASSERT(sizeof(struct ia32_sigframe4) == 408); +CTASSERT(sizeof(struct ia32_freebsd4_mcontext) == 260); +CTASSERT(sizeof(struct ia32_freebsd4_ucontext) == 324); +CTASSERT(sizeof(struct ia32_freebsd4_sigframe) == 408); #endif #include "vdso_ia32_offsets.h"