Add unboxed Mint for X64

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
@@ skipping 172 matching lines @@
   switch (kind) {
     case DeoptInstr::kConstant:
     case DeoptInstr::kPp:
     case DeoptInstr::kCallerPp:
     case DeoptInstr::kMaterializedObjectRef:
     case DeoptInstr::kFloat32x4:
     case DeoptInstr::kInt32x4:
     case DeoptInstr::kFloat64x2:
     case DeoptInstr::kWord:
     case DeoptInstr::kDouble:
+    case DeoptInstr::kMint:
     case DeoptInstr::kMintPair:
     case DeoptInstr::kInt32:
     case DeoptInstr::kUint32:
       return true;
 
     case DeoptInstr::kRetAddress:
     case DeoptInstr::kPcMarker:
     case DeoptInstr::kCallerFp:
     case DeoptInstr::kCallerPc:
       return false;
@@ skipping 365 matching lines @@
 
  private:
   const CpuRegisterSource source_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptIntInstr);
 };
 
 
 typedef DeoptIntInstr<DeoptInstr::kUint32, uint32_t> DeoptUint32Instr;
 typedef DeoptIntInstr<DeoptInstr::kInt32, int32_t> DeoptInt32Instr;
+typedef DeoptIntInstr<DeoptInstr::kMint, int64_t> DeoptMintInstr;
 
 
 template<DeoptInstr::Kind K,
          typename Type,
          typename RawObjectType>
 class DeoptFpuInstr: public DeoptInstr {
  public:
   explicit DeoptFpuInstr(intptr_t source_index)
       : source_(source_index) {}
 
@@ skipping 309 matching lines @@
 }
 
 
 DeoptInstr* DeoptInstr::Create(intptr_t kind_as_int, intptr_t source_index) {
   Kind kind = static_cast<Kind>(kind_as_int);
   switch (kind) {
     case kWord:
       return new DeoptWordInstr(source_index);
     case kDouble:
       return new DeoptDoubleInstr(source_index);
+    case kMint:
+      return new DeoptMintInstr(source_index);
     case kMintPair:
       return new DeoptMintPairInstr(source_index);
     case kInt32:
       return new DeoptInt32Instr(source_index);
     case kUint32:
       return new DeoptUint32Instr(source_index);
     case kFloat32x4:
       return new DeoptFloat32x4Instr(source_index);
     case kFloat64x2:
       return new DeoptFloat64x2Instr(source_index);
@@ skipping 24 matching lines @@
   return NULL;
 }
 
 
 const char* DeoptInstr::KindToCString(Kind kind) {
   switch (kind) {
     case kWord:
       return "word";
     case kDouble:
       return "double";
+    case kMint:
     case kMintPair:
       return "mint";
     case kInt32:
       return "int32";
     case kUint32:
       return "uint32";
     case kFloat32x4:
       return "float32x4";
     case kFloat64x2:
       return "float64x2";
@@ skipping 162 matching lines @@
     ASSERT(index >= 0);
     deopt_instr = new(isolate()) DeoptMaterializedObjectRefInstr(index);
   } else {
     ASSERT(!source_loc.IsInvalid());
     switch (value->definition()->representation()) {
       case kTagged:
         deopt_instr = new(isolate()) DeoptWordInstr(
           ToCpuRegisterSource(source_loc));
         break;
       case kUnboxedMint: {
-        ASSERT(source_loc.IsPairLocation());
-        PairLocation* pair = source_loc.AsPairLocation();
-        deopt_instr = new(isolate()) DeoptMintPairInstr(
-            ToCpuRegisterSource(pair->At(0)),
-            ToCpuRegisterSource(pair->At(1)));
+        if (source_loc.IsPairLocation()) {
+          PairLocation* pair = source_loc.AsPairLocation();
+          deopt_instr = new(isolate()) DeoptMintPairInstr(
+              ToCpuRegisterSource(pair->At(0)),
+              ToCpuRegisterSource(pair->At(1)));
+        } else {
+          ASSERT(!source_loc.IsPairLocation());
+          deopt_instr = new(isolate()) DeoptMintInstr(
+              ToCpuRegisterSource(source_loc));
+        }
         break;
       }
       case kUnboxedInt32:
         deopt_instr = new(isolate()) DeoptInt32Instr(
             ToCpuRegisterSource(source_loc));
         break;
       case kUnboxedUint32:
         deopt_instr = new(isolate()) DeoptUint32Instr(
             ToCpuRegisterSource(source_loc));
         break;
@@ skipping 194 matching lines @@
                           Smi* offset,
                           DeoptInfo* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart