Merge pull request #50 from rust-osdev/0.3.5

Version 0.3.5

Author: phil-opp

src/lib.rs

@@ -9,7 +9,6 @@
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
 #![cfg_attr(feature = "deny-warnings", deny(missing_docs))]
 #![cfg_attr(not(feature = "deny-warnings"), warn(missing_docs))]
-
 #![deny(missing_debug_implementations)]
 
 #[cfg(test)]
@@ -18,10 +17,10 @@ extern crate std;
 
 #[macro_use]
 extern crate bitflags;
+extern crate array_init;
 extern crate bit_field;
 extern crate os_bootinfo;
 extern crate usize_conversions;
-extern crate array_init;
 
 /// Provides the non-standard-width integer types `u2`–`u63`.
 ///

src/registers/control.rs

@@ -39,6 +39,12 @@ bitflags! {
     }
 }
 
+/// Contains the Page Fault Linear Address (PFLA).
+///
+/// When page fault occurs, the CPU sets this register to the accessed address.
+#[derive(Debug)]
+pub struct Cr2;
+
 /// Contains the physical address of the level 4 page table.
 #[derive(Debug)]
 pub struct Cr3;
@@ -57,7 +63,7 @@ bitflags! {
 mod x86_64 {
     use super::*;
     use structures::paging::PhysFrame;
-    use PhysAddr;
+    use {PhysAddr, VirtAddr};
 
     impl Cr0 {
         /// Read the current set of CR0 flags.
@@ -108,6 +114,17 @@ mod x86_64 {
         }
     }
 
+    impl Cr2 {
+        /// Read the current page fault linear address from the CR3 register.
+        pub fn read() -> VirtAddr {
+            let value: u64;
+            unsafe {
+                asm!("mov %cr2, $0" : "=r" (value));
+            }
+            VirtAddr::new(value)
+        }
+    }
+
     impl Cr3 {
         /// Read the current P4 table address from the CR3 register.
         pub fn read() -> (PhysFrame, Cr3Flags) {

src/structures/idt.rs

@@ -682,6 +682,7 @@ impl fmt::Debug for ExceptionStackFrame {
 
 bitflags! {
     /// Describes an page fault error code.
+    #[repr(transparent)]
     pub struct PageFaultErrorCode: u64 {
         /// If this flag is set, the page fault was caused by a page-protection violation,
         /// else the page fault was caused by a not-present page.

src/structures/paging/page_table.rs

@@ -27,9 +27,7 @@ pub struct PageTableEntry {
 impl PageTableEntry {
     /// Creates an unused page table entry.
     pub fn new() -> Self {
-        PageTableEntry {
-            entry: 0,
-        }
+        PageTableEntry { entry: 0 }
     }
 
     /// Returns whether this entry is zero.