Complete Windows port

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Rust
+name: Rust CI
 
 on:
   push:
@@ -18,13 +18,25 @@ jobs:
         os: [
           ubuntu-latest,
           macos-latest,
+          windows-latest
         ]
+        include:
+        - os: ubuntu-latest
+          target: x86_64-unknown-linux-gnu
+        - os: ubuntu-latest
+          target: x86_64-unknown-linux-musl
+        - os: macos-latest
+          target: aarch64-apple-darwin
+        - os: windows-latest
+          target: x86_64-pc-windows-msvc
+        - os: windows-latest
+          target: i686-pc-windows-msvc
     steps:
     - uses: actions/checkout@v4
     - name: Build all features
-      run: cargo build --verbose --all-features
+      run: cargo build --verbose --all-features --target ${{ matrix.target }}
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --verbose --target ${{ matrix.target }} -- --test-threads=1
 
   cross:
     runs-on: ubuntu-latest
@@ -33,6 +45,7 @@ jobs:
       matrix:
         target: [
           i686-unknown-linux-gnu,
+          aarch64-unknown-linux-gnu,
         ]
     steps:
     - name: checkout
@@ -42,7 +55,7 @@ jobs:
     - name: Build all features
       run: cross build --verbose --all-features --target ${{ matrix.target }}
     - name: Run tests
-      run: cross test --verbose --target ${{ matrix.target }}
+      run: cross test --verbose --target ${{ matrix.target }} -- --test-threads=1
 
   rustfmt:
     name: Rustfmt

src/lib.rs

@@ -31,12 +31,26 @@ struct JumpEntry {
 
 impl JumpEntry {
     /// Update fields to be absolute address
+    #[cfg(not(all(target_os = "windows", target_arch = "x86_64")))]
     fn make_relative_address_absolute(&mut self) {
         self.code = (core::ptr::addr_of!(self.code) as usize).wrapping_add(self.code);
         self.target = (core::ptr::addr_of!(self.target) as usize).wrapping_add(self.target);
         self.key = (core::ptr::addr_of!(self.key) as usize).wrapping_add(self.key);
     }
 
+    // For Win64, the relative address is truncated into 32bit.
+    // See https://github.com/llvm/llvm-project/blob/862d837e483437b33f5588f89e62085de3a806b9/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp#L48-L51
+    /// Update fields to be absolute address
+    #[cfg(all(target_os = "windows", target_arch = "x86_64"))]
+    fn make_relative_address_absolute(&mut self) {
+        let code = (self.code as i32) as i64 as usize;
+        self.code = (core::ptr::addr_of!(self.code) as usize).wrapping_add(code);
+        let target = (self.target as i32) as i64 as usize;
+        self.target = (core::ptr::addr_of!(self.target) as usize).wrapping_add(target);
+        let key = (self.key as i32) as i64 as usize;
+        self.key = (core::ptr::addr_of!(self.key) as usize).wrapping_add(key);
+    }
+
     /// Absolute address of the JMP/NOP instruction to be modified
     fn code_addr(&self) -> usize {
         self.code

tests/basic.rs

@@ -1,3 +1,5 @@
+//! This test is designed to be run in single thread. Always pass `--test-threads=1`!
+
 #![feature(asm_goto)]
 #![feature(asm_const)]