add asm imports and exports, hello world works

3 files changed, 4 insertions, 2 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index a7c04c89..90e74db6 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -420,6 +420,7 @@ function JSify(data, functionsOnly, givenFunctions) {
             snippet = snippet.replace('{', '{ var ret = (function() { if (Runtime.debug) Module.printErr("[library call:' + ident + ': " + Array.prototype.slice.call(arguments).map(Runtime.prettyPrint) + "]"); ');
             snippet = snippet.substr(0, snippet.length-1) + '}).apply(this, arguments); if (Runtime.debug && typeof ret !== "undefined") Module.printErr("  [     return:" + Runtime.prettyPrint(ret)); return ret; }';
           }
+          if (ASM_JS) Functions.libraryFunctions.push(ident);
         }
 
         var postsetId = ident + '__postset';
diff --git a/src/modules.js b/src/modules.js
index f9173f8e..94fe582c 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -218,6 +218,7 @@ var Types = {
 var Functions = {
   // All functions that will be implemented in this file
   implementedFunctions: {},
+  libraryFunctions: [], // functions added from the library
 
   indexedFunctions: {},
   nextIndex: 2, // Start at a non-0 (even, see below) value
diff --git a/src/postamble.js b/src/postamble.js
index 144b5af9..83a4daa6 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -19,11 +19,11 @@ Module.callMain = function callMain(args) {
 
 #if CATCH_EXIT_CODE
   try {
-    return _main(argc, argv, 0);
+    return Module['_main'](argc, argv, 0);
   }
   catch(e) { if (e.name == "ExitStatus") return e.status; throw e; }
 #else
-  return _main(argc, argv, 0);
+  return Module['_main'](argc, argv, 0);
 #endif
 }