koffi 1.3.11 → 2.0.1

package/src/abi_arm32.cc

@@ -64,6 +64,22 @@ extern "C" int Trampoline12; extern "C" int TrampolineX12;
 extern "C" int Trampoline13; extern "C" int TrampolineX13;
 extern "C" int Trampoline14; extern "C" int TrampolineX14;
 extern "C" int Trampoline15; extern "C" int TrampolineX15;
+extern "C" int Trampoline16; extern "C" int TrampolineX16;
+extern "C" int Trampoline17; extern "C" int TrampolineX17;
+extern "C" int Trampoline18; extern "C" int TrampolineX18;
+extern "C" int Trampoline19; extern "C" int TrampolineX19;
+extern "C" int Trampoline20; extern "C" int TrampolineX20;
+extern "C" int Trampoline21; extern "C" int TrampolineX21;
+extern "C" int Trampoline22; extern "C" int TrampolineX22;
+extern "C" int Trampoline23; extern "C" int TrampolineX23;
+extern "C" int Trampoline24; extern "C" int TrampolineX24;
+extern "C" int Trampoline25; extern "C" int TrampolineX25;
+extern "C" int Trampoline26; extern "C" int TrampolineX26;
+extern "C" int Trampoline27; extern "C" int TrampolineX27;
+extern "C" int Trampoline28; extern "C" int TrampolineX28;
+extern "C" int Trampoline29; extern "C" int TrampolineX29;
+extern "C" int Trampoline30; extern "C" int TrampolineX30;
+extern "C" int Trampoline31; extern "C" int TrampolineX31;
 
 extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
                                       uint8_t *old_sp, Span<uint8_t> *new_stack,
@@ -85,9 +101,25 @@ static void *const Trampolines[][2] = {
     { &Trampoline12, &TrampolineX12 },
     { &Trampoline13, &TrampolineX13 },
     { &Trampoline14, &TrampolineX14 },
-    { &Trampoline15, &TrampolineX15 }
+    { &Trampoline15, &TrampolineX15 },
+    { &Trampoline16, &TrampolineX16 },
+    { &Trampoline17, &TrampolineX17 },
+    { &Trampoline18, &TrampolineX18 },
+    { &Trampoline19, &TrampolineX19 },
+    { &Trampoline20, &TrampolineX20 },
+    { &Trampoline21, &TrampolineX21 },
+    { &Trampoline22, &TrampolineX22 },
+    { &Trampoline23, &TrampolineX23 },
+    { &Trampoline24, &TrampolineX24 },
+    { &Trampoline25, &TrampolineX25 },
+    { &Trampoline26, &TrampolineX26 },
+    { &Trampoline27, &TrampolineX27 },
+    { &Trampoline28, &TrampolineX28 },
+    { &Trampoline29, &TrampolineX29 },
+    { &Trampoline30, &TrampolineX30 },
+    { &Trampoline31, &TrampolineX31 }
 };
-RG_STATIC_ASSERT(RG_LEN(Trampolines) == MaxTrampolines);
+RG_STATIC_ASSERT(RG_LEN(Trampolines) == MaxTrampolines * 2);
 
 static RG_THREAD_LOCAL CallData *exec_call;
 
@@ -204,6 +236,8 @@ bool AnalyseFunction(Napi::Env, InstanceData *, FunctionInfo *func)
                     }
                 }
             } break;
+
+            case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
         }
 
         func->args_size += AlignLen(param.type->size, 16);
@@ -425,10 +459,10 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
                 if (value.IsFunction()) {
                     Napi::Function func = value.As<Napi::Function>();
 
-                    ptr = ReserveTrampoline(param.type->proto, func);
+                    ptr = ReserveTrampoline(param.type->ref.proto, func);
                     if (RG_UNLIKELY(!ptr))
                         return false;
-                } else if (CheckValueTag(instance, value, param.type)) {
+                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
                     ptr = value.As<Napi::External<void>>().Data();
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
@@ -439,6 +473,8 @@ bool CallData::Prepare(const Napi::CallbackInfo &info)
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;
+
+            case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
         }
     }
 
@@ -485,6 +521,8 @@ void CallData::Execute()
         case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
         case PrimitiveKind::Float32: { result.f = PERFORM_CALL(F); } break;
         case PrimitiveKind::Float64: { result.d = PERFORM_CALL(DDDD).d0; } break;
+
+        case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
 #undef PERFORM_CALL
