Merge pull request #362 from rust-osdev/align

Increase alginment for packed structures

Author: josephlr

src/structures/mod.rs

@@ -13,10 +13,28 @@ pub mod tss;
 /// A struct describing a pointer to a descriptor table (GDT / IDT).
 /// This is in a format suitable for giving to 'lgdt' or 'lidt'.
 #[derive(Debug, Clone, Copy)]
-#[repr(C, packed)]
+#[repr(C, packed(2))]
 pub struct DescriptorTablePointer {
     /// Size of the DT.
     pub limit: u16,
     /// Pointer to the memory region containing the DT.
     pub base: VirtAddr,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::mem::size_of;
+
+    #[test]
+    pub fn check_descriptor_pointer_size() {
+        // Per the SDM, a descriptor pointer has to be 2+8=10 bytes
+        assert_eq!(size_of::<DescriptorTablePointer>(), 10);
+        // Make sure that we can reference a pointer's limit
+        let p = DescriptorTablePointer {
+            limit: 5,
+            base: VirtAddr::zero(),
+        };
+        let _: &u16 = &p.limit;
+    }
+}

src/structures/tss.rs

@@ -8,7 +8,7 @@ use core::mem::size_of;
 /// but is used for finding kernel level stack
 /// if interrupts arrive while in kernel mode.
 #[derive(Debug, Clone, Copy)]
-#[repr(C, packed)]
+#[repr(C, packed(4))]
 pub struct TaskStateSegment {
     reserved_1: u32,
     /// The full 64-bit canonical forms of the stack pointers (RSP) for privilege levels 0-2.