PERFORCE change 132073 for review

[John Birrell]

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

Change 132073 by jb at 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