Use underscore prefix for emscripten_memcpy/memset functions. NFC (#21622)

sbc100 · web-flow · commit 74a4ed113f5f · 2024-03-26T19:02:01.000-07:00
These are internal function for use in our memcpy/memset implementation.
diff --git a/src/library.js b/src/library.js
@@ -413,8 +413,8 @@ addToLibrary({
   $ENV: {},
 
   // In -Oz builds, we replace memcpy() altogether with a non-unrolled wasm
-  // variant, so we should never emit emscripten_memcpy_js() in the build.
-  // In STANDALONE_WASM we avoid the emscripten_memcpy_js dependency so keep
+  // variant, so we should never emit _emscripten_memcpy_js() in the build.
+  // In STANDALONE_WASM we avoid the _emscripten_memcpy_js dependency so keep
   // the wasm file standalone.
   // In BULK_MEMORY mode we include native versions of these functions based
   // on memory.fill and memory.copy.
@@ -435,11 +435,11 @@ addToLibrary({
   //   AppleWebKit/605.1.15 Safari/604.1 Version/13.0.4 iPhone OS 13_3 on iPhone 6s with iOS 13.3
   //   AppleWebKit/605.1.15 Version/13.0.3 Intel Mac OS X 10_15_1 on Safari 13.0.3 (15608.3.10.1.4) on macOS Catalina 10.15.1
   // Hence the support status of .copyWithin() for Safari version range [10.0.0, 10.1.0] is unknown.
-  emscripten_memcpy_js: `= Uint8Array.prototype.copyWithin
+  _emscripten_memcpy_js: `= Uint8Array.prototype.copyWithin
     ? (dest, src, num) => HEAPU8.copyWithin(dest, src, src + num)
     : (dest, src, num) => HEAPU8.set(HEAPU8.subarray(src, src+num), dest)`,
 #else
-  emscripten_memcpy_js: (dest, src, num) => HEAPU8.copyWithin(dest, src, src + num),
+  _emscripten_memcpy_js: (dest, src, num) => HEAPU8.copyWithin(dest, src, src + num),
 #endif
 
 #endif
diff --git a/src/library_sigs.js b/src/library_sigs.js
@@ -325,6 +325,7 @@ sigs = {
   _emscripten_get_now_is_monotonic__sig: 'i',
   _emscripten_get_progname__sig: 'vpi',
   _emscripten_lookup_name__sig: 'ip',
+  _emscripten_memcpy_js__sig: 'vppp',
   _emscripten_notify_mailbox_postmessage__sig: 'vppp',
   _emscripten_push_main_loop_blocker__sig: 'vppp',
   _emscripten_push_uncounted_main_loop_blocker__sig: 'vppp',
@@ -704,7 +705,6 @@ sigs = {
   emscripten_math_sqrt__sig: 'dd',
   emscripten_math_tan__sig: 'dd',
   emscripten_math_tanh__sig: 'dd',
-  emscripten_memcpy_js__sig: 'vppp',
   emscripten_navigator_hardware_concurrency__sig: 'i',
   emscripten_notify_memory_growth__sig: 'vp',
   emscripten_num_logical_cores__sig: 'i',
diff --git a/system/lib/libc/emscripten_internal.h b/system/lib/libc/emscripten_internal.h
@@ -28,14 +28,14 @@ extern "C" {
 
 // An external JS implementation that is efficient for very large copies, using
 // HEAPU8.set()
-void emscripten_memcpy_js(void* __restrict__ dest,
+void _emscripten_memcpy_js(void* __restrict__ dest,
                            const void* __restrict__ src,
-                           size_t n) EM_IMPORT(emscripten_memcpy_js);
+                           size_t n) EM_IMPORT(_emscripten_memcpy_js);
 
-void* emscripten_memcpy_bulkmem(void* __restrict__ dest,
-                                const void* __restrict__ src,
-                                size_t n);
-void* emscripten_memset_bulkmem(void* ptr, char value, size_t n);
+void* _emscripten_memcpy_bulkmem(void* __restrict__ dest,
+                                 const void* __restrict__ src,
+                                 size_t n);
+void* _emscripten_memset_bulkmem(void* ptr, char value, size_t n);
 
 void emscripten_notify_memory_growth(size_t memory_index);
 
diff --git a/system/lib/libc/emscripten_memcpy.c b/system/lib/libc/emscripten_memcpy.c
@@ -22,7 +22,7 @@ static void *__memcpy(void *dest, const void *src, size_t n) {
 #elif defined(__wasm_bulk_memory__)
 
 static void *__memcpy(void *restrict dest, const void *restrict src, size_t n) {
-  return emscripten_memcpy_bulkmem(dest, src, n);
+  return _emscripten_memcpy_bulkmem(dest, src, n);
 }
 
 #else
@@ -37,7 +37,7 @@ static void *__memcpy(void *restrict dest, const void *restrict src, size_t n) {
 
 #if !defined(EMSCRIPTEN_STANDALONE_WASM)
   if (n >= 512) {
-    emscripten_memcpy_js(dest, src, n);
+    _emscripten_memcpy_js(dest, src, n);
     return dest;
   }
 #endif
diff --git a/system/lib/libc/emscripten_memcpy_bulkmem.S b/system/lib/libc/emscripten_memcpy_bulkmem.S
@@ -4,9 +4,9 @@
 #define PTR i32
 #endif
 
-.globl emscripten_memcpy_bulkmem
-emscripten_memcpy_bulkmem:
-  .functype emscripten_memcpy_bulkmem (PTR, PTR, PTR) -> (PTR)
+.globl _emscripten_memcpy_bulkmem
+_emscripten_memcpy_bulkmem:
+  .functype _emscripten_memcpy_bulkmem (PTR, PTR, PTR) -> (PTR)
   local.get 0
   local.get 1
   local.get 2
diff --git a/system/lib/libc/emscripten_memset.c b/system/lib/libc/emscripten_memset.c
@@ -21,7 +21,7 @@ void *__memset(void *str, int c, size_t n) {
 #elif defined(__wasm_bulk_memory__)
 
 void *__memset(void *str, int c, size_t n) {
-  return emscripten_memset_bulkmem(str, c, n);
+  return _emscripten_memset_bulkmem(str, c, n);
 }
 
 #else
diff --git a/system/lib/libc/emscripten_memset_bulkmem.S b/system/lib/libc/emscripten_memset_bulkmem.S
@@ -4,9 +4,9 @@
 #define PTR i32
 #endif
 
-.globl emscripten_memset_bulkmem
-emscripten_memset_bulkmem:
-  .functype emscripten_memset_bulkmem (PTR, i32, PTR) -> (PTR)
+.globl _emscripten_memset_bulkmem
+_emscripten_memset_bulkmem:
+  .functype _emscripten_memset_bulkmem (PTR, i32, PTR) -> (PTR)
   local.get 0
   local.get 1
   local.get 2
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize
@@ -1 +1 @@
-9853
+9855
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.imports b/test/other/metadce/test_metadce_cxx_ctors1.imports
@@ -1,6 +1,6 @@
 env.__cxa_throw
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.strftime_l
 wasi_snapshot_preview1.environ_get
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-24243
+24244
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.sent b/test/other/metadce/test_metadce_cxx_ctors1.sent
@@ -1,6 +1,6 @@
 __cxa_throw
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.size b/test/other/metadce/test_metadce_cxx_ctors1.size
@@ -1 +1 @@
-125812
+125813
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.gzsize b/test/other/metadce/test_metadce_cxx_ctors2.gzsize
@@ -1 +1 @@
-9836
+9838
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.imports b/test/other/metadce/test_metadce_cxx_ctors2.imports
@@ -1,5 +1,5 @@
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.strftime_l
 wasi_snapshot_preview1.fd_close
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-24211
+24212
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.sent b/test/other/metadce/test_metadce_cxx_ctors2.sent
@@ -1,6 +1,6 @@
 __cxa_throw
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.size b/test/other/metadce/test_metadce_cxx_ctors2.size
@@ -1 +1 @@
-125271
+125272
diff --git a/test/other/metadce/test_metadce_cxx_except.gzsize b/test/other/metadce/test_metadce_cxx_except.gzsize
@@ -1 +1 @@
-10944
+10945
diff --git a/test/other/metadce/test_metadce_cxx_except.imports b/test/other/metadce/test_metadce_cxx_except.imports
@@ -6,8 +6,8 @@ env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
 env.__resumeException
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.invoke_diii
 env.invoke_fiii
diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-28160
+28161
diff --git a/test/other/metadce/test_metadce_cxx_except.sent b/test/other/metadce/test_metadce_cxx_except.sent
@@ -6,8 +6,8 @@ __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
 __resumeException
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_except.size b/test/other/metadce/test_metadce_cxx_except.size
@@ -1 +1 @@
-168057
+168058
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize
@@ -1 +1 @@
-9818
+9821
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.imports b/test/other/metadce/test_metadce_cxx_except_wasm.imports
@@ -1,5 +1,5 @@
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.strftime_l
 wasi_snapshot_preview1.environ_get
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-24136
+24137
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.sent b/test/other/metadce/test_metadce_cxx_except_wasm.sent
@@ -1,5 +1,5 @@
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.size b/test/other/metadce/test_metadce_cxx_except_wasm.size
@@ -1 +1 @@
-139149
+139150
diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize
@@ -1 +1 @@
-10953
+10954
diff --git a/test/other/metadce/test_metadce_cxx_mangle.imports b/test/other/metadce/test_metadce_cxx_mangle.imports
@@ -6,8 +6,8 @@ env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
 env.__resumeException
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.invoke_diii
 env.invoke_fiii
diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-28161
+28162
diff --git a/test/other/metadce/test_metadce_cxx_mangle.sent b/test/other/metadce/test_metadce_cxx_mangle.sent
@@ -6,8 +6,8 @@ __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
 __resumeException
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_mangle.size b/test/other/metadce/test_metadce_cxx_mangle.size
@@ -1 +1 @@
-223568
+223569
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize
@@ -1 +1 @@
-9853
+9855
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.imports b/test/other/metadce/test_metadce_cxx_noexcept.imports
@@ -1,6 +1,6 @@
 env.__cxa_throw
+env._emscripten_memcpy_js
 env.abort
-env.emscripten_memcpy_js
 env.emscripten_resize_heap
 env.strftime_l
 wasi_snapshot_preview1.environ_get
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-24243
+24244
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.sent b/test/other/metadce/test_metadce_cxx_noexcept.sent
@@ -1,6 +1,6 @@
 __cxa_throw
+_emscripten_memcpy_js
 abort
-emscripten_memcpy_js
 emscripten_resize_heap
 environ_get
 environ_sizes_get
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.size b/test/other/metadce/test_metadce_cxx_noexcept.size
@@ -1 +1 @@
-128607
+128608
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize
@@ -1 +1 @@
-5212
+5216
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.imports b/test/other/metadce/test_metadce_cxx_wasmfs.imports
@@ -1,4 +1,5 @@
 env.__cxa_throw
+env._emscripten_memcpy_js
 env._wasmfs_copy_preloaded_file_data
 env._wasmfs_get_num_preloaded_dirs
 env._wasmfs_get_num_preloaded_files
@@ -11,7 +12,6 @@ env._wasmfs_stdin_get_char
 env.abort
 env.emscripten_date_now
 env.emscripten_err
-env.emscripten_memcpy_js
 env.emscripten_out
 env.emscripten_resize_heap
 env.getentropy
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.jssize b/test/other/metadce/test_metadce_cxx_wasmfs.jssize
@@ -1 +1 @@
-12055
+12056
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.sent b/test/other/metadce/test_metadce_cxx_wasmfs.sent
@@ -1,4 +1,5 @@
 __cxa_throw
+_emscripten_memcpy_js
 _wasmfs_copy_preloaded_file_data
 _wasmfs_get_num_preloaded_dirs
 _wasmfs_get_num_preloaded_files
@@ -11,7 +12,6 @@ _wasmfs_stdin_get_char
 abort
 emscripten_date_now
 emscripten_err
-emscripten_memcpy_js
 emscripten_out
 emscripten_resize_heap
 environ_get
diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.size b/test/other/metadce/test_metadce_cxx_wasmfs.size
@@ -1 +1 @@
-165851
+165852
diff --git a/test/other/metadce/test_metadce_hello_O0.gzsize b/test/other/metadce/test_metadce_hello_O0.gzsize
@@ -1 +1 @@
-8116
+8118
diff --git a/test/other/metadce/test_metadce_hello_O0.imports b/test/other/metadce/test_metadce_hello_O0.imports
@@ -1,2 +1,2 @@
-env.emscripten_memcpy_js
+env._emscripten_memcpy_js
 wasi_snapshot_preview1.fd_write
diff --git a/test/other/metadce/test_metadce_hello_O0.jssize b/test/other/metadce/test_metadce_hello_O0.jssize
@@ -1 +1 @@
-21940
+21941
diff --git a/test/other/metadce/test_metadce_hello_O0.sent b/test/other/metadce/test_metadce_hello_O0.sent
@@ -1,2 +1,2 @@
-emscripten_memcpy_js
+_emscripten_memcpy_js
 fd_write
diff --git a/test/other/metadce/test_metadce_hello_O0.size b/test/other/metadce/test_metadce_hello_O0.size
@@ -1 +1 @@
-12126
+12127
diff --git a/test/other/metadce/test_metadce_hello_O1.gzsize b/test/other/metadce/test_metadce_hello_O1.gzsize
@@ -1 +1 @@
-2973
+2974
diff --git a/test/other/metadce/test_metadce_hello_O1.imports b/test/other/metadce/test_metadce_hello_O1.imports
@@ -1,2 +1,2 @@
-env.emscripten_memcpy_js
+env._emscripten_memcpy_js
 wasi_snapshot_preview1.fd_write
diff --git a/test/other/metadce/test_metadce_hello_O1.jssize b/test/other/metadce/test_metadce_hello_O1.jssize
@@ -1 +1 @@
-7672
+7673
diff --git a/test/other/metadce/test_metadce_hello_O1.sent b/test/other/metadce/test_metadce_hello_O1.sent
@@ -1,2 +1,2 @@
-emscripten_memcpy_js
+_emscripten_memcpy_js
 fd_write
diff --git a/test/other/metadce/test_metadce_hello_O1.size b/test/other/metadce/test_metadce_hello_O1.size
@@ -1 +1 @@
-2449
+2450
diff --git a/test/other/metadce/test_metadce_hello_O2.gzsize b/test/other/metadce/test_metadce_hello_O2.gzsize
@@ -1 +1 @@
-2616
+2617
diff --git a/test/other/metadce/test_metadce_hello_O2.imports b/test/other/metadce/test_metadce_hello_O2.imports
@@ -1,2 +1,2 @@
-env.emscripten_memcpy_js
+env._emscripten_memcpy_js
 wasi_snapshot_preview1.fd_write
diff --git a/test/other/metadce/test_metadce_hello_O2.jssize b/test/other/metadce/test_metadce_hello_O2.jssize
@@ -1 +1 @@
-5437
+5438
diff --git a/test/other/metadce/test_metadce_hello_O2.sent b/test/other/metadce/test_metadce_hello_O2.sent
@@ -1,2 +1,2 @@
-emscripten_memcpy_js
+_emscripten_memcpy_js
 fd_write
diff --git a/test/other/metadce/test_metadce_hello_O2.size b/test/other/metadce/test_metadce_hello_O2.size
@@ -1 +1 @@
-2064
+2065
diff --git a/test/other/metadce/test_metadce_hello_dylink.gzsize b/test/other/metadce/test_metadce_hello_dylink.gzsize
@@ -1 +1 @@
-6431
+6424
diff --git a/test/other/metadce/test_metadce_hello_dylink.imports b/test/other/metadce/test_metadce_hello_dylink.imports
@@ -3,7 +3,7 @@ env.__indirect_function_table
 env.__memory_base
 env.__stack_pointer
 env.__table_base
-env.emscripten_memcpy_js
+env._emscripten_memcpy_js
 env.emscripten_resize_heap
 env.memory
 wasi_snapshot_preview1.fd_write
diff --git a/test/other/metadce/test_metadce_hello_dylink.jssize b/test/other/metadce/test_metadce_hello_dylink.jssize
@@ -1 +1 @@
-14280
+14259
diff --git a/test/other/metadce/test_metadce_hello_dylink.sent b/test/other/metadce/test_metadce_hello_dylink.sent
@@ -3,7 +3,7 @@ __indirect_function_table
 __memory_base
 __stack_pointer
 __table_base
-emscripten_memcpy_js
+_emscripten_memcpy_js
 emscripten_resize_heap
 fd_write
 memory
diff --git a/test/other/metadce/test_metadce_hello_dylink.size b/test/other/metadce/test_metadce_hello_dylink.size
@@ -1 +1 @@
-9415
+9416
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-55657
+55660
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-12123
+12124
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-31743
+31746
diff --git a/test/other/test_unoptimized_code_size_no_asserts.wasm.size b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
@@ -1 +1 @@
-11601
+11602
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-54544
+54547
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
diff --git a/test/test_other.py b/test/test_other.py

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ static void __memcpy(void dest, const void *src, size_t n) {`
`22`	`22`	`#elif defined(__wasm_bulk_memory__)`
`23`	`23`
`24`	`24`	`static void __memcpy(void restrict dest, const void *restrict src, size_t n) {`
`25`		`- return emscripten_memcpy_bulkmem(dest, src, n);`
	`25`	`+ return _emscripten_memcpy_bulkmem(dest, src, n);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#else`
`@@ -37,7 +37,7 @@ static void __memcpy(void restrict dest, const void *restrict src, size_t n) {`
`37`	`37`
`38`	`38`	`#if !defined(EMSCRIPTEN_STANDALONE_WASM)`
`39`	`39`	`if (n >= 512) {`
`40`		`- emscripten_memcpy_js(dest, src, n);`
	`40`	`+ _emscripten_memcpy_js(dest, src, n);`
`41`	`41`	`return dest;`
`42`	`42`	`}`
`43`	`43`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ void __memset(void str, int c, size_t n) {`
`21`	`21`	`#elif defined(__wasm_bulk_memory__)`
`22`	`22`
`23`	`23`	`void __memset(void str, int c, size_t n) {`
`24`		`- return emscripten_memset_bulkmem(str, c, n);`
	`24`	`+ return _emscripten_memset_bulkmem(str, c, n);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-env.emscripten_memcpy_js`
	`1`	`+env._emscripten_memcpy_js`
`2`	`2`	`wasi_snapshot_preview1.fd_write`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-emscripten_memcpy_js`
	`1`	`+_emscripten_memcpy_js`
`2`	`2`	`fd_write`