[Interpreter] Add support for short (16 bit) operands.

test/unittests/interpreter/bytecode-array-builder-unittest.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "test/unittests/test-utils.h"
 
@@ skipping 76 matching lines @@
   builder.Jump(&start).JumpIfTrue(&start).JumpIfFalse(&start);
   builder.Return();
 
   // Generate BytecodeArray.
   Handle<BytecodeArray> the_array = builder.ToBytecodeArray();
   CHECK_EQ(the_array->frame_size(), builder.locals_count() * kPointerSize);
 
   // Build scorecard of bytecodes encountered in the BytecodeArray.
   std::vector<int> scorecard(Bytecodes::ToByte(Bytecode::kLast) + 1);
   Bytecode final_bytecode = Bytecode::kLdaZero;
-  for (int i = 0; i < the_array->length(); i++) {
+  int i = 0;
+  while (i < the_array->length()) {
     uint8_t code = the_array->get(i);
     scorecard[code] += 1;
-    int operands = Bytecodes::NumberOfOperands(Bytecodes::FromByte(code));
-    CHECK_LE(operands, Bytecodes::MaximumNumberOfOperands());
     final_bytecode = Bytecodes::FromByte(code);
-    i += operands;
+    i += Bytecodes::Size(Bytecodes::FromByte(code));
   }
 
   // Check return occurs at the end and only once in the BytecodeArray.
   CHECK_EQ(final_bytecode, Bytecode::kReturn);
   CHECK_EQ(scorecard[Bytecodes::ToByte(final_bytecode)], 1);
 
 #define CHECK_BYTECODE_PRESENT(Name, ...)     \
   /* Check Bytecode is marked in scorecard */ \
   CHECK_GE(scorecard[Bytecodes::ToByte(Bytecode::k##Name)], 1);
   BYTECODE_LIST(CHECK_BYTECODE_PRESENT)
@@ skipping 119 matching lines @@
     builder.LoadUndefined();
   }
   builder.Bind(&far0).Bind(&far1).Bind(&far2);
   builder.Return();
 
   Handle<BytecodeArray> array = builder.ToBytecodeArray();
   DCHECK_EQ(array->length(), 12 + kFarJumpDistance - 6 + 1);
 
   BytecodeArrayIterator iterator(array);
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 6);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 6);
   iterator.Advance();
 
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfTrue);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 4);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 4);
   iterator.Advance();
 
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfFalse);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 2);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 2);
   iterator.Advance();
 
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpConstant);
   CHECK_EQ(*iterator.GetConstantForIndexOperand(0),
            Smi::FromInt(kFarJumpDistance));
   CHECK_EQ(
       array->get(iterator.current_offset() +
                  Smi::cast(*iterator.GetConstantForIndexOperand(0))->value()),
       Bytecodes::ToByte(Bytecode::kReturn));
   iterator.Advance();
@@ skipping 34 matching lines @@
     builder.Jump(&label2);
   }
   builder.JumpIfFalse(&label2);
   builder.JumpIfTrue(&label1);
   builder.Jump(&label0);
   builder.Return();
 
   Handle<BytecodeArray> array = builder.ToBytecodeArray();
   BytecodeArrayIterator iterator(array);
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 0);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 0);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfTrue);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 0);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 0);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfFalse);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 0);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 0);
   iterator.Advance();
   for (int i = 0; i < 64; i++) {
     CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-    CHECK_EQ(iterator.GetSmi8Operand(0), -i * 2 - 2);
+    CHECK_EQ(iterator.GetImmediateOperand(0), -i * 2 - 2);
     iterator.Advance();
   }
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfFalseConstant);
   CHECK_EQ(Smi::cast(*iterator.GetConstantForIndexOperand(0))->value(), -130);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpIfTrueConstant);
   CHECK_EQ(Smi::cast(*iterator.GetConstantForIndexOperand(0))->value(), -134);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJumpConstant);
   CHECK_EQ(Smi::cast(*iterator.GetConstantForIndexOperand(0))->value(), -138);
