christoph/fail
1
Fork 0
Code Releases Activity

Changed BufferCache Backend to STL (as proposed), added IOPortEvent-Cache, updated class diagram

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1325 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-06-10 19:32:05 +00:00
parent db88736bb9
commit f49fa07a25
9 changed files with 394 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/experiments/l4-sys/experiment.cc
View File

@ -49,7 +49,7 @@ istream& operator>>(istream& in, trace_instr &val) {
return in;
}
char const * const state_folder = "l4sys.state";
char const * const state_folder = "l4sys.state";
char const * const instr_list_fn = "ip.list";
char const * const golden_run_fn = "golden.out";
address_t const aspace = 0x01e00000;
@ -59,8 +59,7 @@ string golden_run;
//the program needs to run 5 times without a fault
const unsigned times_run = 5;
string L4SysExperiment::sanitised(string in_str)
{
string L4SysExperiment::sanitised(string in_str) {
string result;
result.reserve(in_str.size());
for (string::iterator it = in_str.begin(); it != in_str.end(); it++) {
@ -76,8 +75,7 @@ string L4SysExperiment::sanitised(string in_str)
return result;
}
BaseEvent* L4SysExperiment::waitIOOrOther(bool clear_output)
{
BaseEvent* L4SysExperiment::waitIOOrOther(bool clear_output) {
IOPortEvent ev_ioport(0x3F8, true);
BaseEvent* ev = NULL;
if (clear_output)
@ -95,8 +93,7 @@ BaseEvent* L4SysExperiment::waitIOOrOther(bool clear_output)
return ev;
}
bool L4SysExperiment::run()
{
bool L4SysExperiment::run() {
Logger log("L4Sys", false);
BPSingleEvent bp(0, aspace);
@ -109,8 +106,7 @@ bool L4SysExperiment::run()
simulator.addEventAndWait(&bp);
log << "test function entry reached, saving state" << endl;
log << "EIP = " << hex << bp.getTriggerInstructionPointer()
<< " or "
log << "EIP = " << hex << bp.getTriggerInstructionPointer() << " or "
<< simulator.getRegisterManager().getInstructionPointer()
<< endl;
simulator.save(state_folder);
@ -213,7 +209,7 @@ bool L4SysExperiment::run()
}
// STEP 4: The actual experiment.
for (int i = 0; i < L4SYS_NUMINSTR; i++) {
while (1) {
log << "restoring state" << endl;
simulator.restore(state_folder);
@ -247,9 +243,8 @@ bool L4SysExperiment::run()
simulator.getRegisterManager().getInstructionPointer();
param.msg.set_injection_ip(injection_ip);
log << "inject @ ip " << injection_ip << " (offset " << dec
<< instr_offset << ")" << " bit " << bit_offset << ": 0x"
<< hex << ((int) data) << " -> 0x" << ((int) newdata)
<< endl;
<< instr_offset << ")" << " bit " << bit_offset << ": 0x" << hex
<< ((int) data) << " -> 0x" << ((int) newdata) << endl;
// sanity check (only works if we're working with an instruction trace)
if (injection_ip != instr_list[instr_offset].trigger_addr) {
@ -263,7 +258,7 @@ bool L4SysExperiment::run()
simulator.clearEvents();
m_jc.sendResult(param);
continue;
simulator.terminate(20);
}
// aftermath
@ -305,8 +300,7 @@ bool L4SysExperiment::run()
simulator.getRegisterManager().getInstructionPointer());
param.msg.set_output(sanitised(output.c_str()));
} else if (ev == &ev_trap) {
log << dec << "Result TRAP #" << ev_trap.getTriggerNumber()
<< endl;
log << dec << "Result TRAP #" << ev_trap.getTriggerNumber() << endl;
param.msg.set_resulttype(param.msg.TRAP);
param.msg.set_resultdata(
simulator.getRegisterManager().getInstructionPointer());
@ -339,6 +333,7 @@ bool L4SysExperiment::run()
#ifdef HEADLESS_EXPERIMENT
simulator.terminate(0);
#endif
// experiment successfully conducted
// experiment successfully conducted
return true;
}

9
src/experiments/l4-sys/experimentInfo.hpp
View File

@ -1,12 +1,15 @@
#ifndef __EXPERIMENT_INFO_HPP__
#define __EXPERIMENT_INFO_HPP__
// FIXME autogenerate this
//experiment types:
#define GPRFLIP 10
#define IDCFLIP 20
#define L4SYS_FUNC_ENTRY 0x1007cd0
#define L4SYS_FUNC_EXIT 0x1007d3a
#define L4SYS_NUMINSTR 3184
//#define HEADLESS_EXPERIMENT
#define PREPARE_EXPERIMENT
#define HEADLESS_EXPERIMENT
#define EXPERIMENT_TYPE IDCFLIP
//#define PREPARE_EXPERIMENT
#endif // __EXPERIMENT_INFO_HPP__