webruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccb11ba22bb406912f914d14d77a04be6a0f55a4
-  data.tar.gz: 4329265d484d8f18cae203a48ca3e3a21ff08eae
+  metadata.gz: 90c4009581e36a53cf797ad2685ffaf6499097f9
+  data.tar.gz: 6cf5854d209e72baf672e4ec43c691a54710ef49
 SHA512:
-  metadata.gz: a5f96787b0ca595392902208d8ad1d3fdfec1c7552fff46bbac8a1aab2e8aaf9fac4d4a6c2dcf1a9ef349db34a226d1c9ae6714940c1766b02d42ee4e804c9a6
-  data.tar.gz: 7677e581f4e0fb944ce74a638107709bed83d6e2f633af21a755fd53fc409b6d0856c83c4170485180cc5da20f187b0d7611b8d4e9004e626359860c40e390ba
+  metadata.gz: 810169db5643ffcc255636cb72d21a2fb09ca2e198c729735fa07746b743ceb2b2a07d480bd102a5ae122b09686422737774df5d11c293c580b16d890fe9d622
+  data.tar.gz: 92249c4531db15431fc64e73832c337af1caca5d8fbe570dc5fed67caa77728ac7fafeaf5e78aa8c843a3aea25728ee22be76d6315338795f56cf0ee2733e86e

data/lib/webruby/rake/mruby.rake

@@ -25,6 +25,7 @@ end
 MRuby::CrossBuild.new('emscripten') do |conf|
   toolchain :emscripten
   conf.build_dir = '#{Webruby.full_build_dir}/mruby/emscripten'
+  conf.gem_clone_dir = '#{File.expand_path("~/.webruby/gems")}'
 
   #{Webruby::App.config.gembox_lines}
   #{Webruby::App.config.gem_lines}

data/modules/emscripten/AUTHORS

@@ -87,3 +87,10 @@ a license to everyone to use it as detailed in LICENSE.)
 * Manfred Manik Nerurkar <nerurkar*at*made-apps.biz> (copyright owned by MADE, GmbH)
 * Joseph Gentle <me@josephg.com>
 * Douglas T. Crosher <dtc-moz@scieneer.com> (copyright owned by Mozilla Founcation)
+* Soeren Balko <soeren.balko@gmail.com>
+* Ryan Kelly (ryan@rfk.id.au)
+* Michael Lelli <toadking@toadking.com>
+* Yu Kobayashi <yukoba@accelart.jp>
+* Pin Zhang <zhangpin04@gmail.com>
+* Nick Bray <ncbray@chromium.org> (copyright owned by Google, Inc.)
+

data/modules/emscripten/LICENSE

@@ -66,3 +66,29 @@ IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+
+==============================================================================
+
+This program uses portions of Node.js source code located in src/library_path.js,
+in accordance with the terms of the MIT license. Node's license follows:
+
+    """
+        Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to
+        deal in the Software without restriction, including without limitation the
+        rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+
+        The above copyright notice and this permission notice shall be included in
+        all copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+        IN THE SOFTWARE.
+    """

data/modules/emscripten/emcc

@@ -53,6 +53,15 @@ from tools import shared, jsrun
 from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename
 from tools.response_file import read_response_file
 
+CXX_SUFFIXES = ('.cpp', '.cxx', '.cc')
+SOURCE_SUFFIXES = ('.c', '.cpp', '.cxx', '.cc', '.m', '.mm')
+BITCODE_SUFFIXES = ('.bc', '.o', '.obj')
+DYNAMICLIB_SUFFIXES = ('.dylib', '.so', '.dll')
+STATICLIB_SUFFIXES = ('.a',)
+ASSEMBLY_SUFFIXES = ('.ll',)
+LIB_PREFIXES = ('', 'lib')
+JS_CONTAINING_SUFFIXES = ('js', 'html')
+
 # Mapping of emcc opt levels to llvm opt levels. We use llvm opt level 3 in emcc opt
 # levels 2 and 3 (emcc 3 is unsafe opts, so unsuitable for the only level to get
 # llvm opt level 3, and speed-wise emcc level 2 is already the slowest/most optimizing
