[[ Emscripten ]] Tweaks to build of engine

runrevmark · runrevmark · commit b27cf19e168e · 2017-05-30T13:55:08.000+01:00
This patch allows multiple object files to be included in the
javascriptify call, and ensures the builtin engine module object
is passed through directly to it, so that everything needed
gets included.
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -535,6 +535,11 @@
 							},
 						},
 
+						'sources':
+						[
+							'<(PRODUCT_DIR)/obj.target/engine_lcb_modules/geni/engine_lcb_modules.o',
+						],
+
 						'sources!':
 						[
 							'src/dummy.cpp',
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1910,6 +1910,10 @@ MCScriptMapTypeToForeignPrimitiveTypeInModule(MCScriptModuleBuilderRef self, uin
             /* Foundation Types */
             { "undefined", kMCScriptForeignPrimitiveTypePointer },
             { "any", kMCScriptForeignPrimitiveTypePointer },
+            { "bool", kMCScriptForeignPrimitiveTypeCBool },
+            { "double", kMCScriptForeignPrimitiveTypeCDouble },
+            { "sint", kMCScriptForeignPrimitiveTypeSInt },
+            { "uint", kMCScriptForeignPrimitiveTypeUInt },
             
             { "Boolean", kMCScriptForeignPrimitiveTypePointer },
             { "Number", kMCScriptForeignPrimitiveTypePointer },
diff --git a/toolchain/lc-compile/src/emit.cpp b/toolchain/lc-compile/src/emit.cpp
@@ -368,7 +368,9 @@ static MCStringRef EmittedBuiltinAdd(NameRef p_symbol_name, uindex_t p_type_inde
         t_builtin->parameter_count = MCScriptQueryForeignHandlerParameterCountInModule(s_builder, p_type_index);
         t_builtin->parameter_types = new MCScriptForeignPrimitiveType[t_builtin->parameter_count];
         for(uindex_t i = 0; i < t_builtin->parameter_count; i++)
+        {
             t_builtin->parameter_types[i] = MCScriptQueryForeignHandlerParameterTypeInModule(s_builder, p_type_index, i);
+        }
     }
     else
     {
@@ -1065,12 +1067,12 @@ void EmitVariableDefinition(intptr_t p_index, PositionRef p_position, NameRef p_
                cstring_from_nameref(p_name), p_type_index);
 }
 
-void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding)
+static void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding, bool p_force_builtin)
 {
     MCAutoStringRef t_binding_str;
-    if (strcmp((const char *)p_binding, "<builtin>") == 0)
+    if (strcmp((const char *)p_binding, "<builtin>") == 0 || p_force_builtin)
     {
-        t_binding_str = EmittedBuiltinAdd(p_name, p_type_index);
+        t_binding_str = EmittedBuiltinAdd(p_force_builtin ? nameref_from_cstring((const char *)p_binding) : p_name, p_type_index);
     }
     else
         t_binding_str = to_mcstringref(p_binding);
@@ -1109,6 +1111,11 @@ void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, Name
                (const char *) p_binding);
 }
 
+void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding)
+{
+    EmitForeignHandlerDefinition(p_index, p_position, p_name, p_type_index, p_binding, false);
+}
+
 void EmitPropertyDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_getter, intptr_t p_setter)
 {
     MCScriptAddPropertyToModule(s_builder, to_mcnameref(p_name), (uindex_t)p_getter, (uindex_t)p_setter, (uindex_t)p_index);
@@ -2415,13 +2422,13 @@ static void BuildBuiltinModule_ForeignType(const char *p_name, const char *p_for
 static void BuildBuiltinModule_ForeignHandler1(intptr_t p_return_type, MCHandlerTypeFieldMode p_arg_mode_0, const char *p_arg_name_0, intptr_t p_arg_type_0, const char *p_name, const char *p_foreign_name)
 {
     intptr_t t_handler_type_index = -1;
-    EmitBeginHandlerType(p_return_type);
+    EmitBeginForeignHandlerType(p_return_type);
     EmitHandlerTypeParameter(p_arg_mode_0, nameref_from_cstring(p_arg_name_0), p_arg_type_0);
     EmitEndHandlerType(t_handler_type_index);
     
     intptr_t t_handler_def = -1;
     EmitDefinitionIndex("foreignhandler", t_handler_def);
-    EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name);
+    EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name, true);
     EmitExportedDefinition(t_handler_def);
 }
 
@@ -2431,14 +2438,14 @@ static void BuildBuiltinModule_ForeignHandler2(intptr_t p_return_type,
                                                const char *p_name, const char *p_foreign_name)
 {
     intptr_t t_handler_type_index = -1;
-    EmitBeginHandlerType(p_return_type);
+    EmitBeginForeignHandlerType(p_return_type);
     EmitHandlerTypeParameter(p_arg_mode_0, nameref_from_cstring(p_arg_name_0), p_arg_type_0);
     EmitHandlerTypeParameter(p_arg_mode_1, nameref_from_cstring(p_arg_name_1), p_arg_type_1);
     EmitEndHandlerType(t_handler_type_index);
     
     intptr_t t_handler_def = -1;
     EmitDefinitionIndex("foreignhandler", t_handler_def);
-    EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name);
+    EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name, true);
     EmitExportedDefinition(t_handler_def);
 }
 
diff --git a/util/emscripten-javascriptify.py b/util/emscripten-javascriptify.py
@@ -67,7 +67,9 @@
 
 command = emcc + optimisation_flags + cflags
 
