cr3 in context

This commit is contained in:
Jeremy Soller 2016-09-12 12:21:34 -06:00
commit 1298e38ed8

View file

@ -8,6 +8,8 @@ pub static CONTEXT_SWITCH_LOCK: AtomicBool = ATOMIC_BOOL_INIT;
#[derive(Debug)]
pub struct Context {
/// Page table pointer
cr3: usize,
/// RFLAGS register
rflags: usize,
/// RBX register
@ -23,14 +25,13 @@ pub struct Context {
/// Base pointer
rbp: usize,
/// Stack pointer
rsp: usize,
/// Page table pointer
cr3: usize
rsp: usize
}
impl Context {
pub fn new() -> Context {
Context {
cr3: 0,
rflags: 0,
rbx: 0,
r12: 0,
@ -38,11 +39,14 @@ impl Context {
r14: 0,
r15: 0,
rbp: 0,
rsp: 0,
cr3: 0
rsp: 0
}
}
pub fn set_page_table(&mut self, address: usize) {
self.cr3 = address;
}
pub fn set_stack(&mut self, address: usize) {
self.rsp = address;
}
@ -61,6 +65,11 @@ impl Context {
}
*/
asm!("mov $0, cr3" : "=r"(self.cr3) : : "memory" : "intel", "volatile");
if next.cr3 != self.cr3 {
asm!("mov cr3, $0" : : "r"(next.cr3) : "memory" : "intel", "volatile");
}
asm!("pushfq ; pop $0" : "=r"(self.rflags) : : "memory" : "intel", "volatile");
asm!("push $0 ; popfq" : : "r"(next.rflags) : "memory" : "intel", "volatile");
@ -85,11 +94,6 @@ impl Context {
asm!("mov $0, rbp" : "=r"(self.rbp) : : "memory" : "intel", "volatile");
asm!("mov rbp, $0" : : "r"(next.rbp) : "memory" : "intel", "volatile");
/* TODO
asm!("mov $0, cr3" : "=r"(self.cr3) : : "memory" : "intel", "volatile");
asm!("mov cr3, $0" : : "r"(self.cr3) : "memory" : "intel", "volatile");
*/
// Unset global lock, set inside of kernel
CONTEXT_SWITCH_LOCK.store(false, Ordering::SeqCst);
}