diff options
| author | Sam Clegg <sbc@chromium.org> | 2020-12-04 14:37:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 14:37:34 -0800 |
| commit | b501c243b0f0949438e98336c86e1942725fcbda (patch) | |
| tree | 816ee309203bac48839819ac2edee41d25b0a20d | |
| parent | ef8c9f6d06b29fe2c7fe63236d709e3278a55041 (diff) | |
| download | binaryen-b501c243b0f0949438e98336c86e1942725fcbda.tar.gz binaryen-b501c243b0f0949438e98336c86e1942725fcbda.tar.bz2 binaryen-b501c243b0f0949438e98336c86e1942725fcbda.zip | |
Remove legacy DYNAMICTOP_PTR support from SafeHeap (#3425)
| -rw-r--r-- | src/passes/SafeHeap.cpp | 7 | ||||
| -rw-r--r-- | test/metadce/outside.wast | 4 | ||||
| -rw-r--r-- | test/metadce/outside.wast.dced | 4 | ||||
| -rw-r--r-- | test/metadce/outside.wast.dced.stdout | 2 | ||||
| -rw-r--r-- | test/passes/print-call-graph.txt | 4 | ||||
| -rw-r--r-- | test/passes/print-call-graph.wast | 4 | ||||
| -rw-r--r-- | test/passes/remove-unused-names_remove-unused-brs_vacuum.txt | 4 | ||||
| -rw-r--r-- | test/passes/remove-unused-names_remove-unused-brs_vacuum.wast | 4 | ||||
| -rw-r--r-- | test/passes/safe-heap_disable-simd.txt | 1912 | ||||
| -rw-r--r-- | test/passes/safe-heap_disable-simd.wast | 4 | ||||
| -rw-r--r-- | test/passes/safe-heap_enable-threads_enable-simd.txt | 171 | ||||
| -rw-r--r-- | test/passes/safe-heap_enable-threads_enable-simd.wast | 1 | ||||
| -rw-r--r-- | test/passes/safe-heap_enable-threads_enable-simd64.txt | 171 | ||||
| -rw-r--r-- | test/passes/safe-heap_enable-threads_enable-simd64.wast | 2 | ||||
| -rw-r--r-- | test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt | 171 | ||||
| -rw-r--r-- | test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast | 2 |
16 files changed, 262 insertions, 2205 deletions
diff --git a/src/passes/SafeHeap.cpp b/src/passes/SafeHeap.cpp index a0006c973..9d2b250f5 100644 --- a/src/passes/SafeHeap.cpp +++ b/src/passes/SafeHeap.cpp @@ -30,7 +30,6 @@ namespace wasm { -static const Name DYNAMICTOP_PTR_IMPORT("DYNAMICTOP_PTR"); static const Name GET_SBRK_PTR("emscripten_get_sbrk_ptr"); static const Name SBRK("sbrk"); static const Name SEGFAULT_IMPORT("segfault"); @@ -124,11 +123,7 @@ struct SafeHeap : public Pass { void addImports(Module* module) { ImportInfo info(*module); auto indexType = module->memory.indexType; - // Older emscripten imports env.DYNAMICTOP_PTR. - // Newer emscripten imports or exports emscripten_get_sbrk_ptr(). - if (auto* existing = info.getImportedGlobal(ENV, DYNAMICTOP_PTR_IMPORT)) { - dynamicTopPtr = existing->name; - } else if (auto* existing = info.getImportedFunction(ENV, GET_SBRK_PTR)) { + if (auto* existing = info.getImportedFunction(ENV, GET_SBRK_PTR)) { getSbrkPtr = existing->name; } else if (auto* existing = module->getExportOrNull(GET_SBRK_PTR)) { getSbrkPtr = existing->value; diff --git a/test/metadce/outside.wast b/test/metadce/outside.wast index 6bf5aa3da..72588943c 100644 --- a/test/metadce/outside.wast +++ b/test/metadce/outside.wast @@ -1,8 +1,6 @@ (module (import "env" "js_func" (func $a_js_func)) (import "env" "js_func_unused" (func $an_unused_js_func)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32)) - (import "env" "DYNAMICTOP_PTR_unused" (global $DYNAMICTOP_PTR$asm2wasm$import_unused i32)) (import "env" "memory" (memory $0 256 256)) (import "env" "table" (table 10 10 funcref)) @@ -21,11 +19,9 @@ (func $a_wasm_func (call $a_js_func) - (drop (global.get $DYNAMICTOP_PTR$asm2wasm$import)) (drop (global.get $__THREW__)) ) (func $an_unused_wasm_func - (drop (global.get $DYNAMICTOP_PTR$asm2wasm$import_unused)) (drop (global.get $__THREW__unused)) ) (func $table_func diff --git a/test/metadce/outside.wast.dced b/test/metadce/outside.wast.dced index 642d58266..1f1c37f1f 100644 --- a/test/metadce/outside.wast.dced +++ b/test/metadce/outside.wast.dced @@ -5,7 +5,6 @@ (data (global.get $from_segment) "abcd") (import "env" "table" (table $timport$0 10 10 funcref)) (elem (global.get $from_segment_2) $table_func) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32)) (import "env" "js_func" (func $a_js_func)) (global $__THREW__ (mut i32) (i32.const 0)) (global $from_segment (mut i32) (i32.const 0)) @@ -17,9 +16,6 @@ (func $a_wasm_func (call $a_js_func) (drop - (global.get $DYNAMICTOP_PTR$asm2wasm$import) - ) - (drop (global.get $__THREW__) ) ) diff --git a/test/metadce/outside.wast.dced.stdout b/test/metadce/outside.wast.dced.stdout index 6095ebf6a..3fab8c256 100644 --- a/test/metadce/outside.wast.dced.stdout +++ b/test/metadce/outside.wast.dced.stdout @@ -1,4 +1,4 @@ -unused: export$wasm_func_unused$12 +unused: export$wasm_func_unused$10 unused: func$an_unused_wasm_func$1 unused: global$__THREW__unused$4 unused: global$from_segment$5 diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt index 7c8398405..48993a4de 100644 --- a/test/passes/print-call-graph.txt +++ b/test/passes/print-call-graph.txt @@ -126,8 +126,6 @@ digraph call { (elem (i32.const 0) $b0 $___stdio_close $b1 $___stdout_write $___stdio_seek $___stdio_write $b2 $_cleanup_387 $b3) (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) (import "global" "NaN" (global $nan$asm2wasm$import f64)) (import "global" "Infinity" (global $inf$asm2wasm$import f64)) @@ -145,8 +143,6 @@ digraph call { (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (global $STACKTOP (mut i32) (global.get $STACKTOP$asm2wasm$import)) (global $STACK_MAX (mut i32) (global.get $STACK_MAX$asm2wasm$import)) - (global $DYNAMICTOP_PTR (mut i32) (global.get $DYNAMICTOP_PTR$asm2wasm$import)) - (global $tempDoublePtr (mut i32) (global.get $tempDoublePtr$asm2wasm$import)) (global $ABORT (mut i32) (global.get $ABORT$asm2wasm$import)) (global $__THREW__ (mut i32) (i32.const 0)) (global $threwValue (mut i32) (i32.const 0)) diff --git a/test/passes/print-call-graph.wast b/test/passes/print-call-graph.wast index 1b837ed92..b1bb60011 100644 --- a/test/passes/print-call-graph.wast +++ b/test/passes/print-call-graph.wast @@ -7,8 +7,6 @@ (type $FUNCSIG$vii (func (param i32 i32))) (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) (import "global" "NaN" (global $nan$asm2wasm$import f64)) (import "global" "Infinity" (global $inf$asm2wasm$import f64)) @@ -30,8 +28,6 @@ (data (global.get $memoryBase) "\05\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\b0\04\00\00\00\04\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\n\ff\ff\ff\ff\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\04") (global $STACKTOP (mut i32) (global.get $STACKTOP$asm2wasm$import)) (global $STACK_MAX (mut i32) (global.get $STACK_MAX$asm2wasm$import)) - (global $DYNAMICTOP_PTR (mut i32) (global.get $DYNAMICTOP_PTR$asm2wasm$import)) - (global $tempDoublePtr (mut i32) (global.get $tempDoublePtr$asm2wasm$import)) (global $ABORT (mut i32) (global.get $ABORT$asm2wasm$import)) (global $__THREW__ (mut i32) (i32.const 0)) (global $threwValue (mut i32) (i32.const 0)) diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt index e82601a79..0962038f9 100644 --- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt +++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt @@ -10,8 +10,6 @@ (type $i32_=>_i64 (func (param i32) (result i64))) (import "env" "memory" (memory $0 256)) (import "env" "table" (table $timport$0 18 18 funcref)) - (import "env" "DYNAMICTOP_PTR" (global $import$0 i32)) - (import "env" "tempDoublePtr" (global $import$1 i32)) (import "env" "ABORT" (global $import$2 i32)) (import "env" "STACKTOP" (global $import$3 i32)) (import "env" "STACK_MAX" (global $import$4 i32)) @@ -42,8 +40,6 @@ (import "asm2wasm" "i32s-rem" (func $import$27 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-rem" (func $import$28 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $import$29 (param i32 i32) (result i32))) - (global $global$0 (mut i32) (global.get $import$0)) - (global $global$1 (mut i32) (global.get $import$1)) (global $global$2 (mut i32) (global.get $import$2)) (global $global$3 (mut i32) (global.get $import$3)) (global $global$4 (mut i32) (global.get $import$4)) diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.wast b/test/passes/remove-unused-names_remove-unused-brs_vacuum.wast index 8d5138522..f1e1d6ad3 100644 --- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.wast +++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.wast @@ -15,8 +15,6 @@ (type $13 (func (param i32 i32 i32 i32 i32))) (type $14 (func (param f64 i32) (result f64))) (type $15 (func (param i32 i32 i32 i32) (result i32))) - (import "env" "DYNAMICTOP_PTR" (global $import$0 i32)) - (import "env" "tempDoublePtr" (global $import$1 i32)) (import "env" "ABORT" (global $import$2 i32)) (import "env" "STACKTOP" (global $import$3 i32)) (import "env" "STACK_MAX" (global $import$4 i32)) @@ -49,8 +47,6 @@ (import "env" "table" (table 18 18 funcref)) (import "env" "memoryBase" (global $import$32 i32)) (import "env" "tableBase" (global $import$33 i32)) - (global $global$0 (mut i32) (global.get $import$0)) - (global $global$1 (mut i32) (global.get $import$1)) (global $global$2 (mut i32) (global.get $import$2)) (global $global$3 (mut i32) (global.get $import$3)) (global $global$4 (mut i32) (global.get $import$4)) diff --git a/test/passes/safe-heap_disable-simd.txt b/test/passes/safe-heap_disable-simd.txt index 89c8c9c3a..ad0bbaad1 100644 --- a/test/passes/safe-heap_disable-simd.txt +++ b/test/passes/safe-heap_disable-simd.txt @@ -1921,1918 +1921,6 @@ (type $i32_i32_f32_=>_none (func (param i32 i32 f32))) (type $i32_i32_=>_f32 (func (param i32 i32) (result f32))) (type $none_=>_none (func)) - (import "env" "DYNAMICTOP_PTR" (global $foo i32)) - (import "env" "segfault" (func $segfault)) - (import "env" "alignfault" (func $alignfault)) - (memory $0 1 1) - (func $SAFE_HEAP_LOAD_i32_1_1 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.load8_s - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_1_U_1 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.load8_u - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_2_1 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.load16_s align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_2_2 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i32.load16_s - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_2_U_1 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.load16_u align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_2_U_2 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i32.load16_u - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_4_1 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.load align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_4_2 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i32.load align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i32_4_4 (param $0 i32) (param $1 i32) (result i32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (i32.load - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_1_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load8_s - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_1_U_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load8_u - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_2_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load16_s align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_2_2 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.load16_s - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_2_U_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load16_u align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_2_U_2 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.load16_u - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load32_s align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_2 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.load32_s align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_4 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (i64.load32_s - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_U_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load32_u align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_U_2 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.load32_u align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_4_U_4 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (i64.load32_u - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_8_1 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.load align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_8_2 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.load align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_8_4 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (i64.load align=4 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_i64_8_8 (param $0 i32) (param $1 i32) (result i64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 7) - ) - (call $alignfault) - ) - (i64.load - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f32_4_1 (param $0 i32) (param $1 i32) (result f32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (f32.load align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f32_4_2 (param $0 i32) (param $1 i32) (result f32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (f32.load align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f32_4_4 (param $0 i32) (param $1 i32) (result f32) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (f32.load - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f64_8_1 (param $0 i32) (param $1 i32) (result f64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (f64.load align=1 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f64_8_2 (param $0 i32) (param $1 i32) (result f64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 1) - ) - (call $alignfault) - ) - (f64.load align=2 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f64_8_4 (param $0 i32) (param $1 i32) (result f64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 3) - ) - (call $alignfault) - ) - (f64.load align=4 - (local.get $2) - ) - ) - (func $SAFE_HEAP_LOAD_f64_8_8 (param $0 i32) (param $1 i32) (result f64) - (local $2 i32) - (local.set $2 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $2) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $2) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $2) - (i32.const 7) - ) - (call $alignfault) - ) - (f64.load - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_1_1 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.store8 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_2_1 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.store16 align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_2_2 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (i32.store16 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_4_1 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i32.store align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_4_2 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (i32.store align=2 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i32_4_4 (param $0 i32) (param $1 i32) (param $2 i32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 3) - ) - (call $alignfault) - ) - (i32.store - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_1_1 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 1) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.store8 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_2_1 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.store16 align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_2_2 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 2) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.store16 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_4_1 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.store32 align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_4_2 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.store32 align=2 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_4_4 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 3) - ) - (call $alignfault) - ) - (i64.store32 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_8_1 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (i64.store align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_8_2 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (i64.store align=2 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_8_4 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 3) - ) - (call $alignfault) - ) - (i64.store align=4 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_i64_8_8 (param $0 i32) (param $1 i32) (param $2 i64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 7) - ) - (call $alignfault) - ) - (i64.store - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f32_4_1 (param $0 i32) (param $1 i32) (param $2 f32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (f32.store align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f32_4_2 (param $0 i32) (param $1 i32) (param $2 f32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (f32.store align=2 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f32_4_4 (param $0 i32) (param $1 i32) (param $2 f32) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 4) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 3) - ) - (call $alignfault) - ) - (f32.store - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f64_8_1 (param $0 i32) (param $1 i32) (param $2 f64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (f64.store align=1 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f64_8_2 (param $0 i32) (param $1 i32) (param $2 f64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 1) - ) - (call $alignfault) - ) - (f64.store align=2 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f64_8_4 (param $0 i32) (param $1 i32) (param $2 f64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 3) - ) - (call $alignfault) - ) - (f64.store align=4 - (local.get $3) - (local.get $2) - ) - ) - (func $SAFE_HEAP_STORE_f64_8_8 (param $0 i32) (param $1 i32) (param $2 f64) - (local $3 i32) - (local.set $3 - (i32.add - (local.get $0) - (local.get $1) - ) - ) - (if - (i32.or - (i32.eq - (local.get $3) - (i32.const 0) - ) - (i32.gt_u - (i32.add - (local.get $3) - (i32.const 8) - ) - (i32.load - (global.get $foo) - ) - ) - ) - (call $segfault) - ) - (if - (i32.and - (local.get $3) - (i32.const 7) - ) - (call $alignfault) - ) - (f64.store - (local.get $3) - (local.get $2) - ) - ) -) -(module - (type $i32_i32_=>_i64 (func (param i32 i32) (result i64))) - (type $i32_i32_i64_=>_none (func (param i32 i32 i64))) - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) - (type $i32_i32_i32_=>_none (func (param i32 i32 i32))) - (type $i32_i32_f64_=>_none (func (param i32 i32 f64))) - (type $i32_i32_=>_f64 (func (param i32 i32) (result f64))) - (type $i32_i32_f32_=>_none (func (param i32 i32 f32))) - (type $i32_i32_=>_f32 (func (param i32 i32) (result f32))) - (type $none_=>_none (func)) (type $none_=>_i32 (func (result i32))) (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) (import "env" "segfault" (func $segfault)) diff --git a/test/passes/safe-heap_disable-simd.wast b/test/passes/safe-heap_disable-simd.wast index bac91ed98..f867a0e7c 100644 --- a/test/passes/safe-heap_disable-simd.wast +++ b/test/passes/safe-heap_disable-simd.wast @@ -3,10 +3,6 @@ ) (module (memory 1 1) - (import "env" "DYNAMICTOP_PTR" (global $foo i32)) -) -(module - (memory 1 1) (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) ) (module diff --git a/test/passes/safe-heap_enable-threads_enable-simd.txt b/test/passes/safe-heap_enable-threads_enable-simd.txt index 22d633132..75a39591b 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_enable-threads_enable-simd.txt @@ -5437,9 +5437,10 @@ (type $none_=>_none (func)) (type $i32_i32_f32_=>_none (func (param i32 i32 f32))) (type $i32_i32_=>_f32 (func (param i32 i32) (result f32))) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) + (type $none_=>_i32 (func (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) + (import "env" "emscripten_get_sbrk_ptr" (func $emscripten_get_sbrk_ptr (result i32))) (memory $0 (shared 100 100)) (func $actions (drop @@ -5474,7 +5475,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5510,7 +5511,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5540,7 +5541,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5570,7 +5571,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5600,7 +5601,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5630,7 +5631,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5673,7 +5674,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5710,7 +5711,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5740,7 +5741,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5777,7 +5778,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5814,7 +5815,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5844,7 +5845,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5881,7 +5882,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5918,7 +5919,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5955,7 +5956,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -5991,7 +5992,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6021,7 +6022,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6051,7 +6052,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6081,7 +6082,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6111,7 +6112,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6154,7 +6155,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6191,7 +6192,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6221,7 +6222,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6258,7 +6259,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6295,7 +6296,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6325,7 +6326,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6362,7 +6363,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6405,7 +6406,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6442,7 +6443,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6472,7 +6473,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6509,7 +6510,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6546,7 +6547,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6583,7 +6584,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6613,7 +6614,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6650,7 +6651,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6687,7 +6688,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6724,7 +6725,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6761,7 +6762,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6791,7 +6792,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6828,7 +6829,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6865,7 +6866,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6895,7 +6896,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6932,7 +6933,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -6969,7 +6970,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7006,7 +7007,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7036,7 +7037,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7073,7 +7074,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7110,7 +7111,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7147,7 +7148,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7184,7 +7185,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7215,7 +7216,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7246,7 +7247,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7277,7 +7278,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7315,7 +7316,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7353,7 +7354,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7384,7 +7385,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7422,7 +7423,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7460,7 +7461,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7498,7 +7499,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7529,7 +7530,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7560,7 +7561,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7591,7 +7592,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7629,7 +7630,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7667,7 +7668,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7698,7 +7699,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7736,7 +7737,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7774,7 +7775,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7812,7 +7813,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7843,7 +7844,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7881,7 +7882,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7919,7 +7920,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7957,7 +7958,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -7995,7 +7996,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8026,7 +8027,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8064,7 +8065,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8102,7 +8103,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8133,7 +8134,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8171,7 +8172,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8209,7 +8210,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8247,7 +8248,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8278,7 +8279,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8316,7 +8317,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8354,7 +8355,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) @@ -8392,7 +8393,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $emscripten_get_sbrk_ptr) ) ) ) diff --git a/test/passes/safe-heap_enable-threads_enable-simd.wast b/test/passes/safe-heap_enable-threads_enable-simd.wast index 17c9995c4..b1cd1f050 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd.wast +++ b/test/passes/safe-heap_enable-threads_enable-simd.wast @@ -45,7 +45,6 @@ ;; pre-existing (module (type $FUNCSIG$v (func)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared 100 100)) diff --git a/test/passes/safe-heap_enable-threads_enable-simd64.txt b/test/passes/safe-heap_enable-threads_enable-simd64.txt index fcfd59694..ed2365902 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd64.txt +++ b/test/passes/safe-heap_enable-threads_enable-simd64.txt @@ -5623,7 +5623,8 @@ (type $none_=>_none (func)) (type $i64_i64_f32_=>_none (func (param i64 i64 f32))) (type $i64_i64_=>_f32 (func (param i64 i64) (result f32))) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) + (type $none_=>_i64 (func (result i64))) + (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i64))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared i64 100 100)) @@ -5660,7 +5661,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5696,7 +5697,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5726,7 +5727,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5756,7 +5757,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5786,7 +5787,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5816,7 +5817,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5861,7 +5862,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5900,7 +5901,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5930,7 +5931,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5969,7 +5970,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6008,7 +6009,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6038,7 +6039,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6077,7 +6078,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6116,7 +6117,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6155,7 +6156,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6191,7 +6192,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6221,7 +6222,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6251,7 +6252,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6281,7 +6282,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6311,7 +6312,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6356,7 +6357,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6395,7 +6396,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6425,7 +6426,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6464,7 +6465,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6503,7 +6504,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6533,7 +6534,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6572,7 +6573,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6617,7 +6618,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6656,7 +6657,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6686,7 +6687,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6725,7 +6726,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6764,7 +6765,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6803,7 +6804,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6833,7 +6834,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6872,7 +6873,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6911,7 +6912,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6950,7 +6951,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6989,7 +6990,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7019,7 +7020,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7058,7 +7059,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7097,7 +7098,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7127,7 +7128,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7166,7 +7167,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7205,7 +7206,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7244,7 +7245,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7274,7 +7275,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7313,7 +7314,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7352,7 +7353,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7391,7 +7392,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7430,7 +7431,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7461,7 +7462,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7492,7 +7493,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7523,7 +7524,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7563,7 +7564,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7603,7 +7604,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7634,7 +7635,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7674,7 +7675,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7714,7 +7715,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7754,7 +7755,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7785,7 +7786,7 @@ (i64.const 1) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7816,7 +7817,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7847,7 +7848,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7887,7 +7888,7 @@ (i64.const 2) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7927,7 +7928,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7958,7 +7959,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7998,7 +7999,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8038,7 +8039,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8078,7 +8079,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8109,7 +8110,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8149,7 +8150,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8189,7 +8190,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8229,7 +8230,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8269,7 +8270,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8300,7 +8301,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8340,7 +8341,7 @@ (i64.const 4) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8380,7 +8381,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8411,7 +8412,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8451,7 +8452,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8491,7 +8492,7 @@ (i64.const 8) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8531,7 +8532,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8562,7 +8563,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8602,7 +8603,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8642,7 +8643,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8682,7 +8683,7 @@ (i64.const 16) ) (i64.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) diff --git a/test/passes/safe-heap_enable-threads_enable-simd64.wast b/test/passes/safe-heap_enable-threads_enable-simd64.wast index 1907479f4..d34c5772b 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd64.wast +++ b/test/passes/safe-heap_enable-threads_enable-simd64.wast @@ -45,7 +45,7 @@ ;; pre-existing (module (type $FUNCSIG$v (func)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) + (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i64))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared i64 100 100)) diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt index c137e63b6..36a812027 100644 --- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt @@ -5437,7 +5437,8 @@ (type $none_=>_none (func)) (type $i32_i32_f32_=>_none (func (param i32 i32 f32))) (type $i32_i32_=>_f32 (func (param i32 i32) (result f32))) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) + (type $none_=>_i32 (func (result i32))) + (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared 100 100)) @@ -5474,7 +5475,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5510,7 +5511,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5540,7 +5541,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5570,7 +5571,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5600,7 +5601,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5630,7 +5631,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5673,7 +5674,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5710,7 +5711,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5740,7 +5741,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5777,7 +5778,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5814,7 +5815,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5844,7 +5845,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5881,7 +5882,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5918,7 +5919,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5955,7 +5956,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -5991,7 +5992,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6021,7 +6022,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6051,7 +6052,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6081,7 +6082,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6111,7 +6112,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6154,7 +6155,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6191,7 +6192,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6221,7 +6222,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6258,7 +6259,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6295,7 +6296,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6325,7 +6326,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6362,7 +6363,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6405,7 +6406,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6442,7 +6443,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6472,7 +6473,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6509,7 +6510,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6546,7 +6547,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6583,7 +6584,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6613,7 +6614,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6650,7 +6651,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6687,7 +6688,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6724,7 +6725,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6761,7 +6762,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6791,7 +6792,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6828,7 +6829,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6865,7 +6866,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6895,7 +6896,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6932,7 +6933,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -6969,7 +6970,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7006,7 +7007,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7036,7 +7037,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7073,7 +7074,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7110,7 +7111,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7147,7 +7148,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7184,7 +7185,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7215,7 +7216,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7246,7 +7247,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7277,7 +7278,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7315,7 +7316,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7353,7 +7354,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7384,7 +7385,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7422,7 +7423,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7460,7 +7461,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7498,7 +7499,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7529,7 +7530,7 @@ (i32.const 1) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7560,7 +7561,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7591,7 +7592,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7629,7 +7630,7 @@ (i32.const 2) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7667,7 +7668,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7698,7 +7699,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7736,7 +7737,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7774,7 +7775,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7812,7 +7813,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7843,7 +7844,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7881,7 +7882,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7919,7 +7920,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7957,7 +7958,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -7995,7 +7996,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8026,7 +8027,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8064,7 +8065,7 @@ (i32.const 4) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8102,7 +8103,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8133,7 +8134,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8171,7 +8172,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8209,7 +8210,7 @@ (i32.const 8) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8247,7 +8248,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8278,7 +8279,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8316,7 +8317,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8354,7 +8355,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) @@ -8392,7 +8393,7 @@ (i32.const 16) ) (i32.load - (global.get $DYNAMICTOP_PTR) + (call $foo) ) ) ) diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast index 17c9995c4..bad9fb8d4 100644 --- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast +++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.wast @@ -45,7 +45,7 @@ ;; pre-existing (module (type $FUNCSIG$v (func)) - (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) + (import "env" "emscripten_get_sbrk_ptr" (func $foo (result i32))) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared 100 100)) |