fixup

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

src/ffi/types.cc

@@ -667,15 +667,15 @@ bool ToFFIReturnValue(Local<Value> result, ffi_type* type, void* ret) {
       return false;
     }
 
-    *static_cast<int32_t*>(ret) = static_cast<int32_t>(value);
+    *static_cast<ffi_sarg*>(ret) = static_cast<ffi_sarg>(value);
   } else if (type == &ffi_type_uint32) {
     uint64_t value;
 
     if (!GetStrictUnsignedInteger(result, UINT32_MAX, &value)) {
       return false;
     }
 
-    *static_cast<uint32_t*>(ret) = static_cast<uint32_t>(value);
+    *static_cast<ffi_arg*>(ret) = static_cast<ffi_arg>(value);
   } else if (type == &ffi_type_sint64) {
     bool lossless;
 

test/ffi/test-ffi-dynamic-library.js

@@ -4,6 +4,7 @@ const common = require('../common');
 common.skipIfFFIMissing();
 const { gcUntil } = require('../common/gc');
 const assert = require('node:assert');
+const { endianness } = require('node:os');
 const { test } = require('node:test');
 const ffi = require('node:ffi');
 const { fixtureSymbols, libraryPath } = require('./ffi-test-common');
@@ -54,8 +55,11 @@ test('dlopen resolves functions from definitions', () => {
     // Shared-buffer wrapper sets `length` to the FFI signature's arity
     // (see `inheritMetadata` in lib/internal/ffi-shared-buffer.js). The raw
     // native function has length 0, but the wrapper exposes the parameter
-    // count so `fn.length` is useful for introspection.
-    assert.strictEqual(functions.add_i32.length, 2);
+    // count so `fn.length` is useful for introspection. The shared-buffer
+    // wrapper is disabled on big-endian hosts.
+    assert.strictEqual(
+      functions.add_i32.length,
+      endianness() === 'BE' ? 0 : 2);
     assert.strictEqual(typeof functions.add_i32.pointer, 'bigint');
     assert.strictEqual(Object.getPrototypeOf(functions), null);
   } finally {

test/ffi/test-ffi-memory.js

@@ -177,7 +177,7 @@ test('ffi exportString and exportBuffer copy data into native memory', () => {
     const viewSource = new Uint16Array([0x0102, 0x0304, 0x0506]);
     const middleBytes = new Uint8Array(viewSource.buffer, 2, 2);
     ffi.exportArrayBufferView(middleBytes, viewPtr, 2);
-    assert.deepStrictEqual([...ffi.toBuffer(viewPtr, 2)], [0x04, 0x03]);
+    assert.deepStrictEqual([...ffi.toBuffer(viewPtr, 2)], [...middleBytes]);
 
     const bufferViewPtr = alloc(8);
     const bufferView = Buffer.from([1, 7, 2, 8, 3]);

test/ffi/test-ffi-shared-buffer.js

@@ -4,8 +4,13 @@ const common = require('../common');
 common.skipIfFFIMissing();
 
 const assert = require('node:assert');
+const { endianness } = require('node:os');
 const { test } = require('node:test');
 
+if (endianness() === 'BE') {
+  common.skip('shared-buffer FFI is disabled on big-endian hosts');
+}
+
 // Capture the unpatched DynamicLibrary.prototype.getFunction BEFORE loading
 // `node:ffi`, which patches it. The SB-metadata test below uses the raw
 // method to inspect Symbol-keyed internals that `inheritMetadata`