svn commit: r262046 - in stable/9/sys/cddl/contrib/opensolaris/uts: common/sys intel/dtrace

[Andriy Gapon]

Author: avg
Date: Mon Feb 17 13:08:07 2014
New Revision: 262046
URL: http://svnweb.freebsd.org/changeset/base/262046

Log:
  MFC r257679: Use suword32 and suword64 instead of copyout(9) in fasttrap

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
  stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h	Mon Feb 17 13:05:26 2014	(r262045)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h	Mon Feb 17 13:08:07 2014	(r262046)
@@ -158,15 +158,15 @@ typedef struct fasttrap_hash {
  */
 #define	fasttrap_copyout	copyout
 #define	fasttrap_fuword32	fuword32
-#define	fasttrap_suword32(_k, _u)	copyout((_k), (_u), sizeof(uint32_t))
-#define	fasttrap_suword64(_k, _u)	copyout((_k), (_u), sizeof(uint64_t))
+#define	fasttrap_suword32	suword32
+#define	fasttrap_suword64	suword64
 
 #ifdef __amd64__
 #define	fasttrap_fulword	fuword64
-#define	fasttrap_sulword	fasttrap_suword64
+#define	fasttrap_sulword	suword64
 #else
 #define	fasttrap_fulword	fuword32
-#define	fasttrap_sulword	fasttrap_suword32
+#define	fasttrap_sulword	suword32
 #endif
 
 extern void fasttrap_sigtrap(proc_t *, kthread_t *, uintptr_t);

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Mon Feb 17 13:05:26 2014	(r262045)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Mon Feb 17 13:08:07 2014	(r262046)
@@ -1386,12 +1386,12 @@ fasttrap_pid_probe(struct reg *rp)
 #ifdef __amd64
 		if (p->p_model == DATAMODEL_NATIVE) {
 			rp->r_rsp -= sizeof (uintptr_t);
-			ret = fasttrap_sulword(&rp->r_rbp, (void *)rp->r_rsp);
+			ret = fasttrap_sulword((void *)rp->r_rsp, rp->r_rbp);
 		} else {
 #endif
 #ifdef __i386__
 			rp->r_rsp -= sizeof (uint32_t);
-			ret = fasttrap_suword32(&rp->r_rbp, (void *)rp->r_rsp);
+			ret = fasttrap_suword32((void *)rp->r_rsp, rp->r_rbp);
 #endif
 #ifdef __amd64
 		}
@@ -1486,13 +1486,13 @@ fasttrap_pid_probe(struct reg *rp)
 			if (p->p_model == DATAMODEL_NATIVE) {
 				addr = rp->r_rsp - sizeof (uintptr_t);
 				pcps = pc + tp->ftt_size;
-				ret = fasttrap_sulword((void *)addr, &pcps);
+				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);
+				ret = fasttrap_suword32((void *)addr, pcps);
 #endif
 #ifdef __amd64
 			}