Support for multiple register values

runtime/vm/intermediate_language.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 787 matching lines @@
     input->definition()->AddInputUse(input);
   }
   // Take other's environment from this definition.
   ASSERT(other->env() == NULL);
   other->SetEnvironment(env());
   env_ = NULL;
   // Replace all uses of this definition with other.
   ReplaceUsesWith(other);
   // Reuse this instruction's SSA name for other.
   ASSERT(!other->HasSSATemp());
-  if (HasSSATemp()) other->set_ssa_temp_index(ssa_temp_index());
+  if (HasSSATemp()) {
+    other->set_ssa_temp_index(ssa_temp_index());
+    if (RequiresPairSSAIndex()) {
+      ASSERT(other->RequiresPairSSAIndex());
+      other->set_pair_ssa_index(pair_ssa_index());
+    }
+  }
 
   // Finally insert the other definition in place of this one in the graph.
   previous()->LinkTo(other);
   if ((iterator != NULL) && (this == iterator->Current())) {
     // Remove through the iterator.
     other->LinkTo(this);
     iterator->RemoveCurrentFromGraph();
   } else {
     other->LinkTo(next());
     // Remove this definition's input uses.
@@ skipping 2387 matching lines @@
       return kSinRuntimeEntry;
     case MethodRecognizer::kMathCos:
       return kCosRuntimeEntry;
     default:
       UNREACHABLE();
   }
   return kSinRuntimeEntry;
 }
 
 
+MergedMath2Instr::MergedMath2Instr(ZoneGrowableArray<Value*>* inputs,
+                                   intptr_t original_deopt_id,
+                                   MergedMath2Instr::Kind kind)
+    : inputs_(inputs),

[Florian Schneider, 2014/04/04 11:52:46]

pair_ssa_index_ is uninitialized.

[Cutch, 2014/04/04 16:34:46]

Done.

+      kind_(kind) {
+  ASSERT(inputs_->length() == InputCountFor(kind_));
+  for (intptr_t i = 0; i < inputs_->length(); ++i) {
+    ASSERT((*inputs)[i] != NULL);
+    (*inputs)[i]->set_instruction(this);
+    (*inputs)[i]->set_use_index(i);
+  }
+  deopt_id_ = original_deopt_id;
+}
+
+
+intptr_t MergedMath2Instr::OutputIndexOf(intptr_t kind) {
+  switch (kind) {
+    case MethodRecognizer::kMathSin: return 1;
+    case MethodRecognizer::kMathCos: return 0;
+    default: UNIMPLEMENTED(); return -1;
+  }
+}
+
+
+intptr_t MergedMath2Instr::OutputIndexOf(Token::Kind token) {
+  switch (token) {
+    case Token::kTRUNCDIV: return 0;
+    case Token::kMOD: return 1;
+    default: UNIMPLEMENTED(); return -1;
+  }
+}
+
+
 MergedMathInstr::MergedMathInstr(ZoneGrowableArray<Value*>* inputs,
                                  intptr_t original_deopt_id,
                                  MergedMathInstr::Kind kind)
     : inputs_(inputs),
       kind_(kind) {
   ASSERT(inputs_->length() == InputCountFor(kind_));
   for (intptr_t i = 0; i < inputs_->length(); ++i) {
     ASSERT((*inputs)[i] != NULL);
     (*inputs)[i]->set_instruction(this);
     (*inputs)[i]->set_use_index(i);
@@ skipping 16 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart