[interpreter] Add a register operand to ToNumber

src/interpreter/interpreter.cc

 // Copyright 2015 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/interpreter/interpreter.h"
 
 #include <fstream>
 
 #include "src/ast/prettyprinter.h"
 #include "src/code-factory.h"
@@ skipping 979 matching lines @@
   Node* context = __ GetContext();
   Node* lhs_value = __ TruncateTaggedToWord32(context, left);
   Node* rhs_value = __ SmiToWord32(right);
   Node* shift_count = __ Word32And(rhs_value, __ Int32Constant(0x1f));
   Node* value = __ Word32Sar(lhs_value, shift_count);
   Node* result = __ ChangeInt32ToTagged(value);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
-void Interpreter::DoUnaryOp(Callable callable,
-                            InterpreterAssembler* assembler) {
+void Interpreter::DoUnaryOp(Callable callable, InterpreterAssembler* assembler,
+                            Bytecode bytecode) {
   Node* target = __ HeapConstant(callable.code());
   Node* accumulator = __ GetAccumulator();
   Node* context = __ GetContext();
   Node* result =
       __ CallStub(callable.descriptor(), target, context, accumulator);
-  __ SetAccumulator(result);
+  if (Bytecodes::NumberOfOperands(bytecode) == 1 &&

[rmcilroy, 2016/07/21 09:31:48]

Let's not do this in an if here. Split out BuildUnaryOp which only does the
actual operation, and call that form DoUnaryOp and also seperately from ToNumber
and modify ToNumber to store in the register and dispatch.

[klaasb, 2016/07/21 10:55:19]

Done.

+      Bytecodes::GetOperandType(bytecode, 0) == OperandType::kRegOut) {
+    __ StoreRegister(result, __ BytecodeOperandReg(0));
+  } else {
+    __ SetAccumulator(result);
+  }
   __ Dispatch();
 }
 
 template <class Generator>
 void Interpreter::DoUnaryOp(InterpreterAssembler* assembler) {
   Node* value = __ GetAccumulator();
   Node* context = __ GetContext();
   Node* result = Generator::Generate(assembler, value, context);
   __ SetAccumulator(result);
   __ Dispatch();
 }
 
 // ToName
 //
 // Cast the object referenced by the accumulator to a name.
 void Interpreter::DoToName(InterpreterAssembler* assembler) {
-  DoUnaryOp(CodeFactory::ToName(isolate_), assembler);
+  DoUnaryOp(CodeFactory::ToName(isolate_), assembler, Bytecode::kToName);
 }
 
 // ToNumber
 //
 // Cast the object referenced by the accumulator to a number.
 void Interpreter::DoToNumber(InterpreterAssembler* assembler) {
-  DoUnaryOp(CodeFactory::ToNumber(isolate_), assembler);
+  DoUnaryOp(CodeFactory::ToNumber(isolate_), assembler, Bytecode::kToNumber);
 }
 
 // ToObject
 //
 // Cast the object referenced by the accumulator to a JSObject.
 void Interpreter::DoToObject(InterpreterAssembler* assembler) {
-  DoUnaryOp(CodeFactory::ToObject(isolate_), assembler);
+  DoUnaryOp(CodeFactory::ToObject(isolate_), assembler, Bytecode::kToObject);
 }
 
 // Inc
 //
 // Increments value in the accumulator by one.
 void Interpreter::DoInc(InterpreterAssembler* assembler) {
   DoUnaryOp<IncStub>(assembler);
 }
 
 // Dec
@@ skipping 58 matching lines @@
   __ Bind(&end);
   __ SetAccumulator(result.value());
   __ Dispatch();
 }
 
 // TypeOf
 //
 // Load the accumulator with the string representating type of the
 // object in the accumulator.
 void Interpreter::DoTypeOf(InterpreterAssembler* assembler) {
-  DoUnaryOp(CodeFactory::Typeof(isolate_), assembler);
+  DoUnaryOp(CodeFactory::Typeof(isolate_), assembler, Bytecode::kTypeOf);
 }
 
 void Interpreter::DoDelete(Runtime::FunctionId function_id,
                            InterpreterAssembler* assembler) {
   Node* reg_index = __ BytecodeOperandReg(0);
   Node* object = __ LoadRegister(reg_index);
   Node* key = __ GetAccumulator();
   Node* context = __ GetContext();
   Node* result = __ CallRuntime(function_id, context, object, key);
   __ SetAccumulator(result);
@@ skipping 992 matching lines @@
   __ StoreObjectField(generator, JSGeneratorObject::kContinuationOffset,
       __ SmiTag(new_state));
   __ SetAccumulator(old_state);
 
   __ Dispatch();
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8