refactor: all in xmake

Author: std-microblock

CMakeLists.txt

@@ -4,6 +4,7 @@
 #include "concepts.h"
 #include "memo.h"
 #include "utils.h"
+#include <print>
 #include <utility>
 #include <vector>
 #include <zasm/zasm.hpp>
@@ -88,7 +89,6 @@ template <typename Range> class DisassembleRange {
     DisassembleIteratorR(DisassembleIteratorR &&) = default;
     DisassembleIteratorR &operator=(const DisassembleIteratorR &) = default;
     DisassembleIteratorR &operator=(DisassembleIteratorR &&) = default;
-    
 
     explicit DisassembleIteratorR(Range range, const Pointer &address,
                                   zasm::MachineMode machine_mode,
@@ -122,6 +122,7 @@ template <typename Range> class DisassembleRange {
 
   private:
     void decode_next() {
+    retry:
       using namespace zasm;
       Decoder d(machine_mode);
 
@@ -140,20 +141,18 @@ template <typename Range> class DisassembleRange {
       std::copy(ptr, ptr + buffer.size(), buffer.begin());
       const auto r = d.decode(buffer.data(), BufferSize, address);
       if (!r.hasValue()) {
-        d = Decoder(machine_mode);
-        ptr += 4;
-        address += 4;
-        return decode_next();
-      }
-
-      const auto size = r->getLength();
-      ptr += size;
-      address += size;
-      current_value = InstructionCtx{r.value(), address};
-
-      if (ptr == range_end) {
-        over = true;
-        return;
+        ptr += 1;
+        address += 1;
+        goto retry;
+      } else {
+        const auto size = r->getLength();
+        ptr += size;
+        address += size;
+        current_value = InstructionCtx{r.value(), address};
+
+        if (ptr == range_end) {
+          over = true;
+        }
       }
     }
   };

include/blook/disassembly.h

@@ -2,7 +2,7 @@
 #include "blook/blook.h"
 #include <cstdint>
 #include <format>
-
+#include <zasm/formatter/formatter.hpp>
 namespace blook {
 InlineHook::InlineHook(void *target, void *hook_func)
     : target(target), hook_func(hook_func) {}
@@ -51,6 +51,7 @@ void InlineHook::install(bool try_trampoline) {
 
     const auto &instrInfo = *decoderRes;
     const auto instr = instrInfo.getInstruction();
+
     if (auto res = b.emit(instr); res != zasm::ErrorCode::None)
       throw std::runtime_error(
           std::format("Failed to emit instruction at {} {}", curAddress,
@@ -66,9 +67,9 @@ void InlineHook::install(bool try_trampoline) {
   }
 
   if (try_trampoline && !p_trampoline) {
-    const auto trampoline_code_size =
+    const auto trampoline_code_size_estimated =
         utils::estimateCodeSize(programTrampoline);
-    trampoline_size = trampoline_code_size;
+    trampoline_size = trampoline_code_size_estimated;
     const auto trampolineCode =
         Pointer::malloc_near_rwx(target, trampoline_size);
 
@@ -79,7 +80,8 @@ void InlineHook::install(bool try_trampoline) {
       throw std::runtime_error(std::format("JIT Serialization failure: {} {}",
                                            err.getErrorName(),
                                            err.getErrorMessage()));
-    std::memcpy(trampolineCode, serializer2.getCode(), trampoline_code_size);
+    std::memcpy(trampolineCode, serializer2.getCode(),
+                trampoline_code_size_estimated);
     p_trampoline = trampolineCode;
   }
 

src/hook.cpp

@@ -2,6 +2,8 @@
 #include "blook/misc.h"
 #include <format>
 #include <stdexcept>
+#include <zasm/formatter/formatter.hpp>
+
 namespace blook {
 
 namespace utils {
@@ -17,11 +19,7 @@ std::size_t estimateCodeSize(const zasm::Program &program) {
       if (instrInfo.hasValue()) {
         size += instrInfo->getLength();
       } else {
-        throw std::runtime_error(
-            std::format("Failed to estimate code size, error: {} {}",
-                        instrInfo.error().getErrorName(),
-                        instrInfo.error().getErrorMessage()
-                        ));
+        size += 15; // worst case size for an instruction
       }
     } else if (auto *nodeEmbeddedLabel = node->getIf<zasm::EmbeddedLabel>();
                nodeEmbeddedLabel != nullptr) {
@@ -42,7 +40,7 @@ BLOOK_TEXT_SECTION uint8_t _getR11[] = {
     // ret
     0xC3};
 
-getreg_fn_t getR11 = (getreg_fn_t)(void*)_getR11;
+getreg_fn_t getR11 = (getreg_fn_t)(void *)_getR11;
 
 BLOOK_TEXT_SECTION uint8_t _getStackPointer[] = {
     // mov rax, rsp
@@ -57,7 +55,7 @@ BLOOK_TEXT_SECTION uint8_t _getEDX[] = {
     // ret
     0xC3};
 
-getreg_fn_t getEDX = (getreg_fn_t)(void*)_getEDX;
+getreg_fn_t getEDX = (getreg_fn_t)(void *)_getEDX;
 BLOOK_TEXT_SECTION uint8_t _getStackPointer[] = {
     // mov eax, esp
     0x89, 0xE0,
@@ -81,7 +79,7 @@ BLOOK_TEXT_SECTION uint8_t get_peb_fn_buf[] = {
 #endif
 getreg_fn_t getPEB = (getreg_fn_t)(void *)get_peb_fn_buf;
 
-getreg_fn_t getStackPointer = (getreg_fn_t)(void*)_getStackPointer;
+getreg_fn_t getStackPointer = (getreg_fn_t)(void *)_getStackPointer;
 
 } // namespace utils
 } // namespace blook

src/utils.cpp

@@ -1,14 +1,14 @@
 set_xmakever("2.9.8")
 
 set_allowedplats("windows", "linux")
-
+add_rules("plugin.compile_commands.autoupdate", {outputdir = "build"})
 add_rules("mode.debug", "mode.release", "mode.releasedbg")
 set_allowedmodes("debug", "release", "releasedbg")
 
 set_languages("c++23")
 set_encodings("utf-8")
 
-add_requires("zasm 916f28f882801c048eaececc2466c8fdc17653fa")
+add_requires("zasm 2025.03.02")
 
 target("blook")
     set_kind("static")