From 444576c0c4db136c03dad1b1886c4bc2e561d5be Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 12 Jul 2006 06:04:12 +0000 Subject: [PATCH] Add two new CPUID bits for AMD CPUs, i. e., SVM and extended APIC register. --- 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 a8ad392caa9..f413fb5691a 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -306,8 +306,8 @@ printcpuinfo(void) "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index 24db7daead3..7adc83d0b49 100644 --- a/sys/amd64/include/specialreg.h +++ b/sys/amd64/include/specialreg.h @@ -135,6 +135,8 @@ #define AMDID2_LAHF 0x00000001 #define AMDID2_CMP 0x00000002 +#define AMDID2_SVM 0x00000004 +#define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 /* diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index aff022f123c..2f0be0964b2 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -813,8 +813,8 @@ printcpuinfo(void) "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h index 6fd492c43eb..8c8cd0dbdc9 100644 --- a/sys/i386/include/specialreg.h +++ b/sys/i386/include/specialreg.h @@ -122,6 +122,8 @@ #define AMDID2_LAHF 0x00000001 #define AMDID2_CMP 0x00000002 +#define AMDID2_SVM 0x00000004 +#define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 /*