christoph/fail
1
Fork 0
Code Releases Activity

Refining keso experiment.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2071 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hoffmann
2013-02-07 00:51:28 +00:00
parent 609ac58c8f
commit 1ce8f0ab12
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/experiments/kesorefs/campaign.cc
View File

@ -22,7 +22,7 @@ char const * const results_csv = "kesorefs.csv";
bool KesoRefCampaign::run() bool KesoRefCampaign::run()
{ {
Logger log("KesoRefCampaign"); Logger log("KesoRefCampaign");
fail::ElfReader m_elf("/proj/mmtmp41/hoffmann/kesoeval/cdx_x86"); ElfReader elf;
ifstream test(results_csv); ifstream test(results_csv);
if (test.is_open()) { if (test.is_open()) {
@ -35,13 +35,12 @@ bool KesoRefCampaign::run()
return false; return false;
} }
ElfReader elf;
address_t injip = elf.getAddressByName("c23_PersistentDetectorScopeEntry_m5_run"); address_t injip = elf.getAddressByName("c23_PersistentDetectorScopeEntry_m5_run");
address_t rambase = elf.getAddressByName("__CIAO_APPDATA_cdx_det__heap"); address_t rambase = elf.getAddressByName("__CIAO_APPDATA_cdx_det__heap");
address_t ramend = rambase + 0x80000; // address_t ramend = rambase + 0x80000;
cout << "bla: " << hex << ramend << endl; address_t ramend = rambase + 4;
//address_t ramend = rambase + 4; cout << "ramend: " << hex << ramend << endl;
log << "startup, injecting ram @ " << hex << rambase << endl; log << "startup, injecting ram @ " << hex << rambase << endl;

34
src/experiments/kesorefs/experiment.cc
View File

@ -31,10 +31,10 @@ using namespace fail;
!defined(CONFIG_SR_SAVE) !defined(CONFIG_SR_SAVE)
#error This experiment needs: breakpoints, traps, save, and restore. Enable these in the configuration. #error This experiment needs: breakpoints, traps, save, and restore. Enable these in the configuration.
#endif #endif
//
void KESOrefs::printEIP() { //void KESOrefs::printEIP() {
m_log << "EIP = 0x" << hex << simulator.getCPU(0).getInstructionPointer() <<" "<< m_elf.getNameByAddress(simulator.getCPU(0).getInstructionPointer()) << endl; // m_log << "EIP = 0x" << hex << simulator.getCPU(0).getInstructionPointer() <<" "<< m_elf.getNameByAddress(simulator.getCPU(0).getInstructionPointer()) << endl;
} //}
unsigned KESOrefs::injectBitFlip(address_t data_address, unsigned bitpos){ unsigned KESOrefs::injectBitFlip(address_t data_address, unsigned bitpos){
@ -82,8 +82,7 @@ bool KESOrefs::run()
{ {
//******* Boot, and store state *******// //******* Boot, and store state *******//
m_log << "STARTING EXPERIMENT" << endl; m_log << "STARTING EXPERIMENT" << endl;
printEIP(); ElfReader m_elf;
#if SAFESTATE // define SS (SafeState) when building: make -DSS #if SAFESTATE // define SS (SafeState) when building: make -DSS
#warning "Building safe state variant" #warning "Building safe state variant"
m_log << "Booting, and saving state at main"; m_log << "Booting, and saving state at main";
@ -93,7 +92,6 @@ bool KESOrefs::run()
if(simulator.addListenerAndResume(&bp) == &bp){ if(simulator.addListenerAndResume(&bp) == &bp){
m_log << "main function entry reached, saving state" << endl; m_log << "main function entry reached, saving state" << endl;
} }
printEIP();
simulator.save("keso.state"); simulator.save("keso.state");
simulator.terminate(); simulator.terminate();
@ -116,7 +114,6 @@ bool KESOrefs::run()
address_t data_address = param.msg.ram_address(); address_t data_address = param.msg.ram_address();
unsigned bitpos = param.msg.bit_offset(); unsigned bitpos = param.msg.bit_offset();
simulator.restore("keso.state"); simulator.restore("keso.state");
// Goto injection point // Goto injection point
BPSingleListener injBP; BPSingleListener injBP;
@ -125,7 +122,6 @@ bool KESOrefs::run()
injBP.setWatchInstructionPointer(injectionPC); injBP.setWatchInstructionPointer(injectionPC);
simulator.addListenerAndResume(&injBP); simulator.addListenerAndResume(&injBP);
printEIP();
/// INJECT BITFLIP: /// INJECT BITFLIP:
param.msg.set_original_value(injectBitFlip(data_address, bitpos)); param.msg.set_original_value(injectBitFlip(data_address, bitpos));
@ -135,18 +131,22 @@ bool KESOrefs::run()
BPSingleListener l_parity(m_elf.getAddressByName("keso_throw_parity")); BPSingleListener l_parity(m_elf.getAddressByName("keso_throw_parity"));
BPSingleListener l_oobounds(m_elf.getAddressByName("keso_throw_index_out_of_bounds")); BPSingleListener l_oobounds(m_elf.getAddressByName("keso_throw_index_out_of_bounds"));
BPSingleListener l_dump(m_elf.getAddressByName("c17_Main_m4_dumpResults_console")); BPSingleListener l_dump(m_elf.getAddressByName("c17_Main_m4_dumpResults_console"));
MemAccessListener l_memtext(99999); l_memtext.setWatchWidth(2); MemAccessListener l_mem_text(m_elf.getSectionStart(".text"), MemAccessEvent::MEM_WRITE); l_mem_text.setWatchWidth(m_elf.getSectionSize(".text"));
MemAccessListener l_mem_textcdx_det( m_elf.getSectionStart(".text.cdx_det"), MemAccessEvent::MEM_WRITE ); l_mem_textcdx_det.setWatchWidth(m_elf.getSectionSize(".text.cdx_det"));
MemAccessListener l_mem_outerspace( m_elf.getSectionStart(".copy_sec") ); l_mem_outerspace.setWatchWidth(0xfffffff0);
TrapListener l_trap(ANY_TRAP); TrapListener l_trap(ANY_TRAP);
cout << " outerspace : " << l_mem_outerspace.getWatchWidth() << " --- @ :" << l_mem_outerspace.getWatchAddress() << endl;
simulator.addListener(&l_trap); simulator.addListener(&l_trap);
simulator.addListener(&l_error); simulator.addListener(&l_error);
simulator.addListener(&l_nullp); simulator.addListener(&l_nullp);
simulator.addListener(&l_oobounds); simulator.addListener(&l_oobounds);
simulator.addListener(&l_dump); simulator.addListener(&l_dump);
simulator.addListener(&l_parity); simulator.addListener(&l_parity);
simulator.addListener(&l_mem_text);
simulator.addListener(&l_mem_outerspace);
simulator.addListener(&l_mem_textcdx_det);
// resume and wait for results // resume and wait for results
fail::BaseListener* l = simulator.resume(); fail::BaseListener* l = simulator.resume();
printEIP();
// Evaluate result // Evaluate result
if(l == &l_error) { if(l == &l_error) {
@ -169,8 +169,14 @@ bool KESOrefs::run()
sstr << "trap #" << l_trap.getTriggerNumber(); sstr << "trap #" << l_trap.getTriggerNumber();
handleEvent(param, param.msg.TRAP, sstr.str()); handleEvent(param, param.msg.TRAP, sstr.str());
} else if (l == &l_memtext){ } else if (l == &l_mem_text){
handleMemoryAccessEvent(param, l_memtext); handleMemoryAccessEvent(param, l_mem_text);
} else if (l == &l_mem_textcdx_det){
handleMemoryAccessEvent(param, l_mem_textcdx_det);
} else if (l == &l_mem_outerspace){
handleMemoryAccessEvent(param, l_mem_outerspace);
} else { } else {
handleEvent(param, param.msg.UNKNOWN, "UNKNOWN event"); handleEvent(param, param.msg.UNKNOWN, "UNKNOWN event");

1
src/experiments/kesorefs/experiment.hpp
View File

@ -11,7 +11,6 @@
class KESOrefs : public fail::ExperimentFlow { class KESOrefs : public fail::ExperimentFlow {
fail::JobClient m_jc; fail::JobClient m_jc;
fail::ElfReader m_elf;
fail::Logger m_log; fail::Logger m_log;
fail::MemoryManager& m_mm; fail::MemoryManager& m_mm;