From owner-p4-projects@FreeBSD.ORG  Sun Dec 30 07:23:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9488816A6D7; Sun, 30 Dec 2007 07:23:26 +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 139CA16A58F
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 07:23:26 +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 D0EC613C478
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 07:23:25 +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 lBU7NP0P097078
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 07:23:25 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPZ0097074
	for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Dec 2007 07:23:25 GMT
Message-Id: <200712300723.lBU7NPZ0097074@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 132073 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, 30 Dec 2007 07:23:28 -0000

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

Change 132073 by jb@jb_freebsd1 on 2007/12/30 07:23:02

	WIP.
	
	Just trying to get the module to compile, link and load. Hacks abound.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 edit

Differences ...

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

@@ -219,6 +219,12 @@
 static dtrace_helpers_t *dtrace_deferred_pid;	/* deferred helper list */
 static dtrace_enabling_t *dtrace_retained;	/* list of retained enablings */
 static dtrace_dynvar_t	dtrace_dynhash_sink;	/* end of dynamic hash chains */
+#if !defined(sun)
+int		dtrace_in_probe;	/* non-zero if executing a probe */
+#if defined(__i386__) || defined(__amd64__)
+uintptr_t	dtrace_in_probe_addr;	/* Address of invop when already in probe */
+#endif
+#endif
 
 /*
  * DTrace Locking
@@ -2701,7 +2707,7 @@
 				 * dtrace_caller() only guarantees correct
 				 * results for anchored probes.
 				 */
-				pc_t caller[2];
+				pc_t caller[2] = {0, 0};
 
 				dtrace_getpcstack(caller, 2, aframes,
 				    (uint32_t *)(uintptr_t)mstate->dtms_arg[0]);
@@ -2713,7 +2719,7 @@
 				 * we must resort to the slower approach of
 				 * calling dtrace_getpcstack().
 				 */
-				pc_t caller;
+				pc_t caller = 0;
 
 				dtrace_getpcstack(&caller, 1, aframes, NULL);
 				mstate->dtms_caller = caller;
@@ -15937,6 +15943,11 @@
 #include <cddl/dev/dtrace/dtrace_modevent.c>
 #include <cddl/dev/dtrace/dtrace_sysctl.c>
 #include <cddl/dev/dtrace/dtrace_unload.c>
+#include <cddl/dev/dtrace/dtrace_vtime.c>
+#include <cddl/dev/dtrace/dtrace_hacks.c>
+#if defined(__amd64__)
+#include <cddl/dev/dtrace/amd64/dtrace_isa.c>
+#endif
 
 SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL)
 SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_ANON, SI_ORDER_FIRST, dtrace_anon_init, NULL)
@@ -15944,4 +15955,5 @@
 DEV_MODULE(dtrace, dtrace_modevent, NULL);
 MODULE_VERSION(dtrace, 1);
 MODULE_DEPEND(dtrace, cyclic, 1, 1, 1);
+MODULE_DEPEND(dtrace, opensolaris, 1, 1, 1);
 #endif