feat: (iso9660) finishing up unmount

[lunaix-os.git] / lunaix-os / hal / cpu.c

diff --git a/lunaix-os/hal/cpu.c b/lunaix-os/hal/cpu.c
index d57ae26d4a07447957ad2da56a3adc801afd771c..9517445e1e2b31938391c86254f3ffffd9fb4452 100644 (file)
--- a/lunaix-os/hal/cpu.c
+++ b/lunaix-os/hal/cpu.c
@@ -1,11 +1,13 @@
+#include <cpuid.h>

 #include <hal/cpu.h>
 #include <stdint.h>
 #include <hal/cpu.h>
 #include <stdint.h>

-#include <cpuid.h>

 
 

-void cpu_get_model(char* model_out) {
-    uint32_t* out = (uint32_t*)model_out;
+void
+cpu_get_model(char* model_out)
+{
+    u32_t* out = (u32_t*)model_out;

     reg32 eax = 0, ebx = 0, edx = 0, ecx = 0;
     reg32 eax = 0, ebx = 0, edx = 0, ecx = 0;

-    
+

     __get_cpuid(0, &eax, &ebx, &ecx, &edx);
 
     out[0] = ebx;
     __get_cpuid(0, &eax, &ebx, &ecx, &edx);
 
     out[0] = ebx;


@@ -16,64 +18,55 @@ void cpu_get_model(char* model_out) {
 
 #define BRAND_LEAF 0x80000000UL
 
 
 #define BRAND_LEAF 0x80000000UL
 

-int cpu_brand_string_supported() {
+int
+cpu_brand_string_supported()
+{

     reg32 supported = __get_cpuid_max(BRAND_LEAF, 0);
     return (supported >= 0x80000004UL);
 }
 
     reg32 supported = __get_cpuid_max(BRAND_LEAF, 0);
     return (supported >= 0x80000004UL);
 }
 

-void cpu_get_brand(char* brand_out) {
-    if(!cpu_brand_string_supported()) {
+void
+cpu_get_brand(char* brand_out)
+{
+    if (!cpu_brand_string_supported()) {

         brand_out[0] = '?';
         brand_out[1] = '\0';
     }
         brand_out[0] = '?';
         brand_out[1] = '\0';
     }

-    uint32_t* out = (uint32_t*) brand_out;
+    u32_t* out = (u32_t*)brand_out;

     reg32 eax = 0, ebx = 0, edx = 0, ecx = 0;
     reg32 eax = 0, ebx = 0, edx = 0, ecx = 0;

-    for (uint32_t i = 2, j = 0; i < 5; i++)
-    {
+    for (u32_t i = 2, j = 0; i < 5; i++) {

         __get_cpuid(BRAND_LEAF + i, &eax, &ebx, &ecx, &edx);
         out[j] = eax;
         out[j + 1] = ebx;
         out[j + 2] = ecx;
         out[j + 3] = edx;
         __get_cpuid(BRAND_LEAF + i, &eax, &ebx, &ecx, &edx);
         out[j] = eax;
         out[j + 1] = ebx;
         out[j + 2] = ecx;
         out[j + 3] = edx;

-        j+=4;
+        j += 4;

     }
     brand_out[48] = '\0';
 }
 
     }
     brand_out[48] = '\0';
 }
 

-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreturn-type"
-reg32 cpu_r_cr0() {
-    asm volatile ("mov %cr0, %eax");
-}
-
-reg32 cpu_r_cr2() {
-    asm volatile ("mov %cr2, %eax");
-}
+int
+cpu_has_apic()
+{
+    // reference: Intel manual, section 10.4.2
+    reg32 eax = 0, ebx = 0, edx = 0, ecx = 0;
+    __get_cpuid(1, &eax, &ebx, &ecx, &edx);

 
 

-reg32 cpu_r_cr3() {
-    asm volatile ("mov %cr3, %eax");
+    return (edx & 0x100);

 }
 }

-#pragma GCC diagnostic push

 
 

-void cpu_w_cr0(reg32 v) {
-    asm volatile (
-        "mov %0, %%cr0"
-        :: "r"(v)
-    );
-}
+void
+cpu_rdmsr(u32_t msr_idx, u32_t* reg_high, u32_t* reg_low)
+{
+    u32_t h = 0, l = 0;
+    asm volatile("rdmsr" : "=d"(h), "=a"(l) : "c"(msr_idx));

 
 

-void cpu_w_cr2(reg32 v) {
-    asm volatile (
-        "mov %0, %%cr2"
-        :: "r"(v)
-    );
+    *reg_high = h;
+    *reg_low = l;

 }
 
 }
 

-void cpu_w_cr3(reg32 v) {
-    asm volatile (
-        "mov %0, %%cr3"
-        :: "r"(v)
-    );
-}
-
-
+void
+cpu_wrmsr(u32_t msr_idx, u32_t reg_high, u32_t reg_low)
+{
+    asm volatile("wrmsr" : : "d"(reg_high), "a"(reg_low), "c"(msr_idx));
+}
\ No newline at end of file