Module Name: src
Committed By: dsl
Date: Sun Feb 9 17:07:41 UTC 2014
Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/x86/include: cpufunc.h
Log Message:
Add x86_stmxcsr for amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/cpufunc.h
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.22 src/sys/arch/amd64/amd64/cpufunc.S:1.23
--- src/sys/arch/amd64/amd64/cpufunc.S:1.22 Sun Dec 8 18:00:51 2013
+++ src/sys/arch/amd64/amd64/cpufunc.S Sun Feb 9 17:07:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.22 2013/12/08 18:00:51 dsl Exp $ */
+/* $NetBSD: cpufunc.S,v 1.23 2014/02/09 17:07:41 dsl Exp $ */
/*-
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -504,6 +504,10 @@ ENTRY(xrstor)
xrstor (%rdi)
ret
+ENTRY(x86_stmxcsr)
+ ldmxcsr (%rdi)
+ ret
+
ENTRY(x86_ldmxcsr)
ldmxcsr (%rdi)
ret
Index: src/sys/arch/x86/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.14 src/sys/arch/x86/include/cpufunc.h:1.15
--- src/sys/arch/x86/include/cpufunc.h:1.14 Sun Dec 8 18:00:51 2013
+++ src/sys/arch/x86/include/cpufunc.h Sun Feb 9 17:07:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.14 2013/12/08 18:00:51 dsl Exp $ */
+/* $NetBSD: cpufunc.h,v 1.15 2014/02/09 17:07:41 dsl Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ void fldcw(void *);
void fnclex(void);
void fninit(void);
void fnsave(void *);
-void fnstcw(void *);
+void fnstcw(uint16_t *);
void fnstsw(void *);
void fp_divide_by_0(void);
void frstor(void *);
@@ -92,7 +92,8 @@ void fxsave(void *);
void fxrstor(void *);
void x86_monitor(const void *, uint32_t, uint32_t);
void x86_mwait(uint32_t, uint32_t);
-void x86_ldmxcsr(void *);
+void x86_ldmxcsr(const uint32_t *);
+void x86_stmxcsr(uint32_t *);
/* x86_cpuid2() writes four 32bit values, %eax, %ebx, %ecx and %edx */
#define x86_cpuid(a,b) x86_cpuid2((a),0,(b))
void x86_cpuid2(uint32_t, uint32_t, uint32_t *);