kernel/printcpuinfo(): Sync feature bit descriptions with FreeBSD.

diff --git a/sys/platform/pc32/i386/identcpu.c b/sys/platform/pc32/i386/identcpu.c
index 98a10b0..bf75b44 100644 (file)
--- a/sys/platform/pc32/i386/identcpu.c
+++ b/sys/platform/pc32/i386/identcpu.c
@@ -741,24 +741,24 @@ printcpuinfo(void)
                                "\012SSSE3"     /* SSSE3 */
                                "\013CNXT-ID"   /* L1 context ID available */
                                "\014<b11>"
-                               "\015<b12>"
+                               "\015FMA"       /* Fused Multiply Add */
                                "\016CX16"      /* CMPXCHG16B Instruction */
                                "\017xTPR"      /* Send Task Priority Messages */
                                "\020PDCM"      /* Perf/Debug Capability MSR */
                                "\021<b16>"
                                "\022PCID"      /* Process-context Identifiers */
                                "\023DCA"       /* Direct Cache Access */
-                               "\024SSE4.1"
-                               "\025SSE4.2"
+                               "\024SSE4.1"    /* SSE 4.1 */
+                               "\025SSE4.2"    /* SSE 4.2 */
                                "\026x2APIC"    /* xAPIC Extensions */
                                "\027MOVBE"     /* MOVBE Instruction */
-                               "\030POPCNT"
-                               "\031TSC-DL"    /* TSC Deadline */
+                               "\030POPCNT"    /* POPCNT Instruction */
+                               "\031TSCDLT"    /* TSC-Deadline Timer */
                                "\032AESNI"     /* AES Crypto */
-                               "\033XSAVE"
-                               "\034OSXSAVE"
+                               "\033XSAVE"     /* XSAVE/XRSTOR States */
+                               "\034OSXSAVE"   /* OS-Enabled State Management */
                                "\035AVX"       /* Advanced Vector Extensions */
-                               "\036<b29>"
+                               "\036F16C"      /* Half-precision conversions */
                                "\037<b30>"
                                "\040VMM"       /* Running on a hypervisor */
                                );
@@ -825,18 +825,18 @@ printcpuinfo(void)
                                "\011Prefetch"  /* 3DNow! Prefetch/PrefetchW */
                                "\012OSVW"      /* OS visible workaround */
                                "\013IBS"       /* Instruction based sampling */
-                               "\014SSE5"      /* SSE5 */
+                               "\014XOP"       /* XOP extended instructions */
                                "\015SKINIT"    /* SKINIT/STGI */
                                "\016WDT"       /* Watchdog timer */
                                "\017<b14>"
-                               "\020<b15>"
-                               "\021<b16>"
+                               "\020LWP"       /* Lightweight Profiling */
+                               "\021FMA4"      /* 4-operand FMA instructions */
                                "\022<b17>"
                                "\023<b18>"
-                               "\024<b19>"
+                               "\024NodeId"    /* NodeId MSR support */
                                "\025<b20>"
-                               "\026<b21>"
-                               "\027<b22>"
+                               "\026TBM"       /* Trailing Bit Manipulation */
+                               "\027Topology"  /* Topology Extensions */
                                "\030<b23>"
                                "\031<b24>"
                                "\032<b25>"

diff --git a/sys/platform/pc64/x86_64/identcpu.c b/sys/platform/pc64/x86_64/identcpu.c
index a0a1620..270c22b 100644 (file)
--- a/sys/platform/pc64/x86_64/identcpu.c
+++ b/sys/platform/pc64/x86_64/identcpu.c
@@ -251,24 +251,24 @@ printcpuinfo(void)
                                "\012SSSE3"     /* SSSE3 */
                                "\013CNXT-ID"   /* L1 context ID available */
                                "\014<b11>"
-                               "\015<b12>"
+                               "\015FMA"       /* Fused Multiply Add */
                                "\016CX16"      /* CMPXCHG16B Instruction */
                                "\017xTPR"      /* Send Task Priority Messages */
                                "\020PDCM"      /* Perf/Debug Capability MSR */
                                "\021<b16>"
                                "\022PCID"      /* Process-context Identifiers */
                                "\023DCA"       /* Direct Cache Access */
-                               "\024SSE4.1"
-                               "\025SSE4.2"
+                               "\024SSE4.1"    /* SSE 4.1 */
+                               "\025SSE4.2"    /* SSE 4.2 */
                                "\026x2APIC"    /* xAPIC Extensions */
-                               "\027MOVBE"     /* MOVBE instruction */
-                               "\030POPCNT"
-                               "\031TSC-DL"    /* TSC Deadline */
+                               "\027MOVBE"     /* MOVBE Instruction */
+                               "\030POPCNT"    /* POPCNT Instruction */
+                               "\031TSCDLT"    /* TSC-Deadline Timer */
                                "\032AESNI"     /* AES Crypto */
-                               "\033XSAVE"
-                               "\034OSXSAVE"
+                               "\033XSAVE"     /* XSAVE/XRSTOR States */
+                               "\034OSXSAVE"   /* OS-Enabled State Management */
                                "\035AVX"       /* Advanced Vector Extensions */
-                               "\036<b29>"
+                               "\036F16C"      /* Half-precision conversions */
                                "\037<b30>"
                                "\040VMM"       /*  Running on a hypervisor */
                                );
@@ -335,18 +335,18 @@ printcpuinfo(void)
                                "\011Prefetch"  /* 3DNow! Prefetch/PrefetchW */
                                "\012OSVW"      /* OS visible workaround */
                                "\013IBS"       /* Instruction based sampling */
-                               "\014SSE5"      /* SSE5 */
+                               "\014XOP"       /* XOP extended instructions */
                                "\015SKINIT"    /* SKINIT/STGI */
                                "\016WDT"       /* Watchdog timer */
                                "\017<b14>"
-                               "\020<b15>"
-                               "\021<b16>"
+                               "\020LWP"       /* Lightweight Profiling */
+                               "\021FMA4"      /* 4-operand FMA instructions */
                                "\022<b17>"
                                "\023<b18>"
-                               "\024<b19>"
+                               "\024NodeId"    /* NodeId MSR support */
                                "\025<b20>"
-                               "\026<b21>"
-                               "\027<b22>"
+                               "\026TBM"       /* Trailing Bit Manipulation */
+                               "\027Topology"  /* Topology Extensions */
                                "\030<b23>"
                                "\031<b24>"
                                "\032<b25>"