Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 May 2005 22:13:52 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 77237 for review
Message-ID:  <200505202213.j4KMDq1A084549@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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