openbsd
/
ports
mirror of https://github.com/openbsd/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a "cpuid identify" that prints basic information (brand, family, 

model, stepping and manufacturer). Fix a few compiler warnings.

ok sthen@
This commit is contained in:
djm 2023-11-14 22:30:58 +00:00
parent 1710056729
commit 630770a54b
2 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/cpuid/Makefile
View File

@ -2,8 +2,7 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT= simple tool to dump cpuid information
PKGNAME= cpuid-20160409
REVISION= 1
PKGNAME= cpuid-20231115
DISTFILES=
CATEGORIES= sysutils

102
sysutils/cpuid/files/cpuid.c
View File

@ -1,6 +1,7 @@
/*
* Copyright (c) 2016 Philip Guenther <guenther@openbsd.org>
* Copyright (c) 2016 Stuart Henderson <sthen@openbsd.org>
* Copyright (c) 2023 Damien Miller <djm@mindrot.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -21,6 +22,7 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
static inline void
@ -28,7 +30,7 @@ showreg(const char *reg, unsigned value, int show_ascii)
{
unsigned char c;
printf("%s = 0x%08x % 10u", reg, value, value);
printf("%s = 0x%08x %10u", reg, value, value);
if (show_ascii) {
fputs(" \"", stdout);
@ -41,32 +43,9 @@ showreg(const char *reg, unsigned value, int show_ascii)
putchar('\n');
}
int
main(int argc, char **argv)
static inline void
cpuid(u_long code, u_long leaf, u_int *a, u_int *b, u_int *c, u_int *d)
{
unsigned long code, leaf;
unsigned int a, b, c, d;
leaf = 0;
switch (argc) {
case 3:
errno = 0;
/* strtoul() to both dec and hex input */
leaf = strtoul(argv[2], NULL, 0);
if (leaf == ULONG_MAX && errno == ERANGE || leaf > UINT_MAX)
errx(1, "cpuid leaf out of range: %s", argv[2]);
/* FALLTHROUGH */
case 2:
errno = 0;
code = strtoul(argv[1], NULL, 0);
if (code == ULONG_MAX && errno == ERANGE || code > UINT_MAX)
errx(1, "cpuid code out of range: %s", argv[1]);
break;
default:
printf("usage: cpuid code [leaf]\n");
exit(1);
}
/*
* The dance here with %ebx is to work around a gcc bug on i386,
* where gcc uses %ebx for PIC/PIE code but fail to save/reload
@ -75,8 +54,77 @@ main(int argc, char **argv)
* Anyway, this dance is unnecessary but harmless on amd64.
*/
__asm volatile("mov %%ebx, %%esi; cpuid; xchg %%esi, %%ebx"
: "=a" (a), "=S" (b), "=c" (c), "=d" (d)
: "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d)
: "a" (code), "c" (leaf));
}
/* Show basic CPU identity info */
static void
identify(void)
{
u_int a, b, c, d, model, family;
char manufacturer[13], brand[49];
cpuid(0, 0, &a, (u_int *)manufacturer, (u_int *)(manufacturer + 8),
(u_int *)(manufacturer + 4));
manufacturer[12] = '\0';
printf("Manufacturer: %s\n", manufacturer);
cpuid(1, 0, &a, &b, &c, &d);
model = (a >> 4) & 0xf;
family = (a >> 8) & 0xf;
if (family == 6 || family == 15)
model |= (a >> 12) & 0xf0;
if (family == 15)
family += (a >> 20) & 0xff;
printf("Family: 0x%02x\n", family);
printf("Model: 0x%x\n", model);
printf("Stepping: 0x%x\n", a & 0xf);
cpuid(0x80000000, 0, &a, &b, &c, &d);
if (a < 0x80000004)
return;
cpuid(0x80000002, 0, (u_int *)brand, (u_int *)(brand + 4),
(u_int *)(brand + 8), (u_int *)(brand + 12));
cpuid(0x80000003, 0, (u_int *)(brand + 16), (u_int *)(brand + 20),
(u_int *)(brand + 24), (u_int *)(brand + 28));
cpuid(0x80000004, 0, (u_int *)(brand + 32), (u_int *)(brand + 36),
(u_int *)(brand + 40), (u_int *)(brand + 44));
brand[48] = '\0';
printf("Brand: %s\n", brand);
}
int
main(int argc, char **argv)
{
u_long code, leaf;
u_int a, b, c, d;
leaf = 0;
switch (argc) {
case 3:
errno = 0;
/* strtoul() to both dec and hex input */
leaf = strtoul(argv[2], NULL, 0);
if ((leaf == ULONG_MAX && errno == ERANGE) || leaf > UINT_MAX)
errx(1, "cpuid leaf out of range: %s", argv[2]);
/* FALLTHROUGH */
case 2:
if (strcmp(argv[1], "identify") == 0) {
identify();
return 0;
}
errno = 0;
code = strtoul(argv[1], NULL, 0);
if ((code == ULONG_MAX && errno == ERANGE) || code > UINT_MAX)
errx(1, "cpuid code out of range: %s", argv[1]);
break;
default:
printf("usage: cpuid code [leaf]\n");
printf(" cpuid \"identify\"\n");
exit(1);
}
cpuid(code, leaf, &a, &b, &c, &d);
showreg("eax", a, 1);
showreg("ebx", b, 1);