[src/trunk]: src/usr.sbin/tprof/arch Skylake/Kabylake are family 6, so add a ...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e169a1ced5f9
branches:  trunk
changeset: 324622:e169a1ced5f9
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Jul 13 09:53:42 2018 +0000

description:
Skylake/Kabylake are family 6, so add a check for that. While here improve
the layout of "tprof list".

diffstat:

 usr.sbin/tprof/arch/tprof_x86.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r 51f0401c7fe7 -r e169a1ced5f9 usr.sbin/tprof/arch/tprof_x86.c
--- a/usr.sbin/tprof/arch/tprof_x86.c   Fri Jul 13 09:37:32 2018 +0000
+++ b/usr.sbin/tprof/arch/tprof_x86.c   Fri Jul 13 09:53:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tprof_x86.c,v 1.2 2018/07/13 08:09:21 maxv Exp $       */
+/*     $NetBSD: tprof_x86.c,v 1.3 2018/07/13 09:53:42 maxv Exp $       */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -162,13 +162,15 @@
        edx = 0;
        x86_cpuid(&eax, &ebx, &ecx, &edx);
 
-       switch (CPUID_TO_MODEL(eax)) {
-       case 0x4E: /* Skylake */
-       case 0x5E: /* Skylake */
-       case 0x8E: /* Kabylake */
-       case 0x9E: /* Kabylake */
-               table->next = init_intel_skylake_kabylake();
-               break;
+       if (CPUID_TO_FAMILY(eax) == 6) {
+               switch (CPUID_TO_MODEL(eax)) {
+               case 0x4E: /* Skylake */
+               case 0x5E: /* Skylake */
+               case 0x8E: /* Kabylake */
+               case 0x9E: /* Kabylake */
+                       table->next = init_intel_skylake_kabylake();
+                       break;
+               }
        }
 
        return table;
@@ -314,7 +316,6 @@
                        continue;
                printf("\t%s\n", table->names[i].name);
        }
-       printf("\n");
 
        if (table->next != NULL) {
                recursive_event_list(table->next);