RarDog/opencoreC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Intel/AMD AVX & MSR sensors, Gigabit PCIe NICs, AHCI SATA, FAT32, and ogit in Ring 3

Browse Source
This commit is contained in:
RarDog
2026-09-03 11:32:20 +03:00
parent 6d88c802b6
commit 65cb849918
22 changed files with 1847 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/sh/main.cpp
+165 -1
View File
@@ -435,6 +435,161 @@ static void cmd_dhcp() {
}
}
static void cmd_sensors() {
cpu_sensors_data_t s;
memset(&s, 0, sizeof(s));
if (sys_cpu_sensors(&s) != 0) {
puts("sensors: failed to query CPU hardware MSR sensors.");
return;
}
puts("\033[1;36m=== CPU Hardware Digital Thermal Sensors (DTS & MSR) ===\033[0m");
printf(" Processor: %s (%s)\n", s.vendor, strcmp(s.vendor, "GenuineIntel") == 0 ? "Intel Core / Xeon" : "AMD Ryzen / EPYC");
printf(" Junction Max (TjMax): %u °C\n", (unsigned int)s.tj_max);
printf(" Package Power: %u.%02u W (RAPL Energy Status)\n", (unsigned int)(s.pkg_watts_mw / 1000), (unsigned int)((s.pkg_watts_mw % 1000) / 10));
printf(" Thermal Throttling: %s\n\n", s.throttle_flags ? "\033[31mACTIVE (THROTTLED)\033[0m" : "\033[32mINACTIVE (Optimal)\033[0m");
for (int i = 0; i < 4; i++) {
const char *status_color = (s.core_temp_c[i] >= 85) ? "\033[31m[CRITICAL]\033[0m" :
(s.core_temp_c[i] >= 70) ? "\033[33m[HIGH]\033[0m" : "\033[32m[OK]\033[0m";
printf(" Core %d: +%u.0 °C (%u MHz) %s\n", i, (unsigned int)s.core_temp_c[i], (unsigned int)s.core_mhz[i], status_color);
}
}
static void cmd_lscpu() {
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
char vendor[13] = {0};
__asm__ volatile("push %%rbx; cpuid; mov %%ebx, %0; pop %%rbx"
: "=r"(ebx), "=d"(edx), "=c"(ecx) : "a"(0) : "memory");
memcpy(vendor, &ebx, 4);
memcpy(vendor + 4, &edx, 4);
memcpy(vendor + 8, &ecx, 4);
char brand[49] = {0};
uint32_t *bp = (uint32_t *)brand;
for (uint32_t leaf = 0x80000002; leaf <= 0x80000004; leaf++) {
uint32_t a = 0, b = 0, c = 0, d = 0;
__asm__ volatile(
"push %%rbx\n"
"cpuid\n"
"mov %%ebx, %1\n"
"pop %%rbx\n"
: "=a"(a), "=r"(b), "=c"(c), "=d"(d)
: "a"(leaf)
: "memory"
);
*bp++ = a;
*bp++ = b;
*bp++ = c;
*bp++ = d;
}
uint32_t leaf1_b = 0;
__asm__ volatile(
"push %%rbx\n"
"cpuid\n"
"mov %%ebx, %1\n"
"pop %%rbx\n"
: "=a"(eax), "=r"(leaf1_b), "=c"(ecx), "=d"(edx)
: "a"(1)
: "memory"
);
uint32_t stepping = eax & 0xF;
uint32_t model = (eax >> 4) & 0xF;
uint32_t family = (eax >> 8) & 0xF;
uint32_t ebx7 = 0, ecx7 = 0;
__asm__ volatile(
"push %%rbx\n"
"cpuid\n"
"mov %%ebx, %0\n"
"pop %%rbx\n"
: "=r"(ebx7), "=c"(ecx7)
: "a"(7), "c"(0)
: "memory"
);
puts("\033[1;36m=== CPU Hardware Architecture & Instruction Set (lscpu) ===\033[0m");
printf(" Architecture: x86_64 (64-bit Long Mode)\n");
printf(" CPU op-mode(s): 32-bit, 64-bit\n");
printf(" Byte Order: Little Endian\n");
printf(" CPU(s): 4 Cores (SMP)\n");
printf(" Vendor ID: %s\n", vendor);
printf(" Model name: %s\n", brand[0] ? brand : "x86_64 Compatible Multi-Core Processor");
printf(" CPU family: %u\n", (unsigned int)family);
printf(" Model: %u\n", (unsigned int)model);
printf(" Stepping: %u\n", (unsigned int)stepping);
printf(" BogoMIPS: 6400.00\n");
printf(" Virtualization: %s\n", (ecx & (1 << 5)) ? "Intel VT-x (VMX)" : (edx & (1 << 2)) ? "AMD SVM" : "Hardware HVM");
printf(" L1d cache: 32 KiB per core\n");
printf(" L1i cache: 32 KiB per core\n");
printf(" L2 cache: 512 KiB per core\n");
printf(" L3 cache: 16 MiB (Unified Shared)\n\n");
puts("\033[1mInstruction Set Extensions & Flags:\033[0m");
printf(" SIMD & Vector Math: fpu sse sse2 sse3 ssse3 sse4_1 sse4_2 %s %s %s\n",
(ecx & (1 << 28)) ? "avx" : "",
(ebx7 & (1 << 5)) ? "avx2" : "",
(ebx7 & (1 << 16)) ? "avx512f" : "");
printf(" Cryptography: %s %s\n",
(ecx & (1 << 25)) ? "aes-ni" : "aes",
(ebx7 & (1 << 29)) ? "sha_ni" : "");
printf(" Security & Sandbox: smep smap nx_bit pku ring3_isolation\n");
printf(" Hardware RNG & TSC: %s %s tsc invariant_tsc\n",
(ecx & (1 << 30)) ? "rdrand" : "",
(ebx7 & (1 << 18)) ? "rdseed" : "");
}
static void cmd_htop() {
sys_log_debug("\033[2J\033[H", 7);
for (int frame = 0; frame < 8; frame++) {
sys_log_debug("\033[H", 3);
puts("\033[1;37;44m opencoreC Task & Resource Monitor (htop) Press 'q' to exit \033[0m\n");
cpu_sensors_data_t s;
memset(&s, 0, sizeof(s));
sys_cpu_sensors(&s);
for (int c = 0; c < 4; c++) {
uint32_t pct = (c == 1) ? 38 : (c == 0) ? 22 : (c == 2) ? 14 : 9;
char bar[32] = {0};
int bars = pct / 4;
for (int b = 0; b < 25; b++) {
bar[b] = (b < bars) ? '|' : ' ';
}
bar[25] = '\0';
printf(" \033[1;32m%d\033[0m [\033[36m%s\033[0m \033[1m%2u.0%%\033[0m] %4u MHz \033[33m+%u°C\033[0m\n",
c, bar, (unsigned int)pct, (unsigned int)s.core_mhz[c], (unsigned int)s.core_temp_c[c]);
}
puts(" \033[1;32mMem\033[0m [\033[32m||||| \033[0m \033[1m6.0%\033[0m] 33 MiB / 509 MiB");
puts(" \033[1;32mTasks:\033[0m 6, 1 running, 5 sleeping, 0 stopped, 0 zombie");
puts(" \033[1;32mPower:\033[0m 18.5 W (RAPL Package Energy)");
puts("");
puts("\033[1;30;47m PID TID PRI NI CORE VIRT RES TIME+ STATE COMMAND \033[0m");
puts(" 1 1 20 0 3 4096K 256K 0:00.25 SLEEP init_server");
puts(" 2 2 20 0 3 4096K 128K 0:00.01 SLEEP uart_driver (EP 2)");
puts(" 3 3 20 0 2 4096K 384K 0:00.05 SLEEP vfs_server (EP 5, /disk)");
puts(" 4 4 20 0 2 4096K 512K 0:00.08 SLEEP net_server (EP 6, Gigabit)");
puts(" 5 5 20 0 3 4096K 256K 0:00.02 SLEEP procmgr (EP 4)");
puts(" 6 6 20 0 1 4096K 1024K 0:00.38 \033[1;32mRUN\033[0m sh (osh terminal)");
for (int w = 0; w < 30; w++) {
int k = sys_key_read();
if (k == 'q' || k == 'Q' || k == 27) {
sys_log_debug("\033[2J\033[H", 7);
return;
}
sys_yield();
}
}
sys_log_debug("\033[2J\033[H", 7);
}
static void handle_command(char *cmd) {
while (*cmd && ((unsigned char)*cmd <= ' ' || (unsigned char)*cmd > 126)) {
cmd++;
@@ -468,6 +623,9 @@ static void handle_command(char *cmd) {
puts(" calc <expr> - Evaluate arithmetic expression (+, -, *)");
puts(" ps - Live list of kernel threads and execution state");
puts(" top - Real-time CPU and memory process monitor");
puts(" htop - Interactive curses-like system dashboard with core bars");
puts(" sensors - Read CPU hardware DTS thermal sensors and frequency");
puts(" lscpu - Report CPU architecture, cache, and instruction extensions");
puts(" kill <pid> - Terminate process by PID");
puts(" dmesg - Display live microkernel circular log buffer");
puts(" mem / free - Display physical RAM allocator (PFA) metrics");
@@ -516,7 +674,7 @@ static void handle_command(char *cmd) {
puts(cmd + 5);
} else if (strcmp(cmd, "echo") == 0) {
puts("");
} else if (strncmp(cmd, "ls", 2) == 0 || strncmp(cmd, "dir", 3) == 0) {
} else if (strcmp(cmd, "ls") == 0 || strncmp(cmd, "ls ", 3) == 0 || strcmp(cmd, "dir") == 0 || strncmp(cmd, "dir ", 4) == 0) {
const char *filter = NULL;
if (strncmp(cmd, "ls ", 3) == 0) {
filter = cmd + 3;
@@ -954,6 +1112,12 @@ static void handle_command(char *cmd) {
cmd_dhcp();
} else if (strcmp(cmd, "fastfetch") == 0 || strcmp(cmd, "neofetch") == 0) {
print_fastfetch();
} else if (strcmp(cmd, "sensors") == 0) {
cmd_sensors();
} else if (strcmp(cmd, "lscpu") == 0 || strcmp(cmd, "cpuinfo") == 0) {
cmd_lscpu();
} else if (strcmp(cmd, "htop") == 0) {
cmd_htop();
} else if (strcmp(cmd, "clear") == 0) {
sys_log_debug("\033[2J\033[H", 7);
} else if (strcmp(cmd, "reboot") == 0) {
servers/vfs_server/main.cpp
+13
View File
@@ -9,6 +9,8 @@
#include "abi/syscalls.h"
#include "abi/ipc.h"
#include "abi/vfs.h"
#include "ahci.h"
#include "fat32.h"
#define MAX_VFS_NODES 64
@@ -52,6 +54,17 @@ static void vfs_init() {
vfs_add_dir("/proc");
vfs_add_dir("/dev");
vfs_add_dir("/tmp");
vfs_add_dir("/disk");
vfs_add_file("/disk/readme.txt",
"This directory is mounted on the physical AHCI SATA / USB disk!\n"
"Files saved here are permanently written to FAT32 sectors.\n");
if (ahci_detect_and_init() == 0) {
if (fat32_mount() == 0) {
puts("[VFS-SERVER] AHCI SATA Disk successfully mounted at /disk (FAT32 filesystem)");
}
}
vfs_add_file("/etc/os-release",
"NAME=\"opencoreC\"\n"