From owner-p4-projects@FreeBSD.ORG  Sun Jan  6 07:01:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 46C3016A421; Sun,  6 Jan 2008 07:01:38 +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 0C48E16A417
	for <perforce@freebsd.org>; Sun,  6 Jan 2008 07:01:38 +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 EE2A013C447
	for <perforce@freebsd.org>; Sun,  6 Jan 2008 07:01:37 +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 m0671bvM056260
	for <perforce@freebsd.org>; Sun, 6 Jan 2008 07:01:37 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0671b9S056254
	for perforce@freebsd.org; Sun, 6 Jan 2008 07:01:37 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 6 Jan 2008 07:01:37 GMT
Message-Id: <200801060701.m0671b9S056254@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 132616 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: Sun, 06 Jan 2008 07:01:38 -0000

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

Change 132616 by jb@jb_freebsd1 on 2008/01/06 07:00:54

	Define and call the invalid opcode init and uninit functions which
	add/remove the hook to/from the exception handler code.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#25 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#21 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#13 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#25 (text+ko) ====

@@ -53,6 +53,9 @@
 	/* Hang our hook for thread switches. */
 	dtrace_vtime_switch_func = dtrace_vtime_switch;
 
+	/* Hang our hook for invalid opcodes. */
+	dtrace_invop_init();
+
 	/*
 	 * XXX This is a short term hack to avoid having to comment
 	 * out lots and lots of lock/unlock calls.

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#21 (text+ko) ====

@@ -159,6 +159,9 @@
 	/* XXX Hack */
 	mutex_destroy(&mod_lock);
 
+	/* Reset out hook for invalid opcodes. */
+	dtrace_invop_uninit();
+
 	/*
 	 * Reset our hook for thread switches, but ensure that vtime isn't
 	 * active first.

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#13 (text) ====

@@ -15965,6 +15965,9 @@
 static struct clonedevs	*dtrace_clones;		/* Ptr to the array of cloned devices. */
 static eventhandler_tag	eh_tag;			/* Event handler tag. */
 
+void dtrace_invop_init(void);
+void dtrace_invop_uninit(void);
+
 static struct cdevsw dtrace_cdevsw = {
 	.d_version	= D_VERSION,
 	.d_close	= dtrace_close,