Skip to content

V
V8
Commit 560d366d authored by Z Nguyen-Huu's avatar Z Nguyen-Huu Committed by Commit Bot
Browse files
Options

[wasm] Adopt WAT compatible naming 

We want to be consistent with wasdk/wasmparser.

The names used in V8 should follow the WAT convention and always start
with a dollar, both for names from the "names" section as well as
generated names.

Bug: v8:10242
Change-Id: If4dbd4c38208c9dd9377dd2f79120635a531d881
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2070637
Commit-Queue: Z Nguyen-Huu <duongn@microsoft.com>
Reviewed-by: 's avatarClemens Backes <clemensb@chromium.org>
Reviewed-by: 's avatarKim-Anh Tran <kimanh@chromium.org>
Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#66434}
parent fc55d733
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 226 deletions
src/wasm/wasm-debug.cc
View file @ 560d366d
......@@ -82,7 +82,9 @@ MaybeHandle<String> GetLocalNameString(Isolate* isolate,
DCHECK(wire_bytes.BoundsCheck(name_ref));
Vector<const char> name = wire_bytes.GetNameOrNull(name_ref);
if (name.begin() == nullptr) return {};
return isolate->factory()->NewStringFromUtf8(name);
std::string full_name("$");
full_name.append(name.begin(), name.end());
return isolate->factory()->NewStringFromUtf8(VectorOf(full_name));
}
class InterpreterHandle {
......@@ -383,9 +385,8 @@ class InterpreterHandle {
Handle<JSObject> local_scope_object =
isolate_->factory()->NewJSObjectWithNullProto();
// Fill parameters and locals.
int num_params = frame->GetParameterCount();
int num_locals = frame->GetLocalCount();
DCHECK_LE(num_params, num_locals);
DCHECK_LE(frame->GetParameterCount(), num_locals);
if (num_locals > 0) {
Handle<JSObject> locals_obj =
isolate_->factory()->NewJSObjectWithNullProto();
......@@ -400,10 +401,7 @@ class InterpreterHandle {
if (!GetLocalNameString(isolate, native_module,
frame->function()->func_index, i)
.ToHandle(&name)) {
// Parameters should come before locals in alphabetical ordering, so
// we name them "args" here.
const char* label = i < num_params ? "arg#%d" : "local#%d";
name = PrintFToOneByteString<true>(isolate_, label, i);
name = PrintFToOneByteString<true>(isolate_, "$var%d", i);
}
WasmValue value = frame->GetLocalValue(i);
Handle<Object> value_obj = WasmValueToValueObject(isolate_, value);
......@@ -523,7 +521,7 @@ Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject> instance) {
globals_obj, NONE);
for (size_t i = 0; i < globals.size(); ++i) {
const char* label = "global#%d";
const char* label = "$global%d";
Handle<String> name = PrintFToOneByteString<true>(isolate, label, i);
WasmValue value =
WasmInstanceObject::GetGlobalValue(instance, globals[i]);
......@@ -559,9 +557,8 @@ class DebugInfoImpl {
DCHECK_NOT_NULL(debug_side_table_entry);
// Fill parameters and locals.
int num_params = static_cast<int>(function->sig->parameter_count());
int num_locals = static_cast<int>(debug_side_table->num_locals());
DCHECK_LE(num_params, num_locals);
DCHECK_LE(static_cast<int>(function->sig->parameter_count()), num_locals);
if (num_locals > 0) {
Handle<JSObject> locals_obj =
isolate->factory()->NewJSObjectWithNullProto();
......@@ -574,10 +571,7 @@ class DebugInfoImpl {
if (!GetLocalNameString(isolate, native_module_, function->func_index,
i)
.ToHandle(&name)) {
// Parameters should come before locals in alphabetical ordering, so
// we name them "args" here.
const char* label = i < num_params ? "arg#%d" : "local#%d";
name = PrintFToOneByteString<true>(isolate, label, i);
name = PrintFToOneByteString<true>(isolate, "$var%d", i);
}
WasmValue value = GetValue(debug_side_table_entry, i, fp);
Handle<Object> value_obj = WasmValueToValueObject(isolate, value);
......
test/inspector/debugger/wasm-anyref-global-expected.txt
View file @ 560d366d
......@@ -3,5 +3,5 @@ Waiting for wasm script to be parsed.
Setting breakpoint in wasm.
Running main.
Paused in debugger.
globals: {"global#0": hello, world}
globals: {"$global0": hello, world}
Finished.
test/inspector/debugger/wasm-scope-info-expected.txt
View file @ 560d366d
......@@ -13,16 +13,16 @@ Script wasm://wasm/d374ef0a byte offset 69: Wasm opcode 0x41
Scope:
at func (0:69):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 4 (number), "local#1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
stack:
locals: "$i32Arg": 4 (number), "$var1": 0 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -32,16 +32,16 @@ Script wasm://wasm/d374ef0a byte offset 71: Wasm opcode 0x21
Scope:
at func (0:71):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 4 (number), "local#1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
locals: "$i32Arg": 4 (number), "$var1": 0 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 11 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -51,16 +51,16 @@ Script wasm://wasm/d374ef0a byte offset 73: Wasm opcode 0x41
Scope:
at func (0:73):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 0 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -70,16 +70,16 @@ Script wasm://wasm/d374ef0a byte offset 75: Wasm opcode 0x21
Scope:
at func (0:75):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 0 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 47 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -89,16 +89,16 @@ Script wasm://wasm/d374ef0a byte offset 77: Wasm opcode 0x42
Scope:
at func (0:77):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -108,16 +108,16 @@ Script wasm://wasm/d374ef0a byte offset 88: Wasm opcode 0x21
Scope:
at func (0:88):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": 0 (number), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 9223372036854775807 (string)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -127,16 +127,16 @@ Script wasm://wasm/d374ef0a byte offset 90: Wasm opcode 0x42
Scope:
at func (0:90):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": 9223372036854775807 (string), "unicode☼f64": 0 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": 9223372036854775807 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -146,16 +146,16 @@ Script wasm://wasm/d374ef0a byte offset 101: Wasm opcode 0x21
Scope:
at func (0:101):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": 9223372036854775807 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": 9223372036854775807 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": -9223372036854775808 (string)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -165,16 +165,16 @@ Script wasm://wasm/d374ef0a byte offset 103: Wasm opcode 0x41
Scope:
at func (0:103):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -184,16 +184,16 @@ Script wasm://wasm/d374ef0a byte offset 105: Wasm opcode 0xb8
Scope:
at func (0:105):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 1 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -203,16 +203,16 @@ Script wasm://wasm/d374ef0a byte offset 106: Wasm opcode 0x41
Scope:
at func (0:106):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 1 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -222,16 +222,16 @@ Script wasm://wasm/d374ef0a byte offset 108: Wasm opcode 0xb8
Scope:
at func (0:108):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 1 (number), "1": 7 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -241,16 +241,16 @@ Script wasm://wasm/d374ef0a byte offset 109: Wasm opcode 0xa3
Scope:
at func (0:109):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 1 (number), "1": 7 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -260,16 +260,16 @@ Script wasm://wasm/d374ef0a byte offset 110: Wasm opcode 0x21
Scope:
at func (0:110):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0 (number), "$0": 0 (number)
stack: "0": 0.14285714285714285 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -279,16 +279,16 @@ Script wasm://wasm/d374ef0a byte offset 112: Wasm opcode 0x41
Scope:
at func (0:112):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0.14285714285714285 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -298,16 +298,16 @@ Script wasm://wasm/d374ef0a byte offset 114: Wasm opcode 0x24
Scope:
at func (0:114):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0.14285714285714285 (number), "$0": 0 (number)
stack: "0": 15 (number)
at call_func (0:58):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -317,16 +317,16 @@ Script wasm://wasm/d374ef0a byte offset 116: Wasm opcode 0xb
Scope:
at func (0:116):
- scope (global):
globals: "global#0": 15 (number)
globals: "$global0": 15 (number)
- scope (local):
locals: "0": 0 (number), "i32Arg": 11 (number), "local#1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
stack:
locals: "$i32Arg": 11 (number), "$var1": 47 (number), "$i64_local": -9223372036854775808 (string), "$unicode☼f64": 0.14285714285714285 (number), "$0": 0 (number)
stack:
at call_func (0:58):
- scope (global):
globals: "global#0": 15 (number)
globals: "$global0": 15 (number)
- scope (local):
locals: "arg#0": 4 (number), "local#1": 7.199999809265137 (number)
stack:
locals: "$var0": 4 (number), "$var1": 7.199999809265137 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......
test/inspector/debugger/wasm-scope-info-liftoff-expected.txt
View file @ 560d366d
......@@ -14,22 +14,22 @@ Script wasm://wasm/c4eb034a byte offset 85: Wasm opcode 0x20
Scope:
at C (interpreted) (0:85):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "i32_arg": 42 (number), "i32_local": 0 (number)
stack:
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number)
stack:
at B (liftoff) (0:76):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "local#5": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number), "$f32_local": 7.199999809265137 (number), "$0": 0 (number), "$var5": 0 (number)
stack: "0": 42 (number), "1": 3 (number)
at A (liftoff) (0:54):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 42 (number)
stack:
locals: "$var0": 42 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -39,22 +39,22 @@ Script wasm://wasm/c4eb034a byte offset 87: Wasm opcode 0x24
Scope:
at C (interpreted) (0:87):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "i32_arg": 42 (number), "i32_local": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number)
stack: "0": 42 (number)
at B (liftoff) (0:76):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "local#5": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number), "$f32_local": 7.199999809265137 (number), "$0": 0 (number), "$var5": 0 (number)
stack: "0": 42 (number), "1": 3 (number)
at A (liftoff) (0:54):
- scope (global):
globals: "global#0": 0 (number)
globals: "$global0": 0 (number)
- scope (local):
locals: "arg#0": 42 (number)
stack:
locals: "$var0": 42 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -64,22 +64,22 @@ Script wasm://wasm/c4eb034a byte offset 89: Wasm opcode 0x41
Scope:
at C (interpreted) (0:89):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "i32_arg": 42 (number), "i32_local": 0 (number)
stack:
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number)
stack:
at B (liftoff) (0:76):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "local#5": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number), "$f32_local": 7.199999809265137 (number), "$0": 0 (number), "$var5": 0 (number)
stack: "0": 42 (number), "1": 3 (number)
at A (liftoff) (0:54):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "arg#0": 42 (number)
stack:
locals: "$var0": 42 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -89,22 +89,22 @@ Script wasm://wasm/c4eb034a byte offset 91: Wasm opcode 0x21
Scope:
at C (interpreted) (0:91):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "i32_arg": 42 (number), "i32_local": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number)
stack: "0": 47 (number)
at B (liftoff) (0:76):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "local#5": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number), "$f32_local": 7.199999809265137 (number), "$0": 0 (number), "$var5": 0 (number)
stack: "0": 42 (number), "1": 3 (number)
at A (liftoff) (0:54):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "arg#0": 42 (number)
stack:
locals: "$var0": 42 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......@@ -114,22 +114,22 @@ Script wasm://wasm/c4eb034a byte offset 93: Wasm opcode 0xb
Scope:
at C (interpreted) (0:93):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "i32_arg": 42 (number), "i32_local": 47 (number)
stack:
locals: "$i32_arg": 42 (number), "$i32_local": 47 (number)
stack:
at B (liftoff) (0:76):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "local#5": 0 (number)
locals: "$i32_arg": 42 (number), "$i32_local": 0 (number), "$f32_local": 7.199999809265137 (number), "$0": 0 (number), "$var5": 0 (number)
stack: "0": 42 (number), "1": 3 (number)
at A (liftoff) (0:54):
- scope (global):
globals: "global#0": 42 (number)
globals: "$global0": 42 (number)
- scope (local):
locals: "arg#0": 42 (number)
stack:
locals: "$var0": 42 (number)
stack:
at (anonymous) (0:17):
- scope (global):
-- skipped globals
......
test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt
View file @ 560d366d
......@@ -13,7 +13,7 @@ at wasm_A (0:38):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -34,7 +34,7 @@ at wasm_A (0:39):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -44,7 +44,7 @@ Scope:
at wasm_B (0:45):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -54,7 +54,7 @@ Scope:
at wasm_B (0:47):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -64,7 +64,7 @@ Scope:
at wasm_B (0:49):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -74,7 +74,7 @@ Scope:
at wasm_B (0:51):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -84,7 +84,7 @@ Scope:
at wasm_B (0:53):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack: "0": -11 (number), "1": 1 (number)
at (anonymous) (0:17):
-- skipped
......@@ -94,7 +94,7 @@ Scope:
at wasm_B (0:54):
- scope (global):
- scope (local):
locals: "arg#0": 3 (number)
locals: "$var0": 3 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -108,7 +108,7 @@ at wasm_A (0:38):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -122,7 +122,7 @@ at wasm_A (0:39):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -132,7 +132,7 @@ Scope:
at wasm_B (0:45):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -142,7 +142,7 @@ Scope:
at wasm_B (0:47):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -152,7 +152,7 @@ Scope:
at wasm_B (0:49):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -162,7 +162,7 @@ Scope:
at wasm_B (0:51):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -172,7 +172,7 @@ Scope:
at wasm_B (0:53):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack: "0": -11 (number), "1": 1 (number)
at (anonymous) (0:17):
-- skipped
......@@ -182,7 +182,7 @@ Scope:
at wasm_B (0:54):
- scope (global):
- scope (local):
locals: "arg#0": 2 (number)
locals: "$var0": 2 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -196,7 +196,7 @@ at wasm_A (0:38):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -210,7 +210,7 @@ at wasm_A (0:39):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -220,7 +220,7 @@ Scope:
at wasm_B (0:45):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -230,7 +230,7 @@ Scope:
at wasm_B (0:47):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -240,7 +240,7 @@ Scope:
at wasm_B (0:49):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -250,7 +250,7 @@ Scope:
at wasm_B (0:51):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -260,7 +260,7 @@ Scope:
at wasm_B (0:53):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack: "0": -11 (number), "1": 1 (number)
at (anonymous) (0:17):
-- skipped
......@@ -270,7 +270,7 @@ Scope:
at wasm_B (0:54):
- scope (global):
- scope (local):
locals: "arg#0": 1 (number)
locals: "$var0": 1 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......@@ -284,7 +284,7 @@ at wasm_A (0:38):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 0 (number)
locals: "$var0": 0 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -298,7 +298,7 @@ at wasm_A (0:39):
at wasm_B (0:56):
- scope (global):
- scope (local):
locals: "arg#0": 0 (number)
locals: "$var0": 0 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -308,7 +308,7 @@ Scope:
at wasm_B (0:45):
- scope (global):
- scope (local):
locals: "arg#0": 0 (number)
locals: "$var0": 0 (number)
stack:
at (anonymous) (0:17):
-- skipped
......@@ -318,7 +318,7 @@ Scope:
at wasm_B (0:47):
- scope (global):
- scope (local):
locals: "arg#0": 0 (number)
locals: "$var0": 0 (number)
stack: "0": -11 (number)
at (anonymous) (0:17):
-- skipped
......
test/inspector/debugger/wasm-stepping-byte-offsets-expected.txt
View file @ 560d366d
......@@ -12,7 +12,7 @@ at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {"0":1024}
at (anonymous) (0:17):
- scope (global):
......@@ -23,13 +23,13 @@ at wasm_A (0:39):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -40,13 +40,13 @@ at wasm_A (0:40):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -57,7 +57,7 @@ at wasm_B (0:62):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -68,7 +68,7 @@ at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {"0":1024}
at (anonymous) (0:17):
- scope (global):
......@@ -79,7 +79,7 @@ at wasm_B (0:62):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -90,7 +90,7 @@ at wasm_B (0:44):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -101,7 +101,7 @@ at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1024}
at (anonymous) (0:17):
- scope (global):
......@@ -112,13 +112,13 @@ at wasm_A (0:39):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -129,7 +129,7 @@ at wasm_B (0:62):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -140,7 +140,7 @@ at wasm_B (0:44):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -151,7 +151,7 @@ at wasm_B (0:46):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -162,7 +162,7 @@ at wasm_B (0:48):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1}
at (anonymous) (0:17):
- scope (global):
......@@ -173,7 +173,7 @@ at wasm_B (0:50):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -184,7 +184,7 @@ at wasm_B (0:52):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1}
at (anonymous) (0:17):
- scope (global):
......@@ -195,7 +195,7 @@ at wasm_B (0:54):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1,"1":1}
at (anonymous) (0:17):
- scope (global):
......@@ -206,7 +206,7 @@ at wasm_B (0:55):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":0}
at (anonymous) (0:17):
- scope (global):
......@@ -217,7 +217,7 @@ at wasm_B (0:57):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -228,7 +228,7 @@ at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {"0":1024}
at (anonymous) (0:17):
- scope (global):
......@@ -239,13 +239,13 @@ at wasm_A (0:39):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -256,13 +256,13 @@ at wasm_A (0:40):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -273,13 +273,13 @@ at wasm_A (0:41):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1024}
locals: {"$var0":1024}
stack: {}
at wasm_B (0:60):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -290,7 +290,7 @@ at wasm_B (0:62):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......
test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
View file @ 560d366d
......@@ -15,7 +15,7 @@ at wasm_B (0:54):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":4}
locals: {"$var0":4}
stack: {"0":3}
at (anonymous) (0:17):
- scope (global):
......@@ -26,7 +26,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -42,7 +42,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -58,7 +58,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -69,7 +69,7 @@ at wasm_B (0:58):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -80,7 +80,7 @@ at wasm_B (0:54):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":3}
locals: {"$var0":3}
stack: {"0":2}
at (anonymous) (0:17):
- scope (global):
......@@ -91,7 +91,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -102,7 +102,7 @@ at wasm_B (0:58):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -113,7 +113,7 @@ at wasm_B (0:54):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":2}
locals: {"$var0":2}
stack: {"0":1}
at (anonymous) (0:17):
- scope (global):
......@@ -124,7 +124,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -140,7 +140,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -151,7 +151,7 @@ at wasm_B (0:58):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -162,7 +162,7 @@ at wasm_B (0:43):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -173,7 +173,7 @@ at wasm_B (0:45):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -184,7 +184,7 @@ at wasm_B (0:47):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1}
at (anonymous) (0:17):
- scope (global):
......@@ -195,7 +195,7 @@ at wasm_B (0:49):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -206,7 +206,7 @@ at wasm_B (0:51):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1}
at (anonymous) (0:17):
- scope (global):
......@@ -217,7 +217,7 @@ at wasm_B (0:53):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":1,"1":1}
at (anonymous) (0:17):
- scope (global):
......@@ -228,7 +228,7 @@ at wasm_B (0:54):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":1}
locals: {"$var0":1}
stack: {"0":0}
at (anonymous) (0:17):
- scope (global):
......@@ -239,7 +239,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -255,7 +255,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -271,7 +271,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -287,7 +287,7 @@ at wasm_B (0:56):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......@@ -298,7 +298,7 @@ at wasm_B (0:58):
- scope (global):
-- skipped
- scope (local):
locals: {"arg#0":0}
locals: {"$var0":0}
stack: {}
at (anonymous) (0:17):
- scope (global):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment