summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2004-02-05 10:23:56 +0000
committerderaadt <deraadt@openbsd.org>2004-02-05 10:23:56 +0000
commit78555944b293c2cd20f024ba5df93b7f84e3d77b (patch)
treebebc9d34fbdf79e297e7f104f70669bf90a2bd0a
parentsome small cleanup; (diff)
downloadwireguard-openbsd-78555944b293c2cd20f024ba5df93b7f84e3d77b.tar.xz
wireguard-openbsd-78555944b293c2cd20f024ba5df93b7f84e3d77b.zip
2 new cpuid ecx features in prescott
-rw-r--r--sys/arch/i386/i386/machdep.c4
-rw-r--r--sys/arch/i386/include/specialreg.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index daa8cab9548..79d70edc911 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.276 2004/02/04 22:54:10 grange Exp $ */
+/* $OpenBSD: machdep.c,v 1.277 2004/02/05 10:23:56 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -1085,6 +1085,8 @@ const struct cpu_cpuid_feature i386_cpuid_features[] = {
};
const struct cpu_cpuid_feature i386_cpuid_ecxfeatures[] = {
+ { CPUIDECX_PNI, "PNI" },
+ { CPUIDECX_MWAIT, "MWAIT" },
{ CPUIDECX_EST, "EST" },
{ CPUIDECX_TM2, "TM2" },
{ CPUIDECX_CNXTID, "CNXT-ID" },
diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h
index c2239d4206d..2a892090c29 100644
--- a/sys/arch/i386/include/specialreg.h
+++ b/sys/arch/i386/include/specialreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: specialreg.h,v 1.19 2004/02/03 08:42:19 deraadt Exp $ */
+/* $OpenBSD: specialreg.h,v 1.20 2004/02/05 10:23:57 deraadt Exp $ */
/* $NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $ */
/*-
@@ -130,6 +130,8 @@
*/
#define CPUID_3DNOW 0x40000000 /* has 3DNow! instructions (AMD) */
+#define CPUIDECX_PNI 0x00000001 /* Prescott New Instructions */
+#define CPUIDECX_MWAIT 0x00000008 /* Monitor/Mwait */
#define CPUIDECX_EST 0x00000080 /* enhanced SpeedStep */
#define CPUIDECX_TM2 0x00000100 /* thermal monitor 2 */
#define CPUIDECX_CNXTID 0x00000400 /* Context ID */