christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

import-trace: compile with both LLVM 3.1+3.3

Browse Source 
Commit 52322ac broke compilation with LLVM 3.1.

Change-Id: Ia0e1d91258e6be799cfbd3b6e9693894a6bc5650
This commit is contained in:
Horst Schirmeier
2013-08-22 18:08:15 +02:00
parent 470d455e34
commit 64840c02e4
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/import-trace/InstructionImporter.cc
View File

@ -24,9 +24,11 @@ bool InstructionImporter::handle_ip_event(fail::simtime_t curtime, instruction_c
return false; return false;
} }
ObjectFile *obj = dyn_cast<ObjectFile, Binary>(binary.get()); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast()
#ifndef __puma
ObjectFile *obj = llvm::dyn_cast<ObjectFile>(binary.get());
disas.reset(new LLVMDisassembler(obj)); disas.reset(new LLVMDisassembler(obj));
#endif
disas->disassemble(); disas->disassemble();
LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap(); LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap();
LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl; LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl;

6
tools/import-trace/RandomJumpImporter.cc
View File

@ -70,9 +70,11 @@ bool RandomJumpImporter::handle_ip_event(fail::simtime_t curtime, instruction_co
return false; return false;
} }
ObjectFile *obj = dyn_cast<ObjectFile, Binary>(binary.get()); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast()
#ifndef __puma
ObjectFile *obj = dyn_cast<ObjectFile>(binary.get());
disas.reset(new LLVMDisassembler(obj)); disas.reset(new LLVMDisassembler(obj));
#endif
disas->disassemble(); disas->disassemble();
LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap(); LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap();
LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl; LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl;

6
tools/import-trace/RegisterImporter.cc
View File

@ -108,9 +108,11 @@ bool RegisterImporter::handle_ip_event(fail::simtime_t curtime, instruction_coun
return false; return false;
} }
ObjectFile *obj = dyn_cast<ObjectFile, Binary>(binary.get()); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast()
#ifndef __puma
ObjectFile *obj = dyn_cast<ObjectFile>(binary.get());
disas.reset(new LLVMDisassembler(obj)); disas.reset(new LLVMDisassembler(obj));
#endif
disas->disassemble(); disas->disassemble();
LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap(); LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap();
LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl; LOG << "instructions disassembled: " << instr_map.size() << " Triple: " << disas->GetTriple() << std::endl;