@@ -492,10 +530,16 @@ void CallData::Execute()
 
 Napi::Value CallData::Complete()
 {
-    PopOutArguments();
+    RG_DEFER {
+       PopOutArguments();
+
+        if (func->ret.type->dispose) {
+            func->ret.type->dispose(env, func->ret.type, result.ptr);
+        }
+    };
 
     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);
@@ -511,7 +555,7 @@ Napi::Value CallData::Complete()
         case PrimitiveKind::Callback: {
             if (result.ptr) {
                 Napi::External<void> external = Napi::External<void>::New(env, result.ptr);
-                SetValueTag(instance, external, func->ret.type);
+                SetValueTag(instance, external, func->ret.type->ref.marker);
 
                 return external;
             } else {
@@ -528,6 +572,8 @@ Napi::Value CallData::Complete()
         case PrimitiveKind::Array: { RG_UNREACHABLE(); } break;
         case PrimitiveKind::Float32: return Napi::Number::New(env, (double)result.f);
         case PrimitiveKind::Float64: return Napi::Number::New(env, result.d);
+
+        case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
 
     RG_UNREACHABLE();
@@ -535,12 +581,10 @@ Napi::Value CallData::Complete()
 
 void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegisters *out_reg)
 {
-    const TrampolineInfo &trampoline = instance->trampolines[idx];
-
-    if (RG_UNLIKELY(trampoline.generation != mem->generation)) {
-        ThrowError<Napi::Error>(env, "Cannot use non-persistent callback beyond FFI call");
+    if (RG_UNLIKELY(env.IsExceptionPending()))
         return;
-    }
+
+    const TrampolineInfo &trampoline = instance->trampolines[idx];
 
     const FunctionInfo *proto = trampoline.proto;
     Napi::Function func = trampoline.func.Value();
@@ -552,6 +596,13 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
     uint8_t *return_ptr = proto->ret.use_memory ? (uint8_t *)gpr_ptr[0] : nullptr;
     gpr_ptr += proto->ret.use_memory;
 
+    RG_DEFER_N(err_guard) { memset(out_reg, 0, RG_SIZE(*out_reg)); };
+
+    if (RG_UNLIKELY(trampoline.generation >= 0 && trampoline.generation != (int32_t)mem->generation)) {
+        ThrowError<Napi::Error>(env, "Cannot use non-registered callback beyond FFI call");
+        return;
+    }
+
     LocalArray<napi_value, MaxParameters> arguments;
 
     // Convert to JS arguments
@@ -627,12 +678,20 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
 
                 Napi::Value arg = str ? Napi::String::New(env, str) : env.Null();
                 arguments.Append(arg);
+
+                if (param.type->dispose) {
+                    param.type->dispose(env, param.type, str);
+                }
             } break;
             case PrimitiveKind::String16: {
                 const char16_t *str16 = *(const char16_t **)((param.gpr_count ? gpr_ptr : args_ptr)++);
 
                 Napi::Value arg = str16 ? Napi::String::New(env, str16) : env.Null();
                 arguments.Append(arg);
+
+                if (param.type->dispose) {
+                    param.type->dispose(env, param.type, str16);
+                }
             } break;
             case PrimitiveKind::Pointer:
             case PrimitiveKind::Callback: {
@@ -640,12 +699,16 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
 
                 if (ptr2) {
                     Napi::External<void> external = Napi::External<void>::New(env, ptr2);
-                    SetValueTag(instance, external, param.type);
+                    SetValueTag(instance, external, param.type->ref.marker);
 
                     arguments.Append(external);
                 } else {
                     arguments.Append(env.Null());
                 }
+
+                if (param.type->dispose) {
+                    param.type->dispose(env, param.type, ptr2);
+                }
             } break;
             case PrimitiveKind::Record: {
                 if (param.vec_count) {
@@ -721,6 +784,8 @@ 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::Prototype: { RG_UNREACHABLE(); } break;
         }
     }
 
@@ -731,6 +796,9 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
                                      [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argc, argv); });
     Napi::Value value(env, ret);
 
