aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortingyuan <thuang@mozilla.com>2013-04-15 14:16:44 +0800
committerAlon Zakai <alonzakai@gmail.com>2013-05-21 17:09:58 -0700
commitde2dab04c9cd604c138efd6bec43071ded5eaf27 (patch)
treef449a45b97819c9baf2d520c85ebff93bbb70439
parent0cc707a60b3aaa18c4caaf366e8edb420eb09ad3 (diff)
mmap(): Align to malloc's default alignment instead of pages.
-rw-r--r--src/library.js4
-rw-r--r--tools/file_packager.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library.js b/src/library.js
index d0097c19..698569a5 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3732,7 +3732,7 @@ LibraryManager.library = {
if (!_mmap.mappings) _mmap.mappings = {};
if (stream == -1) {
- var ptr = _valloc(num);
+ var ptr = _malloc(num);
if (!ptr) return -1;
_memset(ptr, 0, num);
allocated = true;
@@ -3755,7 +3755,7 @@ LibraryManager.library = {
contents = Array.prototype.slice.call(contents, offset, offset+num);
}
}
- ptr = _valloc(num);
+ ptr = _malloc(num);
if (!ptr) return -1;
HEAPU8.set(contents, ptr);
allocated = true;
diff --git a/tools/file_packager.py b/tools/file_packager.py
index 0154e84e..646444e5 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -352,7 +352,7 @@ if has_preloaded:
use_data += '''
curr = DataRequest.prototype.requests['%s'];
var data = byteArray.subarray(%d, %d);
- ptr = _valloc(%d);
+ ptr = _malloc(%d);
HEAPU8.set(data, ptr);
curr.response = HEAPU8.subarray(ptr, ptr + %d);
curr.onload();