@@ -302,6 +311,9 @@ Options that are modified or new in %s include:
                            your main compiled code (or run it before in
                            some other way).
 
+                           For more docs on the options --preload-file
+                           accepts, see  https://github.com/kripken/emscripten/wiki/Filesystem-Guide
+
   --compression <codec>    Compress both the compiled code and embedded/
                            preloaded files. <codec> should be a triple,
 
@@ -450,6 +462,12 @@ Options that are modified or new in %s include:
                            memory initialization data embedded inside
                            JavaScript as text. (default is off)
 
+  -Wno-warn-absolute-paths If not specified, the compiler will warn about any
+                           uses of absolute paths in -I and -L command line
+                           directives. Pass this flag on the command line
+                           to hide these warnings and acknowledge that the
+                           explicit use of absolute paths is intentional.
+
 The target file, if specified (-o <target>), defines what will
 be generated:
 
@@ -529,7 +547,7 @@ if CONFIGURE_CONFIG or CMAKE_CONFIG:
         if debug_configure: open(tempout, 'a').write('============= ' + arg + '\n' + src + '\n=============\n\n')
       except:
         pass
-    if arg.endswith('.s'):
+    elif arg.endswith('.s'):
       if debug_configure: open(tempout, 'a').write('(compiling .s assembly, must use clang\n')
       use_js = 0
 
@@ -612,15 +630,6 @@ if EMMAKEN_CFLAGS: CC_ADDITIONAL_ARGS += shlex.split(EMMAKEN_CFLAGS)
 
 # ---------------- Utilities ---------------
 
-SOURCE_SUFFIXES = ('.c', '.cpp', '.cxx', '.cc', '.m', '.mm')
-BITCODE_SUFFIXES = ('.bc', '.o', '.obj')
-DYNAMICLIB_SUFFIXES = ('.dylib', '.so', '.dll')
-STATICLIB_SUFFIXES = ('.a',)
-ASSEMBLY_SUFFIXES = ('.ll',)
-LIB_PREFIXES = ('', 'lib')
-
-JS_CONTAINING_SUFFIXES = ('js', 'html')
-
 seen_names = {}
 def uniquename(name):
   if name not in seen_names:
@@ -732,6 +741,12 @@ try:
 
   absolute_warning_shown = False
 
+  # Scan for warning suppression message in advance from other cmdline flags, so that it works even if -I or -L directives are present before this.
+  for i in range(len(newargs)):
+    if newargs[i] == '-Wno-warn-absolute-paths':
+      newargs[i] = ''
+      absolute_warning_shown = True
+
   settings_changes = []
 
   def validate_arg_level(level_string, max_level, err_msg):
@@ -784,6 +799,7 @@ try:
       newargs[i+1] = ''
     elif newargs[i].startswith('--minify'):
       check_bad_eq(newargs[i])
+      assert newargs[i+1] == '0', '0 is the only supported option for --minify; 1 has been deprecated'
       debug_level = max(1, debug_level)
       newargs[i] = ''
       newargs[i+1] = ''
@@ -875,7 +891,7 @@ try:
     elif newargs[i].startswith(('-I', '-L')):
       path_name = newargs[i][2:]
       if not absolute_warning_shown and os.path.isabs(path_name):
-        logging.warning ('-I or -L of an absolute path "' + newargs[i] + '" encountered. If this is to a local system header/library, it may cause problems (local system files make sense for compiling natively on your system, but not necessarily to JavaScript)') # Of course an absolute path to a non-system-specific library or header is fine, and you can ignore this warning. The danger are system headers that are e.g. x86 specific and nonportable. The emscripten bundled headers are modified to be portable, local system ones are generally not
+        logging.warning ('-I or -L of an absolute path "' + newargs[i] + '" encountered. If this is to a local system header/library, it may cause problems (local system files make sense for compiling natively on your system, but not necessarily to JavaScript). Pass \'-Wno-warn-absolute-paths\' to emcc to hide this warning.') # Of course an absolute path to a non-system-specific library or header is fine, and you can ignore this warning. The danger are system headers that are e.g. x86 specific and nonportable. The emscripten bundled headers are modified to be portable, local system ones are generally not
         absolute_warning_shown = True
   newargs = [ arg for arg in newargs if arg is not '' ]
 
@@ -1007,7 +1023,7 @@ try:
     logging.error('no input files\nnote that input files without a known suffix are ignored, make sure your input files end with one of: ' + str(SOURCE_SUFFIXES + BITCODE_SUFFIXES + DYNAMICLIB_SUFFIXES + STATICLIB_SUFFIXES + ASSEMBLY_SUFFIXES))
     exit(0)
 
-  newargs += CC_ADDITIONAL_ARGS
+  newargs = CC_ADDITIONAL_ARGS + newargs
 
   assert not (Compression.on and final_suffix != 'html'), 'Compression only works when generating HTML'
 
@@ -1027,6 +1043,10 @@ try:
     exec('shared.Settings.' + key + ' = ' + value)
 
   # Apply effects from settings
+  if bind and shared.Settings.ASM_JS:
+    logging.warning('disabling asm.js since embind is not ready for it yet')
+    shared.Settings.ASM_JS = 0
+
   if shared.Settings.ASM_JS:
     assert opt_level >= 1, 'asm.js requires -O1 or above'
 
@@ -1046,7 +1066,7 @@ try:
   if shared.Settings.CORRECT_SIGNS >= 2 or shared.Settings.CORRECT_OVERFLOWS >= 2 or shared.Settings.CORRECT_ROUNDINGS >= 2:
     debug_level = 4 # must keep debug info to do line-by-line operations
 
-  if debug_level > 0 and closure:
+  if debug_level > 1 and closure:
     logging.warning('disabling closure because debug info was requested')
     closure = False
 
@@ -1077,6 +1097,13 @@ try:
     shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
     debug_level = max(debug_level, 2)
 
+  if shared.Settings.DLOPEN_SUPPORT:
+    shared.Settings.LINKABLE = 1
+
+  if shared.Settings.STB_IMAGE and final_suffix in JS_CONTAINING_SUFFIXES:
+    input_files.append(shared.path_from_root('third_party', 'stb_image.c'))
+    shared.Settings.EXPORTED_FUNCTIONS += ['_stbi_load', '_stbi_load_from_memory', '_stbi_image_free']
+
   ## Compile source code to bitcode
 
   logging.debug('compiling to bitcode')
@@ -1091,6 +1118,8 @@ try:
       output_file = in_temp(unsuffixed(uniquename(input_file)) + '.o')
       temp_files.append(output_file)
       args = newargs + ['-emit-llvm', '-c', input_file, '-o', output_file]
+      if input_file.endswith(CXX_SUFFIXES):
+        args += shared.EMSDK_CXX_OPTS
       logging.debug("running:" + call + ' ' + ' '.join(args))
       execute([call] + args) # let compiler frontend print directly, so colors are saved (PIPE kills that)
       if not os.path.exists(output_file):
@@ -1268,6 +1297,11 @@ try:
           'wctob.c',
           'wctomb.c',
          ]],
