Move deopt reason into PcDescriptor so the EAX/RAX register is not destroyed. Some cleanups in PC d…

runtime/vm/object.cc

 // Copyright (c) 2012, 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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 6455 matching lines @@
   return static_cast<PcDescriptors::Kind>(*(EntryAddr(index, kKindEntry)));
 }
 
 
 void PcDescriptors::SetKind(intptr_t index, PcDescriptors::Kind value) const {
   *(EntryAddr(index, kKindEntry)) = value;
 }
 
 
 intptr_t PcDescriptors::DeoptId(intptr_t index) const {
-  return Smi::Value(*SmiAddr(index, kDeoptIdEntry));
+  return *(EntryAddr(index, kDeoptIdEntry));
 }
 
 
 void PcDescriptors::SetDeoptId(intptr_t index, intptr_t value) const {
-  *SmiAddr(index, kDeoptIdEntry) = Smi::New(value);
+  *(EntryAddr(index, kDeoptIdEntry)) = value;
 }
 
 
 intptr_t PcDescriptors::TokenPos(intptr_t index) const {
-  return Smi::Value(*SmiAddr(index, kTokenPosEntry));
+  ASSERT(DescriptorKind(index) != kDeoptIndex);
+  return *(EntryAddr(index, kTokenPosEntry));
 }
 
 
 void PcDescriptors::SetTokenPos(intptr_t index, intptr_t value) const {
-  *SmiAddr(index, kTokenPosEntry) = Smi::New(value);
+  *(EntryAddr(index, kTokenPosEntry)) = value;
 }
 
 
 intptr_t PcDescriptors::TryIndex(intptr_t index) const {
   ASSERT(DescriptorKind(index) != kDeoptIndex);
   return *(EntryAddr(index, kTryIndexEntry));
 }
 
 
-intptr_t PcDescriptors::DeoptIndex(intptr_t index) const {
-  ASSERT(DescriptorKind(index) == kDeoptIndex);
-  return *(EntryAddr(index, kTryIndexEntry));
-}
-
-
 void PcDescriptors::SetTryIndex(intptr_t index, intptr_t value) const {
   *(EntryAddr(index, kTryIndexEntry)) = value;
 }
 
 
+intptr_t PcDescriptors::DeoptIndex(intptr_t index) const {
+  ASSERT(DescriptorKind(index) == kDeoptIndex);
+  return *(EntryAddr(index, kDeoptIndexEntry));
+}
+
+
+intptr_t PcDescriptors::DeoptReason(intptr_t index) const {
+  ASSERT(DescriptorKind(index) == kDeoptIndex);
+  return *(EntryAddr(index, kDeoptReasonEntry));
+}
+
+
 RawPcDescriptors* PcDescriptors::New(intptr_t num_descriptors) {
   ASSERT(Object::pc_descriptors_class() != Class::null());
   if (num_descriptors < 0 || num_descriptors > kMaxElements) {
     // This should be caught before we reach here.
     FATAL1("Fatal error in PcDescriptors::New: invalid num_descriptors %ld\n",
            num_descriptors);
   }
   PcDescriptors& result = PcDescriptors::Handle();
   {
     uword size = PcDescriptors::InstanceSize(num_descriptors);
@@ skipping 25 matching lines @@
 
 const char* PcDescriptors::ToCString() const {
   if (Length() == 0) {
     return "No pc descriptors\n";
   }
   const char* kFormat =
       "0x%" PRIxPTR "\t%s\t%" PRIdPTR "\t%" PRIdPTR "\t%" PRIdPTR "\n";
   // First compute the buffer size required.
   intptr_t len = 1;  // Trailing '\0'.
   for (intptr_t i = 0; i < Length(); i++) {
-    const intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
+    intptr_t token_pos_or_deopt_reason = DescriptorKind(i) == kDeoptIndex ?
+        DeoptReason(i) : TokenPos(i);
+    intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
         DeoptIndex(i) : TryIndex(i);
     len += OS::SNPrint(NULL, 0, kFormat,
-        PC(i), KindAsStr(i), DeoptId(i), TokenPos(i), multi_purpose_index);
+        PC(i),
+        KindAsStr(i),
+        DeoptId(i),
+        token_pos_or_deopt_reason,
+        multi_purpose_index);
   }
   // Allocate the buffer.
   char* buffer = Isolate::Current()->current_zone()->Alloc<char>(len);
   // Layout the fields in the buffer.
   intptr_t index = 0;
   for (intptr_t i = 0; i < Length(); i++) {
-    const intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
+    intptr_t token_pos_or_deopt_reason = DescriptorKind(i) == kDeoptIndex ?
+        DeoptReason(i) : TokenPos(i);
+    intptr_t multi_purpose_index = DescriptorKind(i) == kDeoptIndex ?
         DeoptIndex(i) : TryIndex(i);
     index += OS::SNPrint((buffer + index), (len - index), kFormat,
-        PC(i), KindAsStr(i), DeoptId(i), TokenPos(i), multi_purpose_index);
+        PC(i),
+        KindAsStr(i),
+        DeoptId(i),
+        token_pos_or_deopt_reason,
+        multi_purpose_index);
   }
   return buffer;
 }
 
 
 // Verify assumptions (in debug mode only).
 // - No two deopt descriptors have the same deoptimization id.
 // - No two ic-call descriptors have the same deoptimization id (type feedback).
 // - No two descriptors of same kind have the same PC.
 // A function without unique ids is marked as non-optimizable (e.g., because of
@@ skipping 4385 matching lines @@
 const char* JSRegExp::ToCString() const {
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart