From owner-p4-projects@FreeBSD.ORG Sat Aug 25 15:34:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3884616A420; Sat, 25 Aug 2007 15:34:45 +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 C20EE16A41A for ; Sat, 25 Aug 2007 15:34:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.freebsd.org (Postfix) with ESMTP id 71ED213C481 for ; Sat, 25 Aug 2007 15:34:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.8k) with ESMTP id 205258618-1834499 for multiple; Sat, 25 Aug 2007 11:34:55 -0400 Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l7PFYfVP007582; Sat, 25 Aug 2007 11:34:42 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Thu, 23 Aug 2007 11:19:19 -0400 User-Agent: KMail/1.9.7 References: <200708011424.l71EOnG4029903@repoman.freebsd.org> In-Reply-To: <200708011424.l71EOnG4029903@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200708231119.19392.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Sat, 25 Aug 2007 11:34:42 -0400 (EDT) X-Virus-Scanned: ClamAV version 0.88.3, clamav-milter version 0.88.3 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.2 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00, DATE_IN_PAST_48_96 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 124465 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, 25 Aug 2007 15:34:45 -0000 On Wednesday 01 August 2007 10:24:49 am Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=124465 > > Change 124465 by rdivacky@rdivacky_witten on 2007/08/01 14:24:10 > > Initialize cr2 using rcr2() in signal context. > > PR: 77710 > > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/linux_sysvec.c#2 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_fixes/sys/i386/linux/linux_sysvec.c#2 (text+ko) ==== > > @@ -359,6 +359,7 @@ > frame.sf_sc.uc_mcontext.sc_esp_at_signal = regs->tf_esp; > frame.sf_sc.uc_mcontext.sc_ss = regs->tf_ss; > frame.sf_sc.uc_mcontext.sc_err = regs->tf_err; > + frame.sf_sc.uc_mcontext.sc_cr2 = rcr2(); > frame.sf_sc.uc_mcontext.sc_trapno = bsd_to_linux_trapcode(code); > > #ifdef DEBUG > @@ -487,6 +488,7 @@ > frame.sf_sc.sc_esp_at_signal = regs->tf_esp; > frame.sf_sc.sc_ss = regs->tf_ss; > frame.sf_sc.sc_err = regs->tf_err; > + frame.sf_sc.sc_cr2 = rcr2(); > frame.sf_sc.sc_trapno = bsd_to_linux_trapcode(ksi->ksi_trapno); > > for (i = 0; i < (LINUX_NSIG_WORDS-1); i++) This is wrong. Use the same thing that the i386 freebsd code uses to set sc_addr. I think it is ksi->ksi_addr. The sc_err part of the PR is already fixed by the recent fixes for sc_err for wine. -- John Baldwin