From owner-p4-projects@FreeBSD.ORG  Tue Apr 26 14:29:00 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C50B16A4D0; Tue, 26 Apr 2005 14:29:00 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6116416A4CE
	for <perforce@freebsd.org>; Tue, 26 Apr 2005 14:29:00 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B55743D5E
	for <perforce@freebsd.org>; Tue, 26 Apr 2005 14:29:00 +0000 (GMT)
	(envelope-from davidxu@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3QET0qV010471
	for <perforce@freebsd.org>; Tue, 26 Apr 2005 14:29:00 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QESx6d010465
	for perforce@freebsd.org; Tue, 26 Apr 2005 14:28:59 GMT
	(envelope-from davidxu@freebsd.org)
Date: Tue, 26 Apr 2005 14:28:59 GMT
Message-Id: <200504261428.j3QESx6d010465@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76008 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2005 14:29:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=76008

Change 76008 by davidxu@davidxu_tiger on 2005/04/26 14:28:17

	Eliminate a branch.

Affected files ...

.. //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#2 edit

Differences ...

==== //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#2 (text+ko) ====

@@ -28,7 +28,7 @@
 	MEXITCOUNT
 	movl    PCPU(CURPCB),%eax
 	testl	$PCB_FULLCTX,PCB_FLAGS(%eax)
-	jnz	2f
+	jnz	1f
 	/*
 	 * Check for ASTs atomically with returning.  Disabling CPU
 	 * interrupts provides sufficient locking even in the SMP case,
@@ -37,10 +37,7 @@
 	cli
 	movl	PCPU(CURTHREAD),%eax
 	testl	$TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%eax)
-	jz	1f
-	sti
-	jmp	2f
-1:
+	jnz	1f
 	.globl	sysenter_popl_fs
 sysenter_popl_fs:
 	popl	%fs
@@ -68,6 +65,8 @@
 #endif
 	sysexit
 
-2:      /* Requested full context restore, use doreti for that */
+1: 
+	/* Requested full context restore, use doreti for that */
+	sti
 	andq    $~PCB_FULLCTX,PCB_FLAGS(%rax)
 	jmp     doreti