diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /src/parseTools.js | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'src/parseTools.js')
| -rw-r--r-- | src/parseTools.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parseTools.js b/src/parseTools.js index 34e064f0..d25f9bd0 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -2290,7 +2290,7 @@ function processMathop(item) { case 'trunc': { return '((' + idents[0] + '[0]) & ' + (Math.pow(2, bitsLeft)-1) + ')'; } - case 'select': return idents[0] + ' ? ' + makeCopyI64(idents[1]) + ' : ' + makeCopyI64(idents[2]); + case 'select': return '(' + idents[0] + ' ? ' + makeCopyI64(idents[1]) + ' : ' + makeCopyI64(idents[2]) + ')';; case 'ptrtoint': return makeI64(idents[0], 0); case 'inttoptr': { var m = /\(?\[(\d+),\d+\]\)?/.exec(idents[0]); @@ -2501,7 +2501,7 @@ function processMathop(item) { if (PRECISE_F32) return 'Math_fround(' + idents[0] + ')'; return idents[0]; } - case 'select': return idents[0] + '?' + asmEnsureFloat(idents[1], item.type) + ':' + asmEnsureFloat(idents[2], item.type); + case 'select': return '(' + idents[0] + '?' + asmEnsureFloat(idents[1], item.type) + ':' + asmEnsureFloat(idents[2], item.type) + ')'; case 'ptrtoint': case 'inttoptr': { var ret = ''; if (QUANTUM_SIZE == 1) { |