Make more use of ptrToString helper function. NFC

Author: sbc100

emcc.py

@@ -1997,6 +1997,10 @@ def phase_linker_setup(options, state, newargs):
       '$LE_HEAP_LOAD_F64'
     ]
 
+  if settings.RUNTIME_DEBUG or settings.ASSERTIONS or settings.STACK_OVERFLOW_CHECK or settings.PTHREADS_PROFILING:
+    # Lots of code in debug/assertion blocks uses ptrToString.
+    settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$ptrToString']
+
   if settings.STACK_OVERFLOW_CHECK:
     settings.REQUIRED_EXPORTS += [
       'emscripten_stack_get_end',

src/embind/embind.js

@@ -1791,7 +1791,7 @@ var LibraryEmbind = {
         // This is more useful than the empty stacktrace of `FinalizationRegistry`
         // callback.
         var cls = $$.ptrType.registeredClass;
-        info.leakWarning = new Error("Embind found a leaked C++ instance " + cls.name + " <0x" + $$.ptr.toString(16) + ">.\n" +
+        info.leakWarning = new Error("Embind found a leaked C++ instance " + cls.name + " <" + ptrToString($$.ptr) + ">.\n" +
         "We'll free it automatically in this case, but this functionality is not reliable across various environments.\n" +
         "Make sure to invoke .delete() manually once you're done with the instance instead.\n" +
         "Originally allocated"); // `.stack` will add "at ..." after this sentence

src/library.js

@@ -71,7 +71,7 @@ mergeInto(LibraryManager.library, {
     if (!implicit) {
       if (ENVIRONMENT_IS_PTHREAD) {
 #if PTHREADS_DEBUG
-        dbg('Pthread 0x' + _pthread_self().toString(16) + ' called exit(), posting exitOnMainThread.');
+        dbg('Pthread ' + ptrToString(_pthread_self()) + ' called exit(), posting exitOnMainThread.');
 #endif
         // When running in a pthread we propagate the exit back to the main thread
         // where it can decide if the whole process should be shut down or not.
@@ -3145,9 +3145,9 @@ mergeInto(LibraryManager.library, {
   __handle_stack_overflow__deps: ['emscripten_stack_get_base'],
   __handle_stack_overflow: function(requested) {
     requested = requested >>> 0;
-    abort('stack overflow (Attempt to set SP to 0x' + requested.toString(16) +
-          ', with stack limits [0x' + _emscripten_stack_get_end().toString(16) +
-          ' - 0x' + _emscripten_stack_get_base().toString(16) + '])');
+    abort('stack overflow (Attempt to set SP to ' + ptrToString(requested) +
+          ', with stack limits [' + ptrToString(_emscripten_stack_get_end()) +
+          ' - ' + ptrToString(_emscripten_stack_get_base()) + '])');
   },
 #endif
 

src/library_glemu.js

@@ -6,7 +6,7 @@
 
 var LibraryGLEmulation = {
   // GL emulation: provides misc. functionality not present in OpenGL ES 2.0 or WebGL
-  $GLEmulation__deps: ['$GLImmediateSetup', 'glEnable', 'glDisable', 'glIsEnabled', 'glGetBooleanv', 'glGetIntegerv', 'glGetString', 'glCreateShader', 'glShaderSource', 'glCompileShader', 'glAttachShader', 'glDetachShader', 'glUseProgram', 'glDeleteProgram', 'glBindAttribLocation', 'glLinkProgram', 'glBindBuffer', 'glGetFloatv', 'glHint', 'glEnableVertexAttribArray', 'glDisableVertexAttribArray', 'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8'],
+  $GLEmulation__deps: ['$GLImmediateSetup', 'glEnable', 'glDisable', 'glIsEnabled', 'glGetBooleanv', 'glGetIntegerv', 'glGetString', 'glCreateShader', 'glShaderSource', 'glCompileShader', 'glAttachShader', 'glDetachShader', 'glUseProgram', 'glDeleteProgram', 'glBindAttribLocation', 'glLinkProgram', 'glBindBuffer', 'glGetFloatv', 'glHint', 'glEnableVertexAttribArray', 'glDisableVertexAttribArray', 'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8', '$ptrToString'],
   $GLEmulation__postset:
 #if USE_CLOSURE_COMPILER
     // Forward declare GL functions that are overridden by GLEmulation here to appease Closure compiler.
@@ -1090,7 +1090,7 @@ var LibraryGLEmulation = {
             func = "textureCube";
             break;
           default:
-            return abort_sanity("Unknown texType: 0x" + texType.toString(16));
+            return abort_sanity("Unknown texType: " + ptrToString(texType));
         }
 
         var texCoordExpr = TEX_COORD_VARYING_PREFIX + texUnitID;
@@ -1110,7 +1110,7 @@ var LibraryGLEmulation = {
             return "float";
         }
 
-        return abort_noSupport("Unsupported combiner op: 0x" + op.toString(16));
+        return abort_noSupport("Unsupported combiner op: " + ptrToString(op));
       }
 
       function getCurTexUnit() {
@@ -1135,7 +1135,7 @@ var LibraryGLEmulation = {
             srcExpr = previousVar;
             break;
           default:
-              return abort_noSupport("Unsupported combiner src: 0x" + src.toString(16));
+              return abort_noSupport("Unsupported combiner src: " + ptrToString(src));
         }
 
         var expr = null;
@@ -1153,7 +1153,7 @@ var LibraryGLEmulation = {
             expr = "(1.0 - " + srcExpr + ".a)";
             break;
           default:
-            return abort_noSupport("Unsupported combiner op: 0x" + op.toString(16));
+            return abort_noSupport("Unsupported combiner op: " + ptrToString(op));
         }
 
         return expr;
@@ -1465,7 +1465,7 @@ var LibraryGLEmulation = {
           }
         }
 
-        return abort_noSupport("Unsupported TexEnv mode: 0x" + this.mode.toString(16));
+        return abort_noSupport("Unsupported TexEnv mode: " + ptrToString(this.mode));
       }
 
       CTexEnv.prototype.genCombinerLines = function CTexEnv_getCombinerLines(isColor, outputVar,
@@ -1489,7 +1489,7 @@ var LibraryGLEmulation = {
             break;
 
           default:
-            return abort_noSupport("Unsupported combiner: 0x" + combiner.toString(16));
+            return abort_noSupport("Unsupported combiner: " + ptrToString(combiner));
         }
 
         var constantExpr = [
@@ -3409,7 +3409,7 @@ var LibraryGLEmulation = {
         break;
       default: // invalid value provided
 #if GL_ASSERTIONS
-        err('glAlphaFunc: Invalid alpha comparison function 0x' + func.toString(16) + ' !');
+        err('glAlphaFunc: Invalid alpha comparison function 0x' + ptrToString(func) + ' !');
 #endif
         break;
     }

src/library_int53.js

@@ -23,7 +23,7 @@ mergeInto(LibraryManager.library, {
     HEAPU32[ptr+4>>2] = (num - HEAPU32[ptr>>2])/4294967296;
 #if ASSERTIONS
     var deserialized = (num >= 0) ? readI53FromU64(ptr) : readI53FromI64(ptr);
-    if (deserialized != num) warnOnce('writeI53ToI64() out of range: serialized JS Number ' + num + ' to Wasm heap as bytes lo=0x' + HEAPU32[ptr>>2].toString(16) + ', hi=0x' + HEAPU32[ptr+4>>2].toString(16) + ', which deserializes back to ' + deserialized + ' instead!');
+    if (deserialized != num) warnOnce('writeI53ToI64() out of range: serialized JS Number ' + num + ' to Wasm heap as bytes lo=' + ptrToString(HEAPU32[ptr>>2]) + ', hi=' + ptrToString(HEAPU32[ptr+4>>2]) + ', which deserializes back to ' + deserialized + ' instead!');
 #endif
   },