diff options
Diffstat (limited to 'test')
83 files changed, 98 insertions, 98 deletions
diff --git a/test/dump/bad-version-logging.txt b/test/dump/bad-version-logging.txt index 0703ec08..95df42ab 100644 --- a/test/dump/bad-version-logging.txt +++ b/test/dump/bad-version-logging.txt @@ -1,10 +1,10 @@ ;;; ERROR: 1 -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: --gen-wasm --dump-debug magic 0xe 0 0 0 (;; STDERR ;;; -Error running "wasmdump": +Error running "wasm-objdump": *ERROR*: @0x00000008: bad wasm file version: 0xe (expected 0x1) ;;; STDERR ;;) diff --git a/test/dump/bad-version.txt b/test/dump/bad-version.txt index b6c66eed..4226e21d 100644 --- a/test/dump/bad-version.txt +++ b/test/dump/bad-version.txt @@ -1,10 +1,10 @@ ;;; ERROR: 1 -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: --gen-wasm magic 0xe 0 0 0 (;; STDERR ;;; -Error running "wasmdump": +Error running "wasm-objdump": *ERROR*: @0x00000008: bad wasm file version: 0xe (expected 0x1) ;;; STDERR ;;) diff --git a/test/dump/basic.txt b/test/dump/basic.txt index 9088b07c..58c57caa 100644 --- a/test/dump/basic.txt +++ b/test/dump/basic.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --headers (module (memory 1) diff --git a/test/dump/basic_dump_only.txt b/test/dump/basic_dump_only.txt index 4f056884..c3c42f10 100644 --- a/test/dump/basic_dump_only.txt +++ b/test/dump/basic_dump_only.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump (module (memory 1) (func $f (param i32 i32) (result i32) diff --git a/test/dump/binary.txt b/test/dump/binary.txt index ae018381..1df8b9b1 100644 --- a/test/dump/binary.txt +++ b/test/dump/binary.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/block-257-exprs-br.txt b/test/dump/block-257-exprs-br.txt index c5500d4f..74768c91 100644 --- a/test/dump/block-257-exprs-br.txt +++ b/test/dump/block-257-exprs-br.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/block-257-exprs.txt b/test/dump/block-257-exprs.txt index aa7e7e19..23c2c9f5 100644 --- a/test/dump/block-257-exprs.txt +++ b/test/dump/block-257-exprs.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/block.txt b/test/dump/block.txt index 4ed168cb..3ef2a46f 100644 --- a/test/dump/block.txt +++ b/test/dump/block.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/br-block-named.txt b/test/dump/br-block-named.txt index 35996c80..260afb53 100644 --- a/test/dump/br-block-named.txt +++ b/test/dump/br-block-named.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/br-block.txt b/test/dump/br-block.txt index 1efef96f..90531a75 100644 --- a/test/dump/br-block.txt +++ b/test/dump/br-block.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func ;; depth diff --git a/test/dump/br-loop-inner-expr.txt b/test/dump/br-loop-inner-expr.txt index 32a0b0db..a59a5c71 100644 --- a/test/dump/br-loop-inner-expr.txt +++ b/test/dump/br-loop-inner-expr.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (result i32) diff --git a/test/dump/br-loop-inner.txt b/test/dump/br-loop-inner.txt index 82b45d87..f54823a5 100644 --- a/test/dump/br-loop-inner.txt +++ b/test/dump/br-loop-inner.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/br-loop.txt b/test/dump/br-loop.txt index cfaeff6a..da8320a2 100644 --- a/test/dump/br-loop.txt +++ b/test/dump/br-loop.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/brif-loop.txt b/test/dump/brif-loop.txt index 13d9e8dd..acf957f4 100644 --- a/test/dump/brif-loop.txt +++ b/test/dump/brif-loop.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/brif.txt b/test/dump/brif.txt index 05ea0b8f..321f37be 100644 --- a/test/dump/brif.txt +++ b/test/dump/brif.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/brtable-empty.txt b/test/dump/brtable-empty.txt index 553ae9d8..f347effe 100644 --- a/test/dump/brtable-empty.txt +++ b/test/dump/brtable-empty.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/brtable.txt b/test/dump/brtable.txt index 31b8f1eb..08c10554 100644 --- a/test/dump/brtable.txt +++ b/test/dump/brtable.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/call.txt b/test/dump/call.txt index 1b15cec7..4e6dea22 100644 --- a/test/dump/call.txt +++ b/test/dump/call.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (param i32) diff --git a/test/dump/callimport.txt b/test/dump/callimport.txt index 01b00121..180f2794 100644 --- a/test/dump/callimport.txt +++ b/test/dump/callimport.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (import "foo" "bar" (func (param i32 f32) (result i32))) diff --git a/test/dump/callindirect.txt b/test/dump/callindirect.txt index 8b3b0ac3..7d1415bb 100644 --- a/test/dump/callindirect.txt +++ b/test/dump/callindirect.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (type $t (func (param i32))) diff --git a/test/dump/cast.txt b/test/dump/cast.txt index b7a7c09d..b1273a3b 100644 --- a/test/dump/cast.txt +++ b/test/dump/cast.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/compare.txt b/test/dump/compare.txt index d978a945..e2742a83 100644 --- a/test/dump/compare.txt +++ b/test/dump/compare.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/const.txt b/test/dump/const.txt index 8b85a2a4..55fc55fa 100644 --- a/test/dump/const.txt +++ b/test/dump/const.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/convert.txt b/test/dump/convert.txt index f093807c..2786ae11 100644 --- a/test/dump/convert.txt +++ b/test/dump/convert.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/current-memory.txt b/test/dump/current-memory.txt index 6c83218e..72003954 100644 --- a/test/dump/current-memory.txt +++ b/test/dump/current-memory.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1) diff --git a/test/dump/debug-import-names.txt b/test/dump/debug-import-names.txt index 6f7e518f..850b62bf 100644 --- a/test/dump/debug-import-names.txt +++ b/test/dump/debug-import-names.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: --headers -v --debug-names --dump-verbose (module (import "bar" "foo" (func $foo))) diff --git a/test/dump/debug-names.txt b/test/dump/debug-names.txt index f38d4706..c2554811 100644 --- a/test/dump/debug-names.txt +++ b/test/dump/debug-names.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --debug-names --dump-verbose (module (func $F1 (param $F1P0 i32) diff --git a/test/dump/dedupe-sig.txt b/test/dump/dedupe-sig.txt index f78b7186..0f749bce 100644 --- a/test/dump/dedupe-sig.txt +++ b/test/dump/dedupe-sig.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (type (func (param i32) (result i64))) diff --git a/test/dump/drop.txt b/test/dump/drop.txt index d41f5038..561b4fc8 100644 --- a/test/dump/drop.txt +++ b/test/dump/drop.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/export-multi.txt b/test/dump/export-multi.txt index dd5e6c21..cdb119d9 100644 --- a/test/dump/export-multi.txt +++ b/test/dump/export-multi.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (nop)) diff --git a/test/dump/expr-br.txt b/test/dump/expr-br.txt index 38233ee1..004e4c42 100644 --- a/test/dump/expr-br.txt +++ b/test/dump/expr-br.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (result i32) diff --git a/test/dump/expr-brif.txt b/test/dump/expr-brif.txt index bd80fe47..3aa821b6 100644 --- a/test/dump/expr-brif.txt +++ b/test/dump/expr-brif.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (result i32) diff --git a/test/dump/func-exported.txt b/test/dump/func-exported.txt index 7d1f60e7..4ced3d93 100644 --- a/test/dump/func-exported.txt +++ b/test/dump/func-exported.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func) diff --git a/test/dump/func-multi.txt b/test/dump/func-multi.txt index 4550d295..f13f6dde 100644 --- a/test/dump/func-multi.txt +++ b/test/dump/func-multi.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func) diff --git a/test/dump/func-named.txt b/test/dump/func-named.txt index 4a183641..1dbc09b9 100644 --- a/test/dump/func-named.txt +++ b/test/dump/func-named.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func $my-func)) diff --git a/test/dump/getglobal.txt b/test/dump/getglobal.txt index f9881545..0c184c4f 100644 --- a/test/dump/getglobal.txt +++ b/test/dump/getglobal.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (global i32 (i32.const 0)) diff --git a/test/dump/getlocal-param.txt b/test/dump/getlocal-param.txt index ef06b7d5..6f02024e 100644 --- a/test/dump/getlocal-param.txt +++ b/test/dump/getlocal-param.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (param i32 f32) diff --git a/test/dump/getlocal.txt b/test/dump/getlocal.txt index 2cf2e7ce..97e426f8 100644 --- a/test/dump/getlocal.txt +++ b/test/dump/getlocal.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/global.txt b/test/dump/global.txt index da49f27f..3577b8d7 100644 --- a/test/dump/global.txt +++ b/test/dump/global.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --dump-verbose (module (import "foo" "i32_global" (global i32)) diff --git a/test/dump/grow-memory.txt b/test/dump/grow-memory.txt index e27c8c28..9d4052d1 100644 --- a/test/dump/grow-memory.txt +++ b/test/dump/grow-memory.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1 2) diff --git a/test/dump/hexfloat_f32.txt b/test/dump/hexfloat_f32.txt index 11f01f16..0c9593b9 100644 --- a/test/dump/hexfloat_f32.txt +++ b/test/dump/hexfloat_f32.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/hexfloat_f64.txt b/test/dump/hexfloat_f64.txt index d2a24a09..beb5b80b 100644 --- a/test/dump/hexfloat_f64.txt +++ b/test/dump/hexfloat_f64.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/if-then-else-list.txt b/test/dump/if-then-else-list.txt index 9ca82274..5c11f2ca 100644 --- a/test/dump/if-then-else-list.txt +++ b/test/dump/if-then-else-list.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/if-then-list.txt b/test/dump/if-then-list.txt index fc0d7248..ec05ec37 100644 --- a/test/dump/if-then-list.txt +++ b/test/dump/if-then-list.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/if.txt b/test/dump/if.txt index 04e68964..5f22d008 100644 --- a/test/dump/if.txt +++ b/test/dump/if.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/import.txt b/test/dump/import.txt index 82de92cc..9de3be00 100644 --- a/test/dump/import.txt +++ b/test/dump/import.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --dump-verbose (module (import "ignored" "test" (func (param i32 i64 f32 f64))) diff --git a/test/dump/load-aligned.txt b/test/dump/load-aligned.txt index cf36330d..ecdc03b0 100644 --- a/test/dump/load-aligned.txt +++ b/test/dump/load-aligned.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1) diff --git a/test/dump/load.txt b/test/dump/load.txt index 23a56ef8..f7edb6b5 100644 --- a/test/dump/load.txt +++ b/test/dump/load.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1) diff --git a/test/dump/locals.txt b/test/dump/locals.txt index 31b8236a..4d96eb8c 100644 --- a/test/dump/locals.txt +++ b/test/dump/locals.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (local i32 i64 i64 f32 f32 f32 f64 f64 f64 f64))) diff --git a/test/dump/loop-257-exprs-br.txt b/test/dump/loop-257-exprs-br.txt index 94cd390c..56405dc9 100644 --- a/test/dump/loop-257-exprs-br.txt +++ b/test/dump/loop-257-exprs-br.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/loop-257-exprs.txt b/test/dump/loop-257-exprs.txt index 396ca04d..0be48419 100644 --- a/test/dump/loop-257-exprs.txt +++ b/test/dump/loop-257-exprs.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/loop.txt b/test/dump/loop.txt index fbef447c..65a7b99d 100644 --- a/test/dump/loop.txt +++ b/test/dump/loop.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/memory-1-byte.txt b/test/dump/memory-1-byte.txt index 46e94f85..d6835207 100644 --- a/test/dump/memory-1-byte.txt +++ b/test/dump/memory-1-byte.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1)) (;; STDOUT ;;; diff --git a/test/dump/memory-data-size.txt b/test/dump/memory-data-size.txt index 8bdadd48..20fe0c81 100644 --- a/test/dump/memory-data-size.txt +++ b/test/dump/memory-data-size.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --spec (module (memory 1)) (module (memory 2)) diff --git a/test/dump/memory-hex.txt b/test/dump/memory-hex.txt index 631c1440..92c0b0ee 100644 --- a/test/dump/memory-hex.txt +++ b/test/dump/memory-hex.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory diff --git a/test/dump/memory.txt b/test/dump/memory.txt index d9b848ef..2829c94a 100644 --- a/test/dump/memory.txt +++ b/test/dump/memory.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --dump-verbose (module (memory 1) diff --git a/test/dump/multi_file.txt b/test/dump/multi_file.txt index 6ad9077b..1090f609 100644 --- a/test/dump/multi_file.txt +++ b/test/dump/multi_file.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: --headers --spec (module (func (param $param2 i64)) diff --git a/test/dump/no-canonicalize.txt b/test/dump/no-canonicalize.txt index a9439e13..2b3e6e34 100644 --- a/test/dump/no-canonicalize.txt +++ b/test/dump/no-canonicalize.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --no-canonicalize-leb128s (module (import "stdio" "print" (func (param i32))) diff --git a/test/dump/nocheck.txt b/test/dump/nocheck.txt index d0c94316..15dd9e3c 100644 --- a/test/dump/nocheck.txt +++ b/test/dump/nocheck.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --no-check (module (func (result i64) diff --git a/test/dump/nop.txt b/test/dump/nop.txt index f7611710..434fb836 100644 --- a/test/dump/nop.txt +++ b/test/dump/nop.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/param-multi.txt b/test/dump/param-multi.txt index 281ad6b0..a330f075 100644 --- a/test/dump/param-multi.txt +++ b/test/dump/param-multi.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (param i32 i64 f32 f64))) diff --git a/test/dump/relocations.txt b/test/dump/relocations.txt index ef2c42f3..b6355f2a 100644 --- a/test/dump/relocations.txt +++ b/test/dump/relocations.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: --headers -r (module (type $t (func (param i32))) diff --git a/test/dump/result.txt b/test/dump/result.txt index 779ba996..2be6cd03 100644 --- a/test/dump/result.txt +++ b/test/dump/result.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (result i32) diff --git a/test/dump/return.txt b/test/dump/return.txt index 8bdb3815..780ad8fe 100644 --- a/test/dump/return.txt +++ b/test/dump/return.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func (result i32) diff --git a/test/dump/select.txt b/test/dump/select.txt index 5fbde1e7..5920ac9c 100644 --- a/test/dump/select.txt +++ b/test/dump/select.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/setglobal.txt b/test/dump/setglobal.txt index 636276e3..e33d807e 100644 --- a/test/dump/setglobal.txt +++ b/test/dump/setglobal.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (global f32 (f32.const 1)) diff --git a/test/dump/setlocal-param.txt b/test/dump/setlocal-param.txt index a1e71309..fd8b357c 100644 --- a/test/dump/setlocal-param.txt +++ b/test/dump/setlocal-param.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module ;; 0 1 diff --git a/test/dump/setlocal.txt b/test/dump/setlocal.txt index 388cc96e..d34b80f3 100644 --- a/test/dump/setlocal.txt +++ b/test/dump/setlocal.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/signatures.txt b/test/dump/signatures.txt index 102f897b..6ecc09ea 100644 --- a/test/dump/signatures.txt +++ b/test/dump/signatures.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (type (func (param i32))) diff --git a/test/dump/start.txt b/test/dump/start.txt index af2a9658..db2fa79f 100644 --- a/test/dump/start.txt +++ b/test/dump/start.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --dump-verbose --headers (module (func $a) diff --git a/test/dump/store-aligned.txt b/test/dump/store-aligned.txt index e983c0ae..899b103c 100644 --- a/test/dump/store-aligned.txt +++ b/test/dump/store-aligned.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1) diff --git a/test/dump/store.txt b/test/dump/store.txt index 3766aa0f..ac3d3682 100644 --- a/test/dump/store.txt +++ b/test/dump/store.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (memory 1) diff --git a/test/dump/string-escape.txt b/test/dump/string-escape.txt index 4142d72e..0a30e5fe 100644 --- a/test/dump/string-escape.txt +++ b/test/dump/string-escape.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func) (export "tab:\t newline:\n slash:\\ quote:\' double:\"" (func 0))) (;; STDOUT ;;; diff --git a/test/dump/string-hex.txt b/test/dump/string-hex.txt index 73f5fa7e..ea2cfd45 100644 --- a/test/dump/string-hex.txt +++ b/test/dump/string-hex.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func) (export "foo\de\ad\ca\bb" (func 0))) (;; STDOUT ;;; diff --git a/test/dump/table.txt b/test/dump/table.txt index 8904b7c2..9ce1bb72 100644 --- a/test/dump/table.txt +++ b/test/dump/table.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v --dump-verbose (module (type $t (func (param i32))) diff --git a/test/dump/tee_local.txt b/test/dump/tee_local.txt index df908ef7..a52a5908 100644 --- a/test/dump/tee_local.txt +++ b/test/dump/tee_local.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/unary.txt b/test/dump/unary.txt index c65d9d65..4b5144e3 100644 --- a/test/dump/unary.txt +++ b/test/dump/unary.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/dump/unreachable.txt b/test/dump/unreachable.txt index dede7051..3e9bb385 100644 --- a/test/dump/unreachable.txt +++ b/test/dump/unreachable.txt @@ -1,4 +1,4 @@ -;;; TOOL: run-wasmdump +;;; TOOL: run-objdump ;;; FLAGS: -v (module (func diff --git a/test/find_exe.py b/test/find_exe.py index b6b3dec9..4b6c87ed 100644 --- a/test/find_exe.py +++ b/test/find_exe.py @@ -24,7 +24,7 @@ IS_WINDOWS = sys.platform == 'win32' SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) REPO_ROOT_DIR = os.path.dirname(SCRIPT_DIR) EXECUTABLES = [ - 'wast2wasm', 'wasm2wast', 'wasmdump', 'wasm-interp', 'wasmopcodecnt', + 'wast2wasm', 'wasm2wast', 'wasm-objdump', 'wasm-interp', 'wasm-opcodecnt', 'wast-desugar', 'wasm-link' ] @@ -73,7 +73,7 @@ def GetWasm2WastExecutable(override=None): def GetWasmdumpExecutable(override=None): - return FindExecutable('wasmdump', override) + return FindExecutable('wasm-objdump', override) def GetWasmlinkExecutable(override=None): @@ -85,7 +85,7 @@ def GetWasmInterpExecutable(override=None): def GetWasmOpcodeCntExecutable(override=None): - return FindExecutable('wasmopcodecnt', override) + return FindExecutable('wasm-opcodecnt', override) def GetWastDesugarExecutable(override=None): diff --git a/test/run-wasmdump.py b/test/run-objdump.py index 39774cb6..24a777b6 100755 --- a/test/run-wasmdump.py +++ b/test/run-objdump.py @@ -75,10 +75,10 @@ def main(args): '-c': options.compile_only, }) - wasmdump = utils.Executable( + wasm_objdump = utils.Executable( find_exe.GetWasmdumpExecutable(options.bindir), error_cmdline=options.error_cmdline) - wasmdump.AppendOptionalArgs({ + wasm_objdump.AppendOptionalArgs({ '-h': options.headers, '-x': options.dump_verbose, '--debug': options.dump_debug, @@ -86,11 +86,11 @@ def main(args): gen_wasm.verbose = options.print_cmd wast2wasm.verbose = options.print_cmd - wasmdump.verbose = options.print_cmd + wasm_objdump.verbose = options.print_cmd filename = options.file - with utils.TempDirectory(options.out_dir, 'wasmdump-') as out_dir: + with utils.TempDirectory(options.out_dir, 'objdump-') as out_dir: basename = os.path.basename(filename) basename_noext = os.path.splitext(basename)[0] if options.gen_wasm: @@ -109,7 +109,7 @@ def main(args): else: wasm_files = [out_file] - wasmdump.RunWithArgs('-r', '-d', *wasm_files) + wasm_objdump.RunWithArgs('-r', '-d', *wasm_files) if __name__ == '__main__': diff --git a/test/run-opcodecnt.py b/test/run-opcodecnt.py index 7611c96d..c7d33dbe 100644 --- a/test/run-opcodecnt.py +++ b/test/run-opcodecnt.py @@ -52,17 +52,17 @@ def main(args): '-v': options.verbose, }) - wasmopcodecnt = utils.Executable( + wasm_opcodecnt = utils.Executable( find_exe.GetWasmOpcodeCntExecutable(options.bindir), error_cmdline=options.error_cmdline) wast2wasm.verbose = options.print_cmd - wasmopcodecnt.verbose = options.print_cmd + wasm_opcodecnt.verbose = options.print_cmd with utils.TempDirectory(options.out_dir, 'run-opcodecnt-') as out_dir: out_file = utils.ChangeDir(utils.ChangeExt(options.file, '.wasm'), out_dir) wast2wasm.RunWithArgs(options.file, '-o', out_file) - wasmopcodecnt.RunWithArgs(out_file) + wasm_opcodecnt.RunWithArgs(out_file) return 0 diff --git a/test/run-tests.py b/test/run-tests.py index 243bf6df..ec82208d 100755 --- a/test/run-tests.py +++ b/test/run-tests.py @@ -49,8 +49,8 @@ TOOLS = { 'wast-desugar': { 'EXE': '%(wast-desugar)s' }, - 'run-wasmdump': { - 'EXE': 'test/run-wasmdump.py', + 'run-objdump': { + 'EXE': 'test/run-objdump.py', 'FLAGS': ['--bindir=%(bindir)s', '--no-error-cmdline'], 'VERBOSE-FLAGS': ['-v'] }, diff --git a/test/run-wasm-link.py b/test/run-wasm-link.py index 1c98aa40..0387fa50 100755 --- a/test/run-wasm-link.py +++ b/test/run-wasm-link.py @@ -69,7 +69,7 @@ def main(args): '-r': options.relocatable, }) - wasmdump = utils.Executable( + wasm_objdump = utils.Executable( find_exe.GetWasmdumpExecutable(options.bindir), error_cmdline=options.error_cmdline) @@ -78,7 +78,7 @@ def main(args): wast2wasm.verbose = options.print_cmd wasm_link.verbose = options.print_cmd - wasmdump.verbose = options.print_cmd + wasm_objdump.verbose = options.print_cmd wasm_interp.verbose = options.print_cmd filename = options.file @@ -104,11 +104,11 @@ def main(args): os.remove(partially_linked) os.rename(output, partially_linked) wasm_link.RunWithArgs('-r', '-o', output, partially_linked, f) - #wasmdump.RunWithArgs('-d', '-h', output) - wasmdump.RunWithArgs('-d', '-x', '-r', '-h', output) + #wasm_objdump.RunWithArgs('-d', '-h', output) + wasm_objdump.RunWithArgs('-d', '-x', '-r', '-h', output) else: wasm_link.RunWithArgs('-o', output, *wasm_files) - wasmdump.RunWithArgs('-d', '-x', '-r', '-h', output) + wasm_objdump.RunWithArgs('-d', '-x', '-r', '-h', output) if options.spec: with open(out_file) as json_file: |