christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

checksum-oostubs-fix due to arch. changes (tested)

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

12
src/experiments/checksum-oostubs/experiment.cc
View File

@ -55,13 +55,13 @@ bool ChecksumOOStuBSExperiment::run()
log << "error_corrected = " << dec << ((int)simulator.getMemoryManager().getByte(OOSTUBS_ERROR_CORRECTED)) << endl; log << "error_corrected = " << dec << ((int)simulator.getMemoryManager().getByte(OOSTUBS_ERROR_CORRECTED)) << endl;
simulator.save(statename); simulator.save(statename);
assert(bp.getTriggerInstructionPointer() == OOSTUBS_FUNC_ENTRY); assert(bp.getTriggerInstructionPointer() == OOSTUBS_FUNC_ENTRY);
assert(simulator.getRegisterManager().getInstructionPointer() == OOSTUBS_FUNC_ENTRY); assert(simulator.getCPU(0).getInstructionPointer() == OOSTUBS_FUNC_ENTRY);
#elif 0 #elif 0
// STEP 2: record trace for fault-space pruning // STEP 2: record trace for fault-space pruning
log << "restoring state" << endl; log << "restoring state" << endl;
simulator.restore(statename); simulator.restore(statename);
log << "EIP = " << hex << simulator.getRegisterManager().getInstructionPointer() << endl; log << "EIP = " << hex << simulator.getCPU(0).getInstructionPointer() << endl;
assert(simulator.getRegisterManager().getInstructionPointer() == OOSTUBS_FUNC_ENTRY); assert(simulator.getCPU(0).getInstructionPointer() == OOSTUBS_FUNC_ENTRY);
log << "enabling tracing" << endl; log << "enabling tracing" << endl;
TracingPlugin tp; TracingPlugin tp;
@ -201,7 +201,7 @@ bool ChecksumOOStuBSExperiment::run()
byte_t newdata = data ^ (1 << bit_offset); byte_t newdata = data ^ (1 << bit_offset);
mm.setByte(mem_addr, newdata); mm.setByte(mem_addr, newdata);
// note at what IP we did it // note at what IP we did it
int32_t injection_ip = simulator.getRegisterManager().getInstructionPointer(); int32_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 log << "fault injected @ ip " << injection_ip
<< " 0x" << hex << ((int)data) << " -> 0x" << ((int)newdata) << endl; << " 0x" << hex << ((int)data) << " -> 0x" << ((int)newdata) << endl;
@ -273,7 +273,7 @@ bool ChecksumOOStuBSExperiment::run()
} }
// 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());
// record resultdata, finish_reached and error_corrected regardless of result // record resultdata, finish_reached and error_corrected regardless of result
uint32_t results[OOSTUBS_RESULTS_BYTES / sizeof(uint32_t)]; uint32_t results[OOSTUBS_RESULTS_BYTES / sizeof(uint32_t)];
@ -307,7 +307,7 @@ bool ChecksumOOStuBSExperiment::run()
result->set_resulttype(result->UNKNOWN); result->set_resulttype(result->UNKNOWN);
stringstream ss; stringstream ss;
ss << "event addr " << ev << " EIP " << simulator.getRegisterManager().getInstructionPointer(); ss << "event addr " << ev << " EIP " << simulator.getCPU(0).getInstructionPointer();
result->set_details(ss.str()); result->set_details(ss.str());
} }
// explicitly remove all events before we leave their scope // explicitly remove all events before we leave their scope