aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Doerffel <tobias.doerffel@gmail.com>2013-02-03 11:59:53 +0100
committerTobias Doerffel <tobias.doerffel@gmail.com>2013-03-06 18:23:22 +0100
commit4180b3ac7e779f7101791b3f9ca3860bc16e1e15 (patch)
treeef4f11f686afb7085d4b31fe402967df815b01a6
parent97407b218c6d816e964f1faa1420db46ea1fec3c (diff)
Emit correct code for setjmp() calls when in UNALIGNED_MEMORY mode
makeSetValue() returns multiple statements when in UNALIGNED_MEMORY mode and thus have to be separated by commas in this context.
-rw-r--r--AUTHORS1
-rw-r--r--src/library.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 296d4150..0741022f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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 a5166c72..8220f780 100644
--- a/src/library.js
+++ b/src/library.js
@@ -6188,7 +6188,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) {