+    if (RG_UNLIKELY(env.IsExceptionPending()))
+        return;
+
     // Convert the result
     switch (type->primitive) {
         case PrimitiveKind::Void: {} break;
@@ -818,14 +886,14 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
         case PrimitiveKind::Pointer: {
             uint8_t *ptr;
 
-            if (CheckValueTag(instance, value, type)) {
+            if (CheckValueTag(instance, value, type->ref.marker)) {
                 ptr = value.As<Napi::External<uint8_t>>().Data();
-            } else if (IsObject(value) && type->ref->primitive == PrimitiveKind::Record) {
+            } else if (IsObject(value) && type->ref.type->primitive == PrimitiveKind::Record) {
                 Napi::Object obj = value.As<Napi::Object>();
 
-                ptr = AllocHeap(type->ref->size, 16);
+                ptr = AllocHeap(type->ref.type->size, 16);
 
-                if (!PushObject(obj, type->ref, ptr))
+                if (!PushObject(obj, type->ref.type, ptr))
                     return;
             } else if (IsNullOrUndefined(value)) {
                 ptr = nullptr;
@@ -887,10 +955,10 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
             if (value.IsFunction()) {
                 Napi::Function func2 = value.As<Napi::Function>();
 
-                ptr = ReserveTrampoline(type->proto, func2);
+                ptr = ReserveTrampoline(type->ref.proto, func2);
                 if (RG_UNLIKELY(!ptr))
                     return;
-            } else if (CheckValueTag(instance, value, type)) {
+            } else if (CheckValueTag(instance, value, type->ref.marker)) {
                 ptr = value.As<Napi::External<uint8_t>>().Data();
             } else if (IsNullOrUndefined(value)) {
                 ptr = nullptr;
@@ -901,7 +969,11 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, BackRegister
 
             out_reg->r0 = (uint32_t)ptr;
         } break;
+
+        case PrimitiveKind::Prototype: { RG_UNREACHABLE(); } break;
     }
+
+    err_guard.Disable();
 }
 
 void *GetTrampoline(Size idx, const FunctionInfo *proto)

package/src/abi_arm32_fwd.S

@@ -56,57 +56,40 @@
     .cfi_endproc
 .endm
 
-# Prepare general purpose argument registers from array passed by caller.
-.macro forward_gpr
-    ldr r3, [r1, 76]
-    ldr r2, [r1, 72]
-    ldr r0, [r1, 64]
-    ldr r1, [r1, 68]
-.endm
-
-# Prepare vector argument registers from array passed by caller.
-.macro forward_vec
-    vldr d7, [r1, 56]
-    vldr d6, [r1, 48]
-    vldr d5, [r1, 40]
-    vldr d4, [r1, 32]
-    vldr d3, [r1, 24]
-    vldr d2, [r1, 16]
-    vldr d1, [r1, 8]
-    vldr d0, [r1, 0]
-.endm
-
 ForwardCallGG:
     prologue
-    forward_gpr
+    add r1, r1, #64
+    ldmia r1, {r0-r3}
     epilogue
 
 ForwardCallF:
     prologue
-    forward_gpr
+    add r1, r1, #64
+    ldmia r1, {r0-r3}
     epilogue
 
 ForwardCallDDDD:
     prologue
-    forward_gpr
+    add r1, r1, #64
+    ldmia r1, {r0-r3}
     epilogue
 
 ForwardCallXGG:
     prologue
-    forward_vec
-    forward_gpr
+    vldmia r1!, {d0-d7}
+    ldmia r1, {r0-r3}
     epilogue
 
 ForwardCallXF:
     prologue
-    forward_vec
-    forward_gpr
+    vldmia r1!, {d0-d7}
+    ldmia r1, {r0-r3}
     epilogue
 
 ForwardCallXDDDD:
     prologue
-    forward_vec
-    forward_gpr
+    vldmia r1!, {d0-d7}
+    ldmia r1, {r0-r3}
     epilogue
 
 # Callback trampolines
@@ -128,6 +111,22 @@ ForwardCallXDDDD:
 .global Trampoline13
 .global Trampoline14
 .global Trampoline15
+.global Trampoline16
+.global Trampoline17
+.global Trampoline18
+.global Trampoline19
+.global Trampoline20
+.global Trampoline21
+.global Trampoline22
+.global Trampoline23
+.global Trampoline24
+.global Trampoline25
+.global Trampoline26
+.global Trampoline27
+.global Trampoline28
+.global Trampoline29
+.global Trampoline30
+.global Trampoline31
 .global TrampolineX0
 .global TrampolineX1
 .global TrampolineX2
@@ -144,6 +143,22 @@ ForwardCallXDDDD:
 .global TrampolineX13
 .global TrampolineX14
 .global TrampolineX15
+.global TrampolineX16
+.global TrampolineX17
+.global TrampolineX18
+.global TrampolineX19
+.global TrampolineX20
+.global TrampolineX21
+.global TrampolineX22
+.global TrampolineX23
+.global TrampolineX24
+.global TrampolineX25
+.global TrampolineX26
+.global TrampolineX27
+.global TrampolineX28
+.global TrampolineX29
+.global TrampolineX30
+.global TrampolineX31
 .global RelayCallback
 .global CallSwitchStack
 
@@ -160,18 +175,16 @@ ForwardCallXDDDD:
     .cfi_offset 14, 8
     sub sp, sp, #120
     .cfi_def_cfa sp, 128
-    str r0, [sp, 64]
-    str r1, [sp, 68]
-    str r2, [sp, 72]
-    str r3, [sp, 76]
+    add r12, sp, 64
+    stmia r12!, {r0-r3}
     mov r0, \id
     mov r1, sp
     add r2, sp, #128
-    add r3, sp, #80
+    mov r3, r12
     bl RelayCallback
-    ldr r0, [sp, 80]
-    ldr r1, [sp, 84]
-    add sp, sp, #120
+    add sp, sp, #80
+    ldmia sp!, {r0-r1}
+    add sp, sp, #32
     .cfi_def_cfa sp, 8
     pop {fp, lr}
     .cfi_def_cfa sp, 0
@@ -190,30 +203,17 @@ ForwardCallXDDDD:
     .cfi_offset 14, 8
     sub sp, sp, #120
     .cfi_def_cfa sp, 128
-    str r0, [sp, 64]
-    str r1, [sp, 68]
-    str r2, [sp, 72]
-    str r3, [sp, 76]
-    vstr d0, [sp, 0]
-    vstr d1, [sp, 8]
-    vstr d2, [sp, 16]
-    vstr d3, [sp, 24]
-    vstr d4, [sp, 32]
-    vstr d5, [sp, 40]
-    vstr d6, [sp, 48]
-    vstr d7, [sp, 56]
+    mov r12, sp
+    vstmia r12!, {d0-d7}
+    stmia r12!, {r0-r3}
     mov r0, \id
     mov r1, sp
     add r2, sp, #128
-    add r3, sp, #80
+    mov r3, r12
     bl RelayCallback
-    ldr r0, [sp, 80]
-    ldr r1, [sp, 84]
-    vldr d0, [sp, 88]
-    vldr d1, [sp, 96]
-    vldr d2, [sp, 104]
-    vldr d3, [sp, 112]
-    add sp, sp, #120
+    add sp, sp, #80
+    ldmia sp!, {r0-r1}
+    vldmia sp!, {d0-d3}
     .cfi_def_cfa sp, 8
     pop {fp, lr}
     .cfi_def_cfa sp, 0
@@ -255,6 +255,38 @@ Trampoline14:
     trampoline 14
 Trampoline15:
     trampoline 15
+Trampoline16:
+    trampoline 16
+Trampoline17:
+    trampoline 17
+Trampoline18:
+    trampoline 18
+Trampoline19:
+    trampoline 19
+Trampoline20:
+    trampoline 20
+Trampoline21:
+    trampoline 21
+Trampoline22:
+    trampoline 22
+Trampoline23:
+    trampoline 23
+Trampoline24:
+    trampoline 24
+Trampoline25:
+    trampoline 25
+Trampoline26:
+    trampoline 26
+Trampoline27:
+    trampoline 27
+Trampoline28:
+    trampoline 28
+Trampoline29:
+    trampoline 29
+Trampoline30:
+    trampoline 30
+Trampoline31:
+    trampoline 31
 
 TrampolineX0:
     trampoline_vec 0
@@ -288,6 +320,38 @@ TrampolineX14:
     trampoline_vec 14
 TrampolineX15:
     trampoline_vec 15
+TrampolineX16:
+    trampoline_vec 16
+TrampolineX17:
+    trampoline_vec 17
+TrampolineX18:
+    trampoline_vec 18
+TrampolineX19:
+    trampoline_vec 19
+TrampolineX20:
+    trampoline_vec 20
+TrampolineX21:
+    trampoline_vec 21
+TrampolineX22:
+    trampoline_vec 22
+TrampolineX23:
+    trampoline_vec 23
+TrampolineX24:
+    trampoline_vec 24
+TrampolineX25:
+    trampoline_vec 25
+TrampolineX26:
+    trampoline_vec 26
+TrampolineX27:
+    trampoline_vec 27
+TrampolineX28:
+    trampoline_vec 28
+TrampolineX29:
+    trampoline_vec 29
+TrampolineX30:
+    trampoline_vec 30
+TrampolineX31:
+    trampoline_vec 31
 
 # When a callback is relayed, Koffi will call into Node.js and V8 to execute Javascript.
 # The problem is that we're still running on the separate Koffi stack, and V8 will