Support Windows and Microsoft x64 ABI #1

h-c-mueller commented 2026年01月05日 10:03:02 +01:00

This patch fixes compilation and linking issues for Windows (MinGW)
and Cygwin. It ensures that JIT symbols are correctly exported in DLL
builds and provides a fallback for the missing ffs() function in the
Windows C runtime.

• lightening.h (JIT_API): Do not use the hidden visibility attribute
  on Windows or Cygwin. The PE/COFF format used on these platforms
  requires standard visibility for symbols to be correctly exported
  when building Guile as a DLL.

• lightening/x86-cpu.c (__ffs): New static function. Fallback
  implementation using __builtin_ffs() as the standard POSIX ffs()
  is unavailable in MSVCRT/UCRT.
  (ffsw): Use the internal __ffs wrapper for bit-scan operations to
  ensure consistency across all Windows toolchains.

Note: an identical patch has been provided as guile/guile@71d21b9ae6 in guile/guile#68.

This patch fixes compilation and linking issues for Windows (MinGW) and Cygwin. It ensures that JIT symbols are correctly exported in DLL builds and provides a fallback for the missing ffs() function in the Windows C runtime. * lightening.h (JIT_API): Do not use the hidden visibility attribute on Windows or Cygwin. The PE/COFF format used on these platforms requires standard visibility for symbols to be correctly exported when building Guile as a DLL. * lightening/x86-cpu.c (__ffs): New static function. Fallback implementation using __builtin_ffs() as the standard POSIX ffs() is unavailable in MSVCRT/UCRT. (ffsw): Use the internal __ffs wrapper for bit-scan operations to ensure consistency across all Windows toolchains. Note: an identical patch has been provided as https://codeberg.org/guile/guile/commit/71d21b9ae6 in https://codeberg.org/guile/guile/pulls/68.

ekaitz-zarraga commented 2026年01月05日 15:10:26 +01:00

@h-c-mueller how do you build this for testing?
I'd merge but I want to test it first.

Thank you for the pr

@h-c-mueller how do you build this for testing? I'd merge but I want to test it first. Thank you for the pr

h-c-mueller commented 2026年01月09日 16:20:43 +01:00

I updated the patch, which now includes a full test suite update. (Note: This update incorporates changes across three PR iterations to ensure a clean final state).

The command make -C tests test-native now runs successfully on MSYS2 for MSYS (a Cygwin clone), MINGW32, MINGW64, and UCRT64. The command make -C tests CC=clang test-native passed on CLANG64. Verification on Linux x64 also passed without warning.

I removed the inclusion of <sys/mman.h> from lightening/lightening.c as it appears to be no longer required by the core logic. While I am confident in this change, I was unable to verify it on the following architectures: aarch64, arm, mips, ppc, riscv, and s390. I recommend a brief cross-check on these platforms to ensure no indirect dependencies were broken.

I updated the patch, which now includes a full test suite update. (Note: This update incorporates changes across three PR iterations to ensure a clean final state). The command `make -C tests test-native` now runs successfully on MSYS2 for MSYS (a Cygwin clone), MINGW32, MINGW64, and UCRT64. The command `make -C tests CC=clang test-native` passed on CLANG64. Verification on Linux x64 also passed without warning. I removed the inclusion of `<sys/mman.h>` from `lightening/lightening.c` as it appears to be no longer required by the core logic. While I am confident in this change, I was unable to verify it on the following architectures: aarch64, arm, mips, ppc, riscv, and s390. I recommend a brief cross-check on these platforms to ensure no indirect dependencies were broken.

h-c-mueller commented 2026年01月15日 14:29:37 +01:00

I needed more pushes to get it nice, now I have it done. I also found an issue but the fix comes in a separate PR.

Support Windows and Microsoft x64 ABI
The command `make -C tests test-native' now runs successfully on
MSYS2 for MSYS (a Cygwin clone), MINGW32, MINGW64, and UCRT64.
The command `make -C tests CC=clang test-native' passed on CLANG64.
Finally, the command:
'make -C tests check TARGETS="native ia32 aarch64" \
 CC_IA32=i686-linux-gnu-gcc \
 CC_AARCH64=aarch64-linux-gnu-gcc'
passes on Linux x86_64. All without warnings.
Patch regarding __ffs is based on ideas from Michael Gran.
* lightening.h (JIT_API): Update copyright year. Disable visibility
 attributes on Cygwin and Windows, as they are not supported the
 same way as on ELF platforms.
