diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-07 05:18:09 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-07 05:18:09 +0000 |
| commit | 66a07359631e2429593678c4a6f47c58b640b885 (patch) | |
| tree | e50f1d553d0a7a2b7b8ad0402eff56ab4aa6347e /sys/arch/i386 | |
| parent | 646fd3c198ade370763bc5a93c664e73f886d3f6 (diff) | |
Check for a few additional CPUID flags.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/specialreg.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 545e13b2c37..a26e4980b54 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.340 2006/02/22 22:16:05 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.341 2006/03/07 05:18:08 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1112,6 +1112,7 @@ const struct cpu_cpuid_feature i386_cpuid_features[] = { { CPUID_PSE36, "PSE36" }, { CPUID_SER, "SER" }, { CPUID_CFLUSH, "CFLUSH" }, + { CPUID_DS, "DS" }, { CPUID_ACPI, "ACPI" }, { CPUID_MMX, "MMX" }, { CPUID_FXSR, "FXSR" }, @@ -1127,9 +1128,12 @@ const struct cpu_cpuid_feature i386_cpuid_features[] = { const struct cpu_cpuid_feature i386_cpuid_ecxfeatures[] = { { CPUIDECX_SSE3, "SSE3" }, { CPUIDECX_MWAIT, "MWAIT" }, + { CPUIDECX_DSCPL, "DS-CPL" }, + { CPUIDECX_VMX, "VMX" }, { CPUIDECX_EST, "EST" }, { CPUIDECX_TM2, "TM2" }, { CPUIDECX_CNXTID, "CNXT-ID" }, + { CPUIDECX_CX16, "CX16" }, }; void diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h index beabfb23cdb..952629c03b3 100644 --- a/sys/arch/i386/include/specialreg.h +++ b/sys/arch/i386/include/specialreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: specialreg.h,v 1.26 2005/08/20 00:27:08 jsg Exp $ */ +/* $OpenBSD: specialreg.h,v 1.27 2006/03/07 05:18:08 jsg Exp $ */ /* $NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $ */ /*- @@ -133,9 +133,12 @@ #define CPUIDECX_SSE3 0x00000001 /* has SSE3 instructions */ #define CPUIDECX_MWAIT 0x00000008 /* Monitor/Mwait */ +#define CPUIDECX_DSCPL 0x00000010 /* CPL Qualified Debug Store */ +#define CPUIDECX_VMX 0x00000020 /* Virtual Machine Extensions */ #define CPUIDECX_EST 0x00000080 /* enhanced SpeedStep */ #define CPUIDECX_TM2 0x00000100 /* thermal monitor 2 */ #define CPUIDECX_CNXTID 0x00000400 /* Context ID */ +#define CPUIDECX_CX16 0x00002000 /* has CMPXCHG16B instruction */ /* * Model-specific registers for the i386 family |