diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-06-02 16:40:48 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-06-02 16:40:48 -0700 |
| commit | a4393330dbe425ee5253812738e2dfaed631f9b1 (patch) | |
| tree | 57558e773b25397bc96b629fcf8d98f52aac921b /src/jsifier.js | |
| parent | a0ca1cd1d41195ce61da397a82ef815d15d41fc9 (diff) | |
| parent | 8823b6305fa8f488c587018afe84210eca1150a8 (diff) | |
Merge branch 'update_simd' of github.com:huningxin/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'src/jsifier.js')
| -rw-r--r-- | src/jsifier.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 065c66a8..791273f4 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -1321,10 +1321,10 @@ function JSify(data, functionsOnly) { // vector load var native = getVectorNativeType(item.valueType); var base = getSIMDName(native); - return base + '32x4(' + makeGetValue(value, 0, native, 0, item.unsigned, 0, item.align) + ',' + - makeGetValue(value, 4, native, 0, item.unsigned, 0, item.align) + ',' + - makeGetValue(value, 8, native, 0, item.unsigned, 0, item.align) + ',' + - makeGetValue(value, 12, native, 0, item.unsigned, 0, item.align) + ');'; + return 'SIMD.' + base + '32x4(' + makeGetValue(value, 0, native, 0, item.unsigned, 0, item.align) + ',' + + makeGetValue(value, 4, native, 0, item.unsigned, 0, item.align) + ',' + + makeGetValue(value, 8, native, 0, item.unsigned, 0, item.align) + ',' + + makeGetValue(value, 12, native, 0, item.unsigned, 0, item.align) + ');'; } var impl = item.ident ? getVarImpl(item.funcData, item.ident) : VAR_EMULATED; switch (impl) { @@ -1395,7 +1395,7 @@ function JSify(data, functionsOnly) { } for (var i = 0; i < 4; i++) assert(mask[0] == 0 || mask == 1); i = 0; - return base + '32x4(' + mask.map(function(m) { + return 'SIMD.' + base + '32x4(' + mask.map(function(m) { return (m == 1 ? second : first) + '.' + simdLane[i++]; }).join(',') + ')'; } |