Skip to content

Commit 4111f57

Browse files
authored
Remove remaining references to removed emscripten_memcpy_big. NFC (#20548)
This function was renamed in #20144. This change updates/removes the remaining references.
1 parent df5b37d commit 4111f57

7 files changed

+12
-11
lines changed

test/optimizer/applyImportAndExportNameChanges-output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var wasmImports = {
88
memset: _memset,
99
sbrk: _sbrk,
1010
memcpy: _memcpy,
11-
emscripten_memcpy_big: _emscripten_memcpy_big,
11+
emscripten_memcpy_js: _emscripten_memcpy_js,
1212
c: ___syscall54,
1313
d: ___syscall140,
1414
q: ___syscall146

test/optimizer/applyImportAndExportNameChanges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var wasmImports = {
77
memset: _memset,
88
sbrk: _sbrk,
99
memcpy: _memcpy,
10-
emscripten_memcpy_big: _emscripten_memcpy_big,
10+
emscripten_memcpy_js: _emscripten_memcpy_js,
1111
__syscall54: ___syscall54,
1212
__syscall140: ___syscall140,
1313
__syscall146: ___syscall146

test/optimizer/applyImportAndExportNameChanges2-output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function _emscripten_random() {
191191
return Math.random();
192192
}
193193

194-
function _emscripten_memcpy_big(dest, src, num) {
194+
function _emscripten_memcpy_js(dest, src, num) {
195195
HEAPU8.set(HEAPU8.subarray(src, src + num), dest);
196196
}
197197

@@ -219,7 +219,7 @@ var wasmImports = {
219219
g: ___syscall54,
220220
f: ___syscall6,
221221
e: _emscripten_get_now,
222-
d: _emscripten_memcpy_big,
222+
d: _emscripten_memcpy_js,
223223
c: _emscripten_random
224224
};
225225

test/optimizer/applyImportAndExportNameChanges2.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ function _emscripten_random() {
184184
return Math.random()
185185
}
186186

187-
function _emscripten_memcpy_big(dest, src, num) {
187+
function _emscripten_memcpy_js(dest, src, num) {
188188
HEAPU8.set(HEAPU8.subarray(src, src + num), dest)
189189
}
190190
if (ENVIRONMENT_IS_NODE) {
@@ -210,7 +210,7 @@ var wasmImports = {
210210
___syscall54: ___syscall54,
211211
___syscall6: ___syscall6,
212212
_emscripten_get_now: _emscripten_get_now,
213-
_emscripten_memcpy_big: _emscripten_memcpy_big,
213+
_emscripten_memcpy_js: _emscripten_memcpy_js,
214214
_emscripten_random: _emscripten_random
215215
};
216216

@@ -262,4 +262,4 @@ WebAssembly.instantiate(Module["wasm"], imports).then(((output) => {
262262

263263

264264

265-
// EXTRA_INFO: {"mapping": {"_llvm_bswap_i32": "k", "_emscripten_random": "c", "dynCall_ii": "o", "__GLOBAL__sub_I_test_global_initializer_cpp": "i", "___errno_location": "j", "dynCall_iiii": "p", "___syscall6": "f", "_memset": "n", "_memcpy": "m", "abort": "b", "___syscall146": "a", "_emscripten_memcpy_big": "d", "___syscall54": "g", "___syscall140": "h", "_emscripten_get_now": "e", "_main": "l"}}
265+
// EXTRA_INFO: {"mapping": {"_llvm_bswap_i32": "k", "_emscripten_random": "c", "dynCall_ii": "o", "__GLOBAL__sub_I_test_global_initializer_cpp": "i", "___errno_location": "j", "dynCall_iiii": "p", "___syscall6": "f", "_memset": "n", "_memcpy": "m", "abort": "b", "___syscall146": "a", "_emscripten_memcpy_js": "d", "___syscall54": "g", "___syscall140": "h", "_emscripten_get_now": "e", "_main": "l"}}

test/optimizer/wasm2js-output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function instantiate(H, I, J) {
2828
var w = E.NaN;
2929
var x = E.Infinity;
3030
var y = F.fd_write;
31-
var z = F.emscripten_memcpy_big;
31+
var z = F.emscripten_memcpy_js;
3232
var A = 5245632;
3333
var B = 0;
3434

test/optimizer/wasm2js.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function asmFunc(global, env, buffer) {
3131
var nan = global.NaN;
3232
var infinity = global.Infinity;
3333
var fimport$0 = env.fd_write;
34-
var fimport$1 = env.emscripten_memcpy_big;
34+
var fimport$1 = env.emscripten_memcpy_js;
3535
var global$0 = 5245632;
3636
var i64toi32_i32$HIGH_BITS = 0;
3737
// EMSCRIPTEN_START_FUNCS

test/test_other.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13761,8 +13761,9 @@ def run(args, expect_bulk_mem):
1376113761
self.assertContained('_emscripten_memcpy_js', js)
1376213762
self.assertNotIn('$emscripten_memcpy_bulkmem', funcs)
1376313763

13764-
# By default we expect to find _emscripten_memcpy_big in the generaed JS and not in the
13765-
# native code.
13764+
# By default we expect to find `_emscripten_memcpy_js` in the generaed JS
13765+
# and not to find the `emscripten_memcpy_bulkmem` function on the wasm
13766+
# side.
1376613767
run([], expect_bulk_mem=False)
1376713768

1376813769
# With bulk memory enabled we expect *not* to find it.

0 commit comments

Comments
 (0)