* lightening/aarch64.c: Update copyright year. Add `maybe_unused'
 attributes to instruction helpers generated by the
 `DEFINE_PATCHABLE_INSTRUCTION' macro to suppress warnings.
* lightening/lightening.c: Update copyright year. Remove
 inclusion of `<sys/mman.h>' since it is no longer required. Fix
 warnings from -Wundef.
* lightening/lightening.c (jit_address): Cast ternary operator results
 to `(jit_pointer_t)' and wrap in parentheses to avoid pointer type
 mismatch warnings in Clang.
* lightening/x86-cpu.c (__ffs): Update copyright year. New static
 helper to wrap `__builtin_ffs' on Windows/MinGW where the standard
 `ffs' function is missing.
* lightening/x86-cpu.c (ffsw): Use the new `__ffs' helper.
* lightening/x86.c (reset_abi_arg_iterator): Update copyright year.
 Simplify Cygwin 64-bit and Windows 64-bit detection logic without
 changing any code path.
* tests/Makefile: Add `EXEEXT' support for Windows. Update `PROGS' and
 `clean' rules. Refactor test targets to correctly use dependencies
 with extensions. Update Debian package installation instructions and
 dependencies. Add -Wundef since related warnings have been found.
* tests/call_10_2.c (run_test_double): Adjust register usage for the
 Microsoft x64 ABI. Only use `JIT_F0' through `JIT_F4' as scratch
 registers to comply with the MS ABI.
* tests/test.h (main_helper): Use `uint8_t *' for arena_base instead of
 `char *'. Implement Windows-specific JIT memory allocation using
 `CreateFileMapping' and `MapViewOfFile'. Add proper cleanup using
 `UnmapViewOfFile' and `CloseHandle'.

I needed more pushes to get it nice, now I have it done. I also found an issue but the fix comes in a separate PR. ``` Support Windows and Microsoft x64 ABI The command `make -C tests test-native' now runs successfully on MSYS2 for MSYS (a Cygwin clone), MINGW32, MINGW64, and UCRT64. The command `make -C tests CC=clang test-native' passed on CLANG64. Finally, the command: 'make -C tests check TARGETS="native ia32 aarch64" \ CC_IA32=i686-linux-gnu-gcc \ CC_AARCH64=aarch64-linux-gnu-gcc' passes on Linux x86_64. All without warnings. Patch regarding __ffs is based on ideas from Michael Gran. * lightening.h (JIT_API): Update copyright year. Disable visibility attributes on Cygwin and Windows, as they are not supported the same way as on ELF platforms. * lightening/aarch64.c: Update copyright year. Add `maybe_unused' attributes to instruction helpers generated by the `DEFINE_PATCHABLE_INSTRUCTION' macro to suppress warnings. * lightening/lightening.c: Update copyright year. Remove inclusion of `<sys/mman.h>' since it is no longer required. Fix warnings from -Wundef. * lightening/lightening.c (jit_address): Cast ternary operator results to `(jit_pointer_t)' and wrap in parentheses to avoid pointer type mismatch warnings in Clang. * lightening/x86-cpu.c (__ffs): Update copyright year. New static helper to wrap `__builtin_ffs' on Windows/MinGW where the standard `ffs' function is missing. * lightening/x86-cpu.c (ffsw): Use the new `__ffs' helper. * lightening/x86.c (reset_abi_arg_iterator): Update copyright year. Simplify Cygwin 64-bit and Windows 64-bit detection logic without changing any code path. * tests/Makefile: Add `EXEEXT' support for Windows. Update `PROGS' and `clean' rules. Refactor test targets to correctly use dependencies with extensions. Update Debian package installation instructions and dependencies. Add -Wundef since related warnings have been found. * tests/call_10_2.c (run_test_double): Adjust register usage for the Microsoft x64 ABI. Only use `JIT_F0' through `JIT_F4' as scratch registers to comply with the MS ABI. * tests/test.h (main_helper): Use `uint8_t *' for arena_base instead of `char *'. Implement Windows-specific JIT memory allocation using `CreateFileMapping' and `MapViewOfFile'. Add proper cleanup using `UnmapViewOfFile' and `CloseHandle'. ```

This pull request has changes conflicting with the target branch.