1 files changed, 18 insertions, 1 deletions
diff --git a/src/jsifier.js b/src/jsifier.js
index 01ecd7d3..8021f8a1 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -32,7 +32,7 @@ function JSify(data, functionsOnly, givenFunctions) {
     // else. This lets us not hold any strings in memory, we simply print
     // things out as they are ready.
 
-    var shellFile = BUILD_AS_SHARED_LIB ? 'shell_sharedlib.js' : 'shell.js';
+    var shellFile = SHELL_FILE ? SHELL_FILE : (BUILD_AS_SHARED_LIB ? 'shell_sharedlib.js' : 'shell.js');
     var shellParts = read(shellFile).split('{{BODY}}');
     print(shellParts[0]);
     var preFile = BUILD_AS_SHARED_LIB ? 'preamble_sharedlib.js' : 'preamble.js';
@@ -522,6 +522,11 @@ function JSify(data, functionsOnly, givenFunctions) {
         func.JS += ' */\n';
       }
 
+      if (PRINT_SPLIT_FILE_MARKER) {
+          func.JS += '\n//FUNCTION_BEGIN_MARKER\n'
+          var associatedSourceFile = "NO_SOURCE";
+      }
+      
       func.JS += 'function ' + func.ident + '(' + paramIdents.join(', ') + ') {\n';
 
       if (PROFILE) {
@@ -572,6 +577,13 @@ function JSify(data, functionsOnly, givenFunctions) {
           if (EXECUTION_TIMEOUT > 0) {
             ret += indent + 'if (Date.now() - START_TIME >= ' + (EXECUTION_TIMEOUT*1000) + ') throw "Timed out!" + (new Error().stack);\n';
           }
+          
+          if (PRINT_SPLIT_FILE_MARKER && Debugging.on && Debugging.getAssociatedSourceFile(line.lineNum)) {
+            // Overwrite the associated source file for every line. The last line should contain the source file associated to
+            // the return value/address of outer most block (the marked function).
+            associatedSourceFile = Debugging.getAssociatedSourceFile(line.lineNum);
+          }
+          
           // for special labels we care about (for phi), mark that we visited them
           return ret + label.lines.map(function(line) { return line.JS + (Debugging.on ? Debugging.getComment(line.lineNum) : '') })
                                   .join('\n')
@@ -653,6 +665,11 @@ function JSify(data, functionsOnly, givenFunctions) {
         func.JS += '  return' + (func.returnType !== 'void' ? ' null' : '') + ';\n';
       }
       func.JS += '}\n';
+      
+      if (PRINT_SPLIT_FILE_MARKER) {
+          func.JS += '\n//FUNCTION_END_MARKER_OF_SOURCE_FILE_' + associatedSourceFile + '\n';
+      }
+      
       if (func.ident in EXPORTED_FUNCTIONS) {
         func.JS += 'Module["' + func.ident + '"] = ' + func.ident + ';';
       }