Skip to content

Start using auto-generated sigs from library_sigs.js. NFC #19028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Start using auto-generated sigs from library_sigs.js. NFC #19028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions src/library.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/library_async.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,6 @@ mergeInto(LibraryManager.library, {
#endif
},

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

emscripten_wget__sig: 'vpp',
emscripten_wget__deps: ['$Browser', '$PATH_FS', '$FS'],
emscripten_wget: function(url, file) {
return Asyncify.handleSleep((wakeUp) => {
Expand Down Expand Up @@ -488,7 +486,6 @@ mergeInto(LibraryManager.library, {
});
},

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

emscripten_scan_registers__sig: 'vp',
emscripten_scan_registers__deps: ['$safeSetTimeout'],
emscripten_scan_registers: function(func) {
return Asyncify.handleSleep((wakeUp) => {
Expand Down Expand Up @@ -608,7 +604,6 @@ mergeInto(LibraryManager.library, {
},
},

emscripten_fiber_swap__sig: 'vpp',
emscripten_fiber_swap__deps: ["$Asyncify", "$Fibers"],
emscripten_fiber_swap: function(oldFiber, newFiber) {
if (ABORT) return;
Expand Down
23 changes: 0 additions & 23 deletions src/library_browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,6 @@ var LibraryBrowser = {

emscripten_run_preload_plugins__deps: ['$PATH'],
emscripten_run_preload_plugins__proxy: 'sync',
emscripten_run_preload_plugins__sig: 'ippp',
emscripten_run_preload_plugins: function(file, onload, onerror) {
{{{ runtimeKeepalivePush() }}}

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

emscripten_run_preload_plugins_data__proxy: 'sync',
emscripten_run_preload_plugins_data__deps: ['malloc'],
emscripten_run_preload_plugins_data__sig: 'vpipppp',
emscripten_run_preload_plugins_data: function(data, size, suffix, arg, onload, onerror) {
{{{ runtimeKeepalivePush() }}}

Expand Down Expand Up @@ -875,14 +873,12 @@ var LibraryBrowser = {
},

// Runs natively in pthread, no __proxy needed.
emscripten_get_main_loop_timing__sig: 'vpp',
emscripten_get_main_loop_timing: function(mode, value) {
if (mode) {{{ makeSetValue('mode', 0, 'Browser.mainLoop.timingMode', 'i32') }}};
if (value) {{{ makeSetValue('value', 0, 'Browser.mainLoop.timingValue', 'i32') }}};
},

// Runs natively in pthread, no __proxy needed.
emscripten_set_main_loop_timing__sig: 'iii',
emscripten_set_main_loop_timing: function(mode, value) {
Browser.mainLoop.timingMode = mode;
Browser.mainLoop.timingValue = value;
Expand Down Expand Up @@ -942,7 +938,6 @@ var LibraryBrowser = {
},

emscripten_set_main_loop__deps: ['$setMainLoop'],
emscripten_set_main_loop__sig: 'vpii',
emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop) {
var browserIterationFunc = {{{ makeDynCall('v', 'func') }}};
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop);
Expand Down Expand Up @@ -1104,27 +1099,23 @@ var LibraryBrowser = {

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

// Runs natively in pthread, no __proxy needed.
emscripten_cancel_main_loop__sig: 'v',
emscripten_cancel_main_loop: function() {
Browser.mainLoop.pause();
Browser.mainLoop.func = null;
},

// Runs natively in pthread, no __proxy needed.
emscripten_pause_main_loop__sig: 'v',
emscripten_pause_main_loop: function() {
Browser.mainLoop.pause();
},

// Runs natively in pthread, no __proxy needed.
emscripten_resume_main_loop__sig: 'v',
emscripten_resume_main_loop: function() {
Browser.mainLoop.resume();
},
Expand All @@ -1146,15 +1137,13 @@ var LibraryBrowser = {
},

// Runs natively in pthread, no __proxy needed.
emscripten_set_main_loop_expected_blockers__sig: 'vi',
emscripten_set_main_loop_expected_blockers: function(num) {
Browser.mainLoop.expectedBlockers = num;
Browser.mainLoop.remainingBlockers = num;
Browser.mainLoop.updateStatus();
},

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

emscripten_get_window_title__proxy: 'sync',
emscripten_get_window_title__sig: 'p',
emscripten_get_window_title: function() {
var buflen = 256;

Expand All @@ -1188,20 +1176,17 @@ var LibraryBrowser = {
},

emscripten_set_window_title__proxy: 'sync',
emscripten_set_window_title__sig: 'vp',
emscripten_set_window_title: function(title) {
setWindowTitle(UTF8ToString(title));
},

emscripten_get_screen_size__proxy: 'sync',
emscripten_get_screen_size__sig: 'vpp',
emscripten_get_screen_size: function(width, height) {
{{{ makeSetValue('width', '0', 'screen.width', 'i32') }}};
{{{ makeSetValue('height', '0', 'screen.height', 'i32') }}};
},

emscripten_hide_mouse__proxy: 'sync',
emscripten_hide_mouse__sig: 'v',
emscripten_hide_mouse: function() {
var styleSheet = document.styleSheets[0];
var rules = styleSheet.cssRules;
Expand All @@ -1215,13 +1200,11 @@ var LibraryBrowser = {
},

emscripten_set_canvas_size__proxy: 'sync',
emscripten_set_canvas_size__sig: 'vii',
emscripten_set_canvas_size: function(width, height) {
Browser.setCanvasSize(width, height);
},

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

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

emscripten_destroy_worker__proxy: 'sync',
emscripten_destroy_worker__sig: 'vi',
emscripten_destroy_worker: function(id) {
var info = Browser.workers[id];
info.worker.terminate();
Expand All @@ -1283,7 +1264,6 @@ var LibraryBrowser = {
},

emscripten_call_worker__proxy: 'sync',
emscripten_call_worker__sig: 'vippipp',
emscripten_call_worker: function(id, funcName, data, size, callback, arg) {
funcName = UTF8ToString(funcName);
var info = Browser.workers[id];
Expand Down Expand Up @@ -1349,7 +1329,6 @@ var LibraryBrowser = {
#endif

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

emscripten_get_preloaded_image_data__deps: ['$PATH_FS', 'malloc'],
emscripten_get_preloaded_image_data__proxy: 'sync',
emscripten_get_preloaded_image_data__sig: 'pppp',
emscripten_get_preloaded_image_data: function(path, w, h) {
if ((path | 0) === path) path = UTF8ToString(path);

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

emscripten_get_preloaded_image_data_from_FILE__deps: ['emscripten_get_preloaded_image_data', 'fileno'],
emscripten_get_preloaded_image_data_from_FILE__proxy: 'sync',
emscripten_get_preloaded_image_data_from_FILE__sig: 'pppp',
emscripten_get_preloaded_image_data_from_FILE: function(file, w, h) {
var fd = _fileno(file);
var stream = FS.getStream(fd);
Expand Down
4 changes: 0 additions & 4 deletions src/library_dylink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ var LibraryDylink = {
},

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

// Async version of dlopen.
_emscripten_dlopen_js__deps: ['$dlopenInternal', '$callUserCallback', '$dlSetError'],
_emscripten_dlopen_js__sig: 'vpppp',
_emscripten_dlopen_js: function(handle, onsuccess, onerror, user_data) {
/** @param {Object=} e */
function errorCallback(e) {
Expand All @@ -1132,7 +1130,6 @@ var LibraryDylink = {
}
},

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

// void* dlsym(void* handle, const char* symbol);
_dlsym_js__deps: ['$dlSetError', '$getFunctionAddress', '$addFunction'],
_dlsym_js__sig: 'pppp',
_dlsym_js: function(handle, symbol, symbolIndex) {
// void *dlsym(void *restrict handle, const char *restrict name);
// http://pubs.opengroup.org/onlinepubs/009695399/functions/dlsym.html
Expand Down
8 changes: 0 additions & 8 deletions src/library_eventloop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ LibraryJSEventLoop = {
// emscripten_set_immediate_loop() if application links to both of them.
},

emscripten_set_immediate__sig: 'ipp',
emscripten_set_immediate__deps: ['$polyfillSetImmediate', '$callUserCallback'],
emscripten_set_immediate: function(cb, userData) {
polyfillSetImmediate();
Expand All @@ -83,14 +82,12 @@ LibraryJSEventLoop = {
});
},

emscripten_clear_immediate__sig: 'vi',
emscripten_clear_immediate__deps: ['$polyfillSetImmediate'],
emscripten_clear_immediate: function(id) {
{{{ runtimeKeepalivePop(); }}}
emClearImmediate(id);
},

emscripten_set_immediate_loop__sig: 'vpp',
emscripten_set_immediate_loop__deps: ['$polyfillSetImmediate', '$callUserCallback'],
emscripten_set_immediate_loop: function(cb, userData) {
polyfillSetImmediate();
Expand All @@ -107,18 +104,15 @@ LibraryJSEventLoop = {
emSetImmediate(tick);
},

emscripten_set_timeout__sig: 'ipdp',
emscripten_set_timeout__deps: ['$safeSetTimeout'],
emscripten_set_timeout: function(cb, msecs, userData) {
return safeSetTimeout(() => {{{ makeDynCall('vp', 'cb') }}}(userData), msecs);
},

emscripten_clear_timeout__sig: 'vi',
emscripten_clear_timeout: function(id) {
clearTimeout(id);
},

emscripten_set_timeout_loop__sig: 'vpdp',
emscripten_set_timeout_loop__deps: ['$callUserCallback'],
emscripten_set_timeout_loop: function(cb, msecs, userData) {
function tick() {
Expand All @@ -139,7 +133,6 @@ LibraryJSEventLoop = {
return setTimeout(tick, 0);
},

emscripten_set_interval__sig: 'ipdp',
emscripten_set_interval__deps: ['$callUserCallback'],
emscripten_set_interval: function(cb, msecs, userData) {
{{{ runtimeKeepalivePush() }}}
Expand All @@ -150,7 +143,6 @@ LibraryJSEventLoop = {
}, msecs);
},

emscripten_clear_interval__sig: 'vi',
emscripten_clear_interval: function(id) {
{{{ runtimeKeepalivePop() }}}
clearInterval(id);
Expand Down
1 change: 0 additions & 1 deletion src/library_glew.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ var LibraryGLEW = {
return GLEW.extensionIsSupported(UTF8ToString(name));
},

glewGetErrorString__sig: 'pi',
glewGetErrorString: function(error) {
return GLEW.errorString(error);
},
Expand Down
Loading