koffi 2.1.0-beta.2 → 2.1.0-beta.3

package/src/abi_x86.cc

@@ -197,6 +197,51 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         *((func->ret.fast ? fast_ptr : args_ptr)++) = (uint32_t)return_ptr;
     }
 
+#define PUSH_INTEGER_32(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            *((param.fast ? fast_ptr : args_ptr)++) = (uint32_t)v; \
+        } while (false)
+#define PUSH_INTEGER_32_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            *((param.fast ? fast_ptr : args_ptr)++) = (uint32_t)ReverseBytes(v); \
+        } while (false)
+#define PUSH_INTEGER_64(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+             \
+            *(uint64_t *)args_ptr = (uint64_t)v; \
+            args_ptr += 2; \
+        } while (false)
+#define PUSH_INTEGER_64_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1); \
+                return false; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+             \
+            *(uint64_t *)args_ptr = (uint64_t)ReverseBytes(v); \
+            args_ptr += 2; \
+        } while (false)
+
     // Push arguments
     for (Size i = 0; i < func->parameters.len; i++) {
         const ParameterInfo &param = func->parameters[i];
@@ -216,88 +261,20 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 bool b = value.As<Napi::Boolean>();
                 *(bool *)((param.fast ? fast_ptr : args_ptr)++) = b;
             } break;
-            case PrimitiveKind::Int8:
-            case PrimitiveKind::UInt8:
-            case PrimitiveKind::Int16:
-            case PrimitiveKind::UInt16:
-            case PrimitiveKind::Int32: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                int32_t v = CopyNumber<int32_t>(value);
-                *(int32_t *)((param.fast ? fast_ptr : args_ptr)++) = v;
-            } break;
-            case PrimitiveKind::Int16S:
-            case PrimitiveKind::UInt16S:
-            case PrimitiveKind::Int32S: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                int32_t v = CopyNumber<int32_t>(value);
-                *(int32_t *)((param.fast ? fast_ptr : args_ptr)++) = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::UInt32: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                uint32_t v = CopyNumber<uint32_t>(value);
-                *((param.fast ? fast_ptr : args_ptr)++) = v;
-            } break;
-            case PrimitiveKind::UInt32S: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                uint32_t v = CopyNumber<uint32_t>(value);
-                *((param.fast ? fast_ptr : args_ptr)++) = ReverseBytes(v);
-            } break;
-            case PrimitiveKind::Int64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                int64_t v = CopyNumber<int64_t>(value);
-                *(int64_t *)args_ptr = v;
-                args_ptr += 2;
-            } break;
-            case PrimitiveKind::Int64S: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                int64_t v = CopyNumber<int64_t>(value);
-                *(int64_t *)args_ptr = ReverseBytes(v);
-                args_ptr += 2;
-            } break;
-            case PrimitiveKind::UInt64: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                uint64_t v = CopyNumber<uint64_t>(value);
-                *(uint64_t *)args_ptr = v;
-                args_ptr += 2;
-            } break;
-            case PrimitiveKind::UInt64S: {
-                if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for argument %2, expected number", GetValueType(instance, value), param.offset + 1);
-                    return false;
-                }
-
-                uint64_t v = CopyNumber<uint64_t>(value);
-                *(uint64_t *)args_ptr = ReverseBytes(v);
-                args_ptr += 2;
-            } break;
+            case PrimitiveKind::Int8: { PUSH_INTEGER_32(int8_t); } break;
+            case PrimitiveKind::UInt8: { PUSH_INTEGER_32(uint8_t); } break;
+            case PrimitiveKind::Int16: { PUSH_INTEGER_32(int16_t); } break;
+            case PrimitiveKind::Int16S: { PUSH_INTEGER_32_SWAP(int16_t); } break;
+            case PrimitiveKind::UInt16: { PUSH_INTEGER_32(uint16_t); } break;
+            case PrimitiveKind::UInt16S: { PUSH_INTEGER_32_SWAP(uint16_t); } break;
+            case PrimitiveKind::Int32: { PUSH_INTEGER_32(int32_t); } break;
+            case PrimitiveKind::Int32S: { PUSH_INTEGER_32_SWAP(int32_t); } break;
+            case PrimitiveKind::UInt32: { PUSH_INTEGER_32(uint32_t); } break;
+            case PrimitiveKind::UInt32S: { PUSH_INTEGER_32_SWAP(uint32_t); } break;
+            case PrimitiveKind::Int64: { PUSH_INTEGER_64(int64_t); } break;
+            case PrimitiveKind::Int64S: { PUSH_INTEGER_64_SWAP(int64_t); } break;
+            case PrimitiveKind::UInt64: { PUSH_INTEGER_64(uint64_t); } break;
+            case PrimitiveKind::UInt64S: { PUSH_INTEGER_64_SWAP(uint64_t); } break;
             case PrimitiveKind::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -399,6 +376,11 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
         }
     }
 
