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

[interpreter] Rename bytecode operand flag accessors in assembler

Browse Source 
Rename BytecodeOperandFlag to BytecodeOperandFlag8. The methods in
interpreter-assembler were missed in https://crrev.com/c/3857561.

Change-Id: I09383531e4d16e6e428a56feb76192156211dc81
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3867515
Commit-Queue: Patrick Thier <pthier@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/main@{#82869}
This commit is contained in:
Patrick Thier 2022-08-31 13:47:21 +00:00 committed by V8 LUCI CQ
parent 541d4080ca
commit f03dd79562
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interpreter/interpreter-assembler.cc
View File

@ -541,7 +541,7 @@ TNode<Uint32T> InterpreterAssembler::BytecodeOperandCount(int operand_index) {
return BytecodeUnsignedOperand(operand_index, operand_size);
}
TNode<Uint32T> InterpreterAssembler::BytecodeOperandFlag(int operand_index) {
TNode<Uint32T> InterpreterAssembler::BytecodeOperandFlag8(int operand_index) {
DCHECK_EQ(OperandType::kFlag8,
Bytecodes::GetOperandType(bytecode_, operand_index));
OperandSize operand_size =
@ -550,8 +550,7 @@ TNode<Uint32T> InterpreterAssembler::BytecodeOperandFlag(int operand_index) {
return BytecodeUnsignedOperand(operand_index, operand_size);
}
TNode<Uint32T> InterpreterAssembler::BytecodeOperandWideFlag(
int operand_index) {
TNode<Uint32T> InterpreterAssembler::BytecodeOperandFlag16(int operand_index) {
DCHECK_EQ(OperandType::kFlag16,
Bytecodes::GetOperandType(bytecode_, operand_index));
OperandSize operand_size =

4
src/interpreter/interpreter-assembler.h
View File

@ -28,10 +28,10 @@ class V8_EXPORT_PRIVATE InterpreterAssembler : public CodeStubAssembler {
TNode<Uint32T> BytecodeOperandCount(int operand_index);
// Returns the 32-bit unsigned flag for bytecode operand |operand_index|
// in the current bytecode.
TNode<Uint32T> BytecodeOperandFlag(int operand_index);
TNode<Uint32T> BytecodeOperandFlag8(int operand_index);
// Returns the 32-bit unsigned 2-byte flag for bytecode operand
// |operand_index| in the current bytecode.
TNode<Uint32T> BytecodeOperandWideFlag(int operand_index);
TNode<Uint32T> BytecodeOperandFlag16(int operand_index);
// Returns the 32-bit zero-extended index immediate for bytecode operand
// |operand_index| in the current bytecode.
TNode<Uint32T> BytecodeOperandIdxInt32(int operand_index);

16
src/interpreter/interpreter-generator.cc
View File

@ -462,7 +462,7 @@ IGNITION_HANDLER(LdaLookupGlobalSlotInsideTypeof,
IGNITION_HANDLER(StaLookupSlot, InterpreterAssembler) {
TNode<Object> value = GetAccumulator();
TNode<Name> name = CAST(LoadConstantPoolEntryAtOperandIndex(0));
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag(1);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag8(1);
TNode<Context> context = GetContext();
TVARIABLE(Object, var_result);
@ -732,7 +732,7 @@ IGNITION_HANDLER(DefineKeyedOwnPropertyInLiteral, InterpreterAssembler) {
TNode<Object> name = LoadRegisterAtOperandIndex(1);
TNode<Object> value = GetAccumulator();
TNode<Smi> flags =
SmiFromInt32(UncheckedCast<Int32T>(BytecodeOperandFlag(2)));
SmiFromInt32(UncheckedCast<Int32T>(BytecodeOperandFlag8(2)));
TNode<TaggedIndex> slot = BytecodeOperandIdxTaggedIndex(3);
TNode<HeapObject> feedback_vector = LoadFeedbackVector();
@ -1775,7 +1775,7 @@ IGNITION_HANDLER(TestUndefined, InterpreterAssembler) {
// by |literal_flag|.
IGNITION_HANDLER(TestTypeOf, InterpreterAssembler) {
TNode<Object> object = GetAccumulator();
TNode<Uint32T> literal_flag = BytecodeOperandFlag(0);
TNode<Uint32T> literal_flag = BytecodeOperandFlag8(0);
#define MAKE_LABEL(name, lower_case) Label if_##lower_case(this);
TYPEOF_LITERAL_LIST(MAKE_LABEL)
@ -2260,7 +2260,7 @@ IGNITION_HANDLER(CreateRegExpLiteral, InterpreterAssembler) {
TNode<HeapObject> feedback_vector = LoadFeedbackVector();
TNode<TaggedIndex> slot = BytecodeOperandIdxTaggedIndex(1);
TNode<Smi> flags =
SmiFromInt32(UncheckedCast<Int32T>(BytecodeOperandWideFlag(2)));
SmiFromInt32(UncheckedCast<Int32T>(BytecodeOperandFlag16(2)));
TNode<Context> context = GetContext();
TVARIABLE(JSRegExp, result);
@ -2280,7 +2280,7 @@ IGNITION_HANDLER(CreateArrayLiteral, InterpreterAssembler) {
TNode<HeapObject> feedback_vector = LoadFeedbackVector();
TNode<TaggedIndex> slot = BytecodeOperandIdxTaggedIndex(1);
TNode<Context> context = GetContext();
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag(2);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag8(2);
Label fast_shallow_clone(this), call_runtime(this, Label::kDeferred);
// No feedback, so handle it as a slow case.
@ -2368,7 +2368,7 @@ IGNITION_HANDLER(CreateArrayFromIterable, InterpreterAssembler) {
IGNITION_HANDLER(CreateObjectLiteral, InterpreterAssembler) {
TNode<HeapObject> feedback_vector = LoadFeedbackVector();
TNode<TaggedIndex> slot = BytecodeOperandIdxTaggedIndex(1);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag(2);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag8(2);
Label if_fast_clone(this), if_not_fast_clone(this, Label::kDeferred);
// No feedback, so handle it as a slow case.
@ -2428,7 +2428,7 @@ IGNITION_HANDLER(CreateEmptyObjectLiteral, InterpreterAssembler) {
// {source}, converting getters into data properties.
IGNITION_HANDLER(CloneObject, InterpreterAssembler) {
TNode<Object> source = LoadRegisterAtOperandIndex(0);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag(1);
TNode<Uint32T> bytecode_flags = BytecodeOperandFlag8(1);
TNode<UintPtrT> raw_flags =
DecodeWordFromWord32<CreateObjectLiteralFlags::FlagsBits>(bytecode_flags);
TNode<Smi> smi_flags = SmiTag(Signed(raw_flags));
@ -2468,7 +2468,7 @@ IGNITION_HANDLER(GetTemplateObject, InterpreterAssembler) {
// constant pool and with pretenuring controlled by |flags|.
IGNITION_HANDLER(CreateClosure, InterpreterAssembler) {
TNode<Object> shared = LoadConstantPoolEntryAtOperandIndex(0);
TNode<Uint32T> flags = BytecodeOperandFlag(2);
TNode<Uint32T> flags = BytecodeOperandFlag8(2);
TNode<Context> context = GetContext();
TNode<UintPtrT> slot = BytecodeOperandIdx(1);

4
test/unittests/interpreter/interpreter-assembler-unittest.cc
View File

@ -317,11 +317,11 @@ TARGET_TEST_F(InterpreterAssemblerTest, BytecodeOperand) {
m.IsUnsignedOperand(offset, operand_size));
break;
case interpreter::OperandType::kFlag8:
EXPECT_THAT(m.BytecodeOperandFlag(i),
EXPECT_THAT(m.BytecodeOperandFlag8(i),
m.IsUnsignedOperand(offset, operand_size));
break;
case interpreter::OperandType::kFlag16:
EXPECT_THAT(m.BytecodeOperandWideFlag(i),
EXPECT_THAT(m.BytecodeOperandFlag16(i),
m.IsUnsignedOperand(offset, operand_size));
break;
case interpreter::OperandType::kIdx: