Recover High Level IR from Patchable IR

CMakeLists.txt

@@ -28,6 +28,7 @@ find_package(glog CONFIG REQUIRED)
 find_package(Z3 CONFIG REQUIRED)
 find_package(doctest CONFIG REQUIRED)
 find_package(LLVM CONFIG REQUIRED)
+include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
 llvm_map_components_to_libnames(llvm_libs support core irreader bitreader bitwriter)
 
 find_package(sleigh CONFIG)
@@ -56,7 +57,7 @@ if(ANVILL_ENABLE_INSTALL)
 endif(ANVILL_ENABLE_INSTALL)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(ANVILL_ENABLE_TESTS)

Dockerfile

@@ -1,7 +1,7 @@
-ARG LLVM_VERSION=15
+ARG LLVM_VERSION=17
 ARG ARCH=amd64
-ARG UBUNTU_VERSION=20.04
-ARG CXX_COMMON_VERSION=0.2.16
+ARG UBUNTU_VERSION=22.04
+ARG CXX_COMMON_VERSION=0.6.0
 ARG DISTRO_BASE=ubuntu${UBUNTU_VERSION}
 ARG BUILD_BASE=ubuntu:${UBUNTU_VERSION}
 ARG LIBRARIES=/opt/trailofbits
@@ -15,7 +15,7 @@ ARG LLVM_VERSION
 ARG CXX_COMMON_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
-    apt-get install -qqy --no-install-recommends git libdbus-1-3 curl unzip python3 python3-pip python3.8 python3.8-venv python3-setuptools xz-utils cmake && \
+    apt-get install -qqy --no-install-recommends git libdbus-1-3 curl unzip python3 python3-pip python3-setuptools xz-utils cmake && \
     rm -rf /var/lib/apt/lists/*
 
 #### NOTE ####
@@ -32,7 +32,7 @@ ARG CXX_COMMON_VERSION
 ARG LIBRARIES
 
 RUN apt-get update && \
-    apt-get install -qqy xz-utils python3.8-venv make rpm && \
+    apt-get install -qqy xz-utils python3 python3.10-venv make rpm && \
     rm -rf /var/lib/apt/lists/*
 
 # Build dependencies
@@ -59,7 +59,7 @@ ENV VIRTUAL_ENV=/opt/trailofbits/venv
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 
 # create a virtualenv in /opt/trailofbits/venv
-RUN python3.8 -m venv ${VIRTUAL_ENV}
+RUN python3 -m venv ${VIRTUAL_ENV}
 
 # Needed for sourcing venv
 SHELL ["/bin/bash", "-c"]

README.md

@@ -22,7 +22,7 @@ plugin that is currently closed source. You can checkout the tag: [binja-final-v
 
 ## Getting Help
 
-If you are experiencing undocumented problems with Anvill then ask for help in the `#binary-lifting` channel of the [Empire Hacking Slack](https://empireslacking.herokuapp.com/).
+If you are experiencing undocumented problems with Anvill then ask for help in the `#binary-lifting` channel of the [Empire Hacking Slack](https://slack.empirehacking.nyc/).
 
 ## Supported Platforms
 
@@ -103,10 +103,10 @@ Or you can tell CMake where to find the remill installation prefix by passing `-
 
 ### Docker image
 
-To build via Docker run, specify the architecture, base Ubuntu image and LLVM version. For example, to build Anvill linking against LLVM 14 on Ubuntu 20.04 on AMD64 do:
+To build via Docker run, specify the architecture, base Ubuntu image and LLVM version. For example, to build Anvill linking against LLVM 16 on Ubuntu 20.04 on AMD64 do:
 
 ```shell
-ARCH=amd64; UBUNTU_VERSION=20.04; LLVM=14; \
+ARCH=amd64; UBUNTU_VERSION=20.04; LLVM=16; \
    docker build . \
    -t anvill-llvm${LLVM}-ubuntu${UBUNTU_VERSION}-${ARCH} \
    -f Dockerfile \

bin/Decompile/Main.cpp

@@ -10,6 +10,7 @@
 #include <anvill/Optimize.h>
 #include <anvill/Providers.h>
 #include <anvill/Specification.h>
+#include <anvill/Utils.h>
 #include <anvill/Version.h>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
@@ -42,6 +43,11 @@ DEFINE_bool(add_breakpoints, false,
             "lifted bitcode.");
 
 DEFINE_bool(add_names, false, "Try to apply symbol names to lifted entities.");
+DEFINE_bool(disable_opt, false, "Dont apply optimization passes");
+DEFINE_bool(llvm_debug, false, "Enable LLVM debug flag");
+DEFINE_bool(inline_basic_blocks, false,
+            "Enables inlining of basic blocks for high level output");
+
 
 DEFINE_string(
     default_callable_spec, "",
@@ -105,9 +111,6 @@ int main(int argc, char *argv[]) {
       remill::GetReference(maybe_buff);
 
   llvm::LLVMContext context;
-#if LLVM_VERSION_NUMBER < LLVM_VERSION(15, 0)
-  context.enableOpaquePointers();
-#endif
   llvm::Module module("lifted_code", context);
 
   auto maybe_spec =
@@ -158,6 +161,7 @@ int main(int argc, char *argv[]) {
   anvill::SpecificationControlFlowProvider cfp(spec);
   anvill::SpecificationMemoryProvider mp(spec);
   anvill::LifterOptions options(spec.Arch().get(), module, *tp.get(), cfp, mp);
+  options.should_inline_basic_blocks = FLAGS_inline_basic_blocks;
 
   //  options.state_struct_init_procedure =
   //      anvill::StateStructureInitializationProcedure::kNone;
@@ -241,7 +245,14 @@ int main(int argc, char *argv[]) {
     llvm::EnableStatistics();
   }
 
-  anvill::OptimizeModule(lifter, module);
+  if (FLAGS_llvm_debug) {
+    llvm::DebugFlag = true;
+  }
+
+  if (!FLAGS_disable_opt) {
+    anvill::OptimizeModule(lifter, module, spec.GetBlockContexts(), spec);
+  }
+
 
   int ret = EXIT_SUCCESS;