From owner-p4-projects@FreeBSD.ORG  Tue Jul  3 23:00:21 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 110A11065675; Tue,  3 Jul 2012 23:00:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CB5A11065672
	for <perforce@freebsd.org>; Tue,  3 Jul 2012 23:00:20 +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 A02098FC08
	for <perforce@freebsd.org>; Tue,  3 Jul 2012 23:00:20 +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 q63N0KIt064574
	for <perforce@freebsd.org>; Tue, 3 Jul 2012 23:00:20 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q63N0K3h064571
	for perforce@freebsd.org; Tue, 3 Jul 2012 23:00:20 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 3 Jul 2012 23:00:20 GMT
Message-Id: <201207032300.q63N0K3h064571@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 213872 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: Tue, 03 Jul 2012 23:00:21 -0000

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

Change 213872 by jhb@jhb_ralph on 2012/07/03 23:00:05

	Fix the memory operand for xsave/xrstor.

Affected files ...

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

Differences ...

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

@@ -10,7 +10,7 @@
 	low = mask;
 	hi = mask >> 32;
 #ifdef NEW_AS
-	__asm __volatile("xrstor %0" : : "m" (addr), "a" (low), "d" (hi));
+	__asm __volatile("xrstor %0" : : "m" (*addr), "a" (low), "d" (hi));
 #else
 	/* xrstor (%rdi) */
 	__asm __volatile(".byte	0x0f,0xae,0x2f" : :
@@ -26,7 +26,7 @@
 	low = mask;
 	hi = mask >> 32;
 #ifdef NEW_AS
-	__asm __volatile("xsave %0" : "=m" (addr) : "a" (low), "d" (hi) :
+	__asm __volatile("xsave %0" : "=m" (*addr) : "a" (low), "d" (hi) :
 	    "memory");
 #else
 	/* xsave (%rdi) */
@@ -43,7 +43,7 @@
 	low = mask;
 	hi = mask >> 32;
 #ifdef NEW_AS
-	__asm __volatile("xsaveopt %0" : "=m" (addr) : "a" (low), "d" (hi) :
+	__asm __volatile("xsaveopt %0" : "=m" (*addr) : "a" (low), "d" (hi) :
 	    "memory");
 #else
 	/* xsaveopt (%rdi) */