Module Name: src
Committed By: skrll
Date: Thu Oct 1 09:13:54 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
Log Message:
Fix up mwait/monitor now that gas has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/amd64/cpufunc.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.15 src/sys/arch/amd64/amd64/cpufunc.S:1.16
--- src/sys/arch/amd64/amd64/cpufunc.S:1.15 Tue Jun 24 16:32:53 2008
+++ src/sys/arch/amd64/amd64/cpufunc.S Thu Oct 1 09:13:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.15 2008/06/24 16:32:53 ad Exp $ */
+/* $NetBSD: cpufunc.S,v 1.16 2009/10/01 09:13:54 skrll Exp $ */
/*-
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -333,7 +333,7 @@
ENTRY(x86_monitor)
movq %rdi, %rax
movq %rsi, %rcx
- monitor %eax, %ecx, %edx /* XXXgas %rax */
+ monitor %rax, %rcx, %rdx
ret
/* Waits - set up stack frame. */
@@ -342,7 +342,7 @@
movq %rsp, %rbp
movq %rdi, %rax
movq %rsi, %rcx
- mwait %eax, %ecx
+ mwait %rax, %rcx
leave
ret
