From owner-p4-projects@FreeBSD.ORG  Sat May 27 05:19:39 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD76516A752; Sat, 27 May 2006 05:19:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 CCBC916A8C5
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:19:32 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CF9E43D53
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:19:32 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4R5ITAL088427
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:18:29 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4R5ITTE088423
	for perforce@freebsd.org; Sat, 27 May 2006 05:18:29 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 27 May 2006 05:18:29 GMT
Message-Id: <200605270518.k4R5ITTE088423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97919 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 27 May 2006 05:19:40 -0000

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

Change 97919 by jb@jb_freebsd2 on 2006/05/27 05:17:57

	Use some nice label names so that I can recognise stuff in an
	objdump. 
	
	Real men like it when they can recognise stuff. 8-)

Affected files ...

.. //depot/projects/dtrace/src/sys/i386/i386/exception.s#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/i386/i386/exception.s#3 (text+ko) ====

@@ -206,13 +206,13 @@
 
 	/* Process according to the return value from dtrace_invop. */
 	cmpl	$DTRACE_INVOP_PUSHL_EBP, %eax
-	je	1f
+	je	__dtrace_invop_pushl_ebp
 	cmpl	$DTRACE_INVOP_POPL_EBP, %eax
-	je	2f
+	je	__dtrace_invop_popl_ebp
 	cmpl	$DTRACE_INVOP_LEAVE, %eax
-	je	3f
+	je	__dtrace_invop_leave
 	cmpl	$DTRACE_INVOP_NOP, %eax
-	je	4f
+	je	__dtrace_invop_nop
 
 	/*
 	 * The registered DTrace invalid instruction functions didn't
@@ -225,7 +225,7 @@
 	jmp	norm_ill
 
 	/* case DTRACE_INVOP_PUSHL_EBP: */
-1:
+__dtrace_invop_pushl_ebp:
 	/*
 	 * We must emulate a "pushl %ebp".  To do this, we pull the stack
 	 * down 4 bytes, and then store the base pointer.
@@ -245,7 +245,7 @@
 	iret				/* return from interrupt */
 
 	/* case DTRACE_INVOP_POPL_EBP: */
-2:
+__dtrace_invop_popl_ebp:
 	/*
 	 * We must emulate a "popl %ebp".  To do this, we do the opposite of
 	 * the above:  we remove the %ebp from the stack, and squeeze up the
@@ -266,7 +266,7 @@
 	iret				/* return from interrupt */
 
 	/* case DTRACE_INVOP_LEAVE: */
-3:
+__dtrace_invop_leave:
 	/*
 	 * We must emulate a "leave", which is the same as a "movl %ebp, %esp"
 	 * followed by a "popl %ebp".  This looks similar to the above, but
@@ -293,7 +293,7 @@
 	iret				/* return from interrupt */
 
 	/* case DTRACE_INVOP_NOP: */
-4:
+__dtrace_invop_nop:
 	/*
 	 * We must emulate a "nop".  This is obviously not hard:  we need only
 	 * advance the %eip by one.