christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

nanojpeg-fix due to recent architecure changes (compiled but not tested)

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2028 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2013-01-31 12:18:32 +00:00
parent db35166d67
commit 03138b388a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/experiments/nanojpeg/experiment.cc
View File

@ -51,7 +51,7 @@ bool NanoJPEGExperiment::run()
// record trace // record trace
log << "restoring state" << endl; log << "restoring state" << endl;
simulator.restore(NANOJPEG_STATE); simulator.restore(NANOJPEG_STATE);
log << "EIP = " << hex << simulator.getRegisterManager().getInstructionPointer() << endl; log << "EIP = " << hex << simulator.getCPU(0).getInstructionPointer() << endl;
log << "enabling tracing" << endl; log << "enabling tracing" << endl;
TracingPlugin tp; TracingPlugin tp;
tp.setLogIPOnly(true); tp.setLogIPOnly(true);
@ -120,7 +120,7 @@ bool NanoJPEGExperiment::run()
int id = param.getWorkloadID(); int id = param.getWorkloadID();
int instr_offset = param.msg.instr_offset(); int instr_offset = param.msg.instr_offset();
Register *reg = simulator.getRegisterManager().getRegister(param.msg.register_id()); Register *reg = simulator.getCPU(0).getRegister(param.msg.register_id());
uint64_t bitmask = param.msg.bitmask(); uint64_t bitmask = param.msg.bitmask();
int timeout = param.msg.timeout(); int timeout = param.msg.timeout();
@ -156,7 +156,7 @@ bool NanoJPEGExperiment::run()
uint32_t newdata = data ^ (1 << bitnr); uint32_t newdata = data ^ (1 << bitnr);
reg->setData(newdata); reg->setData(newdata);
// note at what IP we did it // note at what IP we did it
uint32_t injection_ip = simulator.getRegisterManager().getInstructionPointer(); uint32_t injection_ip = simulator.getCPU(0).getInstructionPointer();
param.msg.set_injection_ip(injection_ip); param.msg.set_injection_ip(injection_ip);
log << "fault injected @ ip " << injection_ip << " reg " << reg->getName() log << "fault injected @ ip " << injection_ip << " reg " << reg->getName()
<< " 0x" << hex << ((int)data) << " -> 0x" << ((int)newdata) << endl; << " 0x" << hex << ((int)data) << " -> 0x" << ((int)newdata) << endl;
@ -212,7 +212,7 @@ bool NanoJPEGExperiment::run()
BaseListener *ev = simulator.resume(); BaseListener *ev = simulator.resume();
// record latest IP regardless of result // record latest IP regardless of result
result->set_latest_ip(simulator.getRegisterManager().getInstructionPointer()); result->set_latest_ip(simulator.getCPU(0).getInstructionPointer());
if (ev == &ev_io) { if (ev == &ev_io) {
log << "Result FINISHED/BROKEN (" << ev_io.getData() << ")" << endl; log << "Result FINISHED/BROKEN (" << ev_io.getData() << ")" << endl;
@ -262,7 +262,7 @@ bool NanoJPEGExperiment::run()
result->set_resulttype(result->UNKNOWN); result->set_resulttype(result->UNKNOWN);
stringstream ss; stringstream ss;
ss << "eventid " << hex << ((unsigned long) ev) << " EIP " << simulator.getRegisterManager().getInstructionPointer(); ss << "eventid " << hex << ((unsigned long) ev) << " EIP " << simulator.getCPU(0).getInstructionPointer();
result->set_details(ss.str()); result->set_details(ss.str());
} }
} }