remove #ifndef __puma from code using LLVM

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

src/core/util/llvmdisassembler/LLVMDisassembler.cpp

@@ -1,4 +1,3 @@
-#ifndef __puma
 #include "LLVMDisassembler.hpp"
 
 using namespace fail;
@@ -147,5 +146,3 @@ void LLVMDisassembler::disassemble()
 }
 
 void LLVMDisassembler::StringRefMemoryObject::anchor() {}
-
-#endif

src/core/util/llvmdisassembler/LLVMDisassembler.hpp

@@ -1,8 +1,6 @@
 #ifndef __LLVMDISASSEMBLER_HPP__
 #define __LLVMDISASSEMBLER_HPP__
 
-#ifndef __puma
-
 #include <iostream>
 #include <vector>
 #include <map>
@@ -137,5 +135,4 @@ public:
 
 
 }
-#endif // puma
 #endif // __LLVMDISASSEMBLER_HPP__

src/core/util/llvmdisassembler/LLVMtoFailBochs.cpp

@@ -4,7 +4,6 @@
 using namespace fail;
 
 LLVMtoFailBochs::LLVMtoFailBochs() {
-#ifndef __puma
 	/* These magic numbers are taken from the llvm compiler (MC), they
 	   do not appear in any header. They hopefully will never
 	   change */
@@ -46,5 +45,4 @@ LLVMtoFailBochs::LLVMtoFailBochs() {
 	llvm_to_fail_map[54]  = reginfo_t(RID_CSP); // ESP
 	llvm_to_fail_map[117] = reginfo_t(RID_CSP, 16, 0);	// SP
 	llvm_to_fail_map[118] = reginfo_t(RID_CSP, 8, 0);		// SPL
-#endif
 }

src/core/util/llvmdisassembler/LLVMtoFailGem5.cpp

@@ -4,7 +4,6 @@
 using namespace fail;
 
 LLVMtoFailGem5::LLVMtoFailGem5() {
-#ifndef __puma
 	/* These magic numbers are taken from the machine descriptions of
 	   LLVM they (hopefully) will not change, since they are not exported
 	   via a header */
@@ -24,5 +23,4 @@ LLVMtoFailGem5::LLVMtoFailGem5() {
 	llvm_to_fail_map[105]	= reginfo_t(RI_SP);
 	llvm_to_fail_map[40]   = reginfo_t(RI_LR);
 	llvm_to_fail_map[43]   = reginfo_t(RI_IP);
-#endif
 }

src/core/util/llvmdisassembler/LLVMtoFailTranslator.cpp

@@ -4,7 +4,6 @@
 using namespace fail;
 
 const LLVMtoFailTranslator::reginfo_t &	 LLVMtoFailTranslator::getFailRegisterID(unsigned int regid) {
-#ifndef __puma
 	ltof_map_t::iterator it = llvm_to_fail_map.find(regid);
 	if( it != llvm_to_fail_map.end() ) {// found
 		return (*it).second;
@@ -13,7 +12,6 @@ const LLVMtoFailTranslator::reginfo_t &	 LLVMtoFailTranslator::getFailRegisterID
 		//exit(EXIT_FAILURE);
 		return notfound;
 	}
-#endif
 }
 
 regdata_t LLVMtoFailTranslator::getRegisterContent(ConcreteCPU& cpu, const reginfo_t &reginfo){

src/core/util/llvmdisassembler/LLVMtoFailTranslator.hpp

@@ -39,11 +39,8 @@ protected:
 
 	LLVMtoFailTranslator(){};
 
-#ifndef __puma
 	typedef std::map<unsigned int, struct reginfo_t> ltof_map_t;
 	ltof_map_t llvm_to_fail_map;
-#endif
-
 
 public:
 	const reginfo_t &  getFailRegisterID(unsigned int regid);

tools/import-trace/InstructionImporter.cc

@@ -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

tools/import-trace/InstructionImporter.hpp

@@ -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,

tools/import-trace/RandomJumpImporter.cc

@@ -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

tools/import-trace/RandomJumpImporter.hpp

@@ -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;
 

tools/import-trace/RegisterImporter.cc

@@ -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

tools/import-trace/RegisterImporter.hpp

@@ -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;