Skip to content

Commit c4ac7b7

Browse files
authored
Consistent use of makeDynCall in JS library code (emscripten-core#12010)
makeDynCall today doesn't really do anything, it just returns dynCall_sig. For being consistent here makes it easier to reason about and easier to change in central location. The alternative of course would be instead remove the makeDynCall functions, but I have changes planed that might start using it for somthing useful again.
1 parent 7550a3a commit c4ac7b7

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

src/closure-externs/closure-externs.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,14 @@ var dynCall_v;
208208
* @suppress {duplicate, undefinedVars}
209209
*/
210210
var dynCall_vi;
211+
/**
212+
* @suppress {duplicate, undefinedVars}
213+
*/
214+
var dynCall_vii;
215+
/**
216+
* @suppress {duplicate, undefinedVars}
217+
*/
218+
var dynCall_iii;
211219

212220
// Module loaders externs, for AMD etc.
213221

@@ -332,7 +340,7 @@ function AudioWorkletProcessor() {}
332340
/** @type {!MessagePort} */
333341
AudioWorkletProcessor.prototype.port;
334342

335-
// AudioWorkletNodeOptions
343+
// AudioWorkletNodeOptions
336344
/**
337345
* @constructor
338346
*/

src/library_exceptions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ var LibraryExceptions = {
194194
var destructor = info.get_destructor();
195195
if (destructor) {
196196
// In Wasm, destructors return 'this' as in ARM
197-
Module['dynCall_ii'](destructor, info.excPtr);
197+
{{{ makeDynCall('ii') }}}(destructor, info.excPtr);
198198
}
199199
___cxa_free_exception(info.excPtr);
200200
#if EXCEPTION_DEBUG

src/library_glfw.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,11 +1750,7 @@ var LibraryGLFW = {
17501750
},
17511751

17521752
glfwCreateThread: function(fun, arg) {
1753-
var str = 'v';
1754-
for (var i in arg) {
1755-
str += 'i';
1756-
}
1757-
dynCall(str, fun, arg);
1753+
{{{ makeDynCall('vi') }}}(str, fun, arg);
17581754
// One single thread
17591755
return 0;
17601756
},

src/library_sdl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ var LibrarySDL = {
873873
if (!SDL.eventHandler) return;
874874

875875
while (SDL.pollEvent(SDL.eventHandlerTemp)) {
876-
Module['dynCall_iii'](SDL.eventHandler, SDL.eventHandlerContext, SDL.eventHandlerTemp);
876+
{{{ makeDynCall('iii') }}}(SDL.eventHandler, SDL.eventHandlerContext, SDL.eventHandlerTemp);
877877
}
878878
},
879879

src/library_webgpu.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ var LibraryWebGPU = {
10181018
if (ev.error instanceof GPUValidationError) type = Validation;
10191019
else if (ev.error instanceof GPUOutOfMemoryError) type = OutOfMemory;
10201020
var messagePtr = allocateUTF8(ev.error.message);
1021-
dynCall_viii(callback, type, messagePtr, userdata);
1021+
{{{ makeDynCall('viii') }}}(callback, type, messagePtr, userdata);
10221022
_free(messagePtr);
10231023
};
10241024
},
@@ -1031,9 +1031,9 @@ var LibraryWebGPU = {
10311031
var completionValue = {{{ gpu.makeU64ToNumber('completionValue_low', 'completionValue_high') }}};
10321032

10331033
fence.onCompletion(completionValue).then(function() {
1034-
dynCall_vii(callback, 0 /* WEBGPU_FENCE_COMPLETION_STATUS_SUCCESS */, userdata);
1034+
{{{ makeDynCall('vii') }}}(callback, 0 /* WEBGPU_FENCE_COMPLETION_STATUS_SUCCESS */, userdata);
10351035
}, function() {
1036-
dynCall_vii(callback, 1 /* WEBGPU_FENCE_COMPLETION_STATUS_ERROR */, userdata);
1036+
{{{ makeDynCall('vii') }}}(callback, 1 /* WEBGPU_FENCE_COMPLETION_STATUS_ERROR */, userdata);
10371037
});
10381038
},
10391039

@@ -1374,10 +1374,10 @@ var LibraryWebGPU = {
13741374
// `callback` takes (WGPUBufferMapAsyncStatus status, void * userdata)
13751375

13761376
buffer["mapAsync"](mode, offset, size).then(function() {
1377-
dynCall_vii(callback, 0 /* WGPUBufferMapAsyncStatus_Success */, userdata);
1377+
{{{ makeDynCall('vii') }}}(callback, 0 /* WGPUBufferMapAsyncStatus_Success */, userdata);
13781378
}, function() {
13791379
// TODO(kainino0x): Figure out how to pick other error status values.
1380-
dynCall_vii(callback, 1 /* WGPUBufferMapAsyncStatus_Error */, userdata);
1380+
{{{ makeDynCall('vii') }}}(callback, 1 /* WGPUBufferMapAsyncStatus_Error */, userdata);
13811381
});
13821382
},
13831383

0 commit comments

Comments
 (0)