Skip to content

Commit 1320828

Browse files
authored
Start using auto-generated sigs from library_sigs.js. NFC (#19028)
The sigs here were removed by running `tools/gen_sig_info.py --remove` Currently the auto-generated signature cover 906 of the 1279 total signatures we have in the JS library. Hopefully we can figure out a way to remove the rest too, but that work can happen in followups.
1 parent b79bf7b commit 1320828

25 files changed

+32
-679
lines changed

src/library.js

Lines changed: 0 additions & 59 deletions
Large diffs are not rendered by default.

src/library_async.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@ mergeInto(LibraryManager.library, {
450450
#endif
451451
},
452452

453-
emscripten_sleep__sig: 'vi',
454453
emscripten_sleep__deps: ['$safeSetTimeout'],
455454
emscripten_sleep: function(ms) {
456455
// emscripten_sleep() does not return a value, but we still need a |return|
@@ -460,7 +459,6 @@ mergeInto(LibraryManager.library, {
460459
return Asyncify.handleSleep((wakeUp) => safeSetTimeout(wakeUp, ms));
461460
},
462461

463-
emscripten_wget__sig: 'vpp',
464462
emscripten_wget__deps: ['$Browser', '$PATH_FS', '$FS'],
465463
emscripten_wget: function(url, file) {
466464
return Asyncify.handleSleep((wakeUp) => {
@@ -488,7 +486,6 @@ mergeInto(LibraryManager.library, {
488486
});
489487
},
490488

491-
emscripten_wget_data__sig: 'vpppp',
492489
emscripten_wget_data__deps: ['$asyncLoad', 'malloc'],
493490
emscripten_wget_data: function(url, pbuffer, pnum, perror) {
494491
return Asyncify.handleSleep((wakeUp) => {
@@ -507,7 +504,6 @@ mergeInto(LibraryManager.library, {
507504
});
508505
},
509506

510-
emscripten_scan_registers__sig: 'vp',
511507
emscripten_scan_registers__deps: ['$safeSetTimeout'],
512508
emscripten_scan_registers: function(func) {
513509
return Asyncify.handleSleep((wakeUp) => {
@@ -608,7 +604,6 @@ mergeInto(LibraryManager.library, {
608604
},
609605
},
610606

611-
emscripten_fiber_swap__sig: 'vpp',
612607
emscripten_fiber_swap__deps: ["$Asyncify", "$Fibers"],
613608
emscripten_fiber_swap: function(oldFiber, newFiber) {
614609
if (ABORT) return;

src/library_browser.js

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

780780
emscripten_run_preload_plugins__deps: ['$PATH'],
781781
emscripten_run_preload_plugins__proxy: 'sync',
782-
emscripten_run_preload_plugins__sig: 'ippp',
783782
emscripten_run_preload_plugins: function(file, onload, onerror) {
784783
{{{ runtimeKeepalivePush() }}}
785784

@@ -805,7 +804,6 @@ var LibraryBrowser = {
805804

806805
emscripten_run_preload_plugins_data__proxy: 'sync',
807806
emscripten_run_preload_plugins_data__deps: ['malloc'],
808-
emscripten_run_preload_plugins_data__sig: 'vpipppp',
809807
emscripten_run_preload_plugins_data: function(data, size, suffix, arg, onload, onerror) {
810808
{{{ runtimeKeepalivePush() }}}
811809

@@ -875,14 +873,12 @@ var LibraryBrowser = {
875873
},
876874

877875
// Runs natively in pthread, no __proxy needed.
878-
emscripten_get_main_loop_timing__sig: 'vpp',
879876
emscripten_get_main_loop_timing: function(mode, value) {
880877
if (mode) {{{ makeSetValue('mode', 0, 'Browser.mainLoop.timingMode', 'i32') }}};
881878
if (value) {{{ makeSetValue('value', 0, 'Browser.mainLoop.timingValue', 'i32') }}};
882879
},
883880

884881
// Runs natively in pthread, no __proxy needed.
885-
emscripten_set_main_loop_timing__sig: 'iii',
886882
emscripten_set_main_loop_timing: function(mode, value) {
887883
Browser.mainLoop.timingMode = mode;
888884
Browser.mainLoop.timingValue = value;
@@ -942,7 +938,6 @@ var LibraryBrowser = {
942938
},
943939

944940
emscripten_set_main_loop__deps: ['$setMainLoop'],
945-
emscripten_set_main_loop__sig: 'vpii',
946941
emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop) {
947942
var browserIterationFunc = {{{ makeDynCall('v', 'func') }}};
948943
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop);
@@ -1104,27 +1099,23 @@ var LibraryBrowser = {
11041099

11051100
// Runs natively in pthread, no __proxy needed.
11061101
emscripten_set_main_loop_arg__deps: ['$setMainLoop'],
1107-
emscripten_set_main_loop_arg__sig: 'vppii',
11081102
emscripten_set_main_loop_arg: function(func, arg, fps, simulateInfiniteLoop) {
11091103
var browserIterationFunc = () => {{{ makeDynCall('vi', 'func') }}}(arg);
11101104
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop, arg);
11111105
},
11121106

11131107
// Runs natively in pthread, no __proxy needed.
1114-
emscripten_cancel_main_loop__sig: 'v',
11151108
emscripten_cancel_main_loop: function() {
11161109
Browser.mainLoop.pause();
11171110
Browser.mainLoop.func = null;
11181111
},
11191112

11201113
// Runs natively in pthread, no __proxy needed.
1121-
emscripten_pause_main_loop__sig: 'v',
11221114
emscripten_pause_main_loop: function() {
11231115
Browser.mainLoop.pause();
11241116
},
11251117

11261118
// Runs natively in pthread, no __proxy needed.
1127-
emscripten_resume_main_loop__sig: 'v',
11281119
emscripten_resume_main_loop: function() {
11291120
Browser.mainLoop.resume();
11301121
},
@@ -1146,15 +1137,13 @@ var LibraryBrowser = {
11461137
},
11471138

11481139
// Runs natively in pthread, no __proxy needed.
1149-
emscripten_set_main_loop_expected_blockers__sig: 'vi',
11501140
emscripten_set_main_loop_expected_blockers: function(num) {
11511141
Browser.mainLoop.expectedBlockers = num;
11521142
Browser.mainLoop.remainingBlockers = num;
11531143
Browser.mainLoop.updateStatus();
11541144
},
11551145

11561146
// Runs natively in pthread, no __proxy needed.
1157-
emscripten_async_call__sig: 'vppi',
11581147
emscripten_async_call__deps: ['$safeSetTimeout'],
11591148
emscripten_async_call: function(func, arg, millis) {
11601149
function wrapper() {
@@ -1174,7 +1163,6 @@ var LibraryBrowser = {
11741163
},
11751164

11761165
emscripten_get_window_title__proxy: 'sync',
1177-
emscripten_get_window_title__sig: 'p',
11781166
emscripten_get_window_title: function() {
11791167
var buflen = 256;
11801168

@@ -1188,20 +1176,17 @@ var LibraryBrowser = {
11881176
},
11891177

11901178
emscripten_set_window_title__proxy: 'sync',
1191-
emscripten_set_window_title__sig: 'vp',
11921179
emscripten_set_window_title: function(title) {
11931180
setWindowTitle(UTF8ToString(title));
11941181
},
11951182

11961183
emscripten_get_screen_size__proxy: 'sync',
1197-
emscripten_get_screen_size__sig: 'vpp',
11981184
emscripten_get_screen_size: function(width, height) {
11991185
{{{ makeSetValue('width', '0', 'screen.width', 'i32') }}};
12001186
{{{ makeSetValue('height', '0', 'screen.height', 'i32') }}};
12011187
},
12021188

12031189
emscripten_hide_mouse__proxy: 'sync',
1204-
emscripten_hide_mouse__sig: 'v',
12051190
emscripten_hide_mouse: function() {
12061191
var styleSheet = document.styleSheets[0];
12071192
var rules = styleSheet.cssRules;
@@ -1215,13 +1200,11 @@ var LibraryBrowser = {
12151200
},
12161201

12171202
emscripten_set_canvas_size__proxy: 'sync',
1218-
emscripten_set_canvas_size__sig: 'vii',
12191203
emscripten_set_canvas_size: function(width, height) {
12201204
Browser.setCanvasSize(width, height);
12211205
},
12221206

12231207
emscripten_get_canvas_size__proxy: 'sync',
1224-
emscripten_get_canvas_size__sig: 'vppp',
12251208
emscripten_get_canvas_size: function(width, height, isFullscreen) {
12261209
var canvas = Module['canvas'];
12271210
{{{ makeSetValue('width', '0', 'canvas.width', 'i32') }}};
@@ -1231,7 +1214,6 @@ var LibraryBrowser = {
12311214

12321215
// To avoid creating worker parent->child chains, always proxies to execute on the main thread.
12331216
emscripten_create_worker__proxy: 'sync',
1234-
emscripten_create_worker__sig: 'ip',
12351217
emscripten_create_worker: function(url) {
12361218
url = UTF8ToString(url);
12371219
var id = Browser.workers.length;
@@ -1274,7 +1256,6 @@ var LibraryBrowser = {
12741256
},
12751257

12761258
emscripten_destroy_worker__proxy: 'sync',
1277-
emscripten_destroy_worker__sig: 'vi',
12781259
emscripten_destroy_worker: function(id) {
12791260
var info = Browser.workers[id];
12801261
info.worker.terminate();
@@ -1283,7 +1264,6 @@ var LibraryBrowser = {
12831264
},
12841265

12851266
emscripten_call_worker__proxy: 'sync',
1286-
emscripten_call_worker__sig: 'vippipp',
12871267
emscripten_call_worker: function(id, funcName, data, size, callback, arg) {
12881268
funcName = UTF8ToString(funcName);
12891269
var info = Browser.workers[id];
@@ -1349,7 +1329,6 @@ var LibraryBrowser = {
13491329
#endif
13501330

13511331
emscripten_get_worker_queue_size__proxy: 'sync',
1352-
emscripten_get_worker_queue_size__sig: 'ii',
13531332
emscripten_get_worker_queue_size: function(id) {
13541333
var info = Browser.workers[id];
13551334
if (!info) return -1;
@@ -1358,7 +1337,6 @@ var LibraryBrowser = {
13581337

13591338
emscripten_get_preloaded_image_data__deps: ['$PATH_FS', 'malloc'],
13601339
emscripten_get_preloaded_image_data__proxy: 'sync',
1361-
emscripten_get_preloaded_image_data__sig: 'pppp',
13621340
emscripten_get_preloaded_image_data: function(path, w, h) {
13631341
if ((path | 0) === path) path = UTF8ToString(path);
13641342

@@ -1382,7 +1360,6 @@ var LibraryBrowser = {
13821360

13831361
emscripten_get_preloaded_image_data_from_FILE__deps: ['emscripten_get_preloaded_image_data', 'fileno'],
13841362
emscripten_get_preloaded_image_data_from_FILE__proxy: 'sync',
1385-
emscripten_get_preloaded_image_data_from_FILE__sig: 'pppp',
13861363
emscripten_get_preloaded_image_data_from_FILE: function(file, w, h) {
13871364
var fd = _fileno(file);
13881365
var stream = FS.getStream(fd);

src/library_dylink.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,6 @@ var LibraryDylink = {
10871087
},
10881088

10891089
_dlopen_js__deps: ['$dlopenInternal'],
1090-
_dlopen_js__sig: 'pp',
10911090
_dlopen_js: function(handle) {
10921091
#if ASYNCIFY
10931092
return Asyncify.handleSleep(function(wakeUp) {
@@ -1109,7 +1108,6 @@ var LibraryDylink = {
11091108

11101109
// Async version of dlopen.
11111110
_emscripten_dlopen_js__deps: ['$dlopenInternal', '$callUserCallback', '$dlSetError'],
1112-
_emscripten_dlopen_js__sig: 'vpppp',
11131111
_emscripten_dlopen_js: function(handle, onsuccess, onerror, user_data) {
11141112
/** @param {Object=} e */
11151113
function errorCallback(e) {
@@ -1132,7 +1130,6 @@ var LibraryDylink = {
11321130
}
11331131
},
11341132

1135-
_dlsym_catchup_js__sig: 'ppi',
11361133
_dlsym_catchup_js: function(handle, symbolIndex) {
11371134
#if DYLINK_DEBUG
11381135
dbg("_dlsym_catchup: handle=" + ptrToString(handle) + " symbolIndex=" + symbolIndex);
@@ -1150,7 +1147,6 @@ var LibraryDylink = {
11501147

11511148
// void* dlsym(void* handle, const char* symbol);
11521149
_dlsym_js__deps: ['$dlSetError', '$getFunctionAddress', '$addFunction'],
1153-
_dlsym_js__sig: 'pppp',
11541150
_dlsym_js: function(handle, symbol, symbolIndex) {
11551151
// void *dlsym(void *restrict handle, const char *restrict name);
11561152
// http://pubs.opengroup.org/onlinepubs/009695399/functions/dlsym.html

src/library_eventloop.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ LibraryJSEventLoop = {
7070
// emscripten_set_immediate_loop() if application links to both of them.
7171
},
7272

73-
emscripten_set_immediate__sig: 'ipp',
7473
emscripten_set_immediate__deps: ['$polyfillSetImmediate', '$callUserCallback'],
7574
emscripten_set_immediate: function(cb, userData) {
7675
polyfillSetImmediate();
@@ -83,14 +82,12 @@ LibraryJSEventLoop = {
8382
});
8483
},
8584

86-
emscripten_clear_immediate__sig: 'vi',
8785
emscripten_clear_immediate__deps: ['$polyfillSetImmediate'],
8886
emscripten_clear_immediate: function(id) {
8987
{{{ runtimeKeepalivePop(); }}}
9088
emClearImmediate(id);
9189
},
9290

93-
emscripten_set_immediate_loop__sig: 'vpp',
9491
emscripten_set_immediate_loop__deps: ['$polyfillSetImmediate', '$callUserCallback'],
9592
emscripten_set_immediate_loop: function(cb, userData) {
9693
polyfillSetImmediate();
@@ -107,18 +104,15 @@ LibraryJSEventLoop = {
107104
emSetImmediate(tick);
108105
},
109106

110-
emscripten_set_timeout__sig: 'ipdp',
111107
emscripten_set_timeout__deps: ['$safeSetTimeout'],
112108
emscripten_set_timeout: function(cb, msecs, userData) {
113109
return safeSetTimeout(() => {{{ makeDynCall('vp', 'cb') }}}(userData), msecs);
114110
},
115111

116-
emscripten_clear_timeout__sig: 'vi',
117112
emscripten_clear_timeout: function(id) {
118113
clearTimeout(id);
119114
},
120115

121-
emscripten_set_timeout_loop__sig: 'vpdp',
122116
emscripten_set_timeout_loop__deps: ['$callUserCallback'],
123117
emscripten_set_timeout_loop: function(cb, msecs, userData) {
124118
function tick() {
@@ -139,7 +133,6 @@ LibraryJSEventLoop = {
139133
return setTimeout(tick, 0);
140134
},
141135

142-
emscripten_set_interval__sig: 'ipdp',
143136
emscripten_set_interval__deps: ['$callUserCallback'],
144137
emscripten_set_interval: function(cb, msecs, userData) {
145138
{{{ runtimeKeepalivePush() }}}
@@ -150,7 +143,6 @@ LibraryJSEventLoop = {
150143
}, msecs);
151144
},
152145

153-
emscripten_clear_interval__sig: 'vi',
154146
emscripten_clear_interval: function(id) {
155147
{{{ runtimeKeepalivePop() }}}
156148
clearInterval(id);

src/library_glew.js

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

130-
glewGetErrorString__sig: 'pi',
131130
glewGetErrorString: function(error) {
132131
return GLEW.errorString(error);
133132
},

0 commit comments

Comments
 (0)