aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bits64/mod.rs5
-rw-r--r--src/shared/mod.rs7
-rw-r--r--src/shared/perfcnt/intel/counters.rs (renamed from src/bits64/perfcnt/intel/counters.rs)0
-rw-r--r--src/shared/perfcnt/intel/description.rs (renamed from src/bits64/perfcnt/intel/description.rs)0
-rw-r--r--src/shared/perfcnt/intel/mod.rs (renamed from src/bits64/perfcnt/intel/mod.rs)0
-rw-r--r--src/shared/perfcnt/mod.rs (renamed from src/bits64/perfcnt/mod.rs)0
6 files changed, 7 insertions, 5 deletions
diff --git a/src/bits64/mod.rs b/src/bits64/mod.rs
index b73b530..801e80a 100644
--- a/src/bits64/mod.rs
+++ b/src/bits64/mod.rs
@@ -36,8 +36,3 @@ pub mod paging;
pub mod task;
pub mod syscall;
pub mod sgx;
-#[cfg(feature = "performance-counter")]
-pub mod perfcnt;
-pub mod cpuid {
- pub use raw_cpuid::*;
-}
diff --git a/src/shared/mod.rs b/src/shared/mod.rs
index 64a8548..8c81478 100644
--- a/src/shared/mod.rs
+++ b/src/shared/mod.rs
@@ -10,6 +10,10 @@ pub mod segmentation;
pub mod task;
pub mod tlb;
+pub mod cpuid {
+ pub use raw_cpuid::*;
+}
+
#[derive(Copy, Clone, PartialEq, Eq)]
#[repr(u8)]
pub enum PrivilegeLevel {
@@ -19,6 +23,9 @@ pub enum PrivilegeLevel {
Ring3 = 3,
}
+#[cfg(feature = "performance-counter")]
+pub mod perfcnt;
+
#[inline(always)]
pub unsafe fn halt() {
asm!("hlt" :::: "volatile");
diff --git a/src/bits64/perfcnt/intel/counters.rs b/src/shared/perfcnt/intel/counters.rs
index e2987cc..e2987cc 100644
--- a/src/bits64/perfcnt/intel/counters.rs
+++ b/src/shared/perfcnt/intel/counters.rs
diff --git a/src/bits64/perfcnt/intel/description.rs b/src/shared/perfcnt/intel/description.rs
index f64426d..f64426d 100644
--- a/src/bits64/perfcnt/intel/description.rs
+++ b/src/shared/perfcnt/intel/description.rs
diff --git a/src/bits64/perfcnt/intel/mod.rs b/src/shared/perfcnt/intel/mod.rs
index 960e0c6..960e0c6 100644
--- a/src/bits64/perfcnt/intel/mod.rs
+++ b/src/shared/perfcnt/intel/mod.rs
diff --git a/src/bits64/perfcnt/mod.rs b/src/shared/perfcnt/mod.rs
index 74b80a2..74b80a2 100644
--- a/src/bits64/perfcnt/mod.rs
+++ b/src/shared/perfcnt/mod.rs