Fix compilation on Windows (clang-cl)

Partially based on lifting-bits#678

Co-authored-by: Max <[email protected]>

Author: mrexodia

bin/differential_tester_x86/LiftAndCompare.cpp

@@ -168,7 +168,7 @@ class DifferentialModuleBuilder {
 };
 
 using random_bytes_engine =
-    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint8_t>;
+    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint16_t>;
 
 
 std::string PrintState(X86State *state) {

cxx-common/superbuild.cmake

@@ -40,40 +40,6 @@ if(ninja_EXECUTABLE STREQUAL "ninja_EXECUTABLE-NOTFOUND")
 endif()
 message(STATUS "Ninja: ${ninja_EXECUTABLE}")
 
-# On macOS, search Homebrew for keg-only versions of Bison and Flex. Xcode does
-# not provide new enough versions for us to use.
-if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
-    execute_process(
-        COMMAND brew --prefix bison 
-        RESULT_VARIABLE BREW_BISON
-        OUTPUT_VARIABLE BREW_BISON_PREFIX
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(BREW_BISON EQUAL 0 AND EXISTS "${BREW_BISON_PREFIX}")
-        message(STATUS "Found Bison keg installed by Homebrew at ${BREW_BISON_PREFIX}")
-        set(BISON_EXECUTABLE "${BREW_BISON_PREFIX}/bin/bison")
-    else()
-        message(FATAL_ERROR "Bison not found, to install: brew install bison")
-    endif()
-    
-    execute_process(
-        COMMAND brew --prefix flex 
-        RESULT_VARIABLE BREW_FLEX
-        OUTPUT_VARIABLE BREW_FLEX_PREFIX
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(BREW_FLEX EQUAL 0 AND EXISTS "${BREW_FLEX_PREFIX}")
-        message(STATUS "Found Flex keg installed by Homebrew at ${BREW_FLEX_PREFIX}")
-        set(FLEX_EXECUTABLE "${BREW_FLEX_PREFIX}/bin/flex")
-    else()
-        message(FATAL_ERROR "Flex not found, to install: brew install flex")
-    endif()
-else()
-    message(STATUS "Looking for flex/bison")
-    find_package(FLEX 2.6 REQUIRED)
-    find_package(BISON 2.6 REQUIRED)
-endif()
-
 # Documentation: https://cmake.org/cmake/help/latest/module/ExternalProject.html
 include(ExternalProject)
 

include/remill/Arch/Context.h

@@ -23,6 +23,7 @@
 #include <functional>
 #include <map>
 #include <string_view>
+#include <string>
 
 namespace remill {
 

include/remill/Arch/Runtime/Math.h

@@ -36,7 +36,7 @@ static_assert(8 == sizeof(float128_t), "Invalid `float128_t` size.");
 // A "native_float80_t" is a native type that is closes to approximating
 // an x86 80-bit float.
 // when building against CUDA, default to 64-bit float80s
-#if !defined(__CUDACC__) && (defined(__x86_64__) || defined(__i386__) || defined(_M_X86))
+#if !defined(__CUDACC__) && !defined(_WIN32) && (defined(__x86_64__) || defined(__i386__) || defined(_M_X86))
   #if defined(__float80)
   typedef __float80 native_float80_t;
   #else
@@ -53,7 +53,7 @@ union union_ld {
   struct {
     uint8_t data[kEightyBitsInBytes];
     // when building against CUDA, default to 64-bit float80s
-#if !defined(__CUDACC__) && (defined(__x86_64__) || defined(__i386__) || defined(_M_X86))
+#if !defined(__CUDACC__) && !defined(_WIN32) && (defined(__x86_64__) || defined(__i386__) || defined(_M_X86))
     // We are doing x86 on x86, so we have native x86 FP80s, but they
     // are not available in raw 80-bit native form.
     //
@@ -154,8 +154,11 @@ union nan80_t {
   } __attribute__((packed));
 } __attribute__((packed));
 
+// TODO: this should be fixed
+#ifndef _WIN32
 static_assert(sizeof(float80_t) == sizeof(nan80_t),
               "Invalid packing of `nan80_t`.");
+#endif // _WIN32
 
 #if __has_include(<cmath>)
 #  include <cmath>

include/remill/BC/InstructionLifter.h

@@ -19,6 +19,7 @@
 #include <cstdint>
 #include <memory>
 #include <string_view>
+#include <string>
 
 namespace llvm {
 class Argument;

patches/sleigh/address-warning.patch

@@ -0,0 +1,25 @@
+From 5cef084ec56ee326d3b169c2c83950a017ae02f6 Mon Sep 17 00:00:00 2001
+From: Duncan Ogilvie <[email protected]>
+Date: Wed, 29 Oct 2025 00:52:58 +0100
+Subject: [PATCH] Fix narrowing conversion warning
+
+error : constant expression evaluates to -1 which cannot be narrowed to type 'uintb' (aka 'unsigned long long') [-Wc++11-narrowing]
+---
+ Ghidra/Features/Decompiler/src/decompile/cpp/address.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+index 9e8039d486e..a939961c371 100644
+--- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
++++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc
+@@ -630,8 +630,8 @@ void RangeList::decode(Decoder &decoder)
+ #ifdef UINTB4
+ uintb uintbmasks[9] = { 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff };
+ #else
+-uintb uintbmasks[9] = { 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffffLL,
+-			0xffffffffffffLL, 0xffffffffffffffLL, 0xffffffffffffffffLL };
++uintb uintbmasks[9] = { 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffffULL,
++			0xffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffffULL };
+ #endif
+ 
+ /// Treat the given \b val as a constant of \b size bytes

test_runner_lib/TestRunner.cpp

@@ -86,7 +86,7 @@ uint8_t MemoryHandler::read_byte(uint64_t addr) {
     return state.find(addr)->second;
   }
 
-  auto genned = rbe();
+  auto genned = static_cast<uint8_t>(rbe());
   uninitialized_reads.insert({addr, genned});
   state.insert({addr, genned});
   return genned;

test_runner_lib/include/test_runner/TestRunner.h

@@ -45,7 +45,7 @@ namespace test_runner {
 
 
 using random_bytes_engine =
-    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint8_t>;
+    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint16_t>;
 
 
 class MemoryHandler {