Commit 3781ca79 authored by ssanfilippo's avatar ssanfilippo Committed by Commit bot

[Interpreter] Rename GetCountOperand to GetRegisterCountOperand.

Apparently, this BytecodeArrayIterator method was missed during the
previous refactor. No other (collateral) change was done.

BUG=v8:4280
LOG=N

Review URL: https://codereview.chromium.org/1691433002

Cr-Commit-Position: refs/heads/master@{#33897}
parent 269840c4
...@@ -1050,7 +1050,7 @@ void BytecodeGraphBuilder::BuildCall() { ...@@ -1050,7 +1050,7 @@ void BytecodeGraphBuilder::BuildCall() {
Node* callee = Node* callee =
environment()->LookupRegister(bytecode_iterator().GetRegisterOperand(0)); environment()->LookupRegister(bytecode_iterator().GetRegisterOperand(0));
interpreter::Register receiver = bytecode_iterator().GetRegisterOperand(1); interpreter::Register receiver = bytecode_iterator().GetRegisterOperand(1);
size_t arg_count = bytecode_iterator().GetCountOperand(2); size_t arg_count = bytecode_iterator().GetRegisterCountOperand(2);
VectorSlotPair feedback = VectorSlotPair feedback =
CreateVectorSlotPair(bytecode_iterator().GetIndexOperand(3)); CreateVectorSlotPair(bytecode_iterator().GetIndexOperand(3));
...@@ -1070,7 +1070,7 @@ void BytecodeGraphBuilder::BuildCallJSRuntime() { ...@@ -1070,7 +1070,7 @@ void BytecodeGraphBuilder::BuildCallJSRuntime() {
Node* callee = Node* callee =
BuildLoadNativeContextField(bytecode_iterator().GetIndexOperand(0)); BuildLoadNativeContextField(bytecode_iterator().GetIndexOperand(0));
interpreter::Register receiver = bytecode_iterator().GetRegisterOperand(1); interpreter::Register receiver = bytecode_iterator().GetRegisterOperand(1);
size_t arg_count = bytecode_iterator().GetCountOperand(2); size_t arg_count = bytecode_iterator().GetRegisterCountOperand(2);
// Create node to perform the JS runtime call. // Create node to perform the JS runtime call.
const Operator* call = const Operator* call =
...@@ -1101,7 +1101,7 @@ void BytecodeGraphBuilder::BuildCallRuntime() { ...@@ -1101,7 +1101,7 @@ void BytecodeGraphBuilder::BuildCallRuntime() {
Runtime::FunctionId functionId = Runtime::FunctionId functionId =
static_cast<Runtime::FunctionId>(bytecode_iterator().GetIndexOperand(0)); static_cast<Runtime::FunctionId>(bytecode_iterator().GetIndexOperand(0));
interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1); interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1);
size_t arg_count = bytecode_iterator().GetCountOperand(2); size_t arg_count = bytecode_iterator().GetRegisterCountOperand(2);
// Create node to perform the runtime call. // Create node to perform the runtime call.
const Operator* call = javascript()->CallRuntime(functionId, arg_count); const Operator* call = javascript()->CallRuntime(functionId, arg_count);
...@@ -1118,7 +1118,7 @@ void BytecodeGraphBuilder::BuildCallRuntimeForPair() { ...@@ -1118,7 +1118,7 @@ void BytecodeGraphBuilder::BuildCallRuntimeForPair() {
Runtime::FunctionId functionId = Runtime::FunctionId functionId =
static_cast<Runtime::FunctionId>(bytecode_iterator().GetIndexOperand(0)); static_cast<Runtime::FunctionId>(bytecode_iterator().GetIndexOperand(0));
interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1); interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1);
size_t arg_count = bytecode_iterator().GetCountOperand(2); size_t arg_count = bytecode_iterator().GetRegisterCountOperand(2);
interpreter::Register first_return = interpreter::Register first_return =
bytecode_iterator().GetRegisterOperand(3); bytecode_iterator().GetRegisterOperand(3);
...@@ -1157,7 +1157,7 @@ void BytecodeGraphBuilder::BuildCallConstruct() { ...@@ -1157,7 +1157,7 @@ void BytecodeGraphBuilder::BuildCallConstruct() {
FrameStateBeforeAndAfter states(this); FrameStateBeforeAndAfter states(this);
interpreter::Register callee = bytecode_iterator().GetRegisterOperand(0); interpreter::Register callee = bytecode_iterator().GetRegisterOperand(0);
interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1); interpreter::Register first_arg = bytecode_iterator().GetRegisterOperand(1);
size_t arg_count = bytecode_iterator().GetCountOperand(2); size_t arg_count = bytecode_iterator().GetRegisterCountOperand(2);
// TODO(turbofan): Pass the feedback here. // TODO(turbofan): Pass the feedback here.
const Operator* call = javascript()->CallConstruct( const Operator* call = javascript()->CallConstruct(
......
...@@ -63,8 +63,7 @@ int8_t BytecodeArrayIterator::GetImmediateOperand(int operand_index) const { ...@@ -63,8 +63,7 @@ int8_t BytecodeArrayIterator::GetImmediateOperand(int operand_index) const {
return static_cast<int8_t>(operand); return static_cast<int8_t>(operand);
} }
int BytecodeArrayIterator::GetRegisterCountOperand(int operand_index) const {
int BytecodeArrayIterator::GetCountOperand(int operand_index) const {
OperandSize size = OperandSize size =
Bytecodes::GetOperandSize(current_bytecode(), operand_index); Bytecodes::GetOperandSize(current_bytecode(), operand_index);
OperandType type = (size == OperandSize::kByte) ? OperandType::kRegCount8 OperandType type = (size == OperandSize::kByte) ? OperandType::kRegCount8
...@@ -131,7 +130,7 @@ int BytecodeArrayIterator::GetRegisterOperandRange(int operand_index) const { ...@@ -131,7 +130,7 @@ int BytecodeArrayIterator::GetRegisterOperandRange(int operand_index) const {
OperandType next_operand_type = OperandType next_operand_type =
Bytecodes::GetOperandType(current_bytecode(), operand_index + 1); Bytecodes::GetOperandType(current_bytecode(), operand_index + 1);
if (Bytecodes::IsRegisterCountOperandType(next_operand_type)) { if (Bytecodes::IsRegisterCountOperandType(next_operand_type)) {
return GetCountOperand(operand_index + 1); return GetRegisterCountOperand(operand_index + 1);
} }
} }
return 1; return 1;
......
...@@ -29,7 +29,7 @@ class BytecodeArrayIterator { ...@@ -29,7 +29,7 @@ class BytecodeArrayIterator {
int8_t GetImmediateOperand(int operand_index) const; int8_t GetImmediateOperand(int operand_index) const;
int GetIndexOperand(int operand_index) const; int GetIndexOperand(int operand_index) const;
int GetCountOperand(int operand_index) const; int GetRegisterCountOperand(int operand_index) const;
Register GetRegisterOperand(int operand_index) const; Register GetRegisterOperand(int operand_index) const;
int GetRegisterOperandRange(int operand_index) const; int GetRegisterOperandRange(int operand_index) const;
Handle<Object> GetConstantForIndexOperand(int operand_index) const; Handle<Object> GetConstantForIndexOperand(int operand_index) const;
......
...@@ -95,7 +95,7 @@ TEST_F(BytecodeArrayIteratorTest, IteratesBytecodeArray) { ...@@ -95,7 +95,7 @@ TEST_F(BytecodeArrayIteratorTest, IteratesBytecodeArray) {
CHECK_EQ(static_cast<Runtime::FunctionId>(iterator.GetIndexOperand(0)), CHECK_EQ(static_cast<Runtime::FunctionId>(iterator.GetIndexOperand(0)),
Runtime::kLoadIC_Miss); Runtime::kLoadIC_Miss);
CHECK_EQ(iterator.GetRegisterOperand(1).index(), reg_0.index()); CHECK_EQ(iterator.GetRegisterOperand(1).index(), reg_0.index());
CHECK_EQ(iterator.GetCountOperand(2), 1); CHECK_EQ(iterator.GetRegisterCountOperand(2), 1);
CHECK(!iterator.done()); CHECK(!iterator.done());
iterator.Advance(); iterator.Advance();
......
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