diff options
Diffstat (limited to 'src/modules.js')
| -rw-r--r-- | src/modules.js | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/modules.js b/src/modules.js index b5a30866..a08d6f1a 100644 --- a/src/modules.js +++ b/src/modules.js @@ -13,8 +13,10 @@ var LLVM = { ACCESS_OPTIONS: set('volatile', 'atomic'), INVOKE_MODIFIERS: set('alignstack', 'alwaysinline', 'inlinehint', 'naked', 'noimplicitfloat', 'noinline', 'alwaysinline attribute.', 'noredzone', 'noreturn', 'nounwind', 'optsize', 'readnone', 'readonly', 'ssp', 'sspreq'), SHIFTS: set('ashr', 'lshr', 'shl'), - PHI_REACHERS: set('branch', 'switch', 'invoke'), + PHI_REACHERS: set('branch', 'switch', 'invoke', 'indirectbr'), EXTENDS: set('sext', 'zext'), + COMPS: set('icmp', 'fcmp'), + CONVERSIONS: set('inttoptr', 'ptrtoint', 'uitofp', 'sitofp', 'fptosi', 'fptoui'), INTRINSICS_32: set('_llvm_memcpy_p0i8_p0i8_i64', '_llvm_memmove_p0i8_p0i8_i64', '_llvm_memset_p0i8_i64'), // intrinsics that need args converted to i32 in USE_TYPED_ARRAYS == 2 }; LLVM.GLOBAL_MODIFIERS = set(keys(LLVM.LINKAGES).concat(['constant', 'global', 'hidden'])); @@ -263,7 +265,7 @@ var Functions = { function emptyTable(sig) { return zeros(total); } - var tables = {}; + var tables = { pre: '' }; if (ASM_JS) { ['v', 'vi', 'ii', 'iii'].forEach(function(sig) { // add some default signatures that are used in the library tables[sig] = emptyTable(sig); // TODO: make them compact @@ -276,7 +278,9 @@ var Functions = { tables[sig][this.indexedFunctions[ident]] = ident; } var generated = false; + var wrapped = {}; for (var t in tables) { + if (t == 'pre') continue; generated = true; var table = tables[t]; for (var i = 0; i < table.length; i++) { @@ -293,6 +297,22 @@ var Functions = { table[i] = (libName.indexOf('.') < 0 ? '_' : '') + libName; } } + var curr = table[i]; + if (curr && Functions.unimplementedFunctions[table[i]]) { + // This is a library function, we can't just put it in the function table, need a wrapper + if (!wrapped[curr]) { + var args = '', arg_coercions = '', call = curr + '(', ret = t[0] == 'v' ? '' : ('return ' + (t[0] == 'f' ? '+0' : '0')); + for (var i = 1; i < t.length; i++) { + args += (i > 1 ? ',' : '') + 'a' + i; + arg_coercions += 'a' + i + '=' + asmCoercion('a' + i, t[i] == 'f' ? 'float' : 'i32') + ';'; + call += (i > 1 ? ',' : '') + asmCoercion('a' + i, t[i] == 'f' ? 'float' : 'i32'); + } + call += ')'; + tables.pre += 'function ' + curr + '__wrapper(' + args + ') { ' + arg_coercions + ' ; ' + call + ' ; ' + ret + ' }\n'; + wrapped[curr] = 1; + } + table[i] = curr + '__wrapper'; + } } var indices = table.toString().replace('"', ''); if (BUILD_AS_SHARED_LIB) { |