fix: various improvements.

Signed-off-by: Paolo Insogna <[email protected]>

Author: ShogunPanda

configure.py

@@ -2215,7 +2215,7 @@ def bundled_ffi_supported(os_name, target_arch):
     'freebsd': {'arm', 'arm64', 'x64'},
     'linux': {'arm', 'arm64', 'x64'},
     'mac': {'arm64', 'x64'},
-    'win': {'arm', 'arm64', 'x64'},
+    'win': {'arm64', 'x64'},
   }
 
   if target_arch == 'x86':

deps/libffi/generate-headers.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 import argparse
+import os
+import platform
 import sys
 from pathlib import Path
 
@@ -156,7 +158,7 @@ def render_fficonfig(os_name, target_arch):
 
 def generate_headers(output_dir, target_arch, os_name):
     base_dir = Path(__file__).resolve().parent
-    output_dir = Path(output_dir)
+    output_dir = Path(str(output_dir).strip().strip('"'))
     output_dir.mkdir(parents=True, exist_ok=True)
 
     target, target_dir = get_target(os_name, target_arch)
@@ -175,15 +177,62 @@ def generate_headers(output_dir, target_arch, os_name):
         encoding='utf-8')
 
 
+def detect_os_name():
+    if sys.platform.startswith('win'):
+        return 'win'
+    if sys.platform == 'darwin':
+        return 'mac'
+    if sys.platform.startswith('linux'):
+        return 'linux'
+    if sys.platform.startswith('freebsd'):
+        return 'freebsd'
+    raise ValueError(f'Unsupported host platform {sys.platform!r}')
+
+
+def detect_target_arch():
+    candidates = [
+        os.environ.get('TARGET_ARCH'),
+        os.environ.get('npm_config_arch'),
+        os.environ.get('VSCMD_ARG_TGT_ARCH'),
+        os.environ.get('Platform'),
+        os.environ.get('PROCESSOR_ARCHITECTURE'),
+        platform.machine(),
+    ]
+
+    aliases = {
+        'amd64': 'x64',
+        'x86_64': 'x64',
+        'x64': 'x64',
+        'win32': 'x64',
+        'i386': 'x86',
+        'i686': 'x86',
+        'x86': 'x86',
+        'arm64': 'arm64',
+        'aarch64': 'arm64',
+        'arm': 'arm',
+    }
+
+    for candidate in candidates:
+        if not candidate:
+            continue
+        normalized = aliases.get(candidate.lower())
+        if normalized is not None:
+            return normalized
+
+    raise ValueError('Unable to determine target architecture for libffi headers')
+
+
 def main(argv=None):
     parser = argparse.ArgumentParser(description='Generate libffi headers')
     parser.add_argument('--output-dir', required=True)
-    parser.add_argument('--target-arch', required=True)
-    parser.add_argument('--os', required=True)
+    parser.add_argument('--target-arch')
+    parser.add_argument('--os')
     args = parser.parse_args(argv)
 
     try:
-        generate_headers(args.output_dir, args.target_arch, args.os)
+        generate_headers(args.output_dir,
+                         args.target_arch or detect_target_arch(),
+                         args.os or detect_os_name())
     except Exception as exc:  # pylint: disable=broad-except
         print(exc, file=sys.stderr)
         return 1

deps/libffi/libffi.gyp

@@ -6,6 +6,7 @@
       'src/java_raw_api.c',
       'src/prep_cif.c',
       'src/raw_api.c',
+      'src/tramp.c',
       'src/types.c',
     ],
     'libffi_defines%': [],
@@ -18,7 +19,6 @@
           'variables': {
             'libffi_arch_sources': [
               'src/x86/ffiw64.c',
-              'src/x86/win64_intel.S',
             ],
             'libffi_defines': [
               'LIBFFI_HIDE_BASIC_TYPES',
@@ -54,8 +54,10 @@
         ['target_arch == "x64"', {
           'variables': {
             'libffi_arch_sources': [
+              'src/x86/ffiw64.c',
               'src/x86/ffi64.c',
               'src/x86/unix64.S',
+              'src/x86/win64.S',
             ],
           },
         }],
@@ -82,8 +84,10 @@
         ['target_arch == "x64"', {
           'variables': {
             'libffi_arch_sources': [
+              'src/x86/ffiw64.c',
               'src/x86/ffi64.c',
               'src/x86/unix64.S',
+              'src/x86/win64.S',
             ],
           },
         }],
@@ -136,12 +140,50 @@
           'action': [
             '<(python)',
             'generate-headers.py',
-            '--output-dir=<(INTERMEDIATE_DIR)',
-            '--target-arch=<(target_arch)',
-            '--os=<(OS)',
+            '--output-dir',
+            '<(INTERMEDIATE_DIR)',
           ],
         },
       ],
