Crudely throw everything together

Author: Ericson2314

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Gerd Zellweger
+Copyright (c) 2015 The libcpu Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.rs

@@ -23,7 +23,7 @@ mod performance_counter {
 
     use self::serde_json::Value;
 
-    include!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/perfcnt/intel/description.rs"));
+    include!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/bits64/perfcnt/intel/description.rs"));
 
     /// HACK: We need to convert parsed strings to static because we're reusing
     /// the struct definition which declare strings as static in the generated code.

tobba/src/x86.rs renamed to src/bits32/mod.rs

@@ -1,11 +1,11 @@
+//! Data structures and functions used by Protected Mode but not IA-32e.
+
 #![allow(non_upper_case_globals)]
 
-pub use self::x86_shared::*;
+pub use shared::*;
 
 use core::mem::size_of;
 
-mod x86_shared;
-
 bitflags! {
 	pub flags GdtAccess: u8 {
 		const Accessed = 1 << 0,

src/controlregs.rs renamed to src/bits64/controlregs.rs

@@ -1,7 +1,7 @@
 //! Interrupt description and set-up code.
 
 use core::fmt;
-use paging::VAddr;
+use super::paging::VAddr;
 
 /// x86 Exception description (see also Intel Vol. 3a Chapter 6).
 #[derive(Debug)]

src/dtables.rs renamed to src/bits64/dtables.rs

@@ -0,0 +1,52 @@
+//! Data structures and functions used by IA-32e but not Protected Mode.
+
+macro_rules! bit {
+    ( $x:expr ) => {
+        1 << $x
+    };
+}
+
+macro_rules! check_flag {
+    ($doc:meta, $fun:ident, $flag:ident) => (
+        #[$doc]
+        pub fn $fun(&self) -> bool {
+            self.contains($flag)
+        }
+    )
+}
+
+macro_rules! is_bit_set {
+    ($field:expr, $bit:expr) => (
+        $field & (1 << $bit) > 0
+    )
+}
+
+macro_rules! check_bit_fn {
+    ($doc:meta, $fun:ident, $field:ident, $bit:expr) => (
+        #[$doc]
+        pub fn $fun(&self) -> bool {
+            is_bit_set!(self.$field, $bit)
+        }
+    )
+}
+
+pub mod io;
+pub mod controlregs;
+pub mod msr;
+pub mod time;
+pub mod irq;
+pub mod rflags;
+pub mod paging;
+pub mod segmentation;
+pub mod task;
+pub mod dtables;
+pub mod syscall;
+pub mod sgx;
+#[cfg(feature = "performance-counter")]
+pub mod perfcnt;
+pub mod cpuid {
+    pub use raw_cpuid::*;
+}
+pub mod tlb;
+
+pub mod tobba;

src/io.rs renamed to src/bits64/io.rs

@@ -6,13 +6,13 @@
 ///   * Function needs to be executed in ring 0.
 macro_rules! encls {
     ($rax:expr, $rbx:expr)
-        => ( $crate::sgx::encls2($rax as u64, $rbx as u64) );
+        => ( $crate::bits64::sgx::encls2($rax as u64, $rbx as u64) );
 
     ($rax:expr, $rbx:expr, $rcx:expr)
-        => ( $crate::sgx::encls3($rax as u64, $rbx as u64, $rcx as u64) );
+        => ( $crate::bits64::sgx::encls3($rax as u64, $rbx as u64, $rcx as u64) );
 
     ($rax:expr, $rbx:expr, $rcx:expr, $rdx:expr)
-        => ( $crate::sgx::encls4($rax as u64, $rbx as u64, $rcx as u64, $rdx as u64) );
+        => ( $crate::bits64::sgx::encls4($rax as u64, $rbx as u64, $rcx as u64, $rdx as u64) );
 }
 
 /// encls with two arguments -- consider calling the encls! macro instead!
@@ -226,10 +226,10 @@ pub unsafe fn encls_ewb(pageinfo: u64, epc_page: u64, va_slot: u64) -> u32 {
 ///   * Function needs to be executed in ring 3.
 macro_rules! enclu {
     ($rax:expr, $rbx:expr, $rcx:expr)
-        => ( $crate::sgx::enclu3($rax as u64, $rbx as u64, $rcx as u64) );
+        => ( $crate::bits64::sgx::enclu3($rax as u64, $rbx as u64, $rcx as u64) );
 
     ($rax:expr, $rbx:expr, $rcx:expr, $rdx:expr)
-        => ( $crate::sgx::enclu4($rax as u64, $rbx as u64, $rcx as u64, $rdx as u64) );
+        => ( $crate::bits64::sgx::enclu4($rax as u64, $rbx as u64, $rcx as u64, $rdx as u64) );
 }
 
 /// enclu with three arguments -- consider calling the enclu! macro instead!

src/irq.rs renamed to src/bits64/irq.rs

@@ -1,6 +1,6 @@
 //! Helpers to program the task state segment.
 
-use segmentation;
+use super::segmentation;
 
 pub type TaskStateDescriptorLow = segmentation::SegmentDescriptor;
 pub type TaskStateDescriptorHigh = u64;

src/bits64/mod.rs

@@ -15,6 +15,6 @@ pub unsafe fn flush(addr: usize) {
 /// This function is unsafe as it causes a general protection fault (GP) if the current privilege
 /// level is not 0.
 pub unsafe fn flush_all() {
-    use controlregs::{cr3, cr3_write};
+    use super::controlregs::{cr3, cr3_write};
     cr3_write(cr3())
 }

src/msr.rs renamed to src/bits64/msr.rs

@@ -1,8 +1,6 @@
 #![allow(non_upper_case_globals)]
 
-pub use self::x86_shared::*;
-
-mod x86_shared;
+pub use shared::*;
 
 #[inline(always)]
 pub fn get_flags() -> Flags {

src/paging.rs renamed to src/bits64/paging.rs

@@ -1,11 +1,11 @@
+#![cfg(any(target_arch="x86", target_arch="x86_64"))]
+
 #![feature(const_fn)]
 #![feature(asm)]
+#![feature(associated_consts)]
 #![no_std]
 #![cfg_attr(test, allow(unused_features))]
 
-#![crate_name = "x86"]
-#![crate_type = "lib"]
-
 #[macro_use]
 extern crate bitflags;
 
@@ -16,57 +16,14 @@ extern crate raw_cpuid;
 #[macro_use]
 extern crate phf;
 
+#[cfg(target_arch="x86")]
+pub mod bits32;
+#[cfg(target_arch="x86_64")]
+pub mod bits64;
+pub mod shared;
+
 mod std {
     pub use core::fmt;
     pub use core::ops;
     pub use core::option;
 }
-
-macro_rules! bit {
-    ( $x:expr ) => {
-        1 << $x
-    };
-}
-
-macro_rules! check_flag {
-    ($doc:meta, $fun:ident, $flag:ident) => (
-        #[$doc]
-        pub fn $fun(&self) -> bool {
-            self.contains($flag)
-        }
-    )
-}
-
-macro_rules! is_bit_set {
-    ($field:expr, $bit:expr) => (
-        $field & (1 << $bit) > 0
-    )
-}
-
-macro_rules! check_bit_fn {
-    ($doc:meta, $fun:ident, $field:ident, $bit:expr) => (
-        #[$doc]
-        pub fn $fun(&self) -> bool {
-            is_bit_set!(self.$field, $bit)
-        }
-    )
-}
-
-pub mod io;
-pub mod controlregs;
-pub mod msr;
-pub mod time;
-pub mod irq;
-pub mod rflags;
-pub mod paging;
-pub mod segmentation;
-pub mod task;
-pub mod dtables;
-pub mod syscall;
-pub mod sgx;
-#[cfg(feature = "performance-counter")]
-pub mod perfcnt;
-pub mod cpuid {
-    pub use raw_cpuid::*;
-}
-pub mod tlb;

src/perfcnt/intel/counters.rs renamed to src/bits64/perfcnt/intel/counters.rs

@@ -1,3 +1,12 @@
+//! Data structures and functions used by both protected mode and IA-32e.
+
+// In a few rare-cases this module includes mode-specific
+// *implementations*. This is usually because we cannot trust the LLVM inline
+// assembler to infer instruction variants from argument size, and thus we add
+// size-suffixes wherever possible.
+//
+// That said, *interfaces* must always be mode-portable
+
 #![allow(non_upper_case_globals)]
 
 bitflags! {