Added pe-builder submodule

Author: jonomango

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "extern/zydis"]
 	path = extern/zydis
 	url = https://github.com/zyantific/zydis
+[submodule "extern/pe-builder"]
+	path = extern/pe-builder
+	url = https://github.com/jonomango/pe-builder

chum/CMakeLists.txt

@@ -11,8 +11,6 @@ add_executable(chum
   "source/symbol.h"
   "source/disassembler.h"
   "source/disassembler.cpp"
-  "source/pe-builder.h"
-  "source/pe-builder.cpp"
   "source/util.h"
   "source/util.cpp"
 )
@@ -26,4 +24,5 @@ target_compile_features(chum PRIVATE
 # dependencies
 target_link_libraries(chum PRIVATE
   Zydis
+  pe-builder
 )

chum/source/binary.cpp

@@ -1,12 +1,12 @@
 #include "binary.h"
-#include "pe-builder.h"
 
 #include <cassert>
 #include <algorithm>
 #include <fstream>
 
 #include <Windows.h>
 #include <zycore/Format.h>
+#include <pe-builder/pe-builder.h>
 
 namespace chum {
 
@@ -221,7 +221,32 @@ void binary::print(bool const verbose) {
 
 // Create a new PE file from this binary.
 bool binary::create(char const* const path) const {
-  return pe_builder(*this).create(path);
+  pb::pe_builder pe;
+  pe.file_characteristics(IMAGE_FILE_DLL);
+
+  // We don't want to resize in the middle of adding sections.
+  if (pe.sections_until_resize() < 1 + data_blocks_.size())
+    return false;
+
+  // Create the .text section for holding code.
+  auto& text_sec = pe.section()
+    .name(".text")
+    .characteristics(IMAGE_SCN_MEM_EXECUTE);
+  auto& text_sec_data = text_sec.data();
+
+  // Write every instruction to the text section (first pass).
+  for (auto const& bb : basic_blocks_) {
+    for (auto const& instr : bb->instructions) {
+      // This is ENTIRELY wrong, but its a good start...
+      text_sec_data.insert(end(text_sec_data),
+        instr.bytes, instr.bytes + instr.length);
+    }
+  }
+
+  // Set the entrypoint to the start of the text section.
+  pe.entrypoint(pe.virtual_address(text_sec));
+
+  return pe.write(path);
 }
 
 // Get the entrypoint of this binary, if it exists.

chum/source/main.cpp

@@ -62,7 +62,7 @@ int main() {
 
   bin->print(true);
 
-  if (!bin->create("C:\\Users\\realj\\Desktop\\chum-output.exe")) {
+  if (!bin->create("C:\\Users\\realj\\Desktop\\chum-output.dll")) {
     std::printf("[!] Failed to create output binary.\n");
     return 0;
   }

chum/source/pe-builder.cpp

@@ -2,3 +2,6 @@
 option(ZYDIS_BUILD_EXAMPLES "" OFF)
 option(ZYDIS_BUILD_TOOLS    "" OFF)
 add_subdirectory(zydis)
+
+# pe-builder
+add_subdirectory(pe-builder)