+      'conditions': [
+        ['OS == "win" and target_arch == "x64"', {
+          'actions': [
+            {
+              'action_name': 'preprocess_win64_intel_asm',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                'preprocess_asm.py',
+                'include/ffi_cfi.h',
+                'src/x86/asmnames.h',
+                'src/x86/win64_intel.S',
+                '<(INTERMEDIATE_DIR)/ffi.h',
+                '<(INTERMEDIATE_DIR)/fficonfig.h',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/win64_intel.asm',
+              ],
+              'action': [
+                '<(python)',
+                'preprocess_asm.py',
+                '--input',
+                'src/x86/win64_intel.S',
+                '--output',
+                '<@(_outputs)',
+                '--include-dir',
+                'include',
+                '--include-dir',
+                'src/x86',
+                '--include-dir',
+                '<(INTERMEDIATE_DIR)',
+                '--define',
+                'FFI_BUILDING',
+                '--define',
+                'LIBFFI_HIDE_BASIC_TYPES',
+              ],
+            },
+          ],
+        }],
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',

deps/libffi/preprocess_asm.py

@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+from pathlib import Path
+import shlex
+import shutil
+import subprocess
+import sys
+
+
+def split_command(value):
+    if not value:
+        return None
+    value = value.strip()
+    if not value:
+        return None
+    return shlex.split(value, posix=(os.name != 'nt'))
+
+
+def find_compiler():
+    for var in ('CC', 'CXX'):
+        command = split_command(os.environ.get(var))
+        if command and shutil.which(command[0]):
+            return command
+
+    for name in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl', 'cc', 'clang', 'gcc'):
+        path = shutil.which(name)
+        if path:
+            return [path]
+
+    raise RuntimeError('Unable to locate a compiler for preprocessing assembly')
+
+
+def preprocess(args):
+    compiler = find_compiler()
+    output = Path(args.output)
+    output.parent.mkdir(parents=True, exist_ok=True)
+
+    if os.name == 'nt' and Path(compiler[0]).name.lower() in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl'):
+        command = compiler + ['/nologo', '/EP', '/TC']
+        command += [f'/I{include_dir}' for include_dir in args.include_dir]
+        command += [f'/D{define}' for define in args.define]
+        command += [args.input]
+    else:
+        command = compiler + ['-E', '-P', '-x', 'c']
+        command += [f'-I{include_dir}' for include_dir in args.include_dir]
+        command += [f'-D{define}' for define in args.define]
+        command += [args.input]
+
+    result = subprocess.run(command, capture_output=True, text=True)
+    if result.returncode != 0:
+        sys.stderr.write(result.stderr)
+        raise RuntimeError(f'Preprocessing failed: {" ".join(command)}')
+
+    output.write_text(result.stdout, encoding='utf-8')
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description='Preprocess libffi assembly source')
+    parser.add_argument('--input', required=True)
+    parser.add_argument('--output', required=True)
+    parser.add_argument('--include-dir', action='append', default=[])
+    parser.add_argument('--define', action='append', default=[])
+    args = parser.parse_args(argv)
+
+    preprocess(args)
+    return 0
+
+
+if __name__ == '__main__':
+    raise SystemExit(main())

doc/api/cli.md

@@ -111,7 +111,7 @@ native addons by default.
 Attempts to do so will throw an `ERR_DLOPEN_DISABLED` unless the
 user explicitly passes the `--allow-addons` flag when starting Node.js.
 
-Example:
+Example without `--allow-child-process`:
 
 ```cjs
 // Attempt to require an native addon
@@ -160,7 +160,7 @@ child process by default.
 Attempts to do so will throw an `ERR_ACCESS_DENIED` unless the
 user explicitly passes the `--allow-child-process` flag when starting Node.js.
 
-Example:
+Example without `--allow-ffi`:
 
 ```js
 const childProcess = require('node:child_process');
@@ -213,7 +213,7 @@ const lib = new DynamicLibrary('mylib.so');
 ```
 
 ```console
-$ node --permission --experimental-ffi --allow-fs-read=* index.js
+$ node --permission --experimental-ffi index.js
 Error: Access to this API has been restricted. Use --allow-ffi to manage permissions.
     at node:internal/main/run_main_module:17:47 {
   code: 'ERR_ACCESS_DENIED',
@@ -1982,16 +1982,6 @@ changes:
 
 Legacy alias for [`--no-require-module`][].
 
-### `--no-experimental-ffi`
-
-<!-- YAML
-added: REPLACEME
--->
-
-Disable the experimental [`node:ffi`][] module.
-
-This flag is only available in builds with FFI support.
-
 ### `--no-experimental-sqlite`
 
 <!-- YAML
@@ -2215,7 +2205,7 @@ following permissions are restricted:
 * Worker Threads - manageable through [`--allow-worker`][] flag
 * WASI - manageable through [`--allow-wasi`][] flag
 * Addons - manageable through [`--allow-addons`][] flag
-* FFI - manageable through \[`--allow-ffi`]\[] flag
+* FFI - manageable through [`--allow-ffi`](#--allow-ffi) flag
 
 ### `--permission-audit`
 
@@ -3696,7 +3686,6 @@ one is included in the list below.
 * `--no-addons`
 * `--no-async-context-frame`
 * `--no-deprecation`
-* `--no-experimental-ffi`
 * `--no-experimental-global-navigator`
 * `--no-experimental-repl-await`
 * `--no-experimental-sqlite`