diff options
| -rw-r--r-- | src/intertyper.js | 4 | ||||
| -rw-r--r-- | src/jsifier.js | 2 | ||||
| -rw-r--r-- | tests/runner.py | 3 | ||||
| -rwxr-xr-x | tools/emmaken.py | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/intertyper.js b/src/intertyper.js index 3db09516..b181be61 100644 --- a/src/intertyper.js +++ b/src/intertyper.js @@ -47,6 +47,10 @@ var Debugging = { return ret; }, + + getComment: function(lineNum) { + return lineNum in this.llvmLineToSourceLine ? ' //@line ' + this.llvmLineToSourceLine[lineNum] : ''; + } }; //! @param parseFunctions We parse functions only on later passes, since we do not diff --git a/src/jsifier.js b/src/jsifier.js index 32cf263d..67c6ac06 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -436,7 +436,7 @@ function JSify(data, functionsOnly, givenTypes, givenFunctions, givenGlobalVaria ret += indent + 'if (Date.now() - START_TIME >= ' + (EXECUTION_TIMEOUT*1000) + ') throw "Timed out!" + (new Error().stack);\n'; } // 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 ? ' //@line ' + Debugging.llvmLineToSourceLine[line.lineNum] : '') }) + return ret + label.lines.map(function(line) { return line.JS + (Debugging.on ? Debugging.getComment(line.lineNum) : '') }) .join('\n') .split('\n') // some lines include line breaks .map(function(line) { return indent + line }) diff --git a/tests/runner.py b/tests/runner.py index 1e6ef8d6..847ef9e6 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -1552,8 +1552,9 @@ if 'benchmark' not in sys.argv: os.chdir(ft_dir) env = os.environ.copy() env['RANLIB'] = env['AR'] = env['CXX'] = env['CC'] = EMMAKEN + env['CFLAGS'] = '%s' % ' '.join(COMPILER_OPTS) env['EMMAKEN_COMPILER'] = COMPILER - output = Popen(['./configure'], stdout=PIPE, stderr=STDOUT, env=env).communicate()[0] + Popen(['./configure'], stdout=PIPE, stderr=STDOUT, env=env).communicate()[0] Popen(['make', '-j', '2'] + make_args, stdout=PIPE, stderr=STDOUT, env=env).communicate()[0] bc_file = os.path.join(ft_dir, generated_lib) shutil.copyfile(bc_file, bc_file + '.bc') diff --git a/tools/emmaken.py b/tools/emmaken.py index f100255f..3590f86b 100755 --- a/tools/emmaken.py +++ b/tools/emmaken.py @@ -54,7 +54,7 @@ try: CXX = os.environ.get('EMMAKEN_COMPILER') or LLVM_GCC CC = to_cc(CXX) - CC_ARG_SKIP = ['-g', '-O1', '-O2', '-O3'] + CC_ARG_SKIP = ['-O1', '-O2', '-O3'] CC_ADDITIONAL_ARGS = ['-m32', '-U__i386__', '-U__x86_64__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87'] ALLOWED_LINK_ARGS = ['-f', '-help', '-o', '-print-after', '-print-after-all', '-print-before', '-print-before-all', '-time-passes', '-v', '-verify-dom-info', '-version' ] |