Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: src/interpreter/bytecode-array-iterator.cc

Issue 1370893002: [Interpreter] Add support for short (16 bit) operands. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fix Win bots. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/interpreter/bytecode-array-iterator.cc
diff --git a/src/interpreter/bytecode-array-iterator.cc b/src/interpreter/bytecode-array-iterator.cc
index dc49308fbe87e6e449319314c830521c37541f2b..8fea9843a416378824083cdc86110104061f60e5 100644
--- a/src/interpreter/bytecode-array-iterator.cc
+++ b/src/interpreter/bytecode-array-iterator.cc
@@ -32,31 +32,47 @@ Bytecode BytecodeArrayIterator::current_bytecode() const {
}
-uint8_t BytecodeArrayIterator::GetRawOperand(int operand_index,
- OperandType operand_type) const {
+uint32_t BytecodeArrayIterator::GetRawOperand(int operand_index,
+ OperandType operand_type) const {
DCHECK_GE(operand_index, 0);
DCHECK_LT(operand_index, Bytecodes::NumberOfOperands(current_bytecode()));
DCHECK_EQ(operand_type,
Bytecodes::GetOperandType(current_bytecode(), operand_index));
- int operands_start = bytecode_offset_ + 1;
- return bytecode_array()->get(operands_start + operand_index);
+ uint8_t* operand_start =
+ bytecode_array()->GetFirstBytecodeAddress() + bytecode_offset_ +
+ Bytecodes::GetOperandOffset(current_bytecode(), operand_index);
+ switch (Bytecodes::SizeOfOperand(operand_type)) {
+ default:
+ case OperandSize::kNone:
+ UNREACHABLE();
+ case OperandSize::kByte:
+ return static_cast<uint32_t>(*operand_start);
+ case OperandSize::kWide:
+ return Bytecodes::WideOperandFromBytes(operand_start);
+ }
}
int8_t BytecodeArrayIterator::GetSmi8Operand(int operand_index) const {
- uint8_t operand = GetRawOperand(operand_index, OperandType::kImm8);
+ uint32_t operand = GetRawOperand(operand_index, OperandType::kImm8);
return static_cast<int8_t>(operand);
}
int BytecodeArrayIterator::GetIndexOperand(int operand_index) const {
- uint8_t operand = GetRawOperand(operand_index, OperandType::kIdx);
+ uint32_t operand = GetRawOperand(operand_index, OperandType::kIdx);
+ return static_cast<int>(operand);
+}
+
+
+int BytecodeArrayIterator::GetWideIndexOperand(int operand_index) const {
+ uint32_t operand = GetRawOperand(operand_index, OperandType::kWideIdx);
return static_cast<int>(operand);
}
Register BytecodeArrayIterator::GetRegisterOperand(int operand_index) const {
- uint8_t operand = GetRawOperand(operand_index, OperandType::kReg);
+ uint32_t operand = GetRawOperand(operand_index, OperandType::kReg);
return Register::FromOperand(operand);
}

Powered by Google App Engine
This is Rietveld 408576698