christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Fixes, changed experiment to new API

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1596 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hoffmann
2012-09-06 08:22:30 +00:00
parent a9b78c1154
commit 0349f3dfee
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/experiments/vezs-example/experiment.cc
View File

@ -83,17 +83,17 @@ bool VEZSExperiment::run()
// - #loop iterations before/after FI // - #loop iterations before/after FI
// catch traps as "extraordinary" ending // catch traps as "extraordinary" ending
TrapEvent ev_trap(ANY_TRAP); TroubleListener ev_trap(ANY_TRAP);
simulator.addEvent(&ev_trap); simulator.addListener(&ev_trap);
// jump outside text segment // jump outside text segment
BPRangeEvent ev_below_text(ANY_ADDR, OOSTUBS_TEXT_START - 1); BPRangeListener ev_below_text(ANY_ADDR, OOSTUBS_TEXT_START - 1);
BPRangeEvent ev_beyond_text(OOSTUBS_TEXT_END + 1, ANY_ADDR); BPRangeListener ev_beyond_text(OOSTUBS_TEXT_END + 1, ANY_ADDR);
simulator.addEvent(&ev_below_text); simulator.addListener(&ev_below_text);
simulator.addEvent(&ev_beyond_text); simulator.addListener(&ev_beyond_text);
// timeout (e.g., stuck in a HLT instruction) // timeout (e.g., stuck in a HLT instruction)
// 10000us = 500000 instructions // 10000us = 500000 instructions
TimerEvent ev_timeout(1000000); // 50,000,000 instructions !! GenericTimerListener ev_timeout(1000000); // 50,000,000 instructions !!
simulator.addEvent(&ev_timeout); simulator.addListener(&ev_timeout);
// remaining instructions until "normal" ending // remaining instructions until "normal" ending
BPSingleListener ev_end(ANY_ADDR); BPSingleListener ev_end(ANY_ADDR);
@ -101,7 +101,7 @@ bool VEZSExperiment::run()
simulator.addListener(&ev_end); simulator.addListener(&ev_end);
// Start simulator and wait for any result // Start simulator and wait for any result
BaseEvent* ev = simulator.waitAny(); BaseListener* ev = simulator.resume();
// record latest IP regardless of result // record latest IP regardless of result
injection_ip = simulator.getRegisterManager().getInstructionPointer(); injection_ip = simulator.getRegisterManager().getInstructionPointer();
@ -126,5 +126,5 @@ bool VEZSExperiment::run()
#endif #endif
// Explicitly terminate, or the simulator will continue to run. // Explicitly terminate, or the simulator will continue to run.
simulator.terminate(); simulator.resume();
} }