diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-02-11 10:20:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-02-11 14:54:57 -0800 |
| commit | 93f440f4d676ed8a042fd5ed678dc0aee01bda5c (patch) | |
| tree | b293914481977e71b22456991f206f9f6485ef2e /src | |
| parent | a4d78b4c3add1ee2e4d0019a1d6cc6c8121fb7a5 (diff) | |
only support i64 mode 1 in ta2
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler.js | 1 | ||||
| -rw-r--r-- | src/library.js | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler.js b/src/compiler.js index bf9d9c54..d37bc68b 100644 --- a/src/compiler.js +++ b/src/compiler.js @@ -138,6 +138,7 @@ EXPORTED_GLOBALS = set(EXPORTED_GLOBALS); // Settings sanity checks assert(!(USE_TYPED_ARRAYS === 2 && QUANTUM_SIZE !== 4), 'For USE_TYPED_ARRAYS == 2, must have normal QUANTUM_SIZE of 4'); +assert(!(USE_TYPED_ARRAYS !== 2 && I64_MODE === 1), 'i64 mode 1 is only supported with typed arrays mode 2'); // Output some info and warnings based on settings diff --git a/src/library.js b/src/library.js index b255ea9a..39f7867d 100644 --- a/src/library.js +++ b/src/library.js @@ -3481,10 +3481,16 @@ LibraryManager.library = { ___setErrNo(ERRNO_CODES.ERANGE); } -#if I64_MODE == 1 +#if USE_TYPED_ARRAYS == 2 if (bits == 64) { ret = [{{{ splitI64('ret') }}}]; } +#else +#if I64_MODE == 1 + if (bits == 64) { + ret = {{{ splitI64('ret') }}}; + } +#endif #endif return ret; |