Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Jan 2022 12:36:44 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: fbdca1495378 - main - Remove the sigcode base check on arm64
Message-ID:  <202201051236.205CaiT1008735@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=fbdca14953785b6309b2754a90a85180fadc2a9d

commit fbdca14953785b6309b2754a90a85180fadc2a9d
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-01-05 11:01:31 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-01-05 11:57:38 +0000

    Remove the sigcode base check on arm64
    
    This was added with the shared page support. It is unused as we always
    enable the shared page on FreeBSD executables on arm64.
---
 sys/arm64/arm64/exec_machdep.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c
index b4ac8887ab72..715c41031c92 100644
--- a/sys/arm64/arm64/exec_machdep.c
+++ b/sys/arm64/arm64/exec_machdep.c
@@ -542,7 +542,6 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 	struct trapframe *tf;
 	struct sigframe *fp, frame;
 	struct sigacts *psp;
-	struct sysentvec *sysent;
 	int onstack, sig;
 
 	td = curthread;
@@ -600,12 +599,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 
 	tf->tf_elr = (register_t)catcher;
 	tf->tf_sp = (register_t)fp;
-	sysent = p->p_sysent;
-	if (sysent->sv_sigcode_base != 0)
-		tf->tf_lr = (register_t)sysent->sv_sigcode_base;
-	else
-		tf->tf_lr = (register_t)(sysent->sv_psstrings -
-		    *(sysent->sv_szsigcode));
+	tf->tf_lr = (register_t)p->p_sysent->sv_sigcode_base;
 
 	CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr,
 	    tf->tf_sp);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201051236.205CaiT1008735>