Skip to content

Commit e5ee191

Browse files
sbc100sbc100
authored
Update JS library signatures (#18995)
This change was 100% automatically generated by the tool I'm working on as part of #18979. Once this change lands, I plan to completely remove these signatures and instead auto-generate them, but in order to make that change into no-op I'd like to first update them all in-place. See #18985
1 parent b2dbf78 commit e5ee191

19 files changed

+384
-360
lines changed

‎src/embind/embind.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ var LibraryEmbind = {
13181318

13191319
$structRegistrations: {},
13201320

1321-
_embind_register_value_object__sig: 'viiiiii',
1321+
_embind_register_value_object__sig: 'vpppppp',
13221322
_embind_register_value_object__deps: [
13231323
'$structRegistrations', '$readLatin1String', '$embind__requireFunction'],
13241324
_embind_register_value_object: function(
@@ -1337,7 +1337,7 @@ var LibraryEmbind = {
13371337
};
13381338
},
13391339

1340-
_embind_register_value_object_field__sig: 'viiiiiiiiii',
1340+
_embind_register_value_object_field__sig: 'vpppppppppp',
13411341
_embind_register_value_object_field__deps: [
13421342
'$structRegistrations', '$readLatin1String', '$embind__requireFunction'],
13431343
_embind_register_value_object_field: function(
@@ -1363,7 +1363,7 @@ var LibraryEmbind = {
13631363
});
13641364
},
13651365

1366-
_embind_finalize_value_object__sig: 'ii',
1366+
_embind_finalize_value_object__sig: 'vp',
13671367
_embind_finalize_value_object__deps: [
13681368
'$structRegistrations', '$runDestructors',
13691369
'$simpleReadValueFromPointer', '$whenDependentTypesAreResolved'],
@@ -2598,7 +2598,7 @@ var LibraryEmbind = {
25982598
exposePublicSymbol(name, ctor);
25992599
},
26002600

2601-
_embind_register_enum_value__sig: 'vppi',
2601+
_embind_register_enum_value__sig: 'vppp',
26022602
_embind_register_enum_value__deps: ['$createNamedFunction', '$readLatin1String', '$requireRegisteredType'],
26032603
_embind_register_enum_value: function(rawEnumType, name, enumValue) {
26042604
var enumType = requireRegisteredType(rawEnumType, 'enum');

‎src/embind/emval.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,15 +327,15 @@ var LibraryEmVal = {
327327
},
328328

329329
_emval_as_int64__deps: ['$Emval', '$requireRegisteredType'],
330-
_emval_as_int64__sig: 'dppp',
330+
_emval_as_int64__sig: 'jpp',
331331
_emval_as_int64: function(handle, returnType, destructorsRef) {
332332
handle = Emval.toValue(handle);
333333
returnType = requireRegisteredType(returnType, 'emval::as');
334334
return returnType['toWireType'](null, handle);
335335
},
336336

337337
_emval_as_uint64__deps: ['$Emval', '$requireRegisteredType'],
338-
_emval_as_uint64__sig: 'dppp',
338+
_emval_as_uint64__sig: 'jpp',
339339
_emval_as_uint64: function(handle, returnType, destructorsRef) {
340340
handle = Emval.toValue(handle);
341341
returnType = requireRegisteredType(returnType, 'emval::as');
@@ -381,7 +381,7 @@ var LibraryEmVal = {
381381
return !object;
382382
},
383383

384-
_emval_call__sig: 'ppppp',
384+
_emval_call__sig: 'ppipp',
385385
_emval_call__deps: ['$emval_lookupTypes', '$Emval'],
386386
_emval_call: function(handle, argCount, argTypes, argv) {
387387
handle = Emval.toValue(handle);
@@ -427,7 +427,7 @@ var LibraryEmVal = {
427427
},
428428

429429
$emval_registeredMethods: [],
430-
_emval_get_method_caller__sig: 'ppp',
430+
_emval_get_method_caller__sig: 'pip',
431431
_emval_get_method_caller__deps: ['$emval_addMethodCaller', '$emval_lookupTypes', '$new_', '$makeLegalFunctionName', '$emval_registeredMethods'],
432432
_emval_get_method_caller: function(argCount, argTypes) {
433433
var types = emval_lookupTypes(argCount, argTypes);
@@ -564,7 +564,7 @@ var LibraryEmVal = {
564564
},
565565

566566
_emval_throw__deps: ['$Emval'],
567-
_emval_throw__sig: 'vp',
567+
_emval_throw__sig: 'ip',
568568
_emval_throw: function(object) {
569569
object = Emval.toValue(object);
570570
throw object;

‎src/library.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ mergeInto(LibraryManager.library, {
490490
},
491491

492492
_gmtime_js__deps: ['$readI53FromI64'],
493-
_gmtime_js__sig: 'ipp',
493+
_gmtime_js__sig: 'vpp',
494494
_gmtime_js: function(time, tmPtr) {
495495
var date = new Date({{{ makeGetValue('time', 0, 'i53') }}}*1000);
496496
{{{ makeSetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'date.getUTCSeconds()', 'i32') }}};
@@ -525,7 +525,7 @@ mergeInto(LibraryManager.library, {
525525
},
526526

527527
_localtime_js__deps: ['$readI53FromI64', '$ydayFromDate'],
528-
_localtime_js__sig: 'ipp',
528+
_localtime_js__sig: 'vpp',
529529
_localtime_js: function(time, tmPtr) {
530530
var date = new Date({{{ makeGetValue('time', 0, 'i53') }}}*1000);
531531
{{{ makeSetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'date.getSeconds()', 'i32') }}};
@@ -1831,7 +1831,7 @@ mergeInto(LibraryManager.library, {
18311831
// note: lots of leaking here!
18321832
gethostbyaddr__deps: ['$DNS', '$getHostByName', '$inetNtop4', '$setErrNo'],
18331833
gethostbyaddr__proxy: 'sync',
1834-
gethostbyaddr__sig: 'ipii',
1834+
gethostbyaddr__sig: 'ppii',
18351835
gethostbyaddr: function (addr, addrlen, type) {
18361836
if (type !== {{{ cDefine('AF_INET') }}}) {
18371837
setErrNo({{{ cDefine('EAFNOSUPPORT') }}});
@@ -1877,7 +1877,7 @@ mergeInto(LibraryManager.library, {
18771877

18781878
gethostbyname_r__deps: ['gethostbyname', 'memcpy', 'free'],
18791879
gethostbyname_r__proxy: 'sync',
1880-
gethostbyname_r__sig: 'ipppipp',
1880+
gethostbyname_r__sig: 'ipppppp',
18811881
gethostbyname_r: function(name, ret, buf, buflen, out, err) {
18821882
var data = _gethostbyname(name);
18831883
_memcpy(ret, data, {{{ C_STRUCTS.hostent.__size__ }}});
@@ -2671,7 +2671,7 @@ mergeInto(LibraryManager.library, {
26712671
debugger;
26722672
},
26732673

2674-
emscripten_print_double__sig: 'iipi',
2674+
emscripten_print_double__sig: 'idpi',
26752675
emscripten_print_double: function(x, to, max) {
26762676
var str = x + '';
26772677
if (to) return stringToUTF8(str, to, max);
@@ -3066,7 +3066,7 @@ mergeInto(LibraryManager.library, {
30663066
return ASM_CONSTS[code].apply(null, args);
30673067
},
30683068
emscripten_asm_const_int_sync_on_main_thread__deps: ['$runMainThreadEmAsm'],
3069-
emscripten_asm_const_int_sync_on_main_thread__sig: 'iiii',
3069+
emscripten_asm_const_int_sync_on_main_thread__sig: 'ippp',
30703070
emscripten_asm_const_int_sync_on_main_thread: function(code, sigPtr, argbuf) {
30713071
return runMainThreadEmAsm(code, sigPtr, argbuf, 1);
30723072
},
@@ -3413,7 +3413,7 @@ mergeInto(LibraryManager.library, {
34133413

34143414
// Use program_invocation_short_name and program_invocation_name in compiled
34153415
// programs. This function is for implementing them.
3416-
_emscripten_get_progname__sig: 'vpp',
3416+
_emscripten_get_progname__sig: 'vpi',
34173417
_emscripten_get_progname: function(str, len) {
34183418
#if !MINIMAL_RUNTIME
34193419
#if ASSERTIONS

‎src/library_async.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ mergeInto(LibraryManager.library, {
608608
},
609609
},
610610

611-
emscripten_fiber_swap__sig: 'vii',
611+
emscripten_fiber_swap__sig: 'vpp',
612612
emscripten_fiber_swap__deps: ["$Asyncify", "$Fibers"],
613613
emscripten_fiber_swap: function(oldFiber, newFiber) {
614614
if (ABORT) return;

‎src/library_browser.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ var LibraryBrowser = {
779779

780780
emscripten_run_preload_plugins__deps: ['$PATH'],
781781
emscripten_run_preload_plugins__proxy: 'sync',
782-
emscripten_run_preload_plugins__sig: 'iiii',
782+
emscripten_run_preload_plugins__sig: 'ippp',
783783
emscripten_run_preload_plugins: function(file, onload, onerror) {
784784
{{{ runtimeKeepalivePush() }}}
785785

@@ -805,7 +805,7 @@ var LibraryBrowser = {
805805

806806
emscripten_run_preload_plugins_data__proxy: 'sync',
807807
emscripten_run_preload_plugins_data__deps: ['malloc'],
808-
emscripten_run_preload_plugins_data__sig: 'viiiiii',
808+
emscripten_run_preload_plugins_data__sig: 'vpipppp',
809809
emscripten_run_preload_plugins_data: function(data, size, suffix, arg, onload, onerror) {
810810
{{{ runtimeKeepalivePush() }}}
811811

@@ -875,7 +875,7 @@ var LibraryBrowser = {
875875
},
876876

877877
// Runs natively in pthread, no __proxy needed.
878-
emscripten_get_main_loop_timing__sig: 'vii',
878+
emscripten_get_main_loop_timing__sig: 'vpp',
879879
emscripten_get_main_loop_timing: function(mode, value) {
880880
if (mode) {{{ makeSetValue('mode', 0, 'Browser.mainLoop.timingMode', 'i32') }}};
881881
if (value) {{{ makeSetValue('value', 0, 'Browser.mainLoop.timingValue', 'i32') }}};
@@ -942,7 +942,7 @@ var LibraryBrowser = {
942942
},
943943

944944
emscripten_set_main_loop__deps: ['$setMainLoop'],
945-
emscripten_set_main_loop__sig: 'viii',
945+
emscripten_set_main_loop__sig: 'vpii',
946946
emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop) {
947947
var browserIterationFunc = {{{ makeDynCall('v', 'func') }}};
948948
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop);
@@ -1104,7 +1104,7 @@ var LibraryBrowser = {
11041104

11051105
// Runs natively in pthread, no __proxy needed.
11061106
emscripten_set_main_loop_arg__deps: ['$setMainLoop'],
1107-
emscripten_set_main_loop_arg__sig: 'viiii',
1107+
emscripten_set_main_loop_arg__sig: 'vppii',
11081108
emscripten_set_main_loop_arg: function(func, arg, fps, simulateInfiniteLoop) {
11091109
var browserIterationFunc = () => {{{ makeDynCall('vi', 'func') }}}(arg);
11101110
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop, arg);
@@ -1188,13 +1188,13 @@ var LibraryBrowser = {
11881188
},
11891189

11901190
emscripten_set_window_title__proxy: 'sync',
1191-
emscripten_set_window_title__sig: 'vi',
1191+
emscripten_set_window_title__sig: 'vp',
11921192
emscripten_set_window_title: function(title) {
11931193
setWindowTitle(UTF8ToString(title));
11941194
},
11951195

11961196
emscripten_get_screen_size__proxy: 'sync',
1197-
emscripten_get_screen_size__sig: 'vii',
1197+
emscripten_get_screen_size__sig: 'vpp',
11981198
emscripten_get_screen_size: function(width, height) {
11991199
{{{ makeSetValue('width', '0', 'screen.width', 'i32') }}};
12001200
{{{ makeSetValue('height', '0', 'screen.height', 'i32') }}};
@@ -1221,7 +1221,7 @@ var LibraryBrowser = {
12211221
},
12221222

12231223
emscripten_get_canvas_size__proxy: 'sync',
1224-
emscripten_get_canvas_size__sig: 'viii',
1224+
emscripten_get_canvas_size__sig: 'vppp',
12251225
emscripten_get_canvas_size: function(width, height, isFullscreen) {
12261226
var canvas = Module['canvas'];
12271227
{{{ makeSetValue('width', '0', 'canvas.width', 'i32') }}};
@@ -1231,7 +1231,7 @@ var LibraryBrowser = {
12311231

12321232
// To avoid creating worker parent->child chains, always proxies to execute on the main thread.
12331233
emscripten_create_worker__proxy: 'sync',
1234-
emscripten_create_worker__sig: 'ii',
1234+
emscripten_create_worker__sig: 'ip',
12351235
emscripten_create_worker: function(url) {
12361236
url = UTF8ToString(url);
12371237
var id = Browser.workers.length;
@@ -1283,7 +1283,7 @@ var LibraryBrowser = {
12831283
},
12841284

12851285
emscripten_call_worker__proxy: 'sync',
1286-
emscripten_call_worker__sig: 'viiiiii',
1286+
emscripten_call_worker__sig: 'vippipp',
12871287
emscripten_call_worker: function(id, funcName, data, size, callback, arg) {
12881288
funcName = UTF8ToString(funcName);
12891289
var info = Browser.workers[id];
@@ -1358,7 +1358,7 @@ var LibraryBrowser = {
13581358

13591359
emscripten_get_preloaded_image_data__deps: ['$PATH_FS', 'malloc'],
13601360
emscripten_get_preloaded_image_data__proxy: 'sync',
1361-
emscripten_get_preloaded_image_data__sig: 'iiii',
1361+
emscripten_get_preloaded_image_data__sig: 'pppp',
13621362
emscripten_get_preloaded_image_data: function(path, w, h) {
13631363
if ((path | 0) === path) path = UTF8ToString(path);
13641364

@@ -1382,7 +1382,7 @@ var LibraryBrowser = {
13821382

13831383
emscripten_get_preloaded_image_data_from_FILE__deps: ['emscripten_get_preloaded_image_data', 'fileno'],
13841384
emscripten_get_preloaded_image_data_from_FILE__proxy: 'sync',
1385-
emscripten_get_preloaded_image_data_from_FILE__sig: 'iiii',
1385+
emscripten_get_preloaded_image_data_from_FILE__sig: 'pppp',
13861386
emscripten_get_preloaded_image_data_from_FILE: function(file, w, h) {
13871387
var fd = _fileno(file);
13881388
var stream = FS.getStream(fd);

‎src/library_dylink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ var LibraryDylink = {
11321132
}
11331133
},
11341134

1135-
_dlsym_catchup_js__sig: 'ppp',
1135+
_dlsym_catchup_js__sig: 'ppi',
11361136
_dlsym_catchup_js: function(handle, symbolIndex) {
11371137
#if DYLINK_DEBUG
11381138
dbg("_dlsym_catchup: handle=" + ptrToString(handle) + " symbolIndex=" + symbolIndex);

‎src/library_eventloop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ LibraryJSEventLoop = {
9090
emClearImmediate(id);
9191
},
9292

93-
emscripten_set_immediate_loop__sig: 'ipp' ,
93+
emscripten_set_immediate_loop__sig: 'vpp',
9494
emscripten_set_immediate_loop__deps: ['$polyfillSetImmediate', '$callUserCallback'],
9595
emscripten_set_immediate_loop: function(cb, userData) {
9696
polyfillSetImmediate();

‎src/library_glew.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ var LibraryGLEW = {
127127
return GLEW.extensionIsSupported(UTF8ToString(name));
128128
},
129129

130-
glewGetErrorString__sig: 'ii',
130+
glewGetErrorString__sig: 'pi',
131131
glewGetErrorString: function(error) {
132132
return GLEW.errorString(error);
133133
},

‎src/library_glut.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ var LibraryGLUT = {
307307

308308
glutInit__deps: ['$Browser'],
309309
glutInit__proxy: 'sync',
310-
glutInit__sig: 'vii',
310+
glutInit__sig: 'vpp',
311311
glutInit: function(argcp, argv) {
312312
// Ignore arguments
313313
GLUT.initTime = Date.now();
@@ -419,7 +419,7 @@ var LibraryGLUT = {
419419

420420
glutIdleFunc__proxy: 'sync',
421421
glutIdleFunc__deps: ['$safeSetTimeout'],
422-
glutIdleFunc__sig: 'vi',
422+
glutIdleFunc__sig: 'vp',
423423
glutIdleFunc: function(func) {
424424
function callback() {
425425
if (GLUT.idleFunc) {
@@ -435,61 +435,61 @@ var LibraryGLUT = {
435435

436436
glutTimerFunc__proxy: 'sync',
437437
glutTimerFunc__deps: ['$safeSetTimeout'],
438-
glutTimerFunc__sig: 'viii',
438+
glutTimerFunc__sig: 'vipi',
439439
glutTimerFunc: function(msec, func, value) {
440440
safeSetTimeout(function() { {{{ makeDynCall('vi', 'func') }}}(value); }, msec);
441441
},
442442

443443
glutDisplayFunc__proxy: 'sync',
444-
glutDisplayFunc__sig: 'vi',
444+
glutDisplayFunc__sig: 'vp',
445445
glutDisplayFunc: function(func) {
446446
GLUT.displayFunc = func;
447447
},
448448

449449
glutKeyboardFunc__proxy: 'sync',
450-
glutKeyboardFunc__sig: 'vi',
450+
glutKeyboardFunc__sig: 'vp',
451451
glutKeyboardFunc: function(func) {
452452
GLUT.keyboardFunc = func;
453453
},
454454

455455
glutKeyboardUpFunc__proxy: 'sync',
456-
glutKeyboardUpFunc__sig: 'vi',
456+
glutKeyboardUpFunc__sig: 'vp',
457457
glutKeyboardUpFunc: function(func) {
458458
GLUT.keyboardUpFunc = func;
459459
},
460460

461461
glutSpecialFunc__proxy: 'sync',
462-
glutSpecialFunc__sig: 'vi',
462+
glutSpecialFunc__sig: 'vp',
463463
glutSpecialFunc: function(func) {
464464
GLUT.specialFunc = func;
465465
},
466466

467467
glutSpecialUpFunc__proxy: 'sync',
468-
glutSpecialUpFunc__sig: 'vi',
468+
glutSpecialUpFunc__sig: 'vp',
469469
glutSpecialUpFunc: function(func) {
470470
GLUT.specialUpFunc = func;
471471
},
472472

473473
glutReshapeFunc__proxy: 'sync',
474-
glutReshapeFunc__sig: 'vi',
474+
glutReshapeFunc__sig: 'vp',
475475
glutReshapeFunc: function(func) {
476476
GLUT.reshapeFunc = func;
477477
},
478478

479479
glutMotionFunc__proxy: 'sync',
480-
glutMotionFunc__sig: 'vi',
480+
glutMotionFunc__sig: 'vp',
481481
glutMotionFunc: function(func) {
482482
GLUT.motionFunc = func;
483483
},
484484

485485
glutPassiveMotionFunc__proxy: 'sync',
486-
glutPassiveMotionFunc__sig: 'vi',
486+
glutPassiveMotionFunc__sig: 'vp',
487487
glutPassiveMotionFunc: function(func) {
488488
GLUT.passiveMotionFunc = func;
489489
},
490490

491491
glutMouseFunc__proxy: 'sync',
492-
glutMouseFunc__sig: 'vi',
492+
glutMouseFunc__sig: 'vp',
493493
glutMouseFunc: function(func) {
494494
GLUT.mouseFunc = func;
495495
},
@@ -573,7 +573,7 @@ var LibraryGLUT = {
573573

574574
glutCreateWindow__proxy: 'sync',
575575
glutCreateWindow__deps: ['$Browser'],
576-
glutCreateWindow__sig: 'ii',
576+
glutCreateWindow__sig: 'ip',
577577
glutCreateWindow: function(name) {
578578
var contextAttributes = {
579579
antialias: ((GLUT.initDisplayMode & 0x0080 /*GLUT_MULTISAMPLE*/) != 0),
@@ -591,7 +591,7 @@ var LibraryGLUT = {
591591

592592
glutDestroyWindow__proxy: 'sync',
593593
glutDestroyWindow__deps: ['$Browser'],
594-
glutDestroyWindow__sig: 'ii',
594+
glutDestroyWindow__sig: 'vi',
595595
glutDestroyWindow: function(name) {
596596
Module.ctx = Browser.destroyContext(Module['canvas'], true, true);
597597
return 1;

0 commit comments

Comments
 (0)