christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Removed unnecessary debugging elements

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1744 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-10-14 08:46:39 +00:00
parent 111cf2dc97
commit 5f0212aced
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/experiments/l4-sys/aluinstr.cc
View File

@ -92,14 +92,14 @@ bool BochsALUInstructions::isALUInstruction(bxInstruction_c const *src) {
return false; return false;
} }
int BochsALUInstructions::randomEquivalent(bxInstruction_c &result, void BochsALUInstructions::randomEquivalent(bxInstruction_c &result,
std::string &details) const { std::string &details) const {
// find a random member of the same equivalence class // find a random member of the same equivalence class
X86AluClass equClassID = lastInstr.aluClass; X86AluClass equClassID = lastInstr.aluClass;
if (equClassID == ALU_UNDEF) { if (equClassID == ALU_UNDEF) {
// something went wrong - just return the original instruction // something went wrong - just return the original instruction
result = lastOrigInstr; result = lastOrigInstr;
return 10; return;
} }
InstrList const &destList = equivalenceClasses.at(equClassID); InstrList const &destList = equivalenceClasses.at(equClassID);
@ -136,13 +136,6 @@ int BochsALUInstructions::randomEquivalent(bxInstruction_c &result,
if (dest.opcodeRegisterOffset < BochsALUInstr::REG_COUNT) { if (dest.opcodeRegisterOffset < BochsALUInstr::REG_COUNT) {
result.setRm(dest.opcodeRegisterOffset); result.setRm(dest.opcodeRegisterOffset);
} }
if (memcmp(&result, &lastOrigInstr, sizeof(bxInstruction_c)) == 0) {
fprintf(stderr,"randomEquivalent failed\n");
scanf("%*s");
}
return 0;
} }
#ifdef DEBUG #ifdef DEBUG

2
src/experiments/l4-sys/aluinstr.hpp
View File

@ -343,7 +343,7 @@ public:
* @param result the resulting bxInstruction_c object as described above * @param result the resulting bxInstruction_c object as described above
* @param details after completion contains details about \c result * @param details after completion contains details about \c result
*/ */
int randomEquivalent(bxInstruction_c &result, std::string &details) const; void randomEquivalent(bxInstruction_c &result, std::string &details) const;
protected: protected:
/** /**
* Convert a bxInstruction_c object into its matching BochsALUInstr object. * Convert a bxInstruction_c object into its matching BochsALUInstr object.

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

@ -600,7 +600,7 @@ bool L4SysExperiment::run() {
// now exchange it with a random equivalent // now exchange it with a random equivalent
bxInstruction_c newInstr; bxInstruction_c newInstr;
string details; string details;
int result = aluInstrObject.randomEquivalent(newInstr, details); aluInstrObject.randomEquivalent(newInstr, details);
if (memcmp(&newInstr, currInstr, sizeof(bxInstruction_c)) == 0) { if (memcmp(&newInstr, currInstr, sizeof(bxInstruction_c)) == 0) {
// something went wrong - exit experiment // something went wrong - exit experiment
param.msg.set_resulttype(param.msg.UNKNOWN); param.msg.set_resulttype(param.msg.UNKNOWN);