koffi 2.0.0 → 2.1.0-beta.2

package/src/abi_x86.cc

@@ -229,6 +229,17 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 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);
@@ -238,6 +249,15 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 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);
@@ -248,6 +268,16 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 *(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);
@@ -258,6 +288,16 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 *(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::String: {
                 const char *str;
                 if (RG_LIKELY(value.IsString())) {
@@ -382,11 +422,17 @@ void CallData::Execute()
         case PrimitiveKind::Int8:
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
+        case PrimitiveKind::Int16S:
         case PrimitiveKind::UInt16:
+        case PrimitiveKind::UInt16S:
         case PrimitiveKind::Int32:
+        case PrimitiveKind::Int32S:
         case PrimitiveKind::UInt32:
+        case PrimitiveKind::UInt32S:
         case PrimitiveKind::Int64:
+        case PrimitiveKind::Int64S:
         case PrimitiveKind::UInt64:
+        case PrimitiveKind::UInt64S:
         case PrimitiveKind::String:
         case PrimitiveKind::String16:
         case PrimitiveKind::Pointer:
@@ -413,16 +459,22 @@ Napi::Value CallData::Complete()
     };
 
     switch (func->ret.type->primitive) {
-        case PrimitiveKind::Void: return env.Null();
+        case PrimitiveKind::Void: return env.Undefined();
         case PrimitiveKind::Bool: return Napi::Boolean::New(env, result.u32);
         case PrimitiveKind::Int8: return Napi::Number::New(env, (double)result.i8);
         case PrimitiveKind::UInt8: return Napi::Number::New(env, (double)result.u8);
         case PrimitiveKind::Int16: return Napi::Number::New(env, (double)result.i16);
+        case PrimitiveKind::Int16S: return Napi::Number::New(env, (double)ReverseBytes(result.i16));
         case PrimitiveKind::UInt16: return Napi::Number::New(env, (double)result.u16);
+        case PrimitiveKind::UInt16S: return Napi::Number::New(env, (double)ReverseBytes(result.u16));
         case PrimitiveKind::Int32: return Napi::Number::New(env, (double)result.i32);
+        case PrimitiveKind::Int32S: return Napi::Number::New(env, (double)ReverseBytes(result.i32));
         case PrimitiveKind::UInt32: return Napi::Number::New(env, (double)result.u32);
+        case PrimitiveKind::UInt32S: return Napi::Number::New(env, (double)ReverseBytes(result.u32));
         case PrimitiveKind::Int64: return NewBigInt(env, result.i64);
+        case PrimitiveKind::Int64S: return NewBigInt(env, ReverseBytes(result.i64));
         case PrimitiveKind::UInt64: return NewBigInt(env, result.u64);
+        case PrimitiveKind::UInt64S: return NewBigInt(env, ReverseBytes(result.u64));
         case PrimitiveKind::String: return result.ptr ? Napi::String::New(env, (const char *)result.ptr) : env.Null();
         case PrimitiveKind::String16: return result.ptr ? Napi::String::New(env, (const char16_t *)result.ptr) : env.Null();
         case PrimitiveKind::Pointer:
@@ -524,24 +576,52 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int16S: {
+                int16_t v = *(int16_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt16: {
                 double d = (double)*(uint16_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt16S: {
+                uint16_t v = *(uint16_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int32: {
                 double d = (double)*(int32_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int32S: {
+                int32_t v = *(int32_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt32: {
                 double d = (double)*(uint32_t *)(args_ptr++);
 
                 Napi::Value arg = Napi::Number::New(env, d);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt32S: {
+                uint32_t v = *(uint32_t *)(args_ptr++);
+                double d = (double)ReverseBytes(v);
+
+                Napi::Value arg = Napi::Number::New(env, d);
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::Int64: {
                 int64_t v = *(int64_t *)args_ptr;
                 args_ptr += 2;
@@ -549,6 +629,13 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::Int64S: {
+                int64_t v = *(int64_t *)args_ptr;
+                args_ptr += 2;
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::UInt64: {
                 uint64_t v = *(uint64_t *)args_ptr;
                 args_ptr += 2;
@@ -556,6 +643,13 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                 Napi::Value arg = NewBigInt(env, v);
                 arguments.Append(arg);
             } break;
+            case PrimitiveKind::UInt64S: {
+                uint64_t v = *(uint64_t *)args_ptr;
+                args_ptr += 2;
+
+                Napi::Value arg = NewBigInt(env, ReverseBytes(v));
+                arguments.Append(arg);
+            } break;
             case PrimitiveKind::String: {
                 const char *str = *(const char **)(args_ptr++);
 
@@ -647,8 +741,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::UInt8:
         case PrimitiveKind::Int16:
         case PrimitiveKind::UInt16:
-        case PrimitiveKind::Int32:
-        case PrimitiveKind::UInt32: {
+        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;
@@ -657,8 +750,36 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             int32_t v = CopyNumber<int32_t>(value);
             out_reg->eax = (uint32_t)v;
         } break;
-        case PrimitiveKind::Int64:
-        case PrimitiveKind::UInt64: {
+        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;
@@ -668,6 +789,36 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             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::String: {
             const char *str;
             if (RG_LIKELY(value.IsString())) {