From owner-p4-projects@FreeBSD.ORG  Fri Mar 21 23:35:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 649931065670; Fri, 21 Mar 2008 23:35:09 +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 243AD106564A
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:35:09 +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 04C3E8FC1E
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:35:09 +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 m2LNZ8iC043473
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:35:08 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2LNZ8CW043471
	for perforce@freebsd.org; Fri, 21 Mar 2008 23:35:08 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 21 Mar 2008 23:35:08 GMT
Message-Id: <200803212335.m2LNZ8CW043471@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 138261 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: Fri, 21 Mar 2008 23:35:10 -0000

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

Change 138261 by jb@jb_freebsd8 on 2008/03/21 23:34:38

	Enable the stack() action on i386.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#7 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#7 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <sys/pcpu.h>
 
 #include <machine/md_var.h>
+#include <machine/stack.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -57,26 +58,29 @@
 dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
     uint32_t *intrpc)
 {
-#ifdef DOODAD
 	int depth = 0;
+	register_t ebp;
+	struct i386_frame *frame;
 	vm_offset_t callpc;
-	register_t ebp;
-	struct frame *frame;
-	pc_t caller = (pc_t)pcpu_find(curcpu)->pc_dtrace_caller;
+	pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
 
-/*
 	if (intrpc != 0)
-		pcstack[depth++] = (pc_t)intrpc;
-*/
+		pcstack[depth++] = (pc_t) intrpc;
+
 	aframes++;
-	ebp = dtrace_getfp();
-	frame = (struct frame *)ebp;	
-	while(depth < pcstack_limit) {
+
+	__asm __volatile("movl %%ebp,%0" : "=r" (ebp));
+
+	frame = (struct i386_frame *)ebp;
+	while (depth < pcstack_limit) {
 		if (!INKERNEL(frame))
-			break; 
-		callpc = frame->fr_savpc;
+			break;
+
+		callpc = frame->f_retaddr;
+
 		if (!INKERNEL(callpc))
 			break;
+
 		if (aframes > 0) {
 			aframes--;
 			if ((aframes == 0) && (caller != 0)) {
@@ -86,18 +90,17 @@
 		else {
 			pcstack[depth++] = callpc;
 		}
-		
-		if ((struct frame *)frame->fr_savfp < frame ||
-			(vm_offset_t)frame->fr_savfp >=
-			(vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE)
+
+		if (frame->f_frame <= frame ||
+		    (vm_offset_t)frame->f_frame >=
+		    (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE)
 			break;
-		frame = (struct frame *)frame->fr_savfp; 
+		frame = frame->f_frame;
 	}
 
 	for (; depth < pcstack_limit; depth++) {
 		pcstack[depth] = 0;
 	}
-#endif
 }
 
 #ifdef DOODAD