Module Name: src
Committed By: rillig
Date: Fri Mar 8 20:29:18 UTC 2024
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
cpuctl: fix i386 bit descriptions for CPUID_SEF_FLAGS1
warning: non-printing character '\31' in description
'BUS_LOCK_DETECT""b\31' [363]
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.143 -r1.144 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/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.209 src/sys/arch/x86/include/specialreg.h:1.210
--- src/sys/arch/x86/include/specialreg.h:1.209 Fri Oct 27 06:31:48 2023
+++ src/sys/arch/x86/include/specialreg.h Fri Mar 8 20:29:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.209 2023/10/27 06:31:48 mrg Exp $ */
+/* $NetBSD: specialreg.h,v 1.210 2024/03/08 20:29:17 rillig Exp $ */
/*
* Copyright (c) 2014-2020 The NetBSD Foundation, Inc.
@@ -481,7 +481,7 @@
"b\14AVX512_BITALG\0" "b\15TME_EN\0" "b\16AVX512_VPOPCNTDQ\0" \
"b\20LA57\0" \
"f\21\5MAWAU\0" "b\26RDPID\0" "b\27KL\0" \
- "b\30BUS_LOCK_DETECT" "b\31CLDEMOTE\0" "b\33MOVDIRI\0" \
+ "b\30BUS_LOCK_DETECT\0" "b\31CLDEMOTE\0" "b\33MOVDIRI\0" \
"b\34MOVDIR64B\0" "b\35ENQCMD\0" "b\36SGXLC\0" "b\37PKS\0"
/* %ecx = 0, %edx */
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.143 src/usr.sbin/cpuctl/arch/i386.c:1.144
--- src/usr.sbin/cpuctl/arch/i386.c:1.143 Sat Feb 10 18:43:53 2024
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Mar 8 20:29:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.143 2024/02/10 18:43:53 andvar Exp $ */
+/* $NetBSD: i386.c,v 1.144 2024/03/08 20:29:17 rillig 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.143 2024/02/10 18:43:53 andvar Exp $");
+__RCSID("$NetBSD: i386.c,v 1.144 2024/03/08 20:29:17 rillig Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1728,6 +1728,13 @@ print_bits(const char *cpuname, const ch
bp += strlen(bp) + 1;
}
}
+#ifdef lint
+#define print_bits(cpuname, hdr, fmt, val) \
+ do { \
+ print_bits(cpuname, hdr, fmt, val); \
+ snprintb(NULL, 0, fmt, val); \
+ } while (0)
+#endif
static void
dump_descs(uint32_t leafstart, uint32_t leafend, const char *cpuname,