+         ['stdlib', [
+           'ecvt.c',
+           'fcvt.c',
+           'gcvt.c',
+         ]],
          ['string', [
            'wcpcpy.c',
            'wcpncpy.c',
@@ -1535,14 +1569,17 @@ try:
 
   # It is useful to run several js optimizer passes together, to save on unneeded unparsing/reparsing
   js_optimizer_queue = []
+  js_optimizer_extra_info = {}
   def flush_js_optimizer_queue():
-    global final, js_optimizer_queue
+    global final, js_optimizer_queue, js_optimizer_extra_info
+    if len(js_optimizer_extra_info) == 0:
+      js_optimizer_extra_info = None
     if len(js_optimizer_queue) > 0 and not(len(js_optimizer_queue) == 1 and js_optimizer_queue[0] == 'last'):
       if DEBUG != '2':
         if shared.Settings.ASM_JS:
           js_optimizer_queue = ['asm'] + js_optimizer_queue
         logging.debug('applying js optimization passes: %s', js_optimizer_queue)
-        final = shared.Building.js_optimizer(final, js_optimizer_queue, jcache, debug_level >= 4)
+        final = shared.Building.js_optimizer(final, js_optimizer_queue, jcache, debug_level >= 4, js_optimizer_extra_info)
         js_transform_tempfiles.append(final)
         if DEBUG: save_intermediate('js_opts')
       else:
@@ -1551,10 +1588,11 @@ try:
           if shared.Settings.ASM_JS:
             passes = ['asm'] + passes
           logging.debug('applying js optimization pass: %s', passes)
-          final = shared.Building.js_optimizer(final, passes, jcache, debug_level >= 4)
+          final = shared.Building.js_optimizer(final, passes, jcache, debug_level >= 4, js_optimizer_extra_info)
           js_transform_tempfiles.append(final)
           save_intermediate(name)
       js_optimizer_queue = []
+    js_optimizer_extra_info = {}
 
   if opt_level >= 1:
     logging.debug('running pre-closure post-opts')
@@ -1571,7 +1609,7 @@ try:
       else:
         return 'eliminate'
 
-    js_optimizer_queue += [get_eliminate(), 'simplifyExpressionsPre']
+    js_optimizer_queue += [get_eliminate(), 'simplifyExpressions']
 
     if shared.Settings.RELOOP and not shared.Settings.ASM_JS:
       js_optimizer_queue += ['optimizeShiftsAggressive', get_eliminate()] # aggressive shifts optimization requires loops, it breaks on switches
@@ -1585,9 +1623,9 @@ try:
     final = shared.Building.closure_compiler(final)
     if DEBUG: save_intermediate('closure')
 
-  if opt_level >= 1:
-    logging.debug('running post-closure post-opts')
-    js_optimizer_queue += ['simplifyExpressionsPost']
+  if shared.Settings.OUTLINING_LIMIT > 0:
+    js_optimizer_queue += ['outline']
+    js_optimizer_extra_info['sizeToOutline'] = shared.Settings.OUTLINING_LIMIT
 
   if (not closure or shared.Settings.ASM_JS) and shared.Settings.RELOOP and debug_level < 3:
     js_optimizer_queue += ['registerize']

data/modules/emscripten/emlink.py

@@ -6,9 +6,9 @@ Fast static linker for emscripten outputs. Specifically this links asm.js module
 See https://github.com/kripken/emscripten/wiki/Linking
 '''
 
-import os, subprocess, sys, re
+import sys
 from tools import shared
-from tools import js_optimizer
+from tools.asm_module import AsmModule
 
 try:
   me, main, side, out = sys.argv[:4]
@@ -22,269 +22,6 @@ print 'Output:', out
 
 shared.try_delete(out)
 
-class AsmModule():
-  def __init__(self, filename):
-    self.filename = filename
-    self.js = open(filename).read()
-
-    self.start_asm = self.js.find(js_optimizer.start_asm_marker)
-    self.start_funcs = self.js.find(js_optimizer.start_funcs_marker)
-    self.end_funcs = self.js.rfind(js_optimizer.end_funcs_marker)
-    self.end_asm = self.js.rfind(js_optimizer.end_asm_marker)
-
-    # pre
-    self.pre_js = self.js[:self.start_asm]
-
-    # heap initializer
-    self.staticbump = int(re.search(shared.JS.memory_staticbump_pattern, self.pre_js).group(1))
-    if self.staticbump:
-      self.mem_init_js = re.search(shared.JS.memory_initializer_pattern, self.pre_js).group(0)
-
-    # global initializers
-    global_inits = re.search(shared.JS.global_initializers_pattern, self.pre_js)
-    if global_inits:
-      self.global_inits_js = global_inits.group(0)
-      self.global_inits = map(lambda init: init.split('{')[2][1:].split('(')[0], global_inits.groups(0)[0].split(','))
-    else:
-      self.global_inits_js = ''
-      self.global_inits = []
-
-    # imports (and global variables)
-    first_var = self.js.find('var ', self.js.find('var ', self.start_asm)+4)
-    self.pre_imports_js = self.js[self.start_asm:first_var]
-    self.imports_js = self.js[first_var:self.start_funcs]
-    self.imports = {}
-    for imp in js_optimizer.import_sig.finditer(self.imports_js):
-      key, value = imp.group(0).split('var ')[1][:-1].split('=', 1)
-      self.imports[key] = value
-    #print >> sys.stderr, 'imports', self.imports
-
-    # funcs
-    self.funcs_js = self.js[self.start_funcs:self.end_funcs]
-    self.funcs = set([m.group(2) for m in js_optimizer.func_sig.finditer(self.funcs_js)])
-    #print 'funcs', self.funcs
-
-    # tables and exports
-    post_js = self.js[self.end_funcs:self.end_asm]
-    ret = post_js.find('return')
-    self.tables_js = post_js[:ret]
-    self.exports_js = post_js[ret:]
-    self.tables = self.parse_tables(self.tables_js)
-    self.exports = set([export.strip() for export in self.exports_js[self.exports_js.find('{')+1:self.exports_js.find('}')].split(',')])
-
-    # post
-    self.post_js = self.js[self.end_asm:]
-    self.sendings = {}
-    for sending in [sending.strip() for sending in self.post_js[self.post_js.find('}, { ')+5:self.post_js.find(' }, buffer);')].split(',')]:
-      colon = sending.find(':')
-      self.sendings[sending[:colon].replace('"', '')] = sending[colon+1:].strip()
-    self.module_defs = set(re.findall('var [\w\d_$]+ = Module\["[\w\d_$]+"\] = asm\["[\w\d_$]+"\];\n', self.post_js))
-
-  def relocate_into(self, main):
-    # heap initializer
-    if self.staticbump > 0:
-      new_mem_init = self.mem_init_js[:self.mem_init_js.rfind(', ')] + ', Runtime.GLOBAL_BASE+%d)' % main.staticbump
-      main.pre_js = re.sub(shared.JS.memory_staticbump_pattern, 'STATICTOP = STATIC_BASE + %d;\n' % (main.staticbump + side.staticbump) + new_mem_init, main.pre_js, count=1)
-
-    # Find function name replacements TODO: do not rename duplicate names with duplicate contents, just merge them
-    replacements = {}
-    for func in self.funcs:
-      rep = func
-      while rep in main.funcs:
-        rep += '_'
-        replacements[func] = rep
-    #print >> sys.stderr, 'replacements:', replacements
-
-    # sendings: add invokes for new tables
-    all_sendings = main.sendings
-    added_sending = False
-    for table in self.tables:
-      if table not in main.tables:
-        sig = table[table.rfind('_')+1:]
-        all_sendings['invoke_%s' % sig] = shared.JS.make_invoke(sig, named=False)
-        added_sending = True
-
-    # imports
-    all_imports = main.imports
-    for key, value in self.imports.iteritems():
-      if key in self.funcs or key in main.funcs: continue # external function in one module, implemented in the other
-      value_concrete = '.' not in value # env.key means it is an import, an external value, and not a concrete one
-      main_value = main.imports.get(key)
-      main_value_concrete = main_value and '.' not in main_value
-      if value_concrete and main_value_concrete: continue # standard global var
-      if not main_value or value_concrete:
-        if '+' in value:
-          # relocate
-          value = value.replace('(', '').replace(')', '').replace('| 0', '').replace('|0', '').replace(' ', '')
-          left, right = value.split('+')
-          assert left == 'H_BASE'
-          value = str(main.staticbump + int(right))
-        all_imports[key] = value
-      if (value_concrete or main_value_concrete) and key in all_sendings:
-        del all_sendings[key] # import of external value no longer needed
-    main.imports_js = '\n'.join(['var %s = %s;' % (key, value) for key, value in all_imports.iteritems()]) + '\n'
-
-    if added_sending:
-      sendings_js = ', '.join(['%s: %s' % (key, value) for key, value in all_sendings.iteritems()])
-      sendings_start = main.post_js.find('}, { ')+5
-      sendings_end = main.post_js.find(' }, buffer);')
-      main.post_js = main.post_js[:sendings_start] + sendings_js + main.post_js[sendings_end:]
-
-    # check for undefined references to global variables
-    def check_import(key, value):
-      if value.startswith('+') or value.endswith('|0'): # ignore functions
-        if key not in all_sendings:
-          print >> sys.stderr, 'warning: external variable %s is still not defined after linking' % key
-    for key, value in all_imports.iteritems(): check_import(key, value)
-
-    # tables
-    f_bases = {}
-    f_sizes = {}
-    for table, data in self.tables.iteritems():
-      main.tables[table] = self.merge_tables(table, main.tables.get(table), data, replacements, f_bases, f_sizes)
-    main.combine_tables()
-    #print >> sys.stderr, 'f bases', f_bases
-
-    # relocate
-    temp = shared.Building.js_optimizer(self.filename, ['asm', 'relocate', 'last'], extra_info={
-      'replacements': replacements,
-      'fBases': f_bases,
-      'hBase': main.staticbump
-    })
-    #print >> sys.stderr, 'relocated side into', temp
-    relocated_funcs = AsmModule(temp)
-    shared.try_delete(temp)
-    main.extra_funcs_js = relocated_funcs.funcs_js.replace(js_optimizer.start_funcs_marker, '\n')
-
-    # update function table uses
-    ft_marker = 'FUNCTION_TABLE_'
-
-    def update_fts(what):
-      updates = []
-      i = 1 # avoid seeing marker in recursion
-      while 1:
-        i = what.find(ft_marker, i)
-        if i < 0: break;
-        start = i
-        end = what.find('[', start)
-        table = what[i:end]
-        if table not in f_sizes:
-          # table was not modified
-          i += len(ft_marker)
-          continue
-        nesting = 1
-        while nesting > 0:
-          next = what.find(']', end+1)
-          nesting -= 1
-          nesting += what.count('[', end+1, next)
-          end = next
-        assert end > 0
-        mask = what.rfind('&', start, end)
-        assert mask > 0 and end - mask <= 13
-        fixed = update_fts(what[start:mask+1] + str(f_sizes[table]-1) + ']')
-        updates.append((start, end, fixed))
-        i = end # additional function table uses were done by recursion
-      # apply updates
-      if len(updates) == 0: return what
-      parts = []
-      so_far = 0
-      for i in range(len(updates)):
-        start, end, fixed = updates[i]
-        parts.append(what[so_far:start])
-        parts.append(fixed)
-        so_far = end+1
-      parts.append(what[so_far:])
-      return ''.join(parts)
-
-    main.funcs_js = update_fts(main.funcs_js)
-    main.extra_funcs_js = update_fts(main.extra_funcs_js)
-
-    # global initializers
-    if self.global_inits:
-      my_global_inits = map(lambda init: replacements[init] if init in replacements else init, self.global_inits)
-      all_global_inits = map(lambda init: '{ func: function() { %s() } }' % init, main.global_inits + my_global_inits)
-      all_global_inits_js = '/* global initializers */ __ATINIT__.push(' + ','.join(all_global_inits) + ');'
-      if main.global_inits:
-        target = main.global_inits_js
-      else:
-        target = '// === Body ===\n'
-        all_global_inits_js = target + all_global_inits_js
-      main.pre_js = main.pre_js.replace(target, all_global_inits_js)
-
-    # exports
-    def rep_exp(export):
-      key, value = export.split(':')
-      if key in replacements:
-        repped = replacements[key]
-        return repped + ': ' + repped
-      return export
-    my_exports = map(rep_exp, self.exports)
-    exports = main.exports.union(my_exports)
-    main.exports_js = 'return {' + ','.join(list(exports)) + '};\n})\n'
-
-    # post
-    def rep_def(deff):
-      key = deff.split(' ')[1]
-      if key in replacements:
-        rep = replacements[key]
-        return 'var %s = Module["%s"] = asm["%s"];\n' % (rep, rep, rep)
-      return deff
-    my_module_defs = map(rep_def, self.module_defs)
-    new_module_defs = set(my_module_defs).difference(main.module_defs)
-    if len(new_module_defs) > 0:
-      position = main.post_js.find('Runtime.') # Runtime is the start of the hardcoded ones
-      main.post_js = main.post_js[:position] + ''.join(list(new_module_defs)) + '\n' + main.post_js[position:]
-
-  def write(self, out):
-    f = open(out, 'w')
-    f.write(self.pre_js)
-    f.write(self.pre_imports_js)
-    f.write(self.imports_js)
-    f.write(self.funcs_js)
-    f.write(self.extra_funcs_js)
-    f.write(self.tables_js)
-    f.write(self.exports_js)
-    f.write(self.post_js)
-    f.close()
-
-  # Utilities
-
-  def parse_tables(self, js):
-    tables = {}
-    parts = js.split(';')
-    for part in parts:
-      if '=' not in part: continue
-      part = part.split('var ')[1]
-      name, data = part.split(' = ')
-      tables[name] = data
-    return tables
-
-  def merge_tables(self, table, main, side, replacements, f_bases, f_sizes):
-    sig = table.split('_')[-1]
-    side = side[1:-1].split(',')
-    side = map(lambda f: replacements[f] if f in replacements else f, side)
-    if not main:
-      f_bases[sig] = 0
-      f_sizes[table] = len(side)
-      return '[' + ','.join(side) + ']'
-    main = main[1:-1].split(',')
-    # TODO: handle non-aliasing case too
-    assert len(main) % 2 == 0
-    f_bases[sig] = len(main)
-    ret = main + side
-    size = 2
-    while size < len(ret): size *= 2
-    aborter = ret[1] # we can assume odd indexes have an aborting function with the right signature
-    ret = ret + [aborter]*(size - len(ret))
-    assert len(ret) == size
-    f_sizes[table] = size
-    return '[' + ','.join(ret) + ']'
-
-  def combine_tables(self):
-    self.tables_js = '// EMSCRIPTEN_END_FUNCS\n'
-    for table, data in self.tables.iteritems():
-      self.tables_js += 'var %s = %s;\n' % (table, data)
-
 main = AsmModule(main)
 side = AsmModule(side)
 

data/modules/emscripten/emscripten.py

@@ -9,9 +9,8 @@ header files (so that the JS compiler can see the constants in those
 headers, for the libc implementation in JS).
 '''
 
-import os, sys, json, optparse, subprocess, re, time, multiprocessing, functools
+import os, sys, json, optparse, subprocess, re, time, multiprocessing, string
 
-from tools import shared
 from tools import jsrun, cache as cache_module, tempfiles
 from tools.response_file import read_response_file
 
@@ -26,6 +25,7 @@ def get_configuration():
   if hasattr(get_configuration, 'configuration'):
     return get_configuration.configuration
 
+  from tools import shared
   configuration = shared.Configuration(environ=os.environ)
   get_configuration.configuration = configuration
   return configuration
@@ -44,20 +44,25 @@ MIN_CHUNK_SIZE = 1024*1024
 MAX_CHUNK_SIZE = float(os.environ.get('EMSCRIPT_MAX_CHUNK_SIZE') or 'inf') # configuring this is just for debugging purposes
 
 def process_funcs((i, funcs, meta, settings_file, compiler, forwarded_file, libraries, compiler_engine, temp_files, DEBUG)):
-  funcs_file = temp_files.get('.func_%d.ll' % i).name
-  f = open(funcs_file, 'w')
-  f.write(funcs)
-  funcs = None
-  f.write('\n')
-  f.write(meta)
-  f.close()
-  out = jsrun.run_js(
-    compiler,
-    engine=compiler_engine,
-    args=[settings_file, funcs_file, 'funcs', forwarded_file] + libraries,
-    stdout=subprocess.PIPE,
-    cwd=path_from_root('src'))
-  tempfiles.try_delete(funcs_file)
+  try:
+    funcs_file = temp_files.get('.func_%d.ll' % i).name
+    f = open(funcs_file, 'w')
+    f.write(funcs)
+    funcs = None
+    f.write('\n')
+    f.write(meta)
+    f.close()
+    out = jsrun.run_js(
+      compiler,
+      engine=compiler_engine,
+      args=[settings_file, funcs_file, 'funcs', forwarded_file] + libraries,
+      stdout=subprocess.PIPE,
+      cwd=path_from_root('src'))
+  except KeyboardInterrupt:
+    # Python 2.7 seems to lock up when a child process throws KeyboardInterrupt
+    raise Exception()
+  finally:
+    tempfiles.try_delete(funcs_file)
   if DEBUG: print >> sys.stderr, '.'
   return out
 
@@ -286,8 +291,9 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None,
       indexed_functions.add(key)
     if settings.get('ASM_JS'):
       export_bindings = settings['EXPORT_BINDINGS']
+      export_all = settings['EXPORT_ALL']
       for key in curr_forwarded_json['Functions']['implementedFunctions'].iterkeys():
-        if key in all_exported_functions or (export_bindings and key.startswith('_emscripten_bind')):
+        if key in all_exported_functions or export_all or (export_bindings and key.startswith('_emscripten_bind')):
           exported_implemented_functions.add(key)
     for key, value in curr_forwarded_json['Functions']['unimplementedFunctions'].iteritems():
       forwarded_json['Functions']['unimplementedFunctions'][key] = value
@@ -463,6 +469,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None,
   }
 
 ''' % (sig, i, args, arg_coercions, jsret))
+      from tools import shared
       asm_setup += '\n' + shared.JS.make_invoke(sig) + '\n'
       basic_funcs.append('invoke_%s' % sig)
 
@@ -620,6 +627,19 @@ Runtime.stackRestore = function(top) { asm['stackRestore'](top) };
 // EMSCRIPTEN_END_FUNCS
 ''']
 
