From owner-p4-projects@FreeBSD.ORG Tue Mar 25 22:03:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57604106571C; Tue, 25 Mar 2008 22:03:50 +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 CF9CC1065677 for ; Tue, 25 Mar 2008 22:03:49 +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 AC14C8FC1B for ; Tue, 25 Mar 2008 22:03:49 +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 m2PM3njF013685 for ; Tue, 25 Mar 2008 22:03:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PM3n8W013683 for perforce@freebsd.org; Tue, 25 Mar 2008 22:03:49 GMT (envelope-from jb@freebsd.org) Date: Tue, 25 Mar 2008 22:03:49 GMT Message-Id: <200803252203.m2PM3n8W013683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2008 22:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=138559 Change 138559 by jb@jb_freebsd1 on 2008/03/25 22:03:09 This file is amd64-specfic, so remove #ifdefs and non-amd64 code to clean it up. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#6 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -302,39 +303,28 @@ while (pcstack_limit-- > 0) *pcstack++ = NULL; } +#endif /*ARGSUSED*/ uint64_t dtrace_getarg(int arg, int aframes) { uintptr_t val; - struct xframe *fp = (struct xframe *)dtrace_getfp(); + struct amd64_frame *fp = (struct amd64_frame *)dtrace_getfp(); uintptr_t *stack; int i; -#if defined(__amd64) + /* * A total of 6 arguments are passed via registers; any argument with * index of 5 or lower is therefore in a register. */ int inreg = 5; -#endif for (i = 1; i <= aframes; i++) { - fp = (struct xframe *)(fp->fr_savfp); + fp = fp->f_frame; - if (fp->fr_savpc == (pc_t)dtrace_invop_callsite) { -#if !defined(__amd64) + if (fp->f_retaddr == (long)dtrace_invop_callsite) { /* - * If we pass through the invalid op handler, we will - * use the pointer that it passed to the stack as the - * second argument to dtrace_invop() as the pointer to - * the stack. When using this stack, we must step - * beyond the EIP/RIP that was pushed when the trap was - * taken -- hence the "+ 1" below. - */ - stack = ((uintptr_t **)&fp[1])[1] + 1; -#else - /* * In the case of amd64, we will use the pointer to the * regs structure that was pushed when we took the * trap. To get this structure, we must increment @@ -347,7 +337,7 @@ * we're seeking is passed in regsiters, we can just * load it directly. */ - struct regs *rp = (struct regs *)((uintptr_t)&fp[1] + + struct reg *rp = (struct reg *)((uintptr_t)&fp[1] + sizeof (uintptr_t)); if (arg <= inreg) { @@ -356,7 +346,6 @@ stack = (uintptr_t *)(rp->r_rsp); arg -= inreg; } -#endif goto load; } @@ -372,7 +361,6 @@ */ arg++; -#if defined(__amd64) if (arg <= inreg) { /* * This shouldn't happen. If the argument is passed in a @@ -384,7 +372,6 @@ } arg -= (inreg + 1); -#endif stack = (uintptr_t *)&fp[1]; load: @@ -395,9 +382,7 @@ return (val); return (0); } -#endif -/*ARGSUSED*/ int dtrace_getstackdepth(int aframes) {