Skip to content

Commit 421fd39

Browse files
backesCommit Bot
backes
authored and
Commit Bot
committed
[wasm] Rename {Get,Set,Tee}Local to Local{Get,Set,Tee}
This brings our constants back in line with the changed spec text. We already use kExprTableGet and kExprTableSet, but for locals and globals we still use the old wording. This renaming is mostly mechanical. PS1 was created using: ag -l 'kExpr(Get|Set|Tee)Local' src test | \ xargs -L1 sed -E 's/kExpr(Get|Set|Tee)Local\b/kExprLocal\1/g' -i PS2 contains manual fixes. R=mstarzinger@chromium.org Bug: v8:9810 Change-Id: I1617f1b2a100685a3bf56218e76845a9481959c5 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1847354 Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Commit-Queue: Clemens Backes <clemensb@chromium.org> Cr-Commit-Position: refs/heads/master@{#64161}
1 parent f1e5488 commit 421fd39

178 files changed

Lines changed: 1128 additions & 1127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/wasm/baseline/liftoff-compiler.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ class LiftoffCompiler {
12241224
ReturnImpl(decoder);
12251225
}
12261226

1227-
void GetLocal(FullDecoder* decoder, Value* result,
1227+
void LocalGet(FullDecoder* decoder, Value* result,
12281228
const LocalIndexImmediate<validate>& imm) {
12291229
auto& slot = __ cache_state()->stack_state[imm.index];
12301230
DCHECK_EQ(slot.type(), imm.type);
@@ -1245,7 +1245,7 @@ class LiftoffCompiler {
12451245
}
12461246
}
12471247

1248-
void SetLocalFromStackSlot(LiftoffAssembler::VarState* dst_slot,
1248+
void LocalSetFromStackSlot(LiftoffAssembler::VarState* dst_slot,
12491249
uint32_t local_index) {
12501250
auto& state = *__ cache_state();
12511251
ValueType type = dst_slot->type();
@@ -1266,7 +1266,7 @@ class LiftoffCompiler {
12661266
__ cache_state()->inc_used(dst_reg);
12671267
}
12681268

1269-
void SetLocal(uint32_t local_index, bool is_tee) {
1269+
void LocalSet(uint32_t local_index, bool is_tee) {
12701270
auto& state = *__ cache_state();
12711271
auto& source_slot = state.stack_state.back();
12721272
auto& target_slot = state.stack_state[local_index];
@@ -1281,20 +1281,20 @@ class LiftoffCompiler {
12811281
target_slot = source_slot;
12821282
break;
12831283
case kStack:
1284-
SetLocalFromStackSlot(&target_slot, local_index);
1284+
LocalSetFromStackSlot(&target_slot, local_index);
12851285
break;
12861286
}
12871287
if (!is_tee) __ cache_state()->stack_state.pop_back();
12881288
}
12891289

1290-
void SetLocal(FullDecoder* decoder, const Value& value,
1290+
void LocalSet(FullDecoder* decoder, const Value& value,
12911291
const LocalIndexImmediate<validate>& imm) {
1292-
SetLocal(imm.index, false);
1292+
LocalSet(imm.index, false);
12931293
}
12941294

1295-
void TeeLocal(FullDecoder* decoder, const Value& value, Value* result,
1295+
void LocalTee(FullDecoder* decoder, const Value& value, Value* result,
12961296
const LocalIndexImmediate<validate>& imm) {
1297-
SetLocal(imm.index, true);
1297+
LocalSet(imm.index, true);
12981298
}
12991299

13001300
Register GetGlobalBaseAndOffset(const WasmGlobal* global,

‎src/wasm/function-body-decoder-impl.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -714,9 +714,9 @@ struct ControlBase {
714714
F(RefFunc, uint32_t function_index, Value* result) \
715715
F(Drop, const Value& value) \
716716
F(DoReturn, Vector<Value> values) \
717-
F(GetLocal, Value* result, const LocalIndexImmediate<validate>& imm) \
718-
F(SetLocal, const Value& value, const LocalIndexImmediate<validate>& imm) \
719-
F(TeeLocal, const Value& value, Value* result, \
717+
F(LocalGet, Value* result, const LocalIndexImmediate<validate>& imm) \
718+
F(LocalSet, const Value& value, const LocalIndexImmediate<validate>& imm) \
719+
F(LocalTee, const Value& value, Value* result, \
720720
const LocalIndexImmediate<validate>& imm) \
721721
F(GetGlobal, Value* result, const GlobalIndexImmediate<validate>& imm) \
722722
F(SetGlobal, const Value& value, const GlobalIndexImmediate<validate>& imm) \
@@ -910,8 +910,8 @@ class WasmDecoder : public Decoder {
910910
length = OpcodeLength(decoder, pc);
911911
depth++;
912912
break;
913-
case kExprSetLocal: // fallthru
914-
case kExprTeeLocal: {
913+
case kExprLocalSet: // fallthru
914+
case kExprLocalTee: {
915915
LocalIndexImmediate<validate> imm(decoder, pc);
916916
if (assigned->length() > 0 &&
917917
imm.index < static_cast<uint32_t>(assigned->length())) {
@@ -1291,9 +1291,9 @@ class WasmDecoder : public Decoder {
12911291
return 1 + imm.length;
12921292
}
12931293

1294-
case kExprSetLocal:
1295-
case kExprTeeLocal:
1296-
case kExprGetLocal: {
1294+
case kExprLocalGet:
1295+
case kExprLocalSet:
1296+
case kExprLocalTee: {
12971297
LocalIndexImmediate<validate> imm(decoder, pc);
12981298
return 1 + imm.length;
12991299
}
@@ -1458,18 +1458,18 @@ class WasmDecoder : public Decoder {
14581458
return {2, 0};
14591459
FOREACH_LOAD_MEM_OPCODE(DECLARE_OPCODE_CASE)
14601460
case kExprTableGet:
1461-
case kExprTeeLocal:
1461+
case kExprLocalTee:
14621462
case kExprMemoryGrow:
14631463
return {1, 1};
1464-
case kExprSetLocal:
1464+
case kExprLocalSet:
14651465
case kExprSetGlobal:
14661466
case kExprDrop:
14671467
case kExprBrIf:
14681468
case kExprBrTable:
14691469
case kExprIf:
14701470
case kExprRethrow:
14711471
return {1, 0};
1472-
case kExprGetLocal:
1472+
case kExprLocalGet:
14731473
case kExprGetGlobal:
14741474
case kExprI32Const:
14751475
case kExprI64Const:
@@ -2125,28 +2125,28 @@ class WasmFullDecoder : public WasmDecoder<validate> {
21252125
len = 1 + imm.length;
21262126
break;
21272127
}
2128-
case kExprGetLocal: {
2128+
case kExprLocalGet: {
21292129
LocalIndexImmediate<validate> imm(this, this->pc_);
21302130
if (!this->Validate(this->pc_, imm)) break;
21312131
auto* value = Push(imm.type);
2132-
CALL_INTERFACE_IF_REACHABLE(GetLocal, value, imm);
2132+
CALL_INTERFACE_IF_REACHABLE(LocalGet, value, imm);
21332133
len = 1 + imm.length;
21342134
break;
21352135
}
2136-
case kExprSetLocal: {
2136+
case kExprLocalSet: {
21372137
LocalIndexImmediate<validate> imm(this, this->pc_);
21382138
if (!this->Validate(this->pc_, imm)) break;
21392139
auto value = Pop(0, local_type_vec_[imm.index]);
2140-
CALL_INTERFACE_IF_REACHABLE(SetLocal, value, imm);
2140+
CALL_INTERFACE_IF_REACHABLE(LocalSet, value, imm);
21412141
len = 1 + imm.length;
21422142
break;
21432143
}
2144-
case kExprTeeLocal: {
2144+
case kExprLocalTee: {
21452145
LocalIndexImmediate<validate> imm(this, this->pc_);
21462146
if (!this->Validate(this->pc_, imm)) break;
21472147
auto value = Pop(0, local_type_vec_[imm.index]);
21482148
auto* result = Push(value.type);
2149-
CALL_INTERFACE_IF_REACHABLE(TeeLocal, value, result, imm);
2149+
CALL_INTERFACE_IF_REACHABLE(LocalTee, value, result, imm);
21502150
len = 1 + imm.length;
21512151
break;
21522152
}
@@ -2447,9 +2447,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
24472447
TRACE_PART("[%d]", imm.value);
24482448
break;
24492449
}
2450-
case kExprGetLocal:
2451-
case kExprSetLocal:
2452-
case kExprTeeLocal: {
2450+
case kExprLocalGet:
2451+
case kExprLocalSet:
2452+
case kExprLocalTee: {
24532453
LocalIndexImmediate<Decoder::kNoValidate> imm(this, val.pc);
24542454
TRACE_PART("[%u]", imm.index);
24552455
break;

‎src/wasm/graph-builder-interface.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,19 @@ class WasmGraphBuildingInterface {
262262
BUILD(Return, nodes);
263263
}
264264

265-
void GetLocal(FullDecoder* decoder, Value* result,
265+
void LocalGet(FullDecoder* decoder, Value* result,
266266
const LocalIndexImmediate<validate>& imm) {
267267
if (!ssa_env_->locals) return; // unreachable
268268
result->node = ssa_env_->locals[imm.index];
269269
}
270270

271-
void SetLocal(FullDecoder* decoder, const Value& value,
271+
void LocalSet(FullDecoder* decoder, const Value& value,
272272
const LocalIndexImmediate<validate>& imm) {
273273
if (!ssa_env_->locals) return; // unreachable
274274
ssa_env_->locals[imm.index] = value.node;
275275
}
276276

277-
void TeeLocal(FullDecoder* decoder, const Value& value, Value* result,
277+
void LocalTee(FullDecoder* decoder, const Value& value, Value* result,
278278
const LocalIndexImmediate<validate>& imm) {
279279
result->node = value.node;
280280
if (!ssa_env_->locals) return; // unreachable

‎src/wasm/wasm-interpreter.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3125,22 +3125,22 @@ class ThreadImpl {
31253125
len = 1 + imm.length;
31263126
break;
31273127
}
3128-
case kExprGetLocal: {
3128+
case kExprLocalGet: {
31293129
LocalIndexImmediate<Decoder::kNoValidate> imm(&decoder, code->at(pc));
31303130
HandleScope handle_scope(isolate_); // Avoid leaking handles.
31313131
Push(GetStackValue(frames_.back().sp + imm.index));
31323132
len = 1 + imm.length;
31333133
break;
31343134
}
3135-
case kExprSetLocal: {
3135+
case kExprLocalSet: {
31363136
LocalIndexImmediate<Decoder::kNoValidate> imm(&decoder, code->at(pc));
31373137
HandleScope handle_scope(isolate_); // Avoid leaking handles.
31383138
WasmValue val = Pop();
31393139
SetStackValue(frames_.back().sp + imm.index, val);
31403140
len = 1 + imm.length;
31413141
break;
31423142
}
3143-
case kExprTeeLocal: {
3143+
case kExprLocalTee: {
31443144
LocalIndexImmediate<Decoder::kNoValidate> imm(&decoder, code->at(pc));
31453145
HandleScope handle_scope(isolate_); // Avoid leaking handles.
31463146
WasmValue val = Pop();

‎src/wasm/wasm-module-builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ uint32_t WasmFunctionBuilder::AddLocal(ValueType type) {
7171
}
7272

7373
void WasmFunctionBuilder::EmitGetLocal(uint32_t local_index) {
74-
EmitWithU32V(kExprGetLocal, local_index);
74+
EmitWithU32V(kExprLocalGet, local_index);
7575
}
7676

7777
void WasmFunctionBuilder::EmitSetLocal(uint32_t local_index) {
78-
EmitWithU32V(kExprSetLocal, local_index);
78+
EmitWithU32V(kExprLocalSet, local_index);
7979
}
8080

8181
void WasmFunctionBuilder::EmitTeeLocal(uint32_t local_index) {
82-
EmitWithU32V(kExprTeeLocal, local_index);
82+
EmitWithU32V(kExprLocalTee, local_index);
8383
}
8484

8585
void WasmFunctionBuilder::EmitCode(const byte* code, uint32_t code_size) {

‎src/wasm/wasm-opcodes.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
147147
CASE_OP(Drop, "drop")
148148
CASE_OP(Select, "select")
149149
CASE_OP(SelectWithType, "select")
150-
CASE_OP(GetLocal, "local.get")
151-
CASE_OP(SetLocal, "local.set")
152-
CASE_OP(TeeLocal, "local.tee")
150+
CASE_OP(LocalGet, "local.get")
151+
CASE_OP(LocalSet, "local.set")
152+
CASE_OP(LocalTee, "local.tee")
153153
CASE_OP(GetGlobal, "global.get")
154154
CASE_OP(SetGlobal, "global.set")
155155
CASE_OP(TableGet, "table.get")

‎src/wasm/wasm-opcodes.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ bool IsJSCompatibleSignature(const FunctionSig* sig, const WasmFeatures&);
4848
V(Drop, 0x1a, _) \
4949
V(Select, 0x1b, _) \
5050
V(SelectWithType, 0x1c, _) \
51-
V(GetLocal, 0x20, _) \
52-
V(SetLocal, 0x21, _) \
53-
V(TeeLocal, 0x22, _) \
51+
V(LocalGet, 0x20, _) \
52+
V(LocalSet, 0x21, _) \
53+
V(LocalTee, 0x22, _) \
5454
V(GetGlobal, 0x23, _) \
5555
V(SetGlobal, 0x24, _) \
5656
V(TableGet, 0x25, _) \

‎src/wasm/wasm-text.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ void PrintWasmText(const WasmModule* module, const ModuleWireBytes& wire_bytes,
154154
os << WasmOpcodes::OpcodeName(opcode) << ' ' << imm.index;
155155
break;
156156
}
157-
case kExprGetLocal:
158-
case kExprSetLocal:
159-
case kExprTeeLocal: {
157+
case kExprLocalGet:
158+
case kExprLocalSet:
159+
case kExprLocalTee: {
160160
LocalIndexImmediate<Decoder::kNoValidate> imm(&i, i.pc());
161161
os << WasmOpcodes::OpcodeName(opcode) << ' ' << imm.index;
162162
break;

‎test/cctest/wasm/test-run-wasm-64.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ static void CompileCallIndirectMany(ExecutionTier tier, ValueType param) {
15021502

15031503
std::vector<byte> code;
15041504
for (byte p = 0; p < num_params; p++) {
1505-
ADD_CODE(code, kExprGetLocal, p);
1505+
ADD_CODE(code, kExprLocalGet, p);
15061506
}
15071507
ADD_CODE(code, kExprI32Const, 0);
15081508
ADD_CODE(code, kExprCallIndirect, 1, TABLE_ZERO);
@@ -1563,7 +1563,7 @@ static void Run_WasmMixedCall_N(ExecutionTier execution_tier, int start) {
15631563

15641564
// Store the result in a local.
15651565
byte local_index = r.AllocateLocal(ValueTypes::ValueTypeFor(result));
1566-
ADD_CODE(code, kExprSetLocal, local_index);
1566+
ADD_CODE(code, kExprLocalSet, local_index);
15671567

15681568
// Store the result in memory.
15691569
ADD_CODE(code,

‎test/cctest/wasm/test-run-wasm-interpreter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ TEST(Breakpoint_I32Add) {
278278
static const int kNumBreakpoints = 3;
279279
byte code[] = {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
280280
std::unique_ptr<int[]> offsets =
281-
Find(code, sizeof(code), kNumBreakpoints, kExprGetLocal, kExprGetLocal,
281+
Find(code, sizeof(code), kNumBreakpoints, kExprLocalGet, kExprLocalGet,
282282
kExprI32Add);
283283

284284
WasmRunner<int32_t, uint32_t, uint32_t> r(ExecutionTier::kInterpreter);

0 commit comments

Comments
 (0)