christoph/fail
1
Fork 0
Code Releases Activity

remove #ifndef __puma from code using LLVM

Browse Source 
Contemporary AspectC++ versions can deal with the LLVM headers very
well, and #ifdef __puma stuff in Fail* headers results in
unmaintainable #ifdef __puma blocks in other parts of Fail* (e.g., the
trace importer).

Make sure you're using a 64-bit ac++ when living in a 64-bit userland
(the 32-bit version doesn't know about __int128), and be aware that
AspectC++ r325 introduced a regression that has not been fixed yet.

Change-Id: I5bb759b08995a74b020d44a2b40e9d7a6e18111c
This commit is contained in:
Horst Schirmeier
2013-07-09 16:06:14 +02:00
parent 97c0b6b4ae
commit 203ec6c5cc
12 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
#ifndef __puma
#include <sstream>
#include <iostream>
#include "InstructionImporter.hpp"
@ -77,6 +76,3 @@ bool InstructionImporter::handle_ip_event(fail::simtime_t curtime, instruction_c
return true;
}
#endif // !__puma

5
tools/import-trace/InstructionImporter.hpp
View File

@ -3,16 +3,11 @@
#include "Importer.hpp"
#ifndef __puma
#include "util/llvmdisassembler/LLVMDisassembler.hpp"
#endif
class InstructionImporter : public Importer {
#ifndef __puma
llvm::OwningPtr<llvm::object::Binary> binary;
llvm::OwningPtr<fail::LLVMDisassembler> disas;
#endif
public:
virtual bool handle_ip_event(fail::simtime_t curtime, instruction_count_t instr,

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

@ -1,4 +1,3 @@
#ifndef __puma
#include <sstream>
#include <iostream>
#include "util/Logger.hpp"
@ -129,6 +128,3 @@ bool RandomJumpImporter::handle_ip_event(fail::simtime_t curtime, instruction_co
return true;
}
#endif // !__puma

5
tools/import-trace/RandomJumpImporter.hpp
View File

@ -5,16 +5,11 @@
#include "util/CommandLine.hpp"
#include "Importer.hpp"
#ifndef __puma
#include "util/llvmdisassembler/LLVMDisassembler.hpp"
#endif
class RandomJumpImporter : public Importer {
#ifndef __puma
llvm::OwningPtr<llvm::object::Binary> binary;
llvm::OwningPtr<fail::LLVMDisassembler> disas;
#endif
fail::CommandLine::option_handle FROM, TO;

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

@ -1,4 +1,3 @@
#ifndef __puma
#include <sstream>
#include <iostream>
#include "RegisterImporter.hpp"
@ -168,6 +167,3 @@ bool RegisterImporter::handle_ip_event(fail::simtime_t curtime, instruction_coun
return true;
}
#endif // !__puma

5
tools/import-trace/RegisterImporter.hpp
View File

@ -5,13 +5,10 @@
#include "util/CommandLine.hpp"
#include "Importer.hpp"
#ifndef __puma
#include "util/llvmdisassembler/LLVMDisassembler.hpp"
#endif
class RegisterImporter : public Importer {
#ifndef __puma
llvm::OwningPtr<llvm::object::Binary> binary;
llvm::OwningPtr<fail::LLVMDisassembler> disas;
@ -19,8 +16,6 @@ class RegisterImporter : public Importer {
const Trace_Event &ev,
const fail::LLVMtoFailTranslator::reginfo_t &info,
char access_type);
#endif
fail::CommandLine::option_handle NO_GP, FLAGS, IP;
bool do_gp, do_flags, do_ip;