christoph/fail
1
Fork 0
Code Releases Activity

Enhanced logging in ALUInstr

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1723 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-10-05 12:02:39 +00:00
parent 0c3568dc2f
commit 37f030b9a3
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
#include "aluinstr.hpp"
#include <iostream>
#include <sstream>
#include <string.h>
#include <time.h>
#include "bochs.h"
@ -90,12 +92,14 @@ bool BochsALUInstructions::isALUInstruction(bxInstruction_c const *src) {
return false;
}
bxInstruction_c BochsALUInstructions::randomEquivalent() const {
void BochsALUInstructions::randomEquivalent(bxInstruction_c &result,
std::string &details) const {
// find a random member of the same equivalence class
X86AluClass equClassID = lastInstr.aluClass;
if (equClassID == ALU_UNDEF) {
// something went wrong - just return the original instruction
return lastOrigInstr;
result = lastOrigInstr;
return;
}
InstrList const &destList = equivalenceClasses.at(equClassID);
@ -106,8 +110,16 @@ bxInstruction_c BochsALUInstructions::randomEquivalent() const {
dest = destList[index];
} while (memcmp(&dest, &lastInstr, sizeof(BochsALUInstr)) == 0);
// alternative chosen -- now store the necessary details
std::ostringstream oss;
oss << "Opcode 0x" << std::hex << static_cast<unsigned>(dest.opcode) << std::dec;
if (dest.reg < dest.REG_COUNT) oss << " # " << static_cast<unsigned>(dest.reg);
if (dest.opcodeRegisterOffset <= dest.REG_COUNT)
oss << " # " << static_cast<unsigned>(dest.opcodeRegisterOffset);
details = oss.str();
// first, copy everything
bxInstruction_c result = lastOrigInstr;
result = lastOrigInstr;
// then change what has to be different
// execute functions
@ -124,12 +136,9 @@ bxInstruction_c BochsALUInstructions::randomEquivalent() const {
if (dest.opcodeRegisterOffset < BochsALUInstr::REG_COUNT) {
result.setRm(dest.opcodeRegisterOffset);
}
// finally, return the result
return result;
}
#ifdef DEBUG
#include <iostream>
void BochsALUInstructions::printNestedMap() {
for (EquivClassMap::iterator it = equivalenceClasses.begin();