Skip to content

Commit 549f838

Browse files
committed
Prefer calloc over of malloc+zeroMemory. NFC
IIUC, there are cases where the allocator can take advantage of the fact that it knows the memory is fresh and avoid the memset completely.
1 parent 9445d6a commit 549f838

11 files changed

+16
-18
lines changed

src/library_dylink.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ var LibraryDylink = {
363363
// Allocate memory even if malloc isn't ready yet. The allocated memory here
364364
// must be zero initialized since its used for all static data, including bss.
365365
$getMemory__noleakcheck: true,
366-
$getMemory__deps: ['$GOT', '__heap_base', '$zeroMemory', '$alignMemory', 'malloc'],
366+
$getMemory__deps: ['$GOT', '__heap_base', '$alignMemory', 'calloc'],
367367
$getMemory: (size) => {
368368
// After the runtime is initialized, we must only use sbrk() normally.
369369
#if DYLINK_DEBUG
@@ -373,7 +373,7 @@ var LibraryDylink = {
373373
// Currently we don't support freeing of static data when modules are
374374
// unloaded via dlclose. This function is tagged as `noleakcheck` to
375375
// avoid having this reported as leak.
376-
return zeroMemory(_malloc(size), size);
376+
return _calloc(size, 1);
377377
}
378378
var ret = ___heap_base;
379379
// Keep __heap_base stack aligned.
@@ -597,7 +597,7 @@ var LibraryDylink = {
597597
$loadWebAssemblyModule__deps: [
598598
'$loadDynamicLibrary', '$getMemory',
599599
'$relocateExports', '$resolveGlobalSymbol', '$GOTHandler',
600-
'$getDylinkMetadata', '$alignMemory', '$zeroMemory',
600+
'$getDylinkMetadata', '$alignMemory',
601601
'$currentModuleWeakSymbols',
602602
'$updateTableMap',
603603
'$wasmTable',

src/library_pthread.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var LibraryPThread = {
3636
$PThread__deps: ['_emscripten_thread_init',
3737
'$killThread',
3838
'$terminateWorker',
39-
'$cancelThread', '$cleanupThread', '$zeroMemory',
39+
'$cancelThread', '$cleanupThread',
4040
#if MAIN_MODULE
4141
'$markAsFinished',
4242
#endif

src/library_sdl.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ var LibrarySDL = {
13571357
return SDL.version;
13581358
},
13591359

1360-
SDL_Init__deps: ['$zeroMemory', 'memcpy'],
1360+
SDL_Init__deps: ['calloc', 'memcpy'],
13611361
SDL_Init__proxy: 'sync',
13621362
SDL_Init__docs: '/** @param{number} initFlags */',
13631363
SDL_Init: (initFlags) => {
@@ -1376,8 +1376,7 @@ var LibrarySDL = {
13761376
}
13771377

13781378
window.addEventListener("unload", SDL.receiveEvent);
1379-
SDL.keyboardState = _malloc(0x10000); // Our SDL needs 512, but 64K is safe for older SDLs
1380-
zeroMemory(SDL.keyboardState, 0x10000);
1379+
SDL.keyboardState = _calloc(0x10000, 1); // Our SDL needs 512, but 64K is safe for older SDLs
13811380
// Initialize this structure carefully for closure
13821381
SDL.DOMEventToSDLEvent['keydown'] = 0x300 /* SDL_KEYDOWN */;
13831382
SDL.DOMEventToSDLEvent['keyup'] = 0x301 /* SDL_KEYUP */;
@@ -1413,11 +1412,10 @@ var LibrarySDL = {
14131412
return 1;
14141413
},
14151414

1416-
SDL_GetVideoInfo__deps: ['$zeroMemory'],
1415+
SDL_GetVideoInfo__deps: ['calloc'],
14171416
SDL_GetVideoInfo__proxy: 'sync',
14181417
SDL_GetVideoInfo: () => {
1419-
var ret = _malloc({{{ C_STRUCTS.SDL_VideoInfo.__size__ }}});
1420-
zeroMemory(ret, {{{ C_STRUCTS.SDL_version.__size__ }}});
1418+
var ret = _calloc({{{ C_STRUCTS.SDL_VideoInfo.__size__ }}}, 1);
14211419
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_w, 'Module["canvas"].width', 'i32') }}};
14221420
{{{ makeSetValue('ret', C_STRUCTS.SDL_VideoInfo.current_h, 'Module["canvas"].height', 'i32') }}};
14231421
return ret;

test/other/codesize/test_codesize_hello_dylink.exports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ __wasm_apply_data_relocs
22
__wasm_call_ctors
33
_emscripten_stack_alloc
44
_emscripten_stack_restore
5+
calloc
56
dynCall_jiji
67
emscripten_stack_get_current
78
main
8-
malloc
99
setThrew

test/other/codesize/test_codesize_hello_dylink.funcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $__wasm_apply_global_relocs
88
$__wasm_call_ctors
99
$_emscripten_stack_alloc
1010
$_emscripten_stack_restore
11-
$dlmalloc
11+
$dlcalloc
1212
$emscripten_stack_get_current
1313
$legalstub$dynCall_jiji
1414
$main
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6293
1+
6284
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13851
1+
13838
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9347
1+
9760

test/test_core.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,9 +1943,7 @@ def test_em_asm_side_module(self):
19431943
def test_em_js(self, args, force_c):
19441944
if '-sMAIN_MODULE=2' in args:
19451945
self.check_dylink()
1946-
else:
1947-
self.emcc_args += ['-sEXPORTED_FUNCTIONS=_main,_malloc']
1948-
self.emcc_args += args
1946+
self.emcc_args += ['-sEXPORTED_FUNCTIONS=_main,_malloc'] + args
19491947
if '-pthread' in args:
19501948
self.setup_node_pthreads()
19511949

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,6 +2198,7 @@ def test_dylink_pthread_bigint_em_asm(self):
21982198
def test_dylink_pthread_bigint_em_js(self):
21992199
self.set_setting('MAIN_MODULE', 2)
22002200
self.set_setting('WASM_BIGINT')
2201+
self.set_setting('EXPORTED_FUNCTIONS', '_malloc,_main')
22012202
self.emcc_args += ['-Wno-experimental', '-pthread']
22022203
self.do_runf('core/test_em_js.cpp')
22032204

0 commit comments

Comments
 (0)