Modify directory structure to be more akin

Author: lawliet89

Diff for: Makefile.common.in

@@ -1,6 +1,6 @@
 # Set the name of the project here
-PROJECT_NAME := sample
-PROJ_VERSION := 0.9
+PROJECT_NAME := LLVMObfuscator
+PROJ_VERSION := 1.0.0
 
 # Set this variable to the top of the LLVM source tree.
 LLVM_SRC_ROOT = @LLVM_SRC@

Diff for: autoconf/configure.ac

@@ -1492,9 +1492,9 @@ dnl Configure project makefiles
 dnl List every Makefile that exists within your source tree
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(lib/Makefile)
-AC_CONFIG_MAKEFILE(lib/sample/Makefile)
+AC_CONFIG_MAKEFILE(lib/Transform/Makefile)
 AC_CONFIG_MAKEFILE(tools/Makefile)
-AC_CONFIG_MAKEFILE(tools/sample/Makefile)
+AC_CONFIG_MAKEFILE(tools/obfuscator/Makefile)
 
 dnl This must be last
 AC_OUTPUT

Diff for: configure

@@ -12890,13 +12890,13 @@ ac_config_commands="$ac_config_commands Makefile"
 ac_config_commands="$ac_config_commands lib/Makefile"
 
 
-ac_config_commands="$ac_config_commands lib/sample/Makefile"
+ac_config_commands="$ac_config_commands lib/Transform/Makefile"
 
 
 ac_config_commands="$ac_config_commands tools/Makefile"
 
 
-ac_config_commands="$ac_config_commands tools/sample/Makefile"
+ac_config_commands="$ac_config_commands tools/obfuscator/Makefile"
 
 
 
@@ -13629,9 +13629,9 @@ do
     "Makefile.llvm.config") CONFIG_FILES="$CONFIG_FILES Makefile.llvm.config" ;;
     "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
     "lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
-    "lib/sample/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/sample/Makefile" ;;
+    "lib/Transform/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Transform/Makefile" ;;
     "tools/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
-    "tools/sample/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/sample/Makefile" ;;
+    "tools/obfuscator/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/obfuscator/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -14059,12 +14059,12 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
    ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/Makefile Makefile ;;
     "lib/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname lib/Makefile`
    ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/lib/Makefile lib/Makefile ;;
-    "lib/sample/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname lib/sample/Makefile`
-   ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/lib/sample/Makefile lib/sample/Makefile ;;
+    "lib/Transform/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname lib/Transform/Makefile`
+   ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/lib/Transform/Makefile lib/Transform/Makefile ;;
     "tools/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname tools/Makefile`
    ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/tools/Makefile tools/Makefile ;;
-    "tools/sample/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname tools/sample/Makefile`
-   ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/tools/sample/Makefile tools/sample/Makefile ;;
+    "tools/obfuscator/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname tools/obfuscator/Makefile`
+   ${SHELL} ${llvm_src}/autoconf/install-sh -m 0644 -c ${srcdir}/tools/obfuscator/Makefile tools/obfuscator/Makefile ;;
 
   esac
 done # for ac_tag

Diff for: lib/Makefile

@@ -8,6 +8,6 @@ LEVEL=..
 #
 # List all of the subdirectories that we will compile.
 #
-DIRS=sample
+DIRS=Transform
 
 include $(LEVEL)/Makefile.common

Diff for: lib/Transform/Makefile

@@ -0,0 +1,14 @@
+# Makefile for hello pass
+
+# Path to top level of LLVM hierarchy
+LEVEL = ../..
+
+# Name of the library to build
+LIBRARYNAME = LLVMObfuscatorTransforms
+
+# Make the shared library become a loadable module so the tools can
+# dlopen/dlsym on the resulting library.
+LOADABLE_MODULE = 1
+
+# Include the makefile implementation stuff
+include $(LEVEL)/Makefile.common

Diff for: lib/Transform/hello.cpp

@@ -0,0 +1,34 @@
+#include "llvm/Pass.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace llvm;
+
+namespace {
+  struct Hello : public FunctionPass {
+    static char ID;
+    Hello() : FunctionPass(ID) {}
+
+    virtual bool runOnFunction(Function &F) {
+    	int count = 0;
+     	errs().write_escaped(F.getName()) << '\n';
+
+		for (Function::iterator B = F.begin(), Bend = F.end(); B !=Bend; ++B) {
+			for (BasicBlock::iterator I = B -> begin(), Iend = B -> end(); I != Iend; ++I) {
+				// check for instance of CallInst
+				if (CallInst *call = dyn_cast<CallInst>(I)) {
+					Function *calledFunction = call -> getCalledFunction();
+					if (calledFunction -> getName() == "printf") ++count;
+				}
+			}
+		}
+
+		errs() << "\t printf called " << count << " times\n";
+		return false;
+    }
+  };
+}
+
+char Hello::ID = 0;
+static RegisterPass<Hello> X("hello", "Hello World Pass - counts the number of printf(s)", false, false);

Diff for: lib/sample/Makefile

@@ -8,6 +8,6 @@ LEVEL=..
 #
 # List all of the subdirectories that we will compile.
 #
-DIRS=sample
+DIRS=obfuscator
 
 include $(LEVEL)/Makefile.common

Diff for: lib/sample/sample.c

@@ -14,7 +14,7 @@ TOOLNAME=Sample
 # List libraries that we'll need
 # We use LIBS because sample is a dynamic library.
 #
-USEDLIBS = sample.a
+# USEDLIBS = sample.a
 
 #
 # Include Makefile.common so we know what to do.

Diff for: tools/Makefile

@@ -0,0 +1,5 @@
+#include <stdio.h>
+
+int main() {
+	printf("Hello world!");
+}