AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] Use new names for instructions

Browse Source 
These instructions were renamed in the October 2, WebAssembly CG meeting. The
issue describing the change is here:

https://github.com/WebAssembly/spec/issues/884

Change-Id: Ia9e8733156b5ed5db7fc9ab1681c1a51b874dd71
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1620681
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Ben Smith <binji@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61711}
This commit is contained in:
Ben Smith 2019-05-20 16:36:09 -07:00 committed by Commit Bot
parent daa2667990
commit 76537bea86
8 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/wasm/wasm-opcodes.cc
View File

@ -48,11 +48,11 @@ namespace wasm {
#define CASE_ALL_SIGN_OP(name, str) \
CASE_FLOAT_OP(name, str) CASE_SIGN_OP(INT, name, str)
#define CASE_CONVERT_OP(name, RES, SRC, src_suffix, str) \
CASE_##RES##_OP(U##name##SRC, str "_u/" src_suffix) \
CASE_##RES##_OP(S##name##SRC, str "_s/" src_suffix)
#define CASE_CONVERT_SAT_OP(name, RES, SRC, src_suffix, str) \
CASE_##RES##_OP(U##name##Sat##SRC, str "_u:sat/" src_suffix) \
CASE_##RES##_OP(S##name##Sat##SRC, str "_s:sat/" src_suffix)
CASE_##RES##_OP(U##name##SRC, str "_" src_suffix "_u") \
CASE_##RES##_OP(S##name##SRC, str "_" src_suffix "_s")
#define CASE_CONVERT_SAT_OP(name, RES, SRC, src_suffix, str) \
CASE_##RES##_OP(U##name##Sat##SRC, str "_sat_" src_suffix "_u") \
CASE_##RES##_OP(S##name##Sat##SRC, str "_sat_" src_suffix "_s")
#define CASE_L32_OP(name, str) \
CASE_SIGN_OP(I32, name##8, str "8") \
CASE_SIGN_OP(I32, name##16, str "16") \
@ -108,23 +108,23 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
CASE_REF_OP(Null, "null")
CASE_REF_OP(IsNull, "is_null")
CASE_REF_OP(Func, "func")
CASE_I32_OP(ConvertI64, "wrap/i64")
CASE_I32_OP(ConvertI64, "wrap_i64")
CASE_CONVERT_OP(Convert, INT, F32, "f32", "trunc")
CASE_CONVERT_OP(Convert, INT, F64, "f64", "trunc")
CASE_CONVERT_OP(Convert, I64, I32, "i32", "extend")
CASE_CONVERT_OP(Convert, F32, I32, "i32", "convert")
CASE_CONVERT_OP(Convert, F32, I64, "i64", "convert")
CASE_F32_OP(ConvertF64, "demote/f64")
CASE_F32_OP(ConvertF64, "demote_f64")
CASE_CONVERT_OP(Convert, F64, I32, "i32", "convert")
CASE_CONVERT_OP(Convert, F64, I64, "i64", "convert")
CASE_F64_OP(ConvertF32, "promote/f32")
CASE_I32_OP(ReinterpretF32, "reinterpret/f32")
CASE_I64_OP(ReinterpretF64, "reinterpret/f64")
CASE_F32_OP(ReinterpretI32, "reinterpret/i32")
CASE_F64_OP(ReinterpretI64, "reinterpret/i64")
CASE_INT_OP(SExtendI8, "sign_extend8")
CASE_INT_OP(SExtendI16, "sign_extend16")
CASE_I64_OP(SExtendI32, "sign_extend32")
CASE_F64_OP(ConvertF32, "promote_f32")
CASE_I32_OP(ReinterpretF32, "reinterpret_f32")
CASE_I64_OP(ReinterpretF64, "reinterpret_f64")
CASE_F32_OP(ReinterpretI32, "reinterpret_i32")
CASE_F64_OP(ReinterpretI64, "reinterpret_i64")
CASE_INT_OP(SExtendI8, "extend8_s")
CASE_INT_OP(SExtendI16, "extend16_s")
CASE_I64_OP(SExtendI32, "extend32_s")
CASE_OP(Unreachable, "unreachable")
CASE_OP(Nop, "nop")
CASE_OP(Block, "block")
@ -142,13 +142,13 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
CASE_OP(ReturnCallIndirect, "return_call_indirect")
CASE_OP(Drop, "drop")
CASE_OP(Select, "select")
CASE_OP(GetLocal, "get_local")
CASE_OP(SetLocal, "set_local")
CASE_OP(TeeLocal, "tee_local")
CASE_OP(GetGlobal, "get_global")
CASE_OP(SetGlobal, "set_global")
CASE_OP(GetTable, "get_table")
CASE_OP(SetTable, "set_table")
CASE_OP(GetLocal, "local.get")
CASE_OP(SetLocal, "local.set")
CASE_OP(TeeLocal, "local.tee")
CASE_OP(GetGlobal, "global.get")
CASE_OP(SetGlobal, "global.set")
CASE_OP(GetTable, "table.get")
CASE_OP(SetTable, "table.set")
CASE_ALL_OP(Const, "const")
CASE_OP(MemorySize, "memory.size")
CASE_OP(MemoryGrow, "memory.grow")
@ -192,10 +192,10 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
CASE_I32_OP(AsmjsStoreMem16, "asmjs_store16")
CASE_SIGN_OP(I32, AsmjsDiv, "asmjs_div")
CASE_SIGN_OP(I32, AsmjsRem, "asmjs_rem")
CASE_I32_OP(AsmjsSConvertF32, "asmjs_convert_s/f32")
CASE_I32_OP(AsmjsUConvertF32, "asmjs_convert_u/f32")
CASE_I32_OP(AsmjsSConvertF64, "asmjs_convert_s/f64")
CASE_I32_OP(AsmjsUConvertF64, "asmjs_convert_u/f64")
CASE_I32_OP(AsmjsSConvertF32, "asmjs_convert_f32_s")
CASE_I32_OP(AsmjsUConvertF32, "asmjs_convert_f32_u")
CASE_I32_OP(AsmjsSConvertF64, "asmjs_convert_f64_s")
CASE_I32_OP(AsmjsUConvertF64, "asmjs_convert_f64_u")
// Numeric Opcodes.
CASE_CONVERT_SAT_OP(Convert, I32, F32, "f32", "trunc")
@ -271,17 +271,17 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
CASE_S1x16_OP(AllTrue, "all_true")
// Atomic operations.
CASE_OP(AtomicNotify, "atomic_notify")
CASE_INT_OP(AtomicWait, "atomic_wait")
CASE_UNSIGNED_ALL_OP(AtomicLoad, "atomic_load")
CASE_UNSIGNED_ALL_OP(AtomicStore, "atomic_store")
CASE_UNSIGNED_ALL_OP(AtomicAdd, "atomic_add")
CASE_UNSIGNED_ALL_OP(AtomicSub, "atomic_sub")
CASE_UNSIGNED_ALL_OP(AtomicAnd, "atomic_and")
CASE_UNSIGNED_ALL_OP(AtomicOr, "atomic_or")
CASE_UNSIGNED_ALL_OP(AtomicXor, "atomic_xor")
CASE_UNSIGNED_ALL_OP(AtomicExchange, "atomic_xchng")
CASE_UNSIGNED_ALL_OP(AtomicCompareExchange, "atomic_cmpxchng")
CASE_OP(AtomicNotify, "atomic.notify")
CASE_INT_OP(AtomicWait, "atomic.wait")
CASE_UNSIGNED_ALL_OP(AtomicLoad, "atomic.load")
CASE_UNSIGNED_ALL_OP(AtomicStore, "atomic.store")
CASE_UNSIGNED_ALL_OP(AtomicAdd, "atomic.add")
CASE_UNSIGNED_ALL_OP(AtomicSub, "atomic.sub")
CASE_UNSIGNED_ALL_OP(AtomicAnd, "atomic.and")
CASE_UNSIGNED_ALL_OP(AtomicOr, "atomic.or")
CASE_UNSIGNED_ALL_OP(AtomicXor, "atomic.xor")
CASE_UNSIGNED_ALL_OP(AtomicExchange, "atomic.xchng")
CASE_UNSIGNED_ALL_OP(AtomicCompareExchange, "atomic.cmpxchng")
default : return "unknown";
// clang-format on

8
test/inspector/debugger/wasm-get-breakable-locations-expected.txt
View File

@ -11,18 +11,18 @@ Requesting all breakable locations in wasm script 0
4 breakable location(s):
[0] 2:2 || >nop
[1] 3:2 || >i32.const 12
[2] 4:2 || >set_local 0
[2] 4:2 || >local.set 0
[3] 5:0 || >end
Requesting breakable locations in lines [0,3)
1 breakable location(s):
[0] 2:2 || >nop
Requesting breakable locations in lines [4,6)
2 breakable location(s):
[0] 4:2 || >set_local 0
[0] 4:2 || >local.set 0
[1] 5:0 || >end
Requesting all breakable locations in wasm script 1
7 breakable location(s):
[0] 1:2 || >get_local 0
[0] 1:2 || >local.get 0
[1] 2:2 || >if
[2] 3:4 || >block
[3] 4:6 || >call 0
@ -31,7 +31,7 @@ Requesting all breakable locations in wasm script 1
[6] 7:0 || >end
Requesting breakable locations in lines [0,3)
2 breakable location(s):
[0] 1:2 || >get_local 0
[0] 1:2 || >local.get 0
[1] 2:2 || >if
Requesting breakable locations in lines [4,6)
2 breakable location(s):

48
test/inspector/debugger/wasm-scope-info-expected.txt
View File

@ -12,7 +12,7 @@ Setting breakpoint on line 2 (first instruction)
Paused:
(local i32 i64 f64)
#i32.const 11
set_local 0
local.set 0
Scope:
at func (2:2):
@ -27,7 +27,7 @@ at (anonymous) (0:17):
Paused:
i32.const 11
#set_local 0
#local.set 0
i32.const 47
Scope:
@ -42,9 +42,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_local 0
local.set 0
#i32.const 47
set_local 1
local.set 1
Scope:
at func (4:2):
@ -59,7 +59,7 @@ at (anonymous) (0:17):
Paused:
i32.const 47
#set_local 1
#local.set 1
i64.const 9223372036854775807
Scope:
@ -74,9 +74,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_local 1
local.set 1
#i64.const 9223372036854775807
set_local 2
local.set 2
Scope:
at func (6:2):
@ -91,7 +91,7 @@ at (anonymous) (0:17):
Paused:
i64.const 9223372036854775807
#set_local 2
#local.set 2
i64.const -9223372036854775808
Scope:
@ -106,9 +106,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_local 2
local.set 2
#i64.const -9223372036854775808
set_local 2
local.set 2
Scope:
at func (8:2):
@ -123,7 +123,7 @@ at (anonymous) (0:17):
Paused:
i64.const -9223372036854775808
#set_local 2
#local.set 2
i32.const 1
Scope:
@ -138,9 +138,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_local 2
local.set 2
#i32.const 1
f64.convert_u/i32
f64.convert_i32_u
Scope:
at func (10:2):
@ -155,7 +155,7 @@ at (anonymous) (0:17):
Paused:
i32.const 1
#f64.convert_u/i32
#f64.convert_i32_u
i32.const 7
Scope:
@ -170,9 +170,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
f64.convert_u/i32
f64.convert_i32_u
#i32.const 7
f64.convert_u/i32
f64.convert_i32_u
Scope:
at func (12:2):
@ -187,7 +187,7 @@ at (anonymous) (0:17):
Paused:
i32.const 7
#f64.convert_u/i32
#f64.convert_i32_u
f64.div
Scope:
@ -202,9 +202,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
f64.convert_u/i32
f64.convert_i32_u
#f64.div
set_local 3
local.set 3
Scope:
at func (14:2):
@ -219,7 +219,7 @@ at (anonymous) (0:17):
Paused:
f64.div
#set_local 3
#local.set 3
i32.const 15
Scope:
@ -234,9 +234,9 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_local 3
local.set 3
#i32.const 15
set_global 0
global.set 0
Scope:
at func (16:2):
@ -251,7 +251,7 @@ at (anonymous) (0:17):
Paused:
i32.const 15
#set_global 0
#global.set 0
end
Scope:
@ -266,7 +266,7 @@ at (anonymous) (0:17):
-- skipped globals
Paused:
set_global 0
global.set 0
#end

6
test/inspector/debugger/wasm-set-breakpoint-expected.txt
View File

@ -10,12 +10,12 @@ Source of script wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-0:
Source of script wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:
1: func $wasm_B (param i32)
2: loop
3: get_local 0
3: local.get 0
4: if
5: get_local 0
5: local.get 0
6: i32.const 1
7: i32.sub
8: set_local 0
8: local.set 0
9: call 0
10: br 1
11: end

18
test/inspector/debugger/wasm-stepping-expected.txt
View File

@ -14,12 +14,12 @@ end
func $wasm_B (param i32)
loop
get_local 0
local.get 0
if
get_local 0
local.get 0
i32.const 1
i32.sub
set_local 0
local.set 0
call 0
br 1
end
@ -32,7 +32,7 @@ Setting breakpoint on line 7 (on the setlocal before the call), url wasm://wasm/
lineNumber : 7
scriptId : <scriptId>
}
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >set_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >local.set 0
at wasm_B (7:6):
- scope (global):
-- skipped
@ -97,7 +97,7 @@ at (anonymous) (0:17):
- scope (global):
-- skipped
Debugger.stepOut called
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >set_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >local.set 0
at wasm_B (7:6):
- scope (global):
-- skipped
@ -130,7 +130,7 @@ at (anonymous) (0:17):
- scope (global):
-- skipped
Debugger.resume called
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >set_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >local.set 0
at wasm_B (7:6):
- scope (global):
-- skipped
@ -190,7 +190,7 @@ at (anonymous) (0:17):
- scope (global):
-- skipped
Debugger.stepInto called
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:2:4: >get_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:2:4: >local.get 0
at wasm_B (2:4):
- scope (global):
-- skipped
@ -212,7 +212,7 @@ at (anonymous) (0:17):
- scope (global):
-- skipped
Debugger.stepInto called
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:4:6: >get_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:4:6: >local.get 0
at wasm_B (4:6):
- scope (global):
-- skipped
@ -245,7 +245,7 @@ at (anonymous) (0:17):
- scope (global):
-- skipped
Debugger.stepInto called
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >set_local 0
Paused at wasm://wasm/wasm-0c10a5fe/wasm-0c10a5fe-1:7:6: >local.set 0
at wasm_B (7:6):
- scope (global):
-- skipped

2
test/mjsunit/wasm/compilation-hints-interpreter.js
View File

@ -109,5 +109,5 @@ load('test/mjsunit/wasm/wasm-module-builder.js');
assertThrows(() => builder.instantiate().exports.main(0, 22, 77),
WebAssembly.CompileError,
"Compiling function #0:\"add\" failed: i64.add[1] expected " +
"type i64, found get_local of type i32 @+83");
"type i64, found local.get of type i32 @+83");
})();

2
test/mjsunit/wasm/compilation-hints-streaming-compilation.js
View File

@ -75,7 +75,7 @@ load('test/mjsunit/wasm/wasm-module-builder.js');
{mod: {pow: Math.pow}})
.then(assertUnreachable,
error => assertEquals("WebAssembly.instantiateStreaming(): call[1] " +
"expected type f32, found get_local of type " +
"expected type f32, found local.get of type " +
"i32 @+94",
error.message)));
})();

4
test/mjsunit/wasm/streaming-api.js
View File

@ -56,12 +56,12 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
assertUnreachable,
error => assertEquals("WebAssembly.compileStreaming(): Compiling " +
"function #0:\"main\" failed: f32.mul[1] expected " +
"type f32, found get_local of type i32 @+37",
"type f32, found local.get of type i32 @+37",
error.message));
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes)),
assertUnreachable,
error => assertEquals("WebAssembly.instantiateStreaming(): Compiling " +
"function #0:\"main\" failed: f32.mul[1] expected " +
"type f32, found get_local of type i32 @+37",
"type f32, found local.get of type i32 @+37",
error.message));
})();