From owner-p4-projects@FreeBSD.ORG  Fri Jul  6 12:23:24 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6079F1065670; Fri,  6 Jul 2012 12:23:24 +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 23179106566B
	for <perforce@freebsd.org>; Fri,  6 Jul 2012 12:23:24 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C1488FC12
	for <perforce@freebsd.org>; Fri,  6 Jul 2012 12:23:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q66CNN8P058767
	for <perforce@freebsd.org>; Fri, 6 Jul 2012 12:23:23 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q66CNNXV058764
	for perforce@freebsd.org; Fri, 6 Jul 2012 12:23:23 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 6 Jul 2012 12:23:23 GMT
Message-Id: <201207061223.q66CNNXV058764@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 213975 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 06 Jul 2012 12:23:24 -0000

http://p4web.freebsd.org/@@213975?ac=10

Change 213975 by jhb@jhb_jhbbsd on 2012/07/06 12:22:19

	Cleanup.

Affected files ...

.. //depot/projects/smpng/sys/modules/x86dis/x86dis.c#8 edit

Differences ...

==== //depot/projects/smpng/sys/modules/x86dis/x86dis.c#8 (text+ko) ====

@@ -1,8 +1,6 @@
 #include <sys/types.h>
 #include <machine/cpufunc.h>
 
-#define NEW_AS
-
 static __inline void
 xrstor(char *addr, uint64_t mask)
 {
@@ -69,7 +67,6 @@
 void
 isn_list(char *addr, uint32_t reg, uint64_t mask, uint64_t val)
 {
-#if 0
 	uint32_t aux;
 
 	rdtscp(&aux);
@@ -82,22 +79,6 @@
 	mfence();
 	__asm __volatile("sfence" ::: "memory");
 	clflush((u_long)addr);
-#endif
-	/*
-	 * TODO:
-	 * * invept
-	 * * invvpid
-	 * * vmcall
-	 * * vmclear
-	 * * vmlaunch
-	 * * vmresume
-	 * * vmptrld
-	 * * vmptrst
-	 * * vmread
-	 * * vmwrite
-	 * * vmxoff
-	 * * vmxon
-	 */
 	__asm __volatile("cbw");
 	__asm __volatile("cwde");
 	__asm __volatile("cdqe");
@@ -109,15 +90,8 @@
 	__asm __volatile("cmpxchg8b %0" : "+m" (*addr));
 	__asm __volatile("cmpxchg16b %0" : "+m" (*addr));
 	__asm __volatile("rep stosl");
-#ifdef NEW_AS
 	__asm __volatile("invept %0,%1" :: "m" (*addr), "r" ((uint64_t)reg));
 	__asm __volatile("invvpid %0,%1" :: "m" (*addr), "r" ((uint64_t)reg));
-#else
-	/* invept (%rdi),%rax */
-	__asm __volatile(".byte 0x66,0x0f,0x38,0x80,0x07" :: "D" (*addr), "a" (reg));
-	/* invvpid (%rdi),%rax */
-	__asm __volatile(".byte 0x66,0x0f,0x38,0x81,0x07" :: "D" (*addr), "a" (reg));
-#endif
 	__asm __volatile("vmcall");
 	__asm __volatile("vmclear %0" : "=m" (*addr));
 	__asm __volatile("vmlaunch");