From 9f669cf0a2f0e9221fc107e960fc386961c5f15a Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 6 Jan 2020 18:02:02 +0000 Subject: [PATCH] Simplify arguments to signal handlers on mips. - Use ksi_addr directly as si_addr in the siginfo instead of the 'badvaddr' register. - Remove a duplicate assignment of si_code. - Use ksi_addr as the 4th argument to the old-style handler instead of 'badvaddr'. Reviewed by: brooks, kevans Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D23013 --- sys/mips/mips/pm_machdep.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c index 606269456e0..6d8fa7df6d6 100644 --- a/sys/mips/mips/pm_machdep.c +++ b/sys/mips/mips/pm_machdep.c @@ -147,12 +147,10 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* fill siginfo structure */ sf.sf_si = ksi->ksi_info; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = ksi->ksi_code; - sf.sf_si.si_addr = (void*)(intptr_t)regs->badvaddr; } else { /* Old FreeBSD-style arguments. */ regs->a1 = ksi->ksi_code; - regs->a3 = regs->badvaddr; + regs->a3 = (uintptr_t)ksi->ksi_addr; /* sf.sf_ahu.sf_handler = catcher; */ }