Upgraded Zydis version

Author: jonomango

chum/source/binary.cpp

@@ -200,14 +200,13 @@ void binary::print(bool const verbose) {
       std::uint32_t instr_offset = 0;
       for (auto const& instr : bb->instructions) {
         ZydisDecodedInstruction decoded_instr;
-        ZydisDecodedOperand decoded_operands[ZYDIS_MAX_OPERAND_COUNT_VISIBLE];
+        ZydisDecodedOperand decoded_operands[ZYDIS_MAX_OPERAND_COUNT];
 
         ZydisDecoderDecodeFull(&decoder_, instr.bytes, instr.length,
-          &decoded_instr, decoded_operands, ZYDIS_MAX_OPERAND_COUNT_VISIBLE,
-          ZYDIS_DFLAG_VISIBLE_OPERANDS_ONLY);
+          &decoded_instr, decoded_operands);
 
         char buffer[128] = { 0 };
-        ZydisFormatterFormatInstructionEx(&formatter_, &decoded_instr,
+        ZydisFormatterFormatInstruction(&formatter_, &decoded_instr,
           decoded_operands, decoded_instr.operand_count_visible, buffer,
           128, 0, &symbols_);
 

chum/source/main.cpp

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

chum/source/pe-builder.cpp

@@ -90,20 +90,25 @@ std::vector<std::uint8_t> pe_builder::create() const {
 
   std::vector<std::uint32_t> sym_to_rva(bin_.symbols().size(), 0);
 
-  for (auto const bb : bin_.basic_blocks()) {
-    sym_to_rva[bb->sym_id.value] = current_virtual_address + instr_offset;
-
-    for (auto const& instr : bb->instructions) {
-      contents.insert(end(contents),
-        std::begin(instr.bytes), std::begin(instr.bytes) + instr.length);
-      instr_offset += instr.length;
-    }
-
-    contents.push_back(0xCC);
-    contents.push_back(0xCC);
-    contents.push_back(0xCC);
-    instr_offset += 3;
-  }
+  sym_to_rva[bin_.entrypoint()->sym_id.value] = current_virtual_address + instr_offset;
+  contents.push_back(0xEB);
+  contents.push_back(0xFE);
+  instr_offset += 2;
+
+  //for (auto const bb : bin_.basic_blocks()) {
+  //  sym_to_rva[bb->sym_id.value] = current_virtual_address + instr_offset;
+
+  //  for (auto const& instr : bb->instructions) {
+  //    contents.insert(end(contents),
+  //      std::begin(instr.bytes), std::begin(instr.bytes) + instr.length);
+  //    instr_offset += instr.length;
+  //  }
+
+  //  contents.push_back(0xCB);
+  //  contents.push_back(0xCB);
+  //  contents.push_back(0xCB);
+  //  instr_offset += 2;
+  //}
 
   // The code section is the last section (after the data blocks).
   auto const code_section = section_header(contents, data_blocks.size());

extern/CMakeLists.txt

@@ -1,4 +1,4 @@
 # zydis
 option(ZYDIS_BUILD_EXAMPLES "" OFF)
 option(ZYDIS_BUILD_TOOLS    "" OFF)
-add_subdirectory(zydis)
+add_subdirectory(zydis)