From 2498f259d4267db4613faee82de2909856bb990b Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Tue, 20 Mar 2007 20:22:45 +0000 Subject: [PATCH] - Add macros for newly added CPUID bits in the corresponding header files. - Use correct capticalization in xTPR as Intel uses in their documents. - Use proper description instead of vendor code name in comment. --- sys/amd64/amd64/identcpu.c | 4 ++-- sys/amd64/include/specialreg.h | 2 ++ sys/i386/i386/identcpu.c | 4 ++-- sys/i386/include/specialreg.h | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index b4254675905..d0eaee2579b 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -225,7 +225,7 @@ printcpuinfo(void) "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ - "\007SMX" /* LaGrange Technology */ + "\007SMX" /* Safer Mode Extensions */ "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ "\012SSSE3" /* SSSE3 */ @@ -233,7 +233,7 @@ printcpuinfo(void) "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017XTPR" /* Send Task Priority Messages*/ + "\017xTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index 5c5908f365d..fa7b1608d48 100644 --- a/sys/amd64/include/specialreg.h +++ b/sys/amd64/include/specialreg.h @@ -116,12 +116,14 @@ #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 #define CPUID2_VMX 0x00000020 +#define CPUID2_SMX 0x00000040 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 #define CPUID2_SSSE3 0x00000200 #define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 +#define CPUID2_DCA 0x00040000 /* * Important bits in the AMD extended cpuid flags diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index b38e0c46f59..09ff188d1f3 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -745,7 +745,7 @@ via_common: "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ - "\007SMX" /* LaGrange Technology */ + "\007SMX" /* Safer Mode Extensions */ "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ "\012SSSE3" /* SSSE3 */ @@ -753,7 +753,7 @@ via_common: "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017XTPR" /* Send Task Priority Messages*/ + "\017xTPR" /* Send Task Priority Messages*/ "\020" "\021" "\022" diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h index 2789ca23101..f89760f3b15 100644 --- a/sys/i386/include/specialreg.h +++ b/sys/i386/include/specialreg.h @@ -108,12 +108,14 @@ #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 #define CPUID2_VMX 0x00000020 +#define CPUID2_SMX 0x00000040 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 #define CPUID2_SSSE3 0x00000200 #define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 +#define CPUID2_DCA 0x00040000 /* * Important bits in the AMD extended cpuid flags