From owner-svn-src-head@FreeBSD.ORG  Sat Mar  1 17:55:21 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3C7F49DF;
 Sat,  1 Mar 2014 17:55:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E7481E56;
 Sat,  1 Mar 2014 17:55:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s21HtKKV087390;
 Sat, 1 Mar 2014 17:55:20 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s21HtKgl087389;
 Sat, 1 Mar 2014 17:55:20 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201403011755.s21HtKgl087389@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sat, 1 Mar 2014 17:55:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262661 -
 head/sys/cddl/contrib/opensolaris/uts/intel/dtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Mar 2014 17:55:21 -0000

Author: markj
Date: Sat Mar  1 17:55:20 2014
New Revision: 262661
URL: http://svnweb.freebsd.org/changeset/base/262661

Log:
  Fix emulation of call and jmp instructions on i386 and for 32-bit processes
  on amd64.
  
  Submitted by:	Prashanth Kumar <pra_udupi@yahoo.co.in>
  MFC after:	2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Sat Mar  1 17:44:40 2014	(r262660)
+++ head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Sat Mar  1 17:55:20 2014	(r262661)
@@ -1442,10 +1442,7 @@ fasttrap_pid_probe(struct reg *rp)
 		if (tp->ftt_code == 0) {
 			new_pc = tp->ftt_dest;
 		} else {
-#ifdef __amd64
-			uintptr_t value;
-#endif
-			uintptr_t addr = tp->ftt_dest;
+			uintptr_t value, addr = tp->ftt_dest;
 
 			if (tp->ftt_base != FASTTRAP_NOREG)
 				addr += fasttrap_getreg(rp, tp->ftt_base);
@@ -1469,6 +1466,7 @@ fasttrap_pid_probe(struct reg *rp)
 
 #ifdef __amd64
 				if (p->p_model == DATAMODEL_NATIVE) {
+#endif
 					if ((value = fasttrap_fulword((void *)addr))
 					     == -1) {
 						fasttrap_sigsegv(p, curthread,
@@ -1477,9 +1475,8 @@ fasttrap_pid_probe(struct reg *rp)
 						break;
 					}
 					new_pc = value;
+#ifdef __amd64
 				} else {
-#endif
-#ifdef __i386__
 					uint32_t value32;
 					addr = (uintptr_t)(uint32_t)addr;
 					if ((value32 = fasttrap_fuword32((void *)addr))
@@ -1490,13 +1487,11 @@ fasttrap_pid_probe(struct reg *rp)
 						break;
 					}
 					new_pc = value32;
-#endif
 				}
-#ifdef __amd64
+#endif
 			} else {
 				new_pc = addr;
 			}
-#endif
 		}
 
 		/*
@@ -1515,11 +1510,9 @@ fasttrap_pid_probe(struct reg *rp)
 				ret = fasttrap_sulword((void *)addr, pcps);
 			} else {
 #endif
-#ifdef __i386__
 				addr = rp->r_rsp - sizeof (uint32_t);
 				pcps = (uint32_t)(pc + tp->ftt_size);
 				ret = fasttrap_suword32((void *)addr, pcps);
-#endif
 #ifdef __amd64
 			}
 #endif