Fix build on Linux

Author: fay59

Makefile

@@ -1,7 +1,6 @@
 # This Makefile has been tested on Ubuntu 16.10. Use at your own risk
 # on anything else! (Or fix it and submit a PR.)
 
-CAPSTONE_DIR = /usr/include/capstone
 LLVM_VERSION_SUFFIX = -3.9
 PYTHON_INCLUDES = /usr/include/python2.7
 PYTHON27 = python
@@ -21,7 +20,7 @@ CC = $(CLANGC)
 CXX = $(CLANG)
 
 DIRECTORIES = $(sort $(dir $(wildcard $(CURDIR)/fcd/*/)))
-INCLUDES = $(DIRECTORIES:%=-I%) -isystem $(BUILD_DIR)/includes -isystem $(CAPSTONE_DIR)
+INCLUDES = $(DIRECTORIES:%=-I%) -isystem $(BUILD_DIR)/includes
 LLVM_CXXFLAGS = $(subst -I,-isystem ,$(shell $(LLVM_CONFIG) --cxxflags))
 LLVM_LIBS = $(shell $(LLVM_CONFIG) --libs $(LLVM_LIB_LIST))
 LLVM_LDFLAGS = $(shell $(LLVM_CONFIG) --ldflags)
@@ -33,7 +32,6 @@ CXXFLAGS = $(LLVM_CXXFLAGS) $(INCLUDES) $(CLANG_WARNINGS:%=-W%) --std=gnu++14
 CLANG_LIBS = -lclang $(addprefix $(shell $(LLVM_CONFIG) --libdir), $(addprefix "/libclang",$(addsuffix ".a",$(CLANG_LIB_LIST))))
 
 export BUILD_DIR
-export CAPSTONE_DIR
 export CXX
 export CLANG
 export CXXFLAGS
@@ -60,11 +58,11 @@ $(BUILD_DIR)/bindings.cpp: fcd/python/bindings.py
 $(BUILD_DIR)/systemIncludePaths.cpp: $(BUILD_DIR)
 	$(CXX) -E -x c++ -v - < /dev/null 2>&1 | sed -n '/#include <...>/,/End of search/p' > $(@:%.cpp=%.txt)
 	echo 'const char* defaultHeaderSearchPathList[] = {' > $@
-	cat $(@:%.cpp=%.txt) | grep -v '(framework directory)$$' | sed -n 's/^ \(.*\)/\t"\1",/p' >> $@
+	grep -v '(framework directory)$$' $(@:%.cpp=%.txt) | sed -n 's/^ \(.*\)/\t"\1",/p' >> $@
 	echo '\t0' >> $@
 	echo '};' >> $@
 	echo 'const char* defaultFrameworkSearchPathList[] = {' >> $@
-	cat $(@:%.cpp=%.txt) | sed -n 's/^ \(.*\) (framework directory)/\t"\1",/p' >> $@
+	sed -n 's/^ \(.*\) (framework directory)/\t"\1",/p' $(@:%.cpp=%.txt) >> $@
 	echo '\t0' >> $@
 	echo '};' >> $@
 

Makefile.sub

@@ -4,7 +4,7 @@ OBJECTS = $(SOURCES:%.cpp=$(BUILD_DIR)/%.o)
 products: $(OBJECTS)
 
 $(BUILD_DIR)/%.emulator.o: %.emulator.cpp
-	$(CLANG) -c -emit-llvm --std=gnu++14 -isystem $(CAPSTONE_DIR) -O3 -o $(@:%.o=%.bc) $<
+	$(CLANG) -c -emit-llvm --std=gnu++14 -O3 -o $(@:%.o=%.bc) $<
 	sed -e "s/{CPU}/$(<:%.emulator.cpp=%)/" $(INCBIN_TEMPLATE) > $(@:%.o=%.s)
 	cd $(BUILD_DIR) && $(CXX) -c -o $@ $(@:%.o=%.s)
 

fcd.xcodeproj/project.pbxproj

@@ -908,10 +908,7 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "FCD_DEBUG=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -963,6 +960,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1062,7 +1060,8 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
-					"__STDC_CONSTANT_MACROS\n__STDC_LIMIT_MACROS",
+					__STDC_CONSTANT_MACROS,
+					__STDC_LIMIT_MACROS,
 				);
 				GCC_VERSION = "";
 				HEADER_SEARCH_PATHS = (

fcd/ast/pre_ast_cfg.cpp

@@ -160,7 +160,8 @@ void PreAstContext::generateBlocks(Function& fn)
 					Expression* caseCondition = nullptr;
 					if (dest == bb || defaultCondition != nullptr)
 					{
-						const IntegerExpressionType& type = ctx.getIntegerType(false, caseValue->getType()->getIntegerBitWidth());
+						auto bits = static_cast<unsigned short>(caseValue->getType()->getIntegerBitWidth());
+						const IntegerExpressionType& type = ctx.getIntegerType(false, bits);
 						Expression* numericConstant = ctx.numeric(type, caseValue->getLimitedValue());
 						caseCondition = ctx.nary(NAryOperatorExpression::Equal, testVariable, numericConstant);
 					}

fcd/ast/pre_ast_cfg.h

@@ -40,7 +40,7 @@
 
 class AstContext;
 class Expression;
-class PreAstBasicBlock;
+struct PreAstBasicBlock;
 
 struct PreAstBasicBlockEdge
 {

fcd/codegen/translation_context.cpp

@@ -312,15 +312,6 @@ Function* TranslationContext::createFunction(uint64_t baseAddress)
 		break;
 	}
 
-#if DEBUG && 0
-	// check that it still works
-	if (verifyModule(*module, &errs()))
-	{
-		module->dump();
-		abort();
-	}
-#endif
-	
 	return fn;
 }
 

fcd/main.cpp

@@ -544,7 +544,7 @@ namespace
 				phaseTwo.add(createCFGSimplificationPass());
 				phaseTwo.run(module);
 
-#if DEBUG
+#ifdef FCD_DEBUG
 				if (verifyModule(module, &errorOutput))
 				{
 					// errors!
@@ -568,7 +568,7 @@ namespace
 			}
 			passManager.run(module);
 
-#ifdef DEBUG
+#ifdef FCD_DEBUG
 			if (verifyModule(module, &errorOutput))
 			{
 				// errors!

fcd/not_null.h

@@ -16,7 +16,7 @@
 
 #include <llvm/Support/Casting.h>
 
-#ifdef DEBUG
+#ifdef FCD_DEBUG
 
 // Smart pointer class to enforce that the pointer isn't null, and yell loudly if it is.
 template<typename T>

fcd/python/python_context.cpp

@@ -118,7 +118,7 @@ namespace
 	RegisterPass<PythonWrappedFunction> pyFuncPass("#py-function-pass", "Python-wrapped function pass", false, false);
 }
 
-#if DEBUG
+#ifdef FCD_DEBUG
 // needs external linkage to be available during debugging
 void dump(PyObject* obj)
 {