CVS commit: [netbsd-5] src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: bouyer
Date: Sat Mar 17 18:41:16 UTC 2012
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-5]: i386.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1735):
usr.sbin/cpuctl/arch/i386.c: revision 1.29
Print CPU stepping level
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.4 -r1.13.2.5 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4 src/usr.sbin/cpuctl/arch/i386.c:1.13.2.5
--- src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4 Sun Oct 4 00:16:53 2009
+++ src/usr.sbin/cpuctl/arch/i386.c Sat Mar 17 18:41:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $ */
+/* $NetBSD: i386.c,v 1.13.2.5 2012/03/17 18:41:15 bouyer Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $");
+__RCSID("$NetBSD: i386.c,v 1.13.2.5 2012/03/17 18:41:15 bouyer Exp $");
#endif /* not lint */
#include
@@ -1498,9 +1498,10 @@ identifycpu(const char *cpuname)
#endif
aprint_normal_dev(ci->ci_dev, "family %02x model %02x "
- "extfamily %02x extmodel %02x\n", CPUID2FAMILY(ci->ci_signature),
- CPUID2MODEL(ci->ci_signature), CPUID2EXTFAMILY(ci->ci_signature),
- CPUID2EXTMODEL(ci->ci_signature));
+ "extfamily %02x extmodel %02x stepping %02x\n",
+ CPUID2FAMILY(ci->ci_signature), CPUID2MODEL(ci->ci_signature),
+ CPUID2EXTFAMILY(ci->ci_signature), CPUID2EXTMODEL(ci->ci_signature),
+ CPUID2STEPPING(ci->ci_signature));
}
static const char *
CVS commit: [netbsd-5] src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: snj
Date: Sun Oct 4 00:16:53 UTC 2009
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-5]: i386.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1055):
usr.sbin/cpuctl/arch/i386.c: revision 1.20
- add newer VIA C7 core and VIA Nano.
- when printing an unknown VIA CPU, default to 'Unknown IDT/VIA' instead of 'C3'
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.13.2.3 src/usr.sbin/cpuctl/arch/i386.c:1.13.2.4
--- src/usr.sbin/cpuctl/arch/i386.c:1.13.2.3 Mon May 18 19:43:55 2009
+++ src/usr.sbin/cpuctl/arch/i386.c Sun Oct 4 00:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.13.2.3 2009/05/18 19:43:55 bouyer Exp $ */
+/* $NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.13.2.3 2009/05/18 19:43:55 bouyer Exp $");
+__RCSID("$NetBSD: i386.c,v 1.13.2.4 2009/10/04 00:16:53 snj Exp $");
#endif /* not lint */
#include
@@ -546,8 +546,9 @@
{
0, 0, 0, 0, 0, 0, "C3 Samuel",
"C3 Samuel 2/Ezra", "C3 Ezra-T",
-"C3 Nehemiah", "C7 Esther", 0, 0, 0, 0, 0,
-"C3" /* Default */
+"C3 Nehemiah", "C7 Esther", 0, 0, "C7 Esther",
+0, "VIA Nano",
+"Unknown VIA/IDT" /* Default */
},
NULL,
via_cpu_probe,
CVS commit: [netbsd-5] src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: snj
Date: Tue Mar 24 20:34:57 UTC 2009
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-5]: i386.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #594):
usr.sbin/cpuctl/arch/i386.c: revision 1.16
Increase size of buffer for humanize_number(3) to print cache sizes
so that it can return 128KB, 256KB and 512KB properly instead of
truncated 0MB or rounded 1MB.
Problem reported by nisimura@ on port-amd64 and port-i386.
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.13.2.1 src/usr.sbin/cpuctl/arch/i386.c:1.13.2.2
--- src/usr.sbin/cpuctl/arch/i386.c:1.13.2.1 Tue Dec 23 03:36:43 2008
+++ src/usr.sbin/cpuctl/arch/i386.c Tue Mar 24 20:34:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.13.2.1 2008/12/23 03:36:43 snj Exp $ */
+/* $NetBSD: i386.c,v 1.13.2.2 2009/03/24 20:34:56 snj Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.13.2.1 2008/12/23 03:36:43 snj Exp $");
+__RCSID("$NetBSD: i386.c,v 1.13.2.2 2009/03/24 20:34:56 snj Exp $");
#endif /* not lint */
#include
@@ -83,7 +83,7 @@
#include "../cpuctl.h"
/* Size of buffer for printing humanized numbers */
-#define HUMAN_BUFSIZE 5
+#define HUMAN_BUFSIZE sizeof("999KB")
#define x86_cpuid(a,b) x86_cpuid2((a),0,(b))