+#undef PUSH_INTEGER_64_SWAP
+#undef PUSH_INTEGER_64
+#undef PUSH_INTEGER_32_SWAP
+#undef PUSH_INTEGER_32
+
     new_sp = mem->stack.end();
 
     return true;
@@ -726,6 +708,51 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
     if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
 
+#define RETURN_INTEGER_32(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            out_reg->eax = (uint32_t)v; \
+        } while (false)
+#define RETURN_INTEGER_32_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+            out_reg->eax = (uint32_t)ReverseBytes(v); \
+        } while (false)
+#define RETURN_INTEGER_64(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = CopyNumber<CType>(value); \
+             \
+            out_reg->eax = (uint32_t)((uint64_t)v >> 32); \
+            out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+        } while (false)
+#define RETURN_INTEGER_64_SWAP(CType) \
+        do { \
+            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) { \
+                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value)); \
+                return; \
+            } \
+             \
+            CType v = ReverseBytes(CopyNumber<CType>(value)); \
+             \
+            out_reg->eax = (uint32_t)((uint64_t)v >> 32); \
+            out_reg->edx = (uint32_t)((uint64_t)v & 0xFFFFFFFFu); \
+        } while (false)
+
     switch (type->primitive) {
         case PrimitiveKind::Void: {} break;
         case PrimitiveKind::Bool: {
@@ -737,88 +764,20 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             bool b = value.As<Napi::Boolean>();
             out_reg->eax = (uint32_t)b;
         } break;
-        case PrimitiveKind::Int8:
-        case PrimitiveKind::UInt8:
-        case PrimitiveKind::Int16:
-        case PrimitiveKind::UInt16:
-        case PrimitiveKind::Int32: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            int32_t v = CopyNumber<int32_t>(value);
-            out_reg->eax = (uint32_t)v;
-        } break;
-        case PrimitiveKind::Int16S:
-        case PrimitiveKind::UInt16S:
-        case PrimitiveKind::Int32S: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            int32_t v = CopyNumber<int32_t>(value);
-            out_reg->eax = (uint32_t)ReverseBytes(v);
-        } break;
-        case PrimitiveKind::UInt32: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            uint32_t v = CopyNumber<uint32_t>(value);
-            out_reg->eax = v;
-        } break;
-        case PrimitiveKind::UInt32S: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            uint32_t v = CopyNumber<uint32_t>(value);
-            out_reg->eax = ReverseBytes(v);
-        } break;
-        case PrimitiveKind::Int64: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            int64_t v = CopyNumber<int64_t>(value);
-            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
-            out_reg->edx = (uint32_t)(v << 32);
-        } break;
-        case PrimitiveKind::Int64S: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            int64_t v = ReverseBytes(CopyNumber<int64_t>(value));
-            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
-            out_reg->edx = (uint32_t)(v << 32);
-        } break;
-        case PrimitiveKind::UInt64: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            uint64_t v = CopyNumber<uint64_t>(value);
-            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
-            out_reg->edx = (uint32_t)(v << 32);
-        } break;
-        case PrimitiveKind::UInt64S: {
-            if (RG_UNLIKELY(!value.IsNumber() && !value.IsBigInt())) {
-                ThrowError<Napi::TypeError>(env, "Unexpected %1 value for return value, expected number", GetValueType(instance, value));
-                return;
-            }
-
-            uint64_t v = ReverseBytes(CopyNumber<uint64_t>(value));
-            out_reg->eax = (uint32_t)(v & 0xFFFFFFFFul);
-            out_reg->edx = (uint32_t)(v << 32);
-        } break;
+        case PrimitiveKind::Int8: { RETURN_INTEGER_32(int8_t); } break;
+        case PrimitiveKind::UInt8: { RETURN_INTEGER_32(uint8_t); } break;
+        case PrimitiveKind::Int16: { RETURN_INTEGER_32(int16_t); } break;
+        case PrimitiveKind::Int16S: { RETURN_INTEGER_32_SWAP(int16_t); } break;
+        case PrimitiveKind::UInt16: { RETURN_INTEGER_32(uint16_t); } break;
+        case PrimitiveKind::UInt16S: { RETURN_INTEGER_32_SWAP(uint16_t); } break;
+        case PrimitiveKind::Int32: { RETURN_INTEGER_32(int32_t); } break;
+        case PrimitiveKind::Int32S: { RETURN_INTEGER_32_SWAP(int32_t); } break;
+        case PrimitiveKind::UInt32: { RETURN_INTEGER_32(uint32_t); } break;
+        case PrimitiveKind::UInt32S: { RETURN_INTEGER_32_SWAP(uint32_t); } break;
+        case PrimitiveKind::Int64: { RETURN_INTEGER_64(int64_t); } break;
+        case PrimitiveKind::Int64S: { RETURN_INTEGER_64_SWAP(int64_t); } break;
+        case PrimitiveKind::UInt64: { RETURN_INTEGER_64(uint64_t); } break;
+        case PrimitiveKind::UInt64S: { RETURN_INTEGER_64_SWAP(uint64_t); } break;
         case PrimitiveKind::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {
@@ -929,6 +888,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
+#undef RETURN_INTEGER_64_SWAP
+#undef RETURN_INTEGER_64
+#undef RETURN_INTEGER_32_SWAP
+#undef RETURN_INTEGER_32
+
     err_guard.Disable();
 }
 

