From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 07:27:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06DFD16A419; Mon,  7 Jan 2008 07:27:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0A6C16A417
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:27:32 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B94B713C455
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:27:32 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077RWjH028247
	for <perforce@freebsd.org>; Mon, 7 Jan 2008 07:27:32 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077RWGi028244
	for perforce@freebsd.org; Mon, 7 Jan 2008 07:27:32 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 7 Jan 2008 07:27:32 GMT
Message-Id: <200801070727.m077RWGi028244@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 132680 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: Mon, 07 Jan 2008 07:27:33 -0000

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

Change 132680 by jb@jb_freebsd1 on 2008/01/07 07:27:20

	Add functions to set and clear the hook in the exception code.
	Note that the 'invop' reference is a legacy of Sun's implementation.
	On amd64 it isn't an "invalid opcode" interrupt at all (like on i386),
	but a breakpoint one instead. 
	
	The dtrace_invop_start is where the bulk of the OpenSolaris code will
	go (soon).

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#2 (text+ko) ====

@@ -17,6 +17,11 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * Portions Copyright 2008 John Birrell <jb@freebsd.org>
+ *
+ * $FreeBSD$
+ *
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
@@ -26,6 +31,34 @@
 #include <machine/asm.h>
 #include <sys/cpuvar_defs.h>
 
+#include "assym.s"
+
+	.globl	calltrap
+	.type	calltrap,@function
+	ENTRY(dtrace_invop_start)
+
+	/* XXX More code to go in here. :-) */
+
+	/* When all else fails handle the trap in the usual way. */
+	jmpq	*dtrace_invop_calltrap_addr
+	END(dtrace_invop_start)
+
+/*
+void dtrace_invop_init(void)
+*/
+	ENTRY(dtrace_invop_init)
+	movq	$dtrace_invop_start, dtrace_invop_jump_addr(%rip)
+	ret
+	END(dtrace_invop_init)
+
+/*
+void dtrace_invop_uninit(void)
+*/
+	ENTRY(dtrace_invop_uninit)
+	movq	$0, dtrace_invop_jump_addr(%rip)
+	ret
+	END(dtrace_invop_uninit)
+
 /*
 greg_t dtrace_getfp(void)
 */