aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <azakai@mozilla.com>2010-12-30 19:31:57 -0800
committerAlon Zakai <azakai@mozilla.com>2010-12-30 19:31:57 -0800
commit47f29aed8aa7905c24562188d2d7e2861972ebed (patch)
tree61ba7e35d5dcd37514849421c3c188e36211ef24
parent091b6d662ee1e80dedc7d779d2b892acc95f7837 (diff)
stub for calloc
-rw-r--r--src/preamble.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/preamble.js b/src/preamble.js
index 4eb99d18..c743dd49 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -184,7 +184,7 @@ var STACK_ROOT, STACKTOP, STACK_MAX;
var STATICTOP;
// Mangled |new| and |free| (various manglings, for int, long params; new and new[], etc.
-var _malloc, _free, __Znwj, __Znaj, __Znam, __Znwm, __ZdlPv, __ZdaPv;
+var _malloc, _calloc, _free, __Znwj, __Znaj, __Znam, __Znwm, __ZdlPv, __ZdaPv;
var HAS_TYPED_ARRAYS = false;
var TOTAL_MEMORY = 50*1024*1024;
@@ -192,7 +192,8 @@ var TOTAL_MEMORY = 50*1024*1024;
function __initializeRuntime__() {
// If we don't have malloc/free implemented, use a simple implementation.
Module['_malloc'] = _malloc = __Znwj = __Znaj = __Znam = __Znwm = Module['_malloc'] ? Module['_malloc'] : Runtime.staticAlloc;
- Module['_free'] = _free = __ZdlPv = __ZdaPv = Module['_free'] ? Module['_free'] : function() { };
+ Module['_calloc'] = _calloc = Module['_calloc'] ? Module['_calloc'] : function(n, s) { return _malloc(n*s) };
+ Module['_free'] = _free = __ZdlPv = __ZdaPv = Module['_free'] ? Module['_free'] : function() { };
#if USE_TYPED_ARRAYS
// TODO: Remove one of the 3 heaps!