Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Apr 2003 15:38:17 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 28570 for review
Message-ID:  <200304082238.h38McHTJ097621@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28570

Change 28570 by peter@peter_daintree on 2003/04/08 15:37:40

	Use iretq, not iret.  DOH!  this is why I was getting a GPF
	on interrupts.  The manual made me do it.
	Tidy some comments.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#17 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#17 (text+ko) ====

@@ -150,12 +150,8 @@
 calltrap:
 	FAKE_MCOUNT(btrap)		/* init "from" btrap -> calltrap */
 	call	trap
-
-	/*
-	 * Return via doreti to handle ASTs.
-	 */
 	MEXITCOUNT
-	jmp	doreti
+	jmp	doreti			/* Handle any pending ASTs */
 
 /*
  * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80)
@@ -203,13 +199,8 @@
 	movl	$1,TD_CRITNEST(%rbx)
 	sti				/* enable interrupts */
 	call	fork_exit
-	/* cut from syscall */
-
-	/*
-	 * Return via doreti to handle ASTs.
-	 */
 	MEXITCOUNT
-	jmp	doreti
+	jmp	doreti			/* Handle any ASTs */
 
 
 /*
@@ -282,7 +273,7 @@
 	addq	$16,%rsp
 	.globl	doreti_iret
 doreti_iret:
-	iret
+	iretq
 
   	/*
 	 * doreti_iret_fault and friends.  Alternative return code for



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