From owner-p4-projects@FreeBSD.ORG  Fri May 20 22:13:54 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1839916A4E2; Fri, 20 May 2005 22:13:54 +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 DCFB616A4DC
	for <perforce@freebsd.org>; Fri, 20 May 2005 22:13:53 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 866DE43DA1
	for <perforce@freebsd.org>; Fri, 20 May 2005 22:13:52 +0000 (GMT)
	(envelope-from peter@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 j4KMDqJX084552
	for <perforce@freebsd.org>; Fri, 20 May 2005 22:13:52 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4KMDq1A084549
	for perforce@freebsd.org; Fri, 20 May 2005 22:13:52 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 20 May 2005 22:13:52 GMT
Message-Id: <200505202213.j4KMDq1A084549@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 77237 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: Fri, 20 May 2005 22:13:54 -0000

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

Change 77237 by peter@peter_overcee on 2005/05/20 22:13:48

	Hmm. Try and make detection of a trap frame more robust.  If we
	have two symbols with (most likely) the same value, there is no way
	to be sure which one will be matched to a return address.  Except
	we need it to be "calltrap" so that db_trace.c can see the magic.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/exception.S#34 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/exception.S#34 (text+ko) ====

@@ -165,8 +165,9 @@
 	movq	%r13,TF_R13(%rsp)
 	movq	%r14,TF_R14(%rsp)
 	movq	%r15,TF_R15(%rsp)
-alltraps_with_regs_pushed:
 	FAKE_MCOUNT(TF_RIP(%rsp))
+	.globl	calltrap
+	.type	calltrap,@function
 calltrap:
 	call	trap
 	MEXITCOUNT
@@ -434,4 +435,5 @@
 	movq	%r15,TF_R15(%rsp)
 	movq	$T_PROTFLT,TF_TRAPNO(%rsp)
 	movq	$0,TF_ERR(%rsp)	/* XXX should be the error code */
-	jmp	alltraps_with_regs_pushed
+	FAKE_MCOUNT(TF_RIP(%rsp))
+	jmp	calltrap