l3-ENSL/dendrobates-t-azureus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/g5k'

Browse Source
This commit is contained in:
Guillume DIDIER 2021-10-13 13:54:19 +02:00
commit 73d0cceed6
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cache_utils/src/bin/two_thread_cal.rs
View File

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

1
cache_utils/src/calibrate_2t.rs
View File

@ -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 mut calibrate_result_vec = Vec::new();
let offsets = image_antecedent.values().copied(); let offsets = image_antecedent.values().copied();
eprintln!("Number of offsets: {}", offsets.len());
/* /*
let offsets: Box<dyn Iterator<Item = isize>> = match image_antecedent { let offsets: Box<dyn Iterator<Item = isize>> = match image_antecedent {

2
cache_utils/src/complex_addressing.rs
View File

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