Skip to content

Commit fccabd1

Browse files
authored
[dylink] Use multiple argument in calls to dbg(). NFC (#24327)
This generates slightly nicer formatting in some cases I noticed. Its also a little less syntax when string templating is overkill.
1 parent 1b4409e commit fccabd1

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/lib/libdylink.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var LibraryDylink = {
2929
() => loadWebAssemblyModule(byteArray, {loadAsync: true, nodelete: true}, name, {})).then(
3030
(exports) => {
3131
#if DYLINK_DEBUG
32-
dbg(`registering preloadedWasm: ${name}`);
32+
dbg('registering preloadedWasm:', name);
3333
#endif
3434
preloadedWasm[name] = exports;
3535
onload(byteArray);
@@ -217,7 +217,7 @@ var LibraryDylink = {
217217
$updateGOT__deps: ['$GOT', '$isInternalSym', '$addFunction'],
218218
$updateGOT: (exports, replace) => {
219219
#if DYLINK_DEBUG
220-
dbg("updateGOT: adding " + Object.keys(exports).length + " symbols");
220+
dbg(`updateGOT: adding ${Object.keys(exports).length} symbols`);
221221
#endif
222222
for (var symName in exports) {
223223
if (isInternalSym(symName)) {
@@ -304,7 +304,7 @@ var LibraryDylink = {
304304
if (!value && !entry.required) {
305305
// Ignore undefined symbols that are imported as weak.
306306
#if DYLINK_DEBUG
307-
dbg(`ignoring undefined weak symbol: ${symName}`);
307+
dbg('ignoring undefined weak symbol:', symName);
308308
#endif
309309
continue;
310310
}
@@ -357,7 +357,7 @@ var LibraryDylink = {
357357
$dlSetError__deps: ['__dl_seterr', '$stringToUTF8OnStack', '$stackSave', '$stackRestore'],
358358
$dlSetError: (msg) => {
359359
#if DYLINK_DEBUG
360-
dbg(`dlSetError: ${msg}`);
360+
dbg('dlSetError:', msg);
361361
#endif
362362
var sp = stackSave();
363363
var cmsg = stringToUTF8OnStack(msg);
@@ -503,7 +503,7 @@ var LibraryDylink = {
503503
customSection.runtimePaths = getStringList();
504504
} else {
505505
#if ASSERTIONS
506-
err(`unknown dylink.0 subsection: ${subsectionType}`)
506+
err('unknown dylink.0 subsection:', subsectionType)
507507
#endif
508508
// unknown subsection
509509
offset += subsectionSize;
@@ -517,7 +517,7 @@ var LibraryDylink = {
517517
#endif
518518

519519
#if DYLINK_DEBUG
520-
dbg(`dylink needed:${customSection.neededDynlibs}`);
520+
dbg('dylink needed:', customSection.neededDynlibs);
521521
#endif
522522

523523
return customSection;
@@ -613,7 +613,7 @@ var LibraryDylink = {
613613
],
614614
$loadWebAssemblyModule: (binary, flags, libName, localScope, handle) => {
615615
#if DYLINK_DEBUG
616-
dbg(`loadWebAssemblyModule: ${libName}`);
616+
dbg('loadWebAssemblyModule:', libName);
617617
#endif
618618
var metadata = getDylinkMetadata(binary);
619619
currentModuleWeakSymbols = metadata.weakImports;
@@ -758,7 +758,7 @@ var LibraryDylink = {
758758
#if PTHREADS
759759
if (!ENVIRONMENT_IS_PTHREAD && libName) {
760760
#if DYLINK_DEBUG
761-
dbg(`registering sharedModules: ${libName}`)
761+
dbg('registering sharedModules:', libName)
762762
#endif
763763
// cache all loaded modules in `sharedModules`, which gets passed
764764
// to new workers when they are created.
@@ -797,7 +797,7 @@ var LibraryDylink = {
797797
args = args.join(',');
798798
var func = `(${args}) => { ${body} };`;
799799
#if DYLINK_DEBUG
800-
dbg(`adding new EM_ASM constant at: ${ptrToString(start)}`);
800+
dbg('adding new EM_ASM constant at:', ptrToString(start));
801801
#endif
802802
{{{ makeEval('ASM_CONSTS[start] = eval(func)') }}};
803803
}
@@ -1036,7 +1036,7 @@ var LibraryDylink = {
10361036
$loadDynamicLibrary: function(libName, flags = {global: true, nodelete: true}, localScope, handle) {
10371037
#if DYLINK_DEBUG
10381038
dbg(`loadDynamicLibrary: ${libName} handle: ${handle}`);
1039-
dbg(`existing: ${Object.keys(LDSO.loadedLibsByName)}`);
1039+
dbg('existing:', Object.keys(LDSO.loadedLibsByName));
10401040
#endif
10411041
// when loadDynamicLibrary did not have flags, libraries were loaded
10421042
// globally & permanently
@@ -1184,7 +1184,7 @@ var LibraryDylink = {
11841184
}
11851185

11861186
#if DYLINK_DEBUG
1187-
dbg(`loadDylibs: ${dynamicLibraries}`);
1187+
dbg('loadDylibs:', dynamicLibraries);
11881188
#endif
11891189

11901190
// Load binaries asynchronously
@@ -1211,7 +1211,7 @@ var LibraryDylink = {
12111211
var filename = UTF8ToString(handle + {{{ C_STRUCTS.dso.name }}});
12121212
var flags = {{{ makeGetValue('handle', C_STRUCTS.dso.flags, 'i32') }}};
12131213
#if DYLINK_DEBUG
1214-
dbg(`dlopenInternal: ${filename}`);
1214+
dbg('dlopenInternal:', filename);
12151215
#endif
12161216
filename = PATH.normalize(filename);
12171217
var searchpaths = [];
@@ -1305,7 +1305,7 @@ var LibraryDylink = {
13051305
// http://pubs.opengroup.org/onlinepubs/009695399/functions/dlsym.html
13061306
symbol = UTF8ToString(symbol);
13071307
#if DYLINK_DEBUG
1308-
dbg(`dlsym_js: ${symbol}`);
1308+
dbg('dlsym_js:', symbol);
13091309
#endif
13101310
var result;
13111311
var newSymIndex;
@@ -1343,7 +1343,7 @@ var LibraryDylink = {
13431343
var addr = getFunctionAddress(result);
13441344
if (addr) {
13451345
#if DYLINK_DEBUG
1346-
dbg(`symbol already exists in table: ${symbol}`);
1346+
dbg('symbol already exists in table:', symbol);
13471347
#endif
13481348
result = addr;
13491349
} else {
@@ -1353,7 +1353,7 @@ var LibraryDylink = {
13531353
// `<func>__sig` specified in library JS file.
13541354
result = addFunction(result, result.sig);
13551355
#if DYLINK_DEBUG
1356-
dbg(`adding symbol to table: ${symbol}`);
1356+
dbg('adding symbol to table:', symbol);
13571357
#endif
13581358
{{{ makeSetValue('symbolIndex', 0, 'newSymIndex', '*') }}};
13591359
}

0 commit comments

Comments
 (0)