From nobody Fri Jan 14 01:18:06 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 DC92D195B8DE; Fri, 14 Jan 2022 01:18:06 +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 4JZk265cbzz4std; Fri, 14 Jan 2022 01:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123086; 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=5x5+FPvjm89LemkkRUUcMoqkN3UGCp08XtaOgFKKj3o=; b=A6JULmT/SwsMVxY0JHZURJ4xGtmjIy1JmPp2sSbc/N3wDpCL12/uOdxRNXpf/f/5ISyl6n 820OT5Opug+kC07BzzVaN+NiaMBW6nzFhB8JGfd/Q8IG3w5+7aJzJDo4tPS6I45IEadZKO z5C4aBi7YNhxzaRTjG1ZbBlchJIIX7vs1UCkaSuVTtber/M4s0nkPvxCtoGAcyf4WzuCcE sGT90kvjUGYB0zljBGEwZBgop6mUPhZOmP0ypBRDat4SyoxTFtqc5/LRopdWfLy+YBKFRt 7ppgEf8FrWCnXn5HOEMZ12lZI5J9gsZkzwZTTYEEeik1AIM9681witQKzNNuJw== 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 929C42BC0; Fri, 14 Jan 2022 01:18:06 +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 20E1I6iK037257; Fri, 14 Jan 2022 01:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20E1I6YI037256; Fri, 14 Jan 2022 01:18:06 GMT (envelope-from git) Date: Fri, 14 Jan 2022 01:18:06 GMT Message-Id: <202201140118.20E1I6YI037256@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: efdb03e9a9ac - main - Rename struct sigframe4 to struct freebsd4_sigframe. 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: efdb03e9a9acf5d4fc12aad2505ea0b5099cb061 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642123086; 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=5x5+FPvjm89LemkkRUUcMoqkN3UGCp08XtaOgFKKj3o=; b=gHQyDglU2cPxn9nRFO8c+r1pPMp0pp1drrKSyZajGuIcnv652A4f/8Ql9YLqyTli43spyn Mhi2BkNcoMLnMe+nFr3Ot5bZyfx1mN9TlGpm6bUC3hiiex5TjUou0yIkBCRf8VsHvKc99d pa+3QxSi8w1shLFl3CC8Bod1cX6SAkyvDDnMLhykcyGLi15FMBKW1v2Q7G5YDl1I3tIfos J4fOO0F1P3Y6wPh+2WNoyvCP1ASwlnkJdTbZACSj4+ONBez70mw9XlkPo7Dj4jAL1L9IGi ecivNa/6SSv2IpfHRei+uutot+9qFN7TpO6U5oPNsGYq+j+R+A1pq0Lz+XGiGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642123086; a=rsa-sha256; cv=none; b=o+3SvHm8fyLvk/xZKX9YR9RJUHBi79hw37dDSbOoL4h/HCEoS3di+L8bzYCewnlCwEWXvs so5FZ3h75tZCqxoqSEG6t3Eb7oobCYeJPpZtMg9mEKrI9bT+840n5c8Ml/h+9L5ohPPNI3 qov2OZp9tF0l7II5lDAlXWvSz/fFlvgQtD5PgcreeuenPgCuRgmkuWTHwuSdq2EHSrbJdw LVQpNAWuZbR1omCBW0UcvoERT6oxzNOaJutQGlRv2hT4SUADto8+zk4cuUWTw2KQuGIShb 79oALjMokeTgrqz98dyFF5Z0aAvJoDfvvXx7S/aivSH0/KKRGq82xQM9W4XFjQ== 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=efdb03e9a9acf5d4fc12aad2505ea0b5099cb061 commit efdb03e9a9acf5d4fc12aad2505ea0b5099cb061 Author: John Baldwin AuthorDate: 2022-01-14 01:16:50 +0000 Commit: John Baldwin CommitDate: 2022-01-14 01:16:50 +0000 Rename struct sigframe4 to struct freebsd4_sigframe. Reviewed by: brooks, imp, kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33881 --- sys/i386/i386/exec_machdep.c | 8 ++++---- sys/i386/i386/genassym.c | 2 +- sys/i386/include/sigframe.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/i386/i386/exec_machdep.c b/sys/i386/i386/exec_machdep.c index 469b0ebc9a78..a91595c0e969 100644 --- a/sys/i386/i386/exec_machdep.c +++ b/sys/i386/i386/exec_machdep.c @@ -256,7 +256,7 @@ osendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) static void freebsd4_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { - struct sigframe4 sf, *sfp; + struct freebsd4_sigframe sf, *sfp; struct proc *p; struct thread *td; struct sigacts *psp; @@ -291,13 +291,13 @@ freebsd4_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 sigframe4 *)((uintptr_t)td->td_sigstk.ss_sp + - td->td_sigstk.ss_size - sizeof(struct sigframe4)); + sfp = (struct freebsd4_sigframe *)((uintptr_t)td->td_sigstk.ss_sp + + td->td_sigstk.ss_size - sizeof(struct freebsd4_sigframe)); #if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sfp = (struct sigframe4 *)regs->tf_esp - 1; + sfp = (struct freebsd4_sigframe *)regs->tf_esp - 1; /* Build the argument list for the signal handler. */ sf.sf_signum = sig; diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index bde452b44c95..55406cdd6b97 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -162,7 +162,7 @@ ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc)); #endif ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); #ifdef COMPAT_FREEBSD4 -ASSYM(SIGF_UC4, offsetof(struct sigframe4, sf_uc)); +ASSYM(SIGF_UC4, offsetof(struct freebsd4_sigframe, sf_uc)); #endif #ifdef COMPAT_43 ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps)); diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h index 0f07b998cf91..d5e2b1cc0678 100644 --- a/sys/i386/include/sigframe.h +++ b/sys/i386/include/sigframe.h @@ -75,7 +75,7 @@ struct osigframe { #endif #ifdef COMPAT_FREEBSD4 /* FreeBSD 4.x */ -struct sigframe4 { +struct freebsd4_sigframe { register_t sf_signum; register_t sf_siginfo; /* code or pointer to sf_si */ register_t sf_ucontext; /* points to sf_uc */