 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpuctl.h,v 1.1 2008/05/05 17:54:14 ad Exp $	*/
+/*	$NetBSD: cpuctl.h,v 1.1.8.1 2008/12/23 03:36:43 snj Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,16 +23,14 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 int	aprint_normal(const char *, ...);
 int	aprint_verbose(const char *, ...);
 int	aprint_error(const char *, ...);
 int	aprint_normal_dev(const char *, const char *, ...);
 int	aprint_verbose_dev(const char *, const char *, ...);
 int	aprint_error_dev(const char *, const char *, ...);
 char	*bitmask_snprintf(uint64_t, const char *, char *, size_t);
 void	identifycpu(const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i386.c,v 1.13 2008/10/14 15:49:04 cegger Exp $	*/
+/*	$NetBSD: i386.c,v 1.13.2.1 2008/12/23 03:36:43 snj Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden,  and by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -47,40 +47,41 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.13 2008/10/14 15:49:04 cegger Exp $");
+__RCSID("$NetBSD: i386.c,v 1.13.2.1 2008/12/23 03:36:43 snj Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/bitops.h>
 #include <sys/sysctl.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
 #include <assert.h>
 #include <math.h>
 #include <util.h>
 #include <machine/specialreg.h>
 #include <machine/cpu.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/cacheinfo.h>
 #include "../cpuctl.h"
 /* Size of buffer for printing humanized numbers */
 #define HUMAN_BUFSIZE 5
 @@ -1175,42 +1176,41 @@ transmeta_cpu_info(struct cpu_info *ci)
 		aprint_verbose_dev(ci->ci_dev, "LongRun <%dMHz %dmV %d%%>\n",
 		    frequency, voltage, percentage);
+	}
+}
 void
 identifycpu(const char *cpuname)
