X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a362b4b2c4abbf2da6ec14cb44a8685a81107f6a..f09e806d5032150564df39a2f7b1192c4d84cf15:/lunaix-os/includes/hal/cpu.h diff --git a/lunaix-os/includes/hal/cpu.h b/lunaix-os/includes/hal/cpu.h index ae9926b..694d678 100644 --- a/lunaix-os/includes/hal/cpu.h +++ b/lunaix-os/includes/hal/cpu.h @@ -39,7 +39,7 @@ cpu_has_apic(); static inline reg32 cpu_rcr0() { - uintptr_t val; + ptr_t val; asm volatile("movl %%cr0,%0" : "=r"(val)); return val; } @@ -47,7 +47,7 @@ cpu_rcr0() static inline reg32 cpu_rcr2() { - uintptr_t val; + ptr_t val; asm volatile("movl %%cr2,%0" : "=r"(val)); return val; } @@ -55,15 +55,23 @@ cpu_rcr2() static inline reg32 cpu_rcr3() { - uintptr_t val; + ptr_t val; asm volatile("movl %%cr3,%0" : "=r"(val)); return val; } +static inline reg32 +cpu_rcr4() +{ + ptr_t val; + asm volatile("movl %%cr4,%0" : "=r"(val)); + return val; +} + static inline reg32 cpu_reflags() { - uintptr_t val; + ptr_t val; asm volatile("pushf\n" "popl %0\n" : "=r"(val)::); @@ -90,9 +98,9 @@ cpu_lcr3(reg32 v) } static inline void -cpu_invplg(void* va) +cpu_invplg(ptr_t va) { - asm volatile("invlpg (%0)" ::"r"((uintptr_t)va) : "memory"); + asm volatile("invlpg (%0)" ::"r"(va) : "memory"); } static inline void