Merge remote-tracking branch 'origin/incoming' into strMemInit

Author: gagern

emcc

@@ -893,7 +893,6 @@ try:
     assert shared.Settings.PGO == 0, 'pgo not supported in fastcomp'
     assert shared.Settings.USE_TYPED_ARRAYS == 2, 'altering USE_TYPED_ARRAYS is not supported'
     assert shared.Settings.QUANTUM_SIZE == 4, 'altering the QUANTUM_SIZE is not supported'
-    assert shared.Settings.INIT_HEAP == 0, 'HEAP_INIT is not supported in fastcomp (and should never be needed except for debugging)'
   except Exception, e:
     logging.error('Compiler settings are incompatible with fastcomp. You can fall back to the older compiler core, although that is not recommended, see http://kripken.github.io/emscripten-site/docs/building_from_source/LLVM-Backend.html')
     raise e
@@ -1284,6 +1283,8 @@ try:
       file_args.append('--use-preload-cache')
     if no_heap_copy:
       file_args.append('--no-heap-copy')
+    if not closure:
+      file_args.append('--no-closure')
     file_code = execute([shared.PYTHON, shared.FILE_PACKAGER, unsuffixed(target) + '.data'] + file_args, stdout=PIPE)[0]
     pre_js = file_code + pre_js
 

emscripten.py

@@ -165,6 +165,8 @@ def fix_dot_zero(m):
     metadata['declares'] = filter(lambda i64_func: i64_func not in ['getHigh32', 'setHigh32', '__muldi3', '__divdi3', '__remdi3', '__udivdi3', '__uremdi3'], metadata['declares']) # FIXME: do these one by one as normal js lib funcs
 
     # Integrate info from backend
+    if settings['SIDE_MODULE']:
+      settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = [] # we don't need any JS library contents in side modules
     settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = list(
       set(settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] + map(shared.JS.to_nice_ident, metadata['declares'])).difference(
         map(lambda x: x[1:], metadata['implementedFunctions'])
@@ -306,7 +308,7 @@ def move_preasm(m):
       contents = m.groups(0)[0]
       outfile.write(contents + '\n')
       return ''
-    if not settings['BOOTSTRAPPING_STRUCT_INFO']:
+    if not settings['BOOTSTRAPPING_STRUCT_INFO'] and not settings['SIDE_MODULE']:
       funcs_js[1] = re.sub(r'/\* PRE_ASM \*/(.*)\n', lambda m: move_preasm(m), funcs_js[1])
 
     class Counter:
@@ -579,13 +581,16 @@ def keyfunc(other):
       if settings.get('EMULATED_FUNCTION_POINTERS'):
         args = ['a%d' % i for i in range(len(sig)-1)]
         full_args = ['x'] + args
+        table_access = 'FUNCTION_TABLE_' + sig
+        if settings['SIDE_MODULE']:
+          table_access = 'parentModule["' + table_access + '"]' # side module tables were merged into the parent, we need to access the global one
         prelude = '''
-  if (x < 0 || x >= FUNCTION_TABLE_%s.length) { Module.printErr("Function table mask error (out of range)"); %s ; abort(x) }''' % (sig, get_function_pointer_error(sig))
+  if (x < 0 || x >= %s.length) { Module.printErr("Function table mask error (out of range)"); %s ; abort(x) }''' % (table_access, get_function_pointer_error(sig))
         asm_setup += '''
 function ftCall_%s(%s) {%s
-  return FUNCTION_TABLE_%s[x](%s);
+  return %s[x](%s);
 }
-''' % (sig, ', '.join(full_args), prelude, sig, ', '.join(args))
+''' % (sig, ', '.join(full_args), prelude, table_access, ', '.join(args))
         basic_funcs.append('ftCall_%s' % sig)
 
     def quote(prop):
@@ -675,10 +680,14 @@ def math_fix(g):
 
     if settings['RELOCATABLE']:
       receiving += '''
-var NAMED_GLOBALS = %s;
-for (var named in NAMED_GLOBALS) NAMED_GLOBALS[named] += gb;
+var NAMED_GLOBALS = { %s };
+for (var named in NAMED_GLOBALS) {
+  Module['_' + named] = gb + NAMED_GLOBALS[named];
+}
 Module['NAMED_GLOBALS'] = NAMED_GLOBALS;
-''' % json.dumps(metadata['namedGlobals'])
+''' % ', '.join('"' + k + '": ' + str(v) for k, v in metadata['namedGlobals'].iteritems())
+
+      receiving += ''.join(["Module['%s'] = Module['%s']\n" % (k, v) for k, v in metadata['aliases'].iteritems()])
 
     funcs_js = ['''
 %s

src/jsifier.js

@@ -62,7 +62,7 @@ function JSify(data, functionsOnly) {
     var libFuncsToInclude;
     if (INCLUDE_FULL_LIBRARY) {
       assert(!(BUILD_AS_SHARED_LIB || SIDE_MODULE), 'Cannot have both INCLUDE_FULL_LIBRARY and BUILD_AS_SHARED_LIB/SIDE_MODULE set.')
-      libFuncsToInclude = MAIN_MODULE ? DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.slice(0) : [];
+      libFuncsToInclude = (MAIN_MODULE || SIDE_MODULE) ? DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.slice(0) : [];
       for (var key in LibraryManager.library) {
         if (!key.match(/__(deps|postset|inline|asm|sig)$/)) {
           libFuncsToInclude.push(key);
@@ -123,7 +123,9 @@ function JSify(data, functionsOnly) {
       // Note: We don't return the dependencies here. Be careful not to end up where this matters
       if (finalName in Functions.implementedFunctions) return '';
 
-      if (!LibraryManager.library.hasOwnProperty(ident) && !LibraryManager.library.hasOwnProperty(ident + '__inline')) {
+      var noExport = false;
+
+      if ((!LibraryManager.library.hasOwnProperty(ident) && !LibraryManager.library.hasOwnProperty(ident + '__inline')) || SIDE_MODULE) {
         if (notDep) {
           if (VERBOSE || ident.substr(0, 11) !== 'emscripten_') { // avoid warning on emscripten_* functions which are for internal usage anyhow
             if (ERROR_ON_UNDEFINED_SYMBOLS) error('unresolved symbol: ' + ident);
@@ -134,7 +136,13 @@ function JSify(data, functionsOnly) {
           // emit a stub that will fail at runtime
           LibraryManager.library[shortident] = new Function("Module['printErr']('missing function: " + shortident + "'); abort(-1);");
         } else {
-          LibraryManager.library[shortident] = function() { return Module['_' + shortident].apply(null, arguments); };
+          LibraryManager.library[shortident] = new Function("return " + (MAIN_MODULE ? '' : 'parent') + "Module['_" + shortident + "'].apply(null, arguments);");
+          if (SIDE_MODULE) {
+            // no dependencies, just emit the thunk
+            Functions.libraryFunctions[finalName] = 1;
+            return processLibraryFunction(LibraryManager.library[shortident], ident, finalName);
+          }
+          noExport = true;
         }
       }
 
@@ -203,8 +211,7 @@ function JSify(data, functionsOnly) {
         EXPORTED_FUNCTIONS[finalName] = 1;
         Functions.libraryFunctions[finalName] = 2;
       }
-      if (SIDE_MODULE) return ';'; // we import into the side module js library stuff from the outside parent 
-      if (EXPORT_ALL || (finalName in EXPORTED_FUNCTIONS)) {
+      if ((EXPORT_ALL || (finalName in EXPORTED_FUNCTIONS)) && !noExport) {
         contentText += '\nModule["' + finalName + '"] = ' + finalName + ';';
       }
       return depsText + contentText;

src/library.js

@@ -4054,7 +4054,6 @@ LibraryManager.library = {
     if (filename === '__self__') {
       var handle = -1;
       var lib_module = Module;
-      Module.NAMED_GLOBALS = NAMED_GLOBALS;
       var cached_functions = {};
     } else {
       var target = FS.findObject(filename);
@@ -4138,10 +4137,6 @@ LibraryManager.library = {
       return 0;
     } else {
       var lib = DLFCN.loadedLibs[handle];
-      if (lib.module.NAMED_GLOBALS.hasOwnProperty(symbol)) {
-        return lib.module.NAMED_GLOBALS[symbol];
-      }
-      // not a global var, must be a function
       symbol = '_' + symbol;
       if (lib.cached_functions.hasOwnProperty(symbol)) {
         return lib.cached_functions[symbol];

src/postamble_sharedlib.js

@@ -3,14 +3,12 @@
 
 {{GLOBAL_VARS}}
 
-function run(args) {
+runPostSets();
+
+if (runtimeInitialized) {
   initRuntime();
+  Module['initLibraryRuntime'] = function(){};
+} else {
+  Module['initLibraryRuntime'] = initRuntime; // rely on the system to call it later, at the right time
 }
-Module['run'] = run;
-
-// {{PRE_RUN_ADDITIONS}}
-
-run();
-
-// {{POST_RUN_ADDITIONS}}
 

src/preamble.js

@@ -1190,6 +1190,12 @@ function ensureInitRuntime() {
   if (runtimeInitialized) return;
   runtimeInitialized = true;
   callRuntimeCallbacks(__ATINIT__);
+
+#if RELOCATABLE
+  Runtime.loadedDynamicLibraries.forEach(function(lib) {
+    lib['initLibraryRuntime']();
+  });
+#endif
 }
 
 function preMain() {
@@ -1449,6 +1455,16 @@ __ATEXIT__.push({ func: function() { PGOMonitor.dump() } });
 addOnPreRun(function() { addRunDependency('pgo') });
 #endif
 
+#if RELOCATABLE
+if (Module['dynamicLibraries']) {
+  Module['dynamicLibraries'].forEach(function(lib) {
+    addOnPreRun(function() {
+      Runtime.loadDynamicLibrary(lib);
+    });
+  });
+}
+#endif
+
 #if MEM_INIT_METHOD == 1
 var memoryInitializer = null;
 #else

src/runtime.js

@@ -7,12 +7,9 @@
 // itself is as optimized as possible - no unneeded runtime checks).
 
 var RuntimeGenerator = {
-  alloc: function(size, type, init, sep, ignoreAlign) {
+  alloc: function(size, type, sep, ignoreAlign) {
     sep = sep || ';';
     var ret = type + 'TOP';
-    if (init) {
-      ret += sep + '_memset(' + type + 'TOP, 0, ' + size + ')';
-    }
     ret += sep + type + 'TOP = (' + type + 'TOP + ' + size + ')|0';
     if ({{{ STACK_ALIGN }}} > 1 && !ignoreAlign) {
       ret += sep + RuntimeGenerator.alignMemory(type + 'TOP', {{{ STACK_ALIGN }}});
@@ -23,7 +20,7 @@ var RuntimeGenerator = {
   // An allocation that lives as long as the current function call
   stackAlloc: function(size, sep) {
     sep = sep || ';';
-    var ret = RuntimeGenerator.alloc(size, 'STACK', false, sep, (isNumber(size) && parseInt(size) % {{{ STACK_ALIGN }}} == 0));
+    var ret = RuntimeGenerator.alloc(size, 'STACK', sep, (isNumber(size) && parseInt(size) % {{{ STACK_ALIGN }}} == 0));
     if (ASSERTIONS) {
       ret += sep + '(assert(' + asmCoercion('(STACKTOP|0) < (STACK_MAX|0)', 'i32') + ')|0)';
     }
@@ -53,14 +50,14 @@ var RuntimeGenerator = {
   // called, takes control of STATICTOP)
   staticAlloc: function(size) {
     if (ASSERTIONS) size = '(assert(!staticSealed),' + size + ')'; // static area must not be sealed
-    var ret = RuntimeGenerator.alloc(size, 'STATIC', INIT_HEAP);
+    var ret = RuntimeGenerator.alloc(size, 'STATIC');
     return ret;
   },
 
   // allocation on the top of memory, adjusted dynamically by sbrk
   dynamicAlloc: function(size) {
     if (ASSERTIONS) size = '(assert(DYNAMICTOP > 0),' + size + ')'; // dynamic area must be ready
-    var ret = RuntimeGenerator.alloc(size, 'DYNAMIC', INIT_HEAP);
+    var ret = RuntimeGenerator.alloc(size, 'DYNAMIC');
     ret += '; if (DYNAMICTOP >= TOTAL_MEMORY) { var success = enlargeMemory(); if (!success) { DYNAMICTOP = ret; return 0; } }'
     return ret;
   },
@@ -283,8 +280,36 @@ var Runtime = {
   },
 
   removeFunction: function(index) {
+#if EMULATED_FUNCTION_POINTERS == 0
     Runtime.functionPointers[(index-{{{ FUNCTION_POINTER_ALIGNMENT }}})/{{{ FUNCTION_POINTER_ALIGNMENT }}}] = null;
+#else
+    Runtime.alignFunctionTables(); // XXX we should rely on this being an invariant
+    var tables = Runtime.getFunctionTables();
+    for (var sig in tables) {
+      tables[sig][index] = null;
+    }
+#endif
+  },
+
+#if RELOCATABLE
+  loadedDynamicLibraries: [],
+
+  loadDynamicLibrary: function(lib) {
+    // TODO: addRunDep etc., do asynchronously when in the browser. for now we assume we can do a sync xhr, no mem init files in libs, and we ignore the sync xhr lag
+    var src = Module['read'](lib);
+    var libModule = eval(src)(
+      Runtime.alignFunctionTables(),
+      Module
+    );
+    // add symbols into global namespace TODO: weak linking etc.
+    for (var sym in libModule) {
+      if (!Module.hasOwnProperty(sym)) {
+        Module[sym] = libModule[sym];
+      }
+    }
+    Runtime.loadedDynamicLibraries.push(libModule);
   },
+#endif
 
   warnOnce: function(text) {
     if (!Runtime.warnOnce.shown) Runtime.warnOnce.shown = {};

src/settings.js

@@ -35,7 +35,6 @@ var INVOKE_RUN = 1; // Whether we will run the main() function. Disable if you e
                     // can do with Module.callMain(), with an optional parameter of commandline args).
 var NO_EXIT_RUNTIME = 0; // If set, the runtime is not quit when main() completes (allowing code to
                          // run afterwards, for example from the browser main event loop).
-var INIT_HEAP = 0; // Whether to initialize memory anywhere other than the stack to 0.
 var MEM_INIT_METHOD = 2; // Set using the --memory-init-file command line switch.
                          // 0: keep array literal representing the initial memory data
                          // 1: create a *.mem file containing the binary data of the initial memory
@@ -60,7 +59,6 @@ var GLOBAL_BASE = -1; // where global data begins; the start of static memory. -
                       // default, any other value will be used as an override
 
 // Code embetterments
-var MICRO_OPTS = 1; // Various micro-optimizations, like nativizing variables
 var USE_TYPED_ARRAYS = 2; // Use typed arrays for the heap. See https://github.com/kripken/emscripten/wiki/Code-Generation-Modes/
                           // 2 is a single heap, accessible through views as int8, int32, etc. This is
                           //   the only supported mode.
@@ -121,8 +119,6 @@ var SIMD = 0; // Whether to allow autovectorized SIMD code ( https://github.com/
               // any SIMD output at all.)
 
 var CLOSURE_COMPILER = 0; // Whether closure compiling is being run on this output
-var CLOSURE_ANNOTATIONS = 0; // If set, the generated code will be annotated for the closure
-                             // compiler. This potentially lets closure optimize the code better.
 
 var SKIP_STACK_IN_SMALL = 1; // When enabled, does not push/pop the stack at all in
                              // functions that have no basic stack usage. But, they
@@ -131,7 +127,6 @@ var SKIP_STACK_IN_SMALL = 1; // When enabled, does not push/pop the stack at all
                              // a lot can exhaust the stack very fast, with this option.
                              // In particular, be careful with the autodebugger! (We do turn
                              // this off automatically in that case, though.)
-var INLINE_LIBRARY_FUNCS = 1; // Will inline library functions that have __inline defined
 var INLINING_LIMIT = 0;  // A limit on inlining. If 0, we will inline normally in LLVM and
                          // closure. If greater than 0, we will *not* inline in LLVM, and
                          // we will prevent inlining of functions of this size or larger
@@ -353,8 +348,6 @@ var INCLUDE_FULL_LIBRARY = 0; // Whether to include the whole library rather tha
 
 var SHELL_FILE = 0; // set this to a string to override the shell file used
 
-var SHOW_LABELS = 0; // Show labels in the generated code
-
 var RELOCATABLE = 0; // If set to 1, we emit relocatable code from the LLVM backend; both
                      // globals and function pointers are all offset (by gb and fp, respectively)
 
@@ -507,9 +500,6 @@ var EMTERPRETIFY_ADVISE = 0; // Performs a static analysis to suggest which func
 var RUNNING_JS_OPTS = 0; // whether js opts will be run, after the main compiler
 var BOOTSTRAPPING_STRUCT_INFO = 0; // whether we are in the generate struct_info bootstrap phase
 
-var COMPILER_ASSERTIONS = 0; // costly (slow) compile-time assertions
-var COMPILER_FASTPATHS = 1; // use fast-paths to speed up compilation
-
 var EMSCRIPTEN_TRACING = 0; // Add some calls to emscripten tracing APIs
 
 var USE_GLFW = 2; // Specify the GLFW version that is being linked against.

tests/cases/longjmp_tiny_keepem_cond.ll

@@ -6,14 +6,14 @@ target triple = "asmjs-unknown-emscripten"
 @.str1 = private unnamed_addr constant [6 x i8] c"more\0A\00", align 1
 
 define i32 @main() {
+  %wimpy = trunc i32 100 to i8
   %call0 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([6 x i8]* @.str1, i32 0, i32 0))
   %chak = icmp ne i32 %call0, 12345678
   br i1 %chak, label %middle, label %if.then
 
 middle:
   %retval = alloca i32, align 4
   store i32 0, i32* %retval
-  %wimpy = trunc i32 100 to i8
   %buffy = inttoptr i8 %wimpy to i16*
   %call = call i32 @setjmp(i16* %buffy) returns_twice ; 20
   %tobool = icmp ne i32 %call, 0 ; 20

tests/cases/phiself.py

@@ -1,3 +1 @@
-if Settings.MICRO_OPTS:
-  assert '$phi' not in generated, 'we should optimize out self-phis'
-
+assert '$phi' not in generated, 'we should optimize out self-phis'

tests/runner.py

@@ -108,16 +108,16 @@ def hardcode_arguments(self, filename, args):
     open(filename, 'w').write(js.replace('run();', 'run(%s + Module["arguments"]);' % str(args)))
 
   def prep_ll_run(self, filename, ll_file, force_recompile=False, build_ll_hook=None):
-    if ll_file.endswith(('.bc', '.o')):
-      if ll_file != filename + '.o':
-        shutil.copy(ll_file, filename + '.o')
-      Building.llvm_dis(filename)
-    else:
-      shutil.copy(ll_file, filename + '.o.ll')
-
     #force_recompile = force_recompile or os.stat(filename + '.o.ll').st_size > 50000 # if the file is big, recompile just to get ll_opts # Recompiling just for dfe in ll_opts is too costly
 
     if Building.LLVM_OPTS or force_recompile or build_ll_hook:
+      if ll_file.endswith(('.bc', '.o')):
+        if ll_file != filename + '.o':
+          shutil.copy(ll_file, filename + '.o')
+        Building.llvm_dis(filename)
+      else:
+        shutil.copy(ll_file, filename + '.o.ll')
+
       Building.ll_opts(filename)
       if build_ll_hook:
         need_post = build_ll_hook(filename)
@@ -132,6 +132,14 @@ def prep_ll_run(self, filename, ll_file, force_recompile=False, build_ll_hook=No
         shutil.move(filename + '.o.ll', filename + '.o.ll.post') # for comparisons later
         Building.llvm_dis(filename)
 
+      Building.llvm_as(filename)
+    else:
+      if ll_file.endswith('.ll'):
+        safe_copy(ll_file, filename + '.o.ll')
+        Building.llvm_as(filename)
+      else:
+        safe_copy(ll_file, filename + '.o')
+
   # Generate JS from ll, and optionally modify the generated JS with a post_build function. Note
   # that post_build is called on unoptimized JS, so we send it to emcc (otherwise, if run after
   # emcc, it would not apply on the optimized/minified JS)
@@ -155,7 +163,7 @@ def ll_to_js(self, filename, extra_emscripten_args, post_build):
       transform.write('\nprocess(sys.argv[1])\n')
       transform.close()
       transform_args = ['--js-transform', "%s %s" % (PYTHON, transform_filename)]
-    Building.emcc(filename + '.o.ll', Settings.serialize() + emcc_args + transform_args + Building.COMPILER_TEST_OPTS, filename + '.o.js')
+    Building.emcc(filename + '.o', Settings.serialize() + emcc_args + transform_args + Building.COMPILER_TEST_OPTS, filename + '.o.js')
     if post2: post2(filename + '.o.js')
 
   # Build JavaScript code from source code