From b27667eff18ca678aed73ca9a38956c97bd783d4 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Fri, 29 Sep 2000 04:53:00 +0000
Subject: [PATCH] Fill in some more missing bits from cpu_features according to
 the Intel Pentium4 cpuid docs.

---
 sys/amd64/amd64/identcpu.c | 20 ++++++++++----------
 sys/i386/i386/identcpu.c   | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 49014acda595..ffd31f902335 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -558,7 +558,7 @@ printcpuinfo(void)
 			"\020"
 			"\001FPU"	/* Integral FPU */
 			"\002VME"	/* Extended VM86 mode support */
-			"\003DE"
+			"\003DE"	/* Debugging Extensions (CR4.DE) */
 			"\004PSE"	/* 4MByte page tables */
 			"\005TSC"	/* Timestamp counter */
 			"\006MSR"	/* Machine specific registers */
@@ -567,25 +567,25 @@ printcpuinfo(void)
 			"\011CX8"	/* CMPEXCH8 instruction */
 			"\012APIC"	/* SMP local APIC */
 			"\013oldMTRR"
-			"\014SEP"
+			"\014SEP"	/* Fast System Call */
 			"\015MTRR"	/* Memory Type Range Registers */
 			"\016PGE"	/* PG_G (global bit) support */
-			"\017MCA"
+			"\017MCA"	/* Machine Check Architecture */
 			"\020CMOV"	/* CMOV instruction */
 			"\021PAT"	/* Page attributes table */
 			"\022PSE36"	/* 36 bit address space support */
 			"\023PN"	/* Processor Serial number */
-			"\024<b19>"
+			"\024CLFLUSH"	/* Has the CLFLUSH instruction */
 			"\025<b20>"
-			"\026<b21>"
-			"\027<b22>"
+			"\026DTS"	/* Debug Trace Store */
+			"\027ACPI"	/* ACPI support */
 			"\030MMX"	/* MMX instructions */
 			"\031FXSR"	/* FXSAVE/FXRSTOR */
-			"\032XMM"	/* Katmai SIMD/MMX2 instructions */
-			"\033<b26>"
-			"\034<b27>"
+			"\032SSE"	/* Streaming SIMD Extensions */
+			"\033SSE2"	/* Streaming SIMD Extensions #2 */
+			"\034SS"	/* Self snoop */
 			"\035<b28>"
-			"\036<b29>"
+			"\036ACC"	/* Auto Clock Correction (TCC/ACPI) */
 			"\037<b30>"
 			"\040<b31>"
 			);
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 49014acda595..ffd31f902335 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -558,7 +558,7 @@ printcpuinfo(void)
 			"\020"
 			"\001FPU"	/* Integral FPU */
 			"\002VME"	/* Extended VM86 mode support */
-			"\003DE"
+			"\003DE"	/* Debugging Extensions (CR4.DE) */
 			"\004PSE"	/* 4MByte page tables */
 			"\005TSC"	/* Timestamp counter */
 			"\006MSR"	/* Machine specific registers */
@@ -567,25 +567,25 @@ printcpuinfo(void)
 			"\011CX8"	/* CMPEXCH8 instruction */
 			"\012APIC"	/* SMP local APIC */
 			"\013oldMTRR"
-			"\014SEP"
+			"\014SEP"	/* Fast System Call */
 			"\015MTRR"	/* Memory Type Range Registers */
 			"\016PGE"	/* PG_G (global bit) support */
-			"\017MCA"
+			"\017MCA"	/* Machine Check Architecture */
 			"\020CMOV"	/* CMOV instruction */
 			"\021PAT"	/* Page attributes table */
 			"\022PSE36"	/* 36 bit address space support */
 			"\023PN"	/* Processor Serial number */
-			"\024<b19>"
+			"\024CLFLUSH"	/* Has the CLFLUSH instruction */
 			"\025<b20>"
-			"\026<b21>"
-			"\027<b22>"
+			"\026DTS"	/* Debug Trace Store */
+			"\027ACPI"	/* ACPI support */
 			"\030MMX"	/* MMX instructions */
 			"\031FXSR"	/* FXSAVE/FXRSTOR */
-			"\032XMM"	/* Katmai SIMD/MMX2 instructions */
-			"\033<b26>"
-			"\034<b27>"
+			"\032SSE"	/* Streaming SIMD Extensions */
+			"\033SSE2"	/* Streaming SIMD Extensions #2 */
+			"\034SS"	/* Self snoop */
 			"\035<b28>"
-			"\036<b29>"
+			"\036ACC"	/* Auto Clock Correction (TCC/ACPI) */
 			"\037<b30>"
 			"\040<b31>"
 			);