Merge remote-tracking branch 'origin/g5k'

cache_utils/src/bin/two_thread_cal.rs

@@ -147,7 +147,7 @@ fn main() {
             display_name: "clflush remote hit",
             t: &(),
         },
-        CalibrateOperation2T {
+/*        CalibrateOperation2T {
             prepare: maccess::<u8>,
             op: load_and_flush_wrap,
             name: "clflush_shared_hit",
@@ -167,7 +167,7 @@ fn main() {
             name: "clflush_local_hit_f",
             display_name: "clflush local hit - f",
             t: &(),
-        },
+        },*/
         CalibrateOperation2T {
             prepare: noop::<u8>,
             op: only_flush_wrap,
@@ -175,7 +175,7 @@ fn main() {
             display_name: "clflush miss - n",
             t: &(),
         },
-        CalibrateOperation2T {
+/*        CalibrateOperation2T {
             prepare: noop::<u8>,
             op: load_and_flush_wrap,
             name: "clflush_local_hit_n",
@@ -209,7 +209,7 @@ fn main() {
             name: "reload_local_hit",
             display_name: "reload local hit",
             t: &(),
-        },
+        },*/
     ];
 
     let r = unsafe {
@@ -298,13 +298,13 @@ fn main() {
         Err(e) => panic!("Error: {}", e),
     };
 
-    asvp_analysis[&ASVP {
+/*    asvp_analysis[&ASVP {
         attacker: 0,
         slice: 0,
         victim: 0,
         page: pointer as usize,
     }]
-        .debug();
+        .debug();*/
 
     let asp_analysis = accumulate(
         asvp_analysis.clone(),

cache_utils/src/calibrate_2t.rs

@@ -201,7 +201,6 @@ fn calibrate_fixed_freq_2_thread_impl<I: Iterator<Item = (usize, usize)>, T>(
         let mut calibrate_result_vec = Vec::new();
 
         let offsets = image_antecedent.values().copied();
-        eprintln!("Number of offsets: {}", offsets.len());
 
         /*
         let offsets: Box<dyn Iterator<Item = isize>> = match image_antecedent {

cache_utils/src/complex_addressing.rs

@@ -288,7 +288,7 @@ pub enum CacheAttackSlicing {
 impl CacheAttackSlicing {
     pub fn from(cs: CacheSlicing, cache_line_length: usize) -> CacheAttackSlicing {
         match cs {
-            Unsupported => CacheAttackSlicing::Unsupported(!((1 << cache_line_length) - 1)),
+            Unsupported => CacheAttackSlicing::Unsupported(!dbg!(dbg!(cache_line_length) - 1)),
             ComplexAddressing(ca) => CacheAttackSlicing::ComplexAddressing(ca),
             SimpleAddressing(sa) => CacheAttackSlicing::SimpleAddressing(sa),
             NoSlice => CacheAttackSlicing::NoSlice,