+{
 	const char *name, *modifier, *vendorname, *brand = "";
 	int class = CPUCLASS_386, i, xmax;
 	int modif, family, model;
 	const struct cpu_cpuid_nameclass *cpup = NULL;
 	const struct cpu_cpuid_family *cpufam;
 	char *buf;
 	const char *feature_str[5];
 	struct cpu_info *ci, cistore;
 	extern int cpu;
 	extern int cpu_info_level;
 	size_t sz;
 	char buf[256];
 	ci = &cistore;
 	memset(ci, 0, sizeof(*ci));
 	ci->ci_dev = cpuname;
 	x86_identify();
 	ci->ci_cpuid_level = cpu_info_level;
 	cpu_probe_features(ci);
 	buf = malloc(MAXPATHLEN);
 	if (ci->ci_cpuid_level == -1) {
 		if (cpu < 0 || cpu >= __arraycount(i386_nocpuid_cpus))
 			errx(1, "unknown cpu type %d", cpu);
 		name = i386_nocpuid_cpus[cpu].cpu_name;
 		cpu_vendor = i386_nocpuid_cpus[cpu].cpu_vendor;
 		vendorname = i386_nocpuid_cpus[cpu].cpu_vendorname;
 		class = i386_nocpuid_cpus[cpu].cpu_class;
 		ci->ci_info = i386_nocpuid_cpus[cpu].cpu_info;
 		modifier = "";
 	} else {
 		xmax = __arraycount(i386_cpuid_cpus);
 		modif = (ci->ci_signature >> 12) & 0x3;
 		family = CPUID2FAMILY(ci->ci_signature);
 @@ -1333,68 +1333,65 @@ identifycpu(const char *cpuname)
 		feature_str[3] = CPUID_EXT_FLAGS;
 		feature_str[4] = CPUID_AMD_FLAGS4;
 		break;
 	case CPUVENDOR_INTEL:
 		feature_str[3] = CPUID_INTEL_FLAGS4;
 		break;
 	default:
 		feature_str[3] = CPUID_EXT_FLAGS;
 		break;
+	}
 	if (ci->ci_feature_flags) {
 		if ((ci->ci_feature_flags & CPUID_MASK1) != 0) {
-			bitmask_snprintf(ci->ci_feature_flags,
+			snprintb(buf, sizeof(buf), feature_str[0],
-			    feature_str[0], buf, MAXPATHLEN);
+			    ci->ci_feature_flags);
 			aprint_verbose("%s: features %s\n", cpuname, buf);
+		}
 		if ((ci->ci_feature_flags & CPUID_MASK2) != 0) {
-			bitmask_snprintf(ci->ci_feature_flags,
+			snprintb(buf, sizeof(buf), feature_str[1],
-			    feature_str[1], buf, MAXPATHLEN);
+			    ci->ci_feature_flags);
 			aprint_verbose("%s: features %s\n", cpuname, buf);
+		}
 		if ((ci->ci_feature_flags & CPUID_MASK3) != 0) {
-			bitmask_snprintf(ci->ci_feature_flags,
+			snprintb(buf, sizeof(buf), feature_str[2],
-			    feature_str[2], buf, MAXPATHLEN);
+			    ci->ci_feature_flags);
 			aprint_verbose("%s: features %s\n", cpuname, buf);
+		}
+	}
 	if (ci->ci_feature2_flags) {
-		bitmask_snprintf(ci->ci_feature2_flags,
+		snprintb(buf, sizeof(buf), CPUID2_FLAGS, ci->ci_feature2_flags);
 		    CPUID2_FLAGS, buf, MAXPATHLEN);
 		aprint_verbose("%s: features2 %s\n", cpuname, buf);
+	}
 	if (ci->ci_feature3_flags) {
-		bitmask_snprintf(ci->ci_feature3_flags,
+		snprintb(buf, sizeof(buf), feature_str[3],
-			feature_str[3], buf, MAXPATHLEN);
+		    ci->ci_feature3_flags);
 		aprint_verbose("%s: features3 %s\n", cpuname, buf);
+	}
 	if (ci->ci_feature4_flags) {
-		bitmask_snprintf(ci->ci_feature4_flags,
+		snprintb(buf, sizeof(buf), feature_str[4],
-			feature_str[4], buf, MAXPATHLEN);
+		    ci->ci_feature4_flags);
 		aprint_verbose("%s: features4 %s\n", cpuname, buf);
+	}
 	if (ci->ci_padlock_flags) {
-		bitmask_snprintf(ci->ci_padlock_flags,
+		snprintb(buf, sizeof(buf), CPUID_FLAGS_PADLOCK,
-			CPUID_FLAGS_PADLOCK, buf, MAXPATHLEN);
+		    ci->ci_padlock_flags);
 		aprint_verbose("%s: padlock features %s\n", cpuname, buf);
+	}
 	free(buf);
 	if (*cpu_brand_string != '\0')
 		aprint_normal("%s: \"%s\"\n", cpuname, cpu_brand_string);
 	x86_print_cacheinfo(ci);
 	if (ci->ci_cpuid_level >= 3 && (ci->ci_feature_flags & CPUID_PN)) {
 		aprint_verbose("%s: serial number %04X-%04X-%04X-%04X-%04X-%04X\n",
 		    cpuname,
 		    ci->ci_cpu_serial[0] / 65536, ci->ci_cpu_serial[0] % 65536,
 		    ci->ci_cpu_serial[1] / 65536, ci->ci_cpu_serial[1] % 65536,
 		    ci->ci_cpu_serial[2] / 65536, ci->ci_cpu_serial[2] % 65536);
+	}
 @@ -1768,26 +1765,26 @@ x86_print_cacheinfo(struct cpu_info *ci)
 			aprint_verbose("\n");
+	}
 	if (ci->ci_cinfo[CAI_L3CACHE].cai_totalsize != 0) {
 		sep = print_cache_config(ci, CAI_L3CACHE, "L3 cache", NULL);
 		if (sep != NULL)
 			aprint_verbose("\n");
+	}
+}
 static void
 powernow_probe(struct cpu_info *ci)
+{
 	uint32_t regs[4];
-	char line[256];
+	char buf[256];
 	x86_cpuid(0x80000000, regs);
 	/* We need CPUID(0x80000007) */
 	if (regs[0] < 0x80000007)
 		return;
 	x86_cpuid(0x80000007, regs);
-	bitmask_snprintf(regs[3], CPUID_APM_FLAGS, line, sizeof(line));
+	snprintb(buf, sizeof(buf), CPUID_APM_FLAGS, regs[3]);
 	aprint_normal_dev(ci->ci_dev, "AMD Power Management features: %s\n",
-	    line);
+	    buf);
+}

 @@ -1,18 +1,21 @@
-#	$NetBSD: Makefile,v 1.2 2008/05/05 17:54:14 ad Exp $
+#	$NetBSD: Makefile,v 1.2.6.1 2008/12/23 03:36:43 snj Exp $
 .PATH:	${.CURDIR}/arch
 PROG=	cpuctl
 MAN=	cpuctl.8
-SRCS=	cpuctl.c bitmask.c
+SRCS=	cpuctl.c
 .if exists(${.CURDIR}/arch/${MACHINE_ARCH}.c)
 SRCS+=	${MACHINE_ARCH}.c
 .if exists(${.CURDIR}/arch/${MACHINE_ARCH}-asm.S)
 SRCS+=	${MACHINE_ARCH}-asm.S
 .endif
 .else
 SRCS+=	noarch.c
 .endif
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 .include <bsd.prog.mk>