From owner-p4-projects@FreeBSD.ORG  Sat Mar 22 18:22:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC8391065671; Sat, 22 Mar 2008 18:22:58 +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 AC39D106564A
	for <perforce@freebsd.org>; Sat, 22 Mar 2008 18:22:58 +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 A4ACF8FC25
	for <perforce@freebsd.org>; Sat, 22 Mar 2008 18:22:58 +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 m2MIMwcA093159
	for <perforce@freebsd.org>; Sat, 22 Mar 2008 18:22:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2MIMwP3093157
	for perforce@freebsd.org; Sat, 22 Mar 2008 18:22:58 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 22 Mar 2008 18:22:58 GMT
Message-Id: <200803221822.m2MIMwP3093157@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 138302 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: Sat, 22 Mar 2008 18:22:59 -0000

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

Change 138302 by jb@jb_freebsd1 on 2008/03/22 18:22:34

	i386 -> amd64 changes.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#3 edit

Differences ...

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

@@ -41,9 +41,6 @@
 extern uintptr_t kernbase;
 uintptr_t kernelbase = (uintptr_t) &kernbase;
 
-#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
-	 ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
-
 struct frame {
 	greg_t	fr_savfp;		/* saved frame pointer */
 	greg_t	fr_savpc;		/* saved program counter */
@@ -59,7 +56,7 @@
     uint32_t *intrpc)
 {
 	int depth = 0;
-	register_t ebp;
+	register_t rbp;
 	struct amd64_frame *frame;
 	vm_offset_t callpc;
 	pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
@@ -69,11 +66,11 @@
 
 	aframes++;
 
-	__asm __volatile("movl %%ebp,%0" : "=r" (ebp));
+	__asm __volatile("movq %%rbp,%0" : "=r" (rbp));
 
-	frame = (struct amd64_frame *)ebp;
+	frame = (struct amd64_frame *)rbp;
 	while (depth < pcstack_limit) {
-		if (!INKERNEL(frame))
+		if (!INKERNEL((long) frame))
 			break;
 
 		callpc = frame->f_retaddr;
@@ -93,7 +90,7 @@
 
 		if (frame->f_frame <= frame ||
 		    (vm_offset_t)frame->f_frame >=
-		    (vm_offset_t)ebp + KSTACK_PAGES * PAGE_SIZE)
+		    (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE)
 			break;
 		frame = frame->f_frame;
 	}