Fixed a bug in ALUInstr and improved logging for RATFlip

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1991 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

src/experiments/l4-sys/aluinstr.cc

@@ -25,6 +25,7 @@ BochsALUInstructions::BochsALUInstructions(BochsALUInstr const *initial_array, s
 	allInstrSize = array_size / sizeof(BochsALUInstr);
 	srand(time(NULL));
 	buildEquivalenceClasses();
+	checkEquivClasses();
 }
 
 void BochsALUInstructions::buildEquivalenceClasses() {
@@ -48,11 +49,33 @@ void BochsALUInstructions::buildEquivalenceClasses() {
 	}
 }
 
+void BochsALUInstructions::checkEquivClasses() {
+	for (EquivClassMap::iterator it = equivalenceClasses.begin();
+	    it != equivalenceClasses.end();
+	    it++) {
+		InstrList &curr_vector = it->second;
+		size_t curr_size = curr_vector.size();
+		for (size_t i = 0; i < curr_size; i++) {
+			for (size_t j = i + 1; j < curr_size; j++) {
+				if (curr_vector[i] == curr_vector[j]) {
+					std::cerr << "Two instructions in one equivalence class"
+					    << "are equal to each other. Correct the"
+					    << "source code." << std::endl;
+					exit(50);
+				}
+			}
+		}
+	}
+}
+
 void BochsALUInstructions::bochsInstrToInstrStruct(bxInstruction_c const &src, BochsALUInstr &dest) const {
 	//Note: it may be necessary to introduce a solution for two-byte
 	//opcodes once they overlap with one-byte ones
 	for (size_t i = 0; i < allInstrSize; i++) {
 		// first, check the opcode
+		if (allInstr[i].bochs_operation != src.getIaOpcode()) {
+			continue;
+		}
 		if (allInstr[i].opcodeRegisterOffset <= BochsALUInstr::REG_COUNT) {
 			// the opcode listed in allInstr is the starting value for a range
 			if (src.b1() < allInstr[i].opcode ||
@@ -105,6 +128,7 @@ void BochsALUInstructions::randomEquivalent(bxInstruction_c &result,
 
 	InstrList const &destList = equivalenceClasses.at(equClassID);
 	BochsALUInstr dest;
+
 	// make sure the two are not equal by chance
 	do {
 		int index = rand() % destList.size();
@@ -132,7 +156,7 @@ void BochsALUInstructions::randomEquivalent(bxInstruction_c &result,
 		result.execute2 = entry.execute2;
 	}
 	// opcodes
-	result.metaInfo.ia_opcode = dest.bochs_operation;
+	result.setIaOpcode(dest.bochs_operation);
 	result.setB1(dest.opcode);
 	if (dest.opcodeRegisterOffset < BochsALUInstr::REG_COUNT) {
 		result.setRm(dest.opcodeRegisterOffset);

src/experiments/l4-sys/aluinstr.hpp

@@ -48,10 +48,10 @@ struct BochsALUInstr {
 	 * in bxInstruction_c), pointing to several bits of information,
 	 * for instance what simulator function to execute
 	 */
-    Bit16u bochs_operation;
+	Bit16u bochs_operation;
-    /**
+	/**
-     * the x86 opcode, as stored by Bochs (known as b1 in bxInstruction_c)
+	 * the x86 opcode, as stored by Bochs (known as b1 in bxInstruction_c)
-     */
+	 */
 	Bit8u opcode;
 	/**
 	 * the reg part of the modr/m field (known as "nnn" in bxInstruction_c)
@@ -82,10 +82,11 @@ struct BochsALUInstr {
 	 */
 	bool operator==(BochsALUInstr const &obj) const
 	{
-		return opcode == obj.opcode &&
+		return bochs_operation == obj.bochs_operation &&
-		        reg == obj.reg &&
+			opcode == obj.opcode &&
-		        opcodeRegisterOffset == obj.opcodeRegisterOffset &&
+			reg == obj.reg &&
-		        aluClass == obj.aluClass;
+			opcodeRegisterOffset == obj.opcodeRegisterOffset &&
+			aluClass == obj.aluClass;
 	}
 	/**
 	 * returns false if obj equals this object
@@ -363,6 +364,7 @@ private:
 	 * A function to build the equivalence classes from the given instructions.
 	 */
 	void buildEquivalenceClasses();
+	void checkEquivClasses(); //!< checks if the equivalence classes are valid
 #ifdef DEBUG
 	void printNestedMap(); //!< prints the \a EquivClassMap of the oject
 #endif

src/experiments/l4-sys/experiment.cc

@@ -555,6 +555,9 @@ bool L4SysExperiment::run() {
 			} else {
 				// the data comes from an uninitialised register
 				newdata = rand();
+				stringstream ss;
+				ss << "0x" << hex << newdata;
+				param->msg.set_details(ss.str());
 			}
 			cpu.setRegisterContent(bochsRegister, newdata);
 		}