From 7d5555e98518215b788c8e7a73444985e4925951 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Tue, 1 Apr 2025 18:37:00 +0200
Subject: [PATCH] Fix unicorn and switch back to it as default emulator

---
 src/unicorn-emulator/unicorn_x64_emulator.cpp | 2 +-
 src/windows-emulator/windows_emulator.cpp     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/unicorn-emulator/unicorn_x64_emulator.cpp b/src/unicorn-emulator/unicorn_x64_emulator.cpp
index d286bd2e..029ad15e 100644
--- a/src/unicorn-emulator/unicorn_x64_emulator.cpp
+++ b/src/unicorn-emulator/unicorn_x64_emulator.cpp
@@ -307,7 +307,7 @@ namespace unicorn
             void load_gdt(const pointer_type address, const uint32_t limit) override
             {
                 const std::array<uint64_t, 4> gdtr = {0, address, limit, 0};
-                this->write_register(x64_register::gdtr, gdtr.data(), gdtr.size());
+                this->write_register(x64_register::gdtr, gdtr.data(), gdtr.size() * sizeof(uint64_t));
             }
 
             void set_segment_base(const x64_register base, const pointer_type value) override
diff --git a/src/windows-emulator/windows_emulator.cpp b/src/windows-emulator/windows_emulator.cpp
index dfc7f97d..4091053e 100644
--- a/src/windows-emulator/windows_emulator.cpp
+++ b/src/windows-emulator/windows_emulator.cpp
@@ -8,7 +8,6 @@
 
 #include <utils/io.hpp>
 #include <utils/finally.hpp>
-#include <utils/compression.hpp>
 #include <utils/lazy_object.hpp>
 
 #include "exception_dispatch.hpp"
@@ -208,7 +207,7 @@ namespace
 
 std::unique_ptr<x64_emulator> create_default_x64_emulator()
 {
-    return icicle::create_x64_emulator();
+    return unicorn::create_x64_emulator();
 }
 
 windows_emulator::windows_emulator(application_settings app_settings, const emulator_settings& settings,