From owner-svn-src-head@FreeBSD.ORG  Fri Feb  3 21:24:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F0A4106566B;
	Fri,  3 Feb 2012 21:24:29 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 09BFE8FC12;
	Fri,  3 Feb 2012 21:24:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q13LOSEQ004728;
	Fri, 3 Feb 2012 21:24:28 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q13LOSGv004726;
	Fri, 3 Feb 2012 21:24:28 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201202032124.q13LOSGv004726@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 3 Feb 2012 21:24:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230958 - head/sys/amd64/acpica
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 03 Feb 2012 21:24:29 -0000

Author: jkim
Date: Fri Feb  3 21:24:28 2012
New Revision: 230958
URL: http://svn.freebsd.org/changeset/base/230958

Log:
  Restore callee saved registers later and micro-optimize.

Modified:
  head/sys/amd64/acpica/acpi_switch.S

Modified: head/sys/amd64/acpica/acpi_switch.S
==============================================================================
--- head/sys/amd64/acpica/acpi_switch.S	Fri Feb  3 21:21:00 2012	(r230957)
+++ head/sys/amd64/acpica/acpi_switch.S	Fri Feb  3 21:24:28 2012	(r230958)
@@ -120,15 +120,6 @@ ENTRY(acpi_restorecpu)
 #undef	SDT_SYSTSS
 #undef	SDT_SYSBSY
 
-	/* Restore other callee saved registers. */
-	movq	PCB_R15(%rdi), %r15
-	movq	PCB_R14(%rdi), %r14
-	movq	PCB_R13(%rdi), %r13
-	movq	PCB_R12(%rdi), %r12
-	movq	PCB_RBP(%rdi), %rbp
-	movq	PCB_RSP(%rdi), %rsp
-	movq	PCB_RBX(%rdi), %rbx
-
 	/* Restore debug registers. */
 	movq	PCB_DR0(%rdi), %rax
 	movq	%rax, %dr0
@@ -145,6 +136,7 @@ ENTRY(acpi_restorecpu)
 
 	/* Restore FPU state. */
 	fninit
+	movq	WAKEUP_CTX(fpusave), %rbx
 	movq	WAKEUP_CTX(xsmask), %rax
 	testq	%rax, %rax
 	jz	1f
@@ -153,19 +145,26 @@ ENTRY(acpi_restorecpu)
 	movl	$XCR0, %ecx
 /*	xsetbv	*/
 	.byte	0x0f, 0x01, 0xd1
-	movq	WAKEUP_CTX(fpusave), %rcx
-/*	xrstor	(%rcx) */
-	.byte	0x0f, 0xae, 0x29
+/*	xrstor	(%rbx) */
+	.byte	0x0f, 0xae, 0x2b
 	jmp	2f
 1:
-	movq	WAKEUP_CTX(fpusave), %rcx
-	fxrstor	(%rcx)
+	fxrstor	(%rbx)
 2:
 
 	/* Reload CR0. */
 	movq	PCB_CR0(%rdi), %rax
 	movq	%rax, %cr0
 
+	/* Restore other callee saved registers. */
+	movq	PCB_R15(%rdi), %r15
+	movq	PCB_R14(%rdi), %r14
+	movq	PCB_R13(%rdi), %r13
+	movq	PCB_R12(%rdi), %r12
+	movq	PCB_RBP(%rdi), %rbp
+	movq	PCB_RSP(%rdi), %rsp
+	movq	PCB_RBX(%rdi), %rbx
+
 	/* Restore return address. */
 	movq	PCB_RIP(%rdi), %rax
 	movq	%rax, (%rsp)