koffi 2.2.2-beta.4 → 2.2.2-beta.6

package/src/koffi/src/abi_x86.cc

@@ -40,78 +40,11 @@ extern "C" uint64_t ForwardCallRG(const void *func, uint8_t *sp, uint8_t **out_o
 extern "C" float ForwardCallRF(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" double ForwardCallRD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" int Trampoline0; extern "C" int TrampolineX0;
-extern "C" int Trampoline1; extern "C" int TrampolineX1;
-extern "C" int Trampoline2; extern "C" int TrampolineX2;
-extern "C" int Trampoline3; extern "C" int TrampolineX3;
-extern "C" int Trampoline4; extern "C" int TrampolineX4;
-extern "C" int Trampoline5; extern "C" int TrampolineX5;
-extern "C" int Trampoline6; extern "C" int TrampolineX6;
-extern "C" int Trampoline7; extern "C" int TrampolineX7;
-extern "C" int Trampoline8; extern "C" int TrampolineX8;
-extern "C" int Trampoline9; extern "C" int TrampolineX9;
-extern "C" int Trampoline10; extern "C" int TrampolineX10;
-extern "C" int Trampoline11; extern "C" int TrampolineX11;
-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,
                                       napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
 
-static void *const Trampolines[][2] = {
-    { &Trampoline0, &TrampolineX0 },
-    { &Trampoline1, &TrampolineX1 },
-    { &Trampoline2, &TrampolineX2 },
-    { &Trampoline3, &TrampolineX3 },
-    { &Trampoline4, &TrampolineX4 },
-    { &Trampoline5, &TrampolineX5 },
-    { &Trampoline6, &TrampolineX6 },
-    { &Trampoline7, &TrampolineX7 },
-    { &Trampoline8, &TrampolineX8 },
-    { &Trampoline9, &TrampolineX9 },
-    { &Trampoline10, &TrampolineX10 },
-    { &Trampoline11, &TrampolineX11 },
-    { &Trampoline12, &TrampolineX12 },
-    { &Trampoline13, &TrampolineX13 },
-    { &Trampoline14, &TrampolineX14 },
-    { &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 * 2);
+#include "abi_trampolines.inc"
 
 bool AnalyseFunction(Napi::Env env, InstanceData *instance, FunctionInfo *func)
 {
@@ -337,7 +270,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                     if (RG_UNLIKELY(!ptr))
                         return false;
                 } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<uint8_t>>().Data();
+                    ptr = value.As<Napi::External<void>>().Data();
                 } else if (IsNullOrUndefined(value)) {
                     ptr = nullptr;
                 } else {
@@ -839,7 +772,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
                 if (RG_UNLIKELY(!ptr))
                     return;
             } else if (CheckValueTag(instance, value, type->ref.marker)) {
-                ptr = value.As<Napi::External<uint8_t>>().Data();
+                ptr = value.As<Napi::External<void>>().Data();
             } else if (IsNullOrUndefined(value)) {
                 ptr = nullptr;
             } else {
@@ -861,7 +794,7 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool async,
     err_guard.Disable();
 }
 
-void *GetTrampoline(Size idx, const FunctionInfo *proto)
+void *GetTrampoline(int16_t idx, const FunctionInfo *proto)
 {
     bool x87 = IsFloat(proto->ret.type);
     return Trampolines[idx][x87];