Date: Mon, 12 May 2003 11:36:45 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31023 for review Message-ID: <200305121836.h4CIaiDT017407@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31023 Change 31023 by peter@peter_daintree on 2003/05/12 11:35:46 IFC @31022 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.108 2003/05/12 02:37:28 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.109 2003/05/12 18:33:19 peter Exp $ */ #include <machine/asmacros.h> @@ -90,7 +90,7 @@ IDTVEC(bpt) TRAP_NOEN(T_BPTFLT) -/* Regular traps */ +/* Regular traps; The cpu does not supply tf_err for these. */ #define TRAP(a) \ subq $TF_RIP,%rsp; \ movq $(a),TF_TRAPNO(%rsp) ; \ @@ -209,9 +209,9 @@ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: movq %rdi,TF_RDI(%rsp) - movq %cr2,%rdi - movq %rdi,TF_ADDR(%rsp) +1: movq %rdi,TF_RDI(%rsp) /* free up a GP register */ + movq %cr2,%rdi /* preserve %cr2 before .. */ + movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ testl $PSL_I,TF_RFLAGS(%rsp) jz alltraps_pushregs_no_rdi sti ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#11 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.143 2003/05/12 02:37:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.144 2003/05/12 18:33:19 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.573 2003/05/12 18:23:04 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.574 2003/05/12 18:33:19 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.255 2003/05/11 22:55:40 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.256 2003/05/12 18:33:19 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/frame.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/frame.h,v 1.23 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/frame.h,v 1.24 2003/05/12 18:33:19 peter Exp $ */ #ifndef _MACHINE_FRAME_H_ ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.12 2003/05/12 18:23:04 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.13 2003/05/12 18:33:19 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305121836.h4CIaiDT017407>