2 files changed, 41 insertions, 0 deletions

diff --git a/libc/cpu.c b/libc/cpu.c
index 0425dc8..b8d250b 100644
--- a/libc/cpu.c
+++ b/libc/cpu.c
@@ -1,7 +1,9 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 // This file is a wrapper around some CPU asm calls
 
+#include <cpu.h>
 #include <def.h>
+#include <print.h>
 
 u8 inb(u16 port)
 {
@@ -47,6 +49,39 @@ void outl(u16 port, u32 data)
 	__asm__ volatile("outl %0, %1" ::"a"(data), "Nd"(port));
 }
 
+void cpuid(int code, u32 *a, u32 *b, u32 *c, u32 *d)
+{
+	__asm__ volatile("cpuid" : "=a"(*a), "=b"(*b), "=c"(*c), "=d"(*d) : "a"(code));
+}
+
+char *cpu_string(char buf[12])
+{
+	u32 a, b, c, d;
+	cpuid(CPUID_VENDOR_STRING, &a, &b, &c, &d);
+	char *ebx = (char *)&b;
+	char *ecx = (char *)&c;
+	char *edx = (char *)&d;
+	buf[0] = ebx[0];
+	buf[1] = ebx[1];
+	buf[2] = ebx[2];
+	buf[3] = ebx[3];
+	buf[4] = edx[0];
+	buf[5] = edx[1];
+	buf[6] = edx[2];
+	buf[7] = edx[3];
+	buf[8] = ecx[0];
+	buf[9] = ecx[1];
+	buf[10] = ecx[2];
+	buf[11] = ecx[3];
+	return buf;
+}
+
+void cpu_print()
+{
+	char buf[12] = { 0 };
+	printf("%s\n", cpu_string(buf));
+}
+
 #ifdef kernel
 void cli()
 {
diff --git a/libc/inc/cpu.h b/libc/inc/cpu.h
index c25dc60..e742390 100644
--- a/libc/inc/cpu.h
+++ b/libc/inc/cpu.h
@@ -5,6 +5,8 @@
 
 #include <def.h>
 
+enum cpuid_requests { CPUID_VENDOR_STRING, CPUID_FEATURES, CPUID_TLB, CPUID_SERIAL };
+
 u8 inb(u16 port);
 u16 inw(u16 port);
 u32 inl(u16 port);
@@ -14,6 +16,10 @@ void outb(u16 port, u8 data);
 void outw(u16 port, u16 data);
 void outl(u16 port, u32 data);
 
+void cpuid(int code, u32 *a, u32 *b, u32 *c, u32 *d);
+char *cpu_string(char buf[12]);
+void cpu_print();
+
 #ifdef kernel
 void cli();
 void sti();