[[ VM ]] Use builtins array if present for ordinal bindings

runrevmark · runrevmark · commit 5af9f69d1ac5 · 2017-05-30T13:55:08.000+01:00
This patch adds the idea of a builtins array to a ScriptModule
and changes how binding strings are resolved for foreign
handlers.

If the module containing the handler definition has a builtins
array and the binding string is an integer, then it will use
the pointer in the builtins array as the function pointer when
resolving.
diff --git a/libscript/include/libscript/script.h b/libscript/include/libscript/script.h
@@ -171,8 +171,8 @@ bool MCScriptCreateModuleFromStream(MCStreamRef stream, MCScriptModuleRef& r_mod
 // Load a module from a blob
 MC_DLLEXPORT bool MCScriptCreateModuleFromData(MCDataRef data, MCScriptModuleRef & r_module);
 
-// Set initializer / finalizer
-void MCScriptSetModuleLifecycleFunctions(MCScriptModuleRef module, bool (*initializer)(void), void (*finalizer)(void));
+// Set initializer / finalizer / builtins
+void MCScriptConfigureBuiltinModule(MCScriptModuleRef module, bool (*initializer)(void), void (*finalizer)(void), void **builtins);
 
 // Lookup the module with the given name. Returns false if no such module exists.
 bool MCScriptLookupModule(MCNameRef name, MCScriptModuleRef& r_module);
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -647,6 +647,19 @@ __MCScriptResolveForeignFunctionBinding(MCScriptInstanceRef p_instance,
 										ffi_abi& r_abi,
 										bool* r_bound)
 {
+    integer_t t_ordinal = 0;
+    if (p_instance->module->builtins != nullptr &&
+        MCTypeConvertStringToLongInteger(p_handler->binding, t_ordinal))
+    {
+        p_handler->native.function = p_instance->module->builtins[t_ordinal];
+        r_abi = FFI_DEFAULT_ABI;
+        if (r_bound != nullptr)
+        {
+            *r_bound = true;
+        }
+        return true;
+    }
+
 	MCStringRef t_rest;
 	t_rest = MCValueRetain(p_handler -> binding);
 	
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -500,12 +500,14 @@ MCScriptCreateModulesFromData(MCDataRef p_data,
 }
 
 void
-MCScriptSetModuleLifecycleFunctions(MCScriptModuleRef p_module,
-                                    bool (*p_initializer)(void),
-                                    void (*p_finalizer)(void))
+MCScriptConfigureBuiltinModule(MCScriptModuleRef p_module,
+                               bool (*p_initializer)(void),
+                               void (*p_finalizer)(void),
+                               void **p_builtins)
 {
     p_module->initializer = p_initializer;
     p_module->finalizer = p_finalizer;
+    p_module->builtins = p_builtins;
 }
 
 bool MCScriptLookupModule(MCNameRef p_name, MCScriptModuleRef& r_module)
@@ -734,8 +736,17 @@ bool MCScriptEnsureModuleIsUsable(MCScriptModuleRef self)
                 t_type = static_cast<MCScriptForeignType *>(self -> types[i]);
                 
                 void *t_symbol = nullptr;
-                t_symbol = MCSLibraryLookupSymbol(MCScriptGetLibrary(),
-                                                  t_type->binding);
+                integer_t t_ordinal = 0;
+                if (self->builtins != nullptr &&
+                    MCTypeConvertStringToLongInteger(t_type->binding, t_ordinal))
+                {
+                    t_symbol = self->builtins[t_ordinal];
+                }
+                else
+                {
+                    t_symbol = MCSLibraryLookupSymbol(MCScriptGetLibrary(),
+                                                      t_type->binding);
+                }
                 
                 if (t_symbol == nullptr)
                 {
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -49,6 +49,7 @@ struct MCBuiltinModule
     long size;
     bool (*initializer)(void);
     void (*finalizer)(void);
+    void **builtins;
 };
 
 static MCBuiltinModule *s_builtin_modules = nil;
@@ -85,9 +86,10 @@ bool MCScriptInitialize(void)
         if (!MCScriptCreateModuleFromStream(t_stream, t_module->handle))
             return false;
         
-        MCScriptSetModuleLifecycleFunctions(t_module->handle,
-                                            t_module->initializer,
-                                            t_module->finalizer);
+        MCScriptConfigureBuiltinModule(t_module->handle,
+                                       t_module->initializer,
+                                       t_module->finalizer,
+                                       t_module->builtins);
         
         MCValueRelease(t_stream);
     }
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -449,6 +449,9 @@ struct MCScriptModule: public MCScriptObject
     // These are the native code initializer/finalizer (if any) -- not pickled
     bool (*initializer)(void);
     void (*finalizer)(void);
+    
+    // This is the ordinal mapping array (if any) -- not pickled
+    void **builtins;
 };
 
 bool MCScriptWriteRawModule(MCStreamRef stream, MCScriptModule *module);
