[src/trunk]: src/usr.sbin/cpuctl/arch fix printing of padlock features

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

details:   https://anonhg.NetBSD.org/src/rev/fa3f9df19fe0
branches:  trunk
changeset: 762329:fa3f9df19fe0
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 19 13:34:38 2011 +0000

description:
fix printing of padlock features

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r f65292a6f0ab -r fa3f9df19fe0 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Sat Feb 19 13:21:05 2011 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Sat Feb 19 13:34:38 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.23 2010/12/15 17:09:07 cegger Exp $ */
+/*     $NetBSD: i386.c,v 1.24 2011/02/19 13:34:38 jmcneill Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.23 2010/12/15 17:09:07 cegger Exp $");
+__RCSID("$NetBSD: i386.c,v 1.24 2011/02/19 13:34:38 jmcneill Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -742,7 +742,7 @@
                ci->ci_feat_val[2] |= descs[3];
        }
 
-       if (model < 0x9)
+       if (model < 0x9 || (model == 0x9 && stepping < 3))
                return;
 
        /* Nehemiah or Esther */
@@ -753,11 +753,7 @@
 
        x86_cpuid(0xc0000001, descs);
        lfunc = descs[3];
-       if (model > 0x9 || stepping >= 8) {     /* ACE */
-               if (lfunc & CPUID_VIA_HAS_ACE) {
-                       ci->ci_feat_val[4] = lfunc;
-               }
-       }
+       ci->ci_feat_val[4] = lfunc;
 }
 
 static const char *
@@ -1414,9 +1410,9 @@
                feature_str[2] = CPUID_INTEL_EXT_FLAGS;
                feature_str[3] = CPUID_INTEL_FLAGS4;
                break;
-       case CPUVENDOR_CYRIX:
+       case CPUVENDOR_IDT:
                feature_str[4] = CPUID_FLAGS_PADLOCK;
-               /* FALLTHRU */
+               break;
        default:
                break;
        }