-command.append(options['input'][0])
+for input in options['input']:
+    command.append(input)
+    
 command += ['-o', options['output'][0]]
 
 for setting in sorted(settings.keys()):

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,9 @@ static MCStringRef EmittedBuiltinAdd(NameRef p_symbol_name, uindex_t p_type_inde`
`368`	`368`	`t_builtin->parameter_count = MCScriptQueryForeignHandlerParameterCountInModule(s_builder, p_type_index);`
`369`	`369`	`t_builtin->parameter_types = new MCScriptForeignPrimitiveType[t_builtin->parameter_count];`
`370`	`370`	`for(uindex_t i = 0; i < t_builtin->parameter_count; i++)`
	`371`	`+ {`
`371`	`372`	`t_builtin->parameter_types[i] = MCScriptQueryForeignHandlerParameterTypeInModule(s_builder, p_type_index, i);`
	`373`	`+ }`
`372`	`374`	`}`
`373`	`375`	`else`
`374`	`376`	`{`
`@@ -1065,12 +1067,12 @@ void EmitVariableDefinition(intptr_t p_index, PositionRef p_position, NameRef p_`
`1065`	`1067`	`cstring_from_nameref(p_name), p_type_index);`
`1066`	`1068`	`}`
`1067`	`1069`
`1068`		`-void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding)`
	`1070`	`+static void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding, bool p_force_builtin)`
`1069`	`1071`	`{`
`1070`	`1072`	`MCAutoStringRef t_binding_str;`
`1071`		`- if (strcmp((const char *)p_binding, "<builtin>") == 0)`
	`1073`	`+ if (strcmp((const char *)p_binding, "<builtin>") == 0 \|\| p_force_builtin)`
`1072`	`1074`	`{`
`1073`		`- t_binding_str = EmittedBuiltinAdd(p_name, p_type_index);`
	`1075`	`+ t_binding_str = EmittedBuiltinAdd(p_force_builtin ? nameref_from_cstring((const char *)p_binding) : p_name, p_type_index);`
`1074`	`1076`	`}`
`1075`	`1077`	`else`
`1076`	`1078`	`t_binding_str = to_mcstringref(p_binding);`
`@@ -1109,6 +1111,11 @@ void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, Name`
`1109`	`1111`	`(const char *) p_binding);`
`1110`	`1112`	`}`
`1111`	`1113`
	`1114`	`+void EmitForeignHandlerDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_type_index, intptr_t p_binding)`
	`1115`	`+{`
	`1116`	`+ EmitForeignHandlerDefinition(p_index, p_position, p_name, p_type_index, p_binding, false);`
	`1117`	`+}`
	`1118`	`+`
`1112`	`1119`	`void EmitPropertyDefinition(intptr_t p_index, PositionRef p_position, NameRef p_name, intptr_t p_getter, intptr_t p_setter)`
`1113`	`1120`	`{`
`1114`	`1121`	`MCScriptAddPropertyToModule(s_builder, to_mcnameref(p_name), (uindex_t)p_getter, (uindex_t)p_setter, (uindex_t)p_index);`
`@@ -2415,13 +2422,13 @@ static void BuildBuiltinModule_ForeignType(const char p_name, const char p_for`
`2415`	`2422`	`static void BuildBuiltinModule_ForeignHandler1(intptr_t p_return_type, MCHandlerTypeFieldMode p_arg_mode_0, const char p_arg_name_0, intptr_t p_arg_type_0, const char p_name, const char *p_foreign_name)`
`2416`	`2423`	`{`
`2417`	`2424`	`intptr_t t_handler_type_index = -1;`
`2418`		`- EmitBeginHandlerType(p_return_type);`
	`2425`	`+ EmitBeginForeignHandlerType(p_return_type);`
`2419`	`2426`	`EmitHandlerTypeParameter(p_arg_mode_0, nameref_from_cstring(p_arg_name_0), p_arg_type_0);`
`2420`	`2427`	`EmitEndHandlerType(t_handler_type_index);`
`2421`	`2428`
`2422`	`2429`	`intptr_t t_handler_def = -1;`
`2423`	`2430`	`EmitDefinitionIndex("foreignhandler", t_handler_def);`
`2424`		`- EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name);`
	`2431`	`+ EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name, true);`
`2425`	`2432`	`EmitExportedDefinition(t_handler_def);`
`2426`	`2433`	`}`
`2427`	`2434`
`@@ -2431,14 +2438,14 @@ static void BuildBuiltinModule_ForeignHandler2(intptr_t p_return_type,`
`2431`	`2438`	`const char p_name, const char p_foreign_name)`
`2432`	`2439`	`{`
`2433`	`2440`	`intptr_t t_handler_type_index = -1;`
`2434`		`- EmitBeginHandlerType(p_return_type);`
	`2441`	`+ EmitBeginForeignHandlerType(p_return_type);`
`2435`	`2442`	`EmitHandlerTypeParameter(p_arg_mode_0, nameref_from_cstring(p_arg_name_0), p_arg_type_0);`
`2436`	`2443`	`EmitHandlerTypeParameter(p_arg_mode_1, nameref_from_cstring(p_arg_name_1), p_arg_type_1);`
`2437`	`2444`	`EmitEndHandlerType(t_handler_type_index);`
`2438`	`2445`
`2439`	`2446`	`intptr_t t_handler_def = -1;`
`2440`	`2447`	`EmitDefinitionIndex("foreignhandler", t_handler_def);`
`2441`		`- EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name);`
	`2448`	`+ EmitForeignHandlerDefinition(t_handler_def, 0, nameref_from_cstring(p_name), t_handler_type_index, (intptr_t)p_foreign_name, true);`
`2442`	`2449`	`EmitExportedDefinition(t_handler_def);`
`2443`	`2450`	`}`
`2444`	`2451`