Merge branch 'master' of pterpstra.com:mikros/kernel
This commit is contained in:
commit
7ed9dd7cc3
@ -106,8 +106,7 @@ use tasking::{SleepReason, Tid, TASKING};
|
|||||||
use virtual_memory::{ACTIVE_SPACE, KERNEL_SPACE};
|
use virtual_memory::{ACTIVE_SPACE, KERNEL_SPACE};
|
||||||
use x86_64::{
|
use x86_64::{
|
||||||
registers::{
|
registers::{
|
||||||
control::{Cr0, Cr0Flags, Cr4, Cr4Flags},
|
control::{Cr0, Cr0Flags, Cr4, Cr4Flags}, model_specific::Msr, rflags::{self, RFlags}
|
||||||
rflags::{self, RFlags},
|
|
||||||
},
|
},
|
||||||
structures::paging::{Page, PageTableFlags},
|
structures::paging::{Page, PageTableFlags},
|
||||||
VirtAddr,
|
VirtAddr,
|
||||||
@ -132,6 +131,8 @@ pub fn main() {
|
|||||||
unsafe {
|
unsafe {
|
||||||
rflags::write(rflags_data);
|
rflags::write(rflags_data);
|
||||||
}
|
}
|
||||||
|
//unsafe { Msr::new(0x277).write(0x0007_0501_0007_0406) };
|
||||||
|
unsafe { Msr::new(0x277).write(0x0007_0406_0507_0406) };
|
||||||
// Enable the FPU
|
// Enable the FPU
|
||||||
unsafe {
|
unsafe {
|
||||||
Cr0::update(|cr0| {
|
Cr0::update(|cr0| {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user