diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-03-07 18:04:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-03-07 18:04:53 -0800 |
| commit | f4ee4c8c4b5b8d7b22df3db23283e0b95677cc3c (patch) | |
| tree | 3ae6e2b102341e2d31175e76479ec6c1332fb9a4 | |
| parent | 8ea95234f8827eea1b846c427040f94e932e7f46 (diff) | |
| parent | 4180b3ac7e779f7101791b3f9ca3860bc16e1e15 (diff) | |
Merge pull request #932 from tobydox/incoming
Emit correct code for setjmp() calls when in UNALIGNED_MEMORY mode
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/library.js | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -52,4 +52,5 @@ a license to everyone to use it as detailed in LICENSE.) * Roger Braun <roger@rogerbraun.net> * Vladimir Vukicevic <vladimir@pobox.com> (copyright owned by Mozilla Foundation) * Lorant Pinter <lorant.pinter@prezi.com> +* Tobias Doerffel <tobias.doerffel@gmail.com> diff --git a/src/library.js b/src/library.js index 075f9750..7c9cc22c 100644 --- a/src/library.js +++ b/src/library.js @@ -6199,7 +6199,7 @@ LibraryManager.library = { setjmp__inline: function(env) { // Save the label - return '(tempInt = setjmpId++, mySetjmpIds[tempInt] = 1, setjmpLabels[tempInt] = label,' + makeSetValue(env, '0', 'tempInt', 'i32') + ', 0)'; + return '(tempInt = setjmpId++, mySetjmpIds[tempInt] = 1, setjmpLabels[tempInt] = label,' + makeSetValue(env, '0', 'tempInt', 'i32', undefined, undefined, undefined, undefined, ',') + ', 0)'; }, longjmp: function(env, value) { |