package/test/misc.c

@@ -143,6 +143,21 @@ typedef struct StructCallbacks {
     IntCallback *third;
 } StructCallbacks;
 
+typedef struct EndianInts {
+    int16_t i16le;
+    int16_t i16be;
+    uint16_t u16le;
+    uint16_t u16be;
+    int32_t i32le;
+    int32_t i32be;
+    uint32_t u32le;
+    uint32_t u32be;
+    int64_t i64le;
+    int64_t i64be;
+    uint64_t u64le;
+    uint64_t u64be;
+} EndianInts;
+
 EXPORT int8_t GetMinusOne1(void)
 {
     return -1;
@@ -653,3 +668,31 @@ EXPORT void ReverseBytes(void *p, int len)
         bytes[len - i - 1] = tmp;
     }
 }
+
+EXPORT void CopyEndianInts1(EndianInts ints, uint8_t buf[56])
+{
+    memcpy(buf, &ints, sizeof(ints));
+}
+
+EXPORT void CopyEndianInts2(int16_t i16le, int16_t i16be, uint16_t u16le, uint16_t u16be,
+                            int32_t i32le, int32_t i32be, uint32_t u32le, uint32_t u32be,
+                            int64_t i64le, int64_t i64be, uint64_t u64le, uint64_t u64be,
+                            EndianInts *out)
+{
+    out->i16le = i16le;
+    out->i16be = i16be;
+    out->u16le = u16le;
+    out->u16be = u16be;
+    out->i32le = i32le;
+    out->i32be = i32be;
+    out->u32le = u32le;
+    out->u32be = u32be;
+    out->i64le = i64le;
+    out->i64be = i64be;
+    out->u64le = u64le;
+    out->u64be = u64be;
+}
+
+EXPORT uint16_t ReturnEndianInt2(uint16_t v) { return v; }
+EXPORT uint32_t ReturnEndianInt4(uint32_t v) { return v; }
+EXPORT uint64_t ReturnEndianInt8(uint64_t v) { return v; }

package/test/sync.js

@@ -114,6 +114,21 @@ const StrStruct = koffi.struct('StrStruct', {
     str16: koffi.types.string16
 });
 
+const EndianInts = koffi.struct('EndianInts', {
+    i16le: 'int16_le_t',
+    i16be: 'int16_be_t',
+    u16le: 'uint16_le_t',
+    u16be: 'uint16_be_t',
+    i32le: 'int32_le_t',
+    i32be: 'int32_be_t',
+    u32le: 'uint32_le_t',
+    u32be: 'uint32_be_t',
+    i64le: 'int64_le_t',
+    i64be: 'int64_be_t',
+    u64le: 'uint64_le_t',
+    u64be: 'uint64_be_t'
+});
+
 main();
 
 async function main() {
@@ -187,6 +202,23 @@ async function test() {
     const ThroughStr = lib.func('str ThroughStr(StrStruct s)');
     const ThroughStr16 = lib.func('str16 ThroughStr16(StrStruct s)');
     const ReverseBytes = lib.func('void ReverseBytes(_Inout_ void *array, int len)');
+    const CopyEndianInts1 = lib.func('void CopyEndianInts1(EndianInts ints, _Out_ uint8_t *buf)');
+    const CopyEndianInts2 = lib.func('void CopyEndianInts2(int16_le_t i16le, int16_be_t i16be, uint16_le_t u16le, uint16_be_t u16be, ' +
+                                                          'int32_le_t i32le, int32_be_t i32be, uint32_le_t u32le, uint32_be_t u32be, ' +
+                                                          'int64_le_t i64le, int64_be_t i64be, uint64_le_t u64le, uint64_be_t u64be, ' +
+                                                          '_Out_ void *out)');
+    const ReturnEndianInt2SL = lib.func('int16_le_t ReturnEndianInt2(int16_be_t v)');
+    const ReturnEndianInt2SB = lib.func('int16_be_t ReturnEndianInt2(int16_le_t v)');
+    const ReturnEndianInt2UL = lib.func('uint16_le_t ReturnEndianInt2(uint16_be_t v)');
+    const ReturnEndianInt2UB = lib.func('uint16_be_t ReturnEndianInt2(uint16_le_t v)');
+    const ReturnEndianInt4SL = lib.func('int32_le_t ReturnEndianInt4(int32_be_t v)');
+    const ReturnEndianInt4SB = lib.func('int32_be_t ReturnEndianInt4(int32_le_t v)');
+    const ReturnEndianInt4UL = lib.func('uint32_le_t ReturnEndianInt4(uint32_be_t v)');
+    const ReturnEndianInt4UB = lib.func('uint32_be_t ReturnEndianInt4(uint32_le_t v)');
+    const ReturnEndianInt8SL = lib.func('int64_le_t ReturnEndianInt8(int64_be_t v)');
+    const ReturnEndianInt8SB = lib.func('int64_be_t ReturnEndianInt8(int64_le_t v)');
+    const ReturnEndianInt8UL = lib.func('uint64_le_t ReturnEndianInt8(uint64_be_t v)');
+    const ReturnEndianInt8UB = lib.func('uint64_be_t ReturnEndianInt8(uint64_le_t v)');
 
     // Simple signed value returns
     assert.equal(GetMinusOne1(), -1);
@@ -418,4 +450,53 @@ async function test() {
         ReverseBytes(arr16, arr16.byteLength);
         assert.deepEqual(arr16, Int16Array.from([1280, 1024, 768, 512, 256]));
     }
+
+    // Endian-sensitive integer types
+    {
+        let ints = {
+            i16le: 0x7BCD,
+            i16be: 0x7BCD,
+            u16le: 0x7BCD,
+            u16be: 0x7BCD,
+            i32le: 0x4EADBEEF,
+            i32be: 0x4EADBEEF,
+            u32le: 0x4EADBEEF,
+            u32be: 0x4EADBEEF,
+            i64le: 0x0123456789ABCDEFn,
+            i64be: 0x0123456789ABCDEFn,
+            u64le: 0x0123456789ABCDEFn,
+            u64be: 0x0123456789ABCDEFn
+        };
+
+        let out1 = new Uint8Array(56);
+        let out2 = new Uint8Array(56);
+
+        CopyEndianInts1(ints, out1);
+        CopyEndianInts2(ints.i16le, ints.i16be, ints.u16le, ints.u16be,
+                        ints.i32le, ints.i32be, ints.u32le, ints.u32be,
+                        ints.u64le, ints.u64be, ints.u64le, ints.u64be, out2);
+
+        assert.deepEqual(out1, Uint8Array.from([
+            0xCD, 0x7B, 0x7B, 0xCD,
+            0xCD, 0x7B, 0x7B, 0xCD,
+            0xEF, 0xBE, 0xAD, 0x4E, 0x4E, 0xAD, 0xBE, 0xEF,
+            0xEF, 0xBE, 0xAD, 0x4E, 0x4E, 0xAD, 0xBE, 0xEF,
+            0xEF, 0xCD, 0xAB, 0x89, 0x67, 0x45, 0x23, 0x01, 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+            0xEF, 0xCD, 0xAB, 0x89, 0x67, 0x45, 0x23, 0x01, 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF
+        ]));
+        assert.deepEqual(out2, out1);
+
+        assert.equal(ReturnEndianInt2SL(0x7B6D), 0x6D7B);
+        assert.equal(ReturnEndianInt2SB(0x7B6D), 0x6D7B);
+        assert.equal(ReturnEndianInt2UL(0x7B6D), 0x6D7B);
+        assert.equal(ReturnEndianInt2UB(0x7B6D), 0x6D7B);
+        assert.equal(ReturnEndianInt4SL(0x4EADBE4F), 0x4FBEAD4E);
+        assert.equal(ReturnEndianInt4SB(0x4EADBE4F), 0x4FBEAD4E);
+        assert.equal(ReturnEndianInt4UL(0x4EADBE4F), 0x4FBEAD4E);
+        assert.equal(ReturnEndianInt4UB(0x4EADBE4F), 0x4FBEAD4E);
+        assert.equal(ReturnEndianInt8SL(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
+        assert.equal(ReturnEndianInt8SB(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
+        assert.equal(ReturnEndianInt8UL(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
+        assert.equal(ReturnEndianInt8UB(0x0123456789ABCD3Fn), 0x3FCDAB8967452301n);
+    }
 }