From owner-p4-projects@FreeBSD.ORG Sat May 16 22:45:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 967221065689; Sat, 16 May 2009 22:45:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E5481065672 for ; Sat, 16 May 2009 22:45:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2938FC0A for ; Sat, 16 May 2009 22:45:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GMjba8095173 for ; Sat, 16 May 2009 22:45:37 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4GMjblc095171 for perforce@freebsd.org; Sat, 16 May 2009 22:45:37 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 16 May 2009 22:45:37 GMT Message-Id: <200905162245.n4GMjblc095171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 162189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 22:45:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=162189 Change 162189 by lulf@lulf_carrot on 2009/05/16 22:45:22 - First take on sigreturn. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#9 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#9 (text+ko) ==== @@ -215,7 +215,35 @@ int sigreturn(struct thread *td, struct sigreturn_args *uap) { - avr32_impl(); - return (0); + struct trapframe *tf; + struct reg *regs; + const ucontext_t *ucp; + struct proc *p; + ucontext_t uc; + int error; + + ucp = &uc; + p = td->td_proc; + + error = copyin(uap->sigcntxp, &uc, sizeof(uc)); + if (error != 0) + return (error); + tf = td->td_frame; + regs = &tf->regs; + + /* Check magic */ + if (ucp->uc_mcontext.mc_len != sizeof(ucp->uc_mcontext)) { + CTR2(KTR_SIG, "sigreturn: pid=%d, ucp %p\n", p->p_pid, ucp); + return (EINVAL); + } + bcopy(&ucp->uc_mcontext.mc_regs, regs, + sizeof(ucp->uc_mcontext.mc_regs)); + + PROC_LOCK(p); + td->td_sigmask = ucp->uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); + PROC_UNLOCK(p); + return (EJUSTRETURN); }