@@ skipping 11 matching lines @@
 
   // Labels can only have 1 forward reference, but
   // can be referred to mulitple times once bound.
   BytecodeLabel label;
 
   builder.Jump(&label).Bind(&label).Jump(&label).Jump(&label).Return();
 
   Handle<BytecodeArray> array = builder.ToBytecodeArray();
   BytecodeArrayIterator iterator(array);
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 2);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 2);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-  CHECK_EQ(iterator.GetSmi8Operand(0), 0);
+  CHECK_EQ(iterator.GetImmediateOperand(0), 0);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-  CHECK_EQ(iterator.GetSmi8Operand(0), -2);
+  CHECK_EQ(iterator.GetImmediateOperand(0), -2);
   iterator.Advance();
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kReturn);
   iterator.Advance();
   CHECK(iterator.done());
 }
 
 
 TEST_F(BytecodeArrayBuilderTest, LabelAddressReuse) {
   static const int kRepeats = 3;
 
   BytecodeArrayBuilder builder(isolate(), zone());
   builder.set_parameter_count(0);
   builder.set_locals_count(0);
 
   for (int i = 0; i < kRepeats; i++) {
     BytecodeLabel label;
     builder.Jump(&label).Bind(&label).Jump(&label).Jump(&label);
   }
 
   builder.Return();
 
   Handle<BytecodeArray> array = builder.ToBytecodeArray();
   BytecodeArrayIterator iterator(array);
   for (int i = 0; i < kRepeats; i++) {
     CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-    CHECK_EQ(iterator.GetSmi8Operand(0), 2);
+    CHECK_EQ(iterator.GetImmediateOperand(0), 2);
     iterator.Advance();
     CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-    CHECK_EQ(iterator.GetSmi8Operand(0), 0);
+    CHECK_EQ(iterator.GetImmediateOperand(0), 0);
     iterator.Advance();
     CHECK_EQ(iterator.current_bytecode(), Bytecode::kJump);
-    CHECK_EQ(iterator.GetSmi8Operand(0), -2);
+    CHECK_EQ(iterator.GetImmediateOperand(0), -2);
     iterator.Advance();
   }
   CHECK_EQ(iterator.current_bytecode(), Bytecode::kReturn);
   iterator.Advance();
   CHECK(iterator.done());
 }
 
 
+TEST_F(BytecodeArrayBuilderTest, ToBoolean) {
+  BytecodeArrayBuilder builder(isolate(), zone());
+  builder.set_parameter_count(0);
+  builder.set_locals_count(0);
+
+  // Check ToBoolean emitted at start of block.
+  builder.EnterBlock().CastAccumulatorToBoolean();
+
+  // Check ToBoolean emitted preceding bytecode is non-boolean.
+  builder.LoadNull().CastAccumulatorToBoolean();
+
+  // Check ToBoolean omitted if preceding bytecode is boolean.
+  builder.LoadFalse().CastAccumulatorToBoolean();
+
+  // Check ToBoolean emitted if it is at the start of the next block.
+  builder.LoadFalse()
+      .LeaveBlock()
+      .EnterBlock()
+      .CastAccumulatorToBoolean()
+      .LeaveBlock();
+
+  builder.Return();
+
+  Handle<BytecodeArray> array = builder.ToBytecodeArray();
+  BytecodeArrayIterator iterator(array);
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kToBoolean);
+  iterator.Advance();
+
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kLdaNull);
+  iterator.Advance();
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kToBoolean);
+  iterator.Advance();
+
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kLdaFalse);
+  iterator.Advance();
+
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kLdaFalse);
+  iterator.Advance();
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kToBoolean);
+  iterator.Advance();
+
+  CHECK_EQ(iterator.current_bytecode(), Bytecode::kReturn);
+  iterator.Advance();
+  CHECK(iterator.done());
+}
+
+
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8