aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-28 18:15:11 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-28 18:15:11 -0800
commit40258fa6e8dffd4b3f63a08dccc772458c3959aa (patch)
tree8f8829094b5c8cd680934fb7e8d91db3443bb32b /src
parent96713d72568b16d6789b58acce336090f2e9ed4d (diff)
fix memset return value
Diffstat (limited to 'src')
-rw-r--r--src/library.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js
index 048a55fd..dc2ef192 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3570,7 +3570,7 @@ LibraryManager.library = {
memset__inline: function(ptr, value, num, align) {
return makeSetValues(ptr, 0, value, 'null', num, align);
},
- memset__sig: 'viii',
+ memset__sig: 'iiii',
memset__asm: true,
memset: function(ptr, value, num) {
#if USE_TYPED_ARRAYS == 2
@@ -3599,8 +3599,10 @@ LibraryManager.library = {
{{{ makeSetValueAsm('ptr', 0, 'value', 'i8') }}};
ptr = (ptr+1)|0;
}
+ return (ptr-num)|0;
#else
{{{ makeSetValues('ptr', '0', 'value', 'null', 'num') }}};
+ return ptr;
#endif
},
llvm_memset_i32: 'memset',