christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

nanojpeg: cosmetics, updated CSV header

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1806 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-10-24 09:58:26 +00:00
parent f74954f460
commit 6af5689cce
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/experiments/nanojpeg/campaign.cc
View File

@ -71,7 +71,7 @@ bool NanoJPEGCampaign::run()
} }
// only write CSV header if file didn't exist before // only write CSV header if file didn't exist before
if (!file_exists) { if (!file_exists) {
results << "instr_offset\tinstr_address\tregister_id\ttimeout\tinjection_ip\tbitnr\tresulttype\tlatest_ip\tpsnr\tdetails" << endl; results << "instr_ecstart\ninstr_offset\tinstr_address\tregister_id\ttimeout\tinjection_ip\tbitnr\tresulttype\tlatest_ip\tpsnr\tdetails" << endl;
} }
// load binary image (objcopy'ed system.elf = system.bin) // load binary image (objcopy'ed system.elf = system.bin)
@ -107,7 +107,7 @@ bool NanoJPEGCampaign::run()
ProtoIStream ps(&tracef); ProtoIStream ps(&tracef);
// experiment count // experiment count
int count = 0; int count_exp = 0;
// instruction counter within trace // instruction counter within trace
int instr = 0; int instr = 0;
@ -182,7 +182,9 @@ bool NanoJPEGCampaign::run()
acc->second &= ~common_mask; acc->second &= ~common_mask;
// new EC with experiments: acc->first -- instr, common_mask // new EC with experiments: acc->first -- instr, common_mask
count += add_experiment_ec(acc->first, instr, 0 /*todo*/, reg, common_mask); // if (reg != RID_EBP && reg != RID_ESI && reg != RID_EDI) {
count_exp += add_experiment_ec(acc->first, instr, 0 /*todo*/, reg, common_mask);
// }
// new memory access EC in access cascade // new memory access EC in access cascade
reg_cascade[reg].push_front(std::pair<unsigned, uint64_t>(instr + 1, common_mask)); reg_cascade[reg].push_front(std::pair<unsigned, uint64_t>(instr + 1, common_mask));
@ -194,14 +196,16 @@ bool NanoJPEGCampaign::run()
++acc; ++acc;
} }
} }
assert(remaining_access_mask == 0); if (remaining_access_mask != 0) {
m_log << "something weird happened: remaining_access_mask = 0x" << hex << remaining_access_mask << endl;
}
} }
// all OUT registers close an equivalence class and generate known results // all OUT registers close an equivalence class and generate known results
// TODO // TODO
// special case: empty EC! // special case: empty EC!
} }
cout << "experiments planned: " << dec << count << endl; cout << "experiments planned: " << dec << count_exp << endl;
return true; return true;
} }