From owner-p4-projects@FreeBSD.ORG  Thu May 25 01:41:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D09D16A438; Thu, 25 May 2006 01:41:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 32D6016A436
	for <perforce@freebsd.org>; Thu, 25 May 2006 01:41:05 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0038D43D45
	for <perforce@freebsd.org>; Thu, 25 May 2006 01:41:04 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4P1eBjO005231
	for <perforce@freebsd.org>; Thu, 25 May 2006 01:40:11 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4P1eB6A005228
	for perforce@freebsd.org; Thu, 25 May 2006 01:40:11 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 25 May 2006 01:40:11 GMT
Message-Id: <200605250140.k4P1eB6A005228@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 97781 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: Thu, 25 May 2006 01:41:05 -0000

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

Change 97781 by jb@jb_freebsd2 on 2006/05/25 01:39:34

	Add a hook for the invalid opcode function that DTrace uses to
	locate the callsite of a (FBT or SDT) probe.

Affected files ...

.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/i386/i386/trap.c#6 (text+ko) ====

@@ -105,18 +105,26 @@
 
 #ifdef KDTRACE
 #include <sys/cpuvar.h>
+#include <machine/dtrace.h>
 
 /*
- * This is a hook which is initialised by the dtrace module
+ * These are hooks which are  initialised by the dtrace module
  * when it is loaded. This keeps the DTrace implementation
- * opaque. All that the trap() function below needs to determine
- * is how many instruction bytes to osset the instruction
+ * opaque.
+ *
+ * All that the trap() function below needs to determine
+ * is how many instruction bytes to offset the instruction
  * pointer before returning from a trap that occured durin a
  * 'no-fault' DTrace probe.
  */
 dtrace_instr_size_func_t	dtrace_instr_size_func;
 
 /*
+ * This hook handles invalid opcodes.
+ */
+dtrace_invop_func_t	dtrace_invop_func;
+
+/*
  * This is a hook which is initialised by the systrace module
  * when it is loaded. This keeps the DTrace syscall provider
  * implementation opaque.