+  # Create symbol table for self-dlopen
+  if settings.get('DLOPEN_SUPPORT'):
+    symbol_table = {}
+    for k, v in forwarded_json['Variables']['indexedGlobals'].iteritems():
+       if forwarded_json['Variables']['globals'][k]['named']:
+         symbol_table[k] = v + forwarded_json['Runtime']['GLOBAL_BASE']
+    for raw in last_forwarded_json['Functions']['tables'].itervalues():
+      if raw == '': continue
+      table = map(string.strip, raw[raw.find('[')+1:raw.find(']')].split(","))
+      symbol_table.update(map(lambda x: (x[1], x[0]),
+        filter(lambda x: x[1] != '0', enumerate(table))))
+    outfile.write("var SYMBOL_TABLE = %s;" % json.dumps(symbol_table))
+
   for funcs_js_item in funcs_js: # do this loop carefully to save memory
     funcs_js_item = indexize(funcs_js_item)
     funcs_js_item = blockaddrsize(funcs_js_item)
@@ -789,7 +809,7 @@ WARNING: You should normally never use this! Use emcc instead.
   '''
 
   if len(positional) != 1:
-    raise RuntimeError('Must provide exactly one positional argument.')
+    raise RuntimeError('Must provide exactly one positional argument. Got ' + str(len(positional)) + ': "' + '", "'.join(positional) + '"')
   keywords.infile = os.path.abspath(positional[0])
   if isinstance(keywords.outfile, basestring):
     keywords.outfile = open(keywords.outfile, 'w')