Make __remill_state extern "C"

mrexodia · mrexodia · commit d55b11a88fa2 · 2025-10-31T02:15:14.000+01:00
Closes lifting-bits#677
diff --git a/lib/Arch/AArch32/Runtime/Instructions.cpp b/lib/Arch/AArch32/Runtime/Instructions.cpp
@@ -29,7 +29,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-State __remill_state;
+extern "C" State __remill_state;
 
 #define REG_PC state.gpr.r15.dword
 #define REG_LR state.gpr.r14.dword
diff --git a/lib/Arch/AArch64/Runtime/Instructions.cpp b/lib/Arch/AArch64/Runtime/Instructions.cpp
@@ -29,7 +29,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-State __remill_state;
+extern "C" State __remill_state;
 
 #define REG_PC state.gpr.pc.qword
 #define REG_SP state.gpr.sp.qword
diff --git a/lib/Arch/PPC/Runtime/Instructions.cpp b/lib/Arch/PPC/Runtime/Instructions.cpp
@@ -21,7 +21,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004f
-State __remill_state;
+extern "C" State __remill_state;
 
 #define HYPER_CALL state.hyper_call
 
diff --git a/lib/Arch/Runtime/Intrinsics.cpp b/lib/Arch/Runtime/Intrinsics.cpp
@@ -29,7 +29,7 @@ extern "C" void __remill_mark_as_used(const void *);
 
 // Each architecture's semantics module defines this variable
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-extern State __remill_state;
+extern "C" State __remill_state;
 
 #if defined(REMILL_ON_SPARC32) || defined(REMILL_ON_SPARC64)
 extern RegisterWindow __remill_register_window;
diff --git a/lib/Arch/SPARC32/Runtime/Instructions.cpp b/lib/Arch/SPARC32/Runtime/Instructions.cpp
@@ -25,7 +25,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-State __remill_state;
+extern "C" State __remill_state;
 
 #define REG_PC state.pc.aword
 #define REG_NPC state.next_pc.aword
diff --git a/lib/Arch/SPARC64/Runtime/Instructions.cpp b/lib/Arch/SPARC64/Runtime/Instructions.cpp
@@ -25,7 +25,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-State __remill_state;
+extern "C" State __remill_state;
 
 #define REG_PC state.pc.aword
 #define REG_NPC state.next_pc.aword
diff --git a/lib/Arch/X86/Runtime/Instructions.cpp b/lib/Arch/X86/Runtime/Instructions.cpp
@@ -29,7 +29,7 @@
 
 // A definition is required to ensure that LLVM doesn't optimize the `State` type out of the bytecode
 // See https://github.com/lifting-bits/remill/pull/631#issuecomment-1279989004
-State __remill_state;
+extern "C" State __remill_state;
 
 #define REG_IP state.gpr.rip.word
 #define REG_EIP state.gpr.rip.dword
