Support for unboxed 64-bit integer bitwise operations and equality on ia32.

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
 #include "vm/parser.h"
@@ skipping 104 matching lines @@
         *from_addr, reinterpret_cast<RawDouble**>(to_addr));
   }
 
  private:
   const intptr_t stack_slot_index_;  // First argument is 0, always >= 0.
 
   DISALLOW_COPY_AND_ASSIGN(DeoptDoubleStackSlotInstr);
 };
 
 
+class DeoptMintStackSlotInstr : public DeoptInstr {
+ public:
+  explicit DeoptMintStackSlotInstr(intptr_t from_index)
+      : stack_slot_index_(from_index) {
+    ASSERT(stack_slot_index_ >= 0);
+  }
+
+  virtual intptr_t from_index() const { return stack_slot_index_; }
+  virtual DeoptInstr::Kind kind() const { return kCopyMintStackSlot; }
+
+  virtual const char* ToCString() const {
+    const char* format = "ms%"Pd"";
+    intptr_t len = OS::SNPrint(NULL, 0, format, stack_slot_index_);
+    char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
+    OS::SNPrint(chars, len + 1, format, stack_slot_index_);
+    return chars;
+  }
+
+  void Execute(DeoptimizationContext* deopt_context, intptr_t to_index) {
+    intptr_t from_index =
+       deopt_context->from_frame_size() - stack_slot_index_ - 1;
+    int64_t* from_addr = reinterpret_cast<int64_t*>(
+        deopt_context->GetFromFrameAddressAt(from_index));
+    intptr_t* to_addr = deopt_context->GetToFrameAddressAt(to_index);
+    *reinterpret_cast<RawSmi**>(to_addr) = Smi::New(0);
+    Isolate::Current()->DeferMintMaterialization(

[Vyacheslav Egorov (Google), 2012/09/24 14:53:42]

You can materialize Smi right away and defer only actual Mint case.

[Florian Schneider, 2012/09/26 11:51:32]

Done.

+        *from_addr, reinterpret_cast<RawInteger**>(to_addr));
+  }
+
+ private:
+  const intptr_t stack_slot_index_;  // First argument is 0, always >= 0.
+
+  DISALLOW_COPY_AND_ASSIGN(DeoptMintStackSlotInstr);
+};
+
+
 // Deoptimization instruction creating return address using function and
 // deopt-id stored at 'object_table_index'. Uses the deopt-after
 // continuation point.
 class DeoptRetAddrAfterInstr : public DeoptInstr {
  public:
   explicit DeoptRetAddrAfterInstr(intptr_t object_table_index)
       : object_table_index_(object_table_index) {
     ASSERT(object_table_index >= 0);
   }
 
@@ skipping 150 matching lines @@
         value, reinterpret_cast<RawDouble**>(to_addr));
   }
 
  private:
   const XmmRegister reg_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptXmmRegisterInstr);
 };
 
 
+class DeoptMintXmmRegisterInstr: public DeoptInstr {
+ public:
+  explicit DeoptMintXmmRegisterInstr(intptr_t reg_as_int)
+      : reg_(static_cast<XmmRegister>(reg_as_int)) {}
+
+  virtual intptr_t from_index() const { return static_cast<intptr_t>(reg_); }
+  virtual DeoptInstr::Kind kind() const { return kCopyMintXmmRegister; }
+
+  virtual const char* ToCString() const {
+    const char* format = "%s(m)";
+    intptr_t len =
+        OS::SNPrint(NULL, 0, format, Assembler::XmmRegisterName(reg_));
+    char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
+    OS::SNPrint(chars, len + 1, format, Assembler::XmmRegisterName(reg_));
+    return chars;
+  }
+
+  void Execute(DeoptimizationContext* deopt_context, intptr_t to_index) {
+    int64_t value = deopt_context->MintXmmRegisterValue(reg_);
+    intptr_t* to_addr = deopt_context->GetToFrameAddressAt(to_index);
+    *reinterpret_cast<RawSmi**>(to_addr) = Smi::New(0);
+    Isolate::Current()->DeferMintMaterialization(

[Vyacheslav Egorov (Google), 2012/09/24 14:53:42]

You can materialize Smi right away and defer only actual Mint case.

[Florian Schneider, 2012/09/26 11:51:32]

Done.

+        value, reinterpret_cast<RawInteger**>(to_addr));
+  }
+
+ private:
+  const XmmRegister reg_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeoptMintXmmRegisterInstr);
+};
+
+
 // Deoptimization instruction creating a PC marker for the code of
 // function at 'object_table_index'.
 class DeoptPcMarkerInstr : public DeoptInstr {
  public:
   explicit DeoptPcMarkerInstr(intptr_t object_table_index)
       : object_table_index_(object_table_index) {
     ASSERT(object_table_index >= 0);
   }
 
   virtual intptr_t from_index() const { return object_table_index_; }
@@ skipping 71 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptCallerPcInstr);
 };
 
 
 DeoptInstr* DeoptInstr::Create(intptr_t kind_as_int, intptr_t from_index) {
   Kind kind = static_cast<Kind>(kind_as_int);
   switch (kind) {
     case kCopyStackSlot: return new DeoptStackSlotInstr(from_index);
     case kCopyDoubleStackSlot: return new DeoptDoubleStackSlotInstr(from_index);
+    case kCopyMintStackSlot: return new DeoptMintStackSlotInstr(from_index);
     case kSetRetAfterAddress: return new DeoptRetAddrAfterInstr(from_index);
     case kSetRetBeforeAddress: return new DeoptRetAddrBeforeInstr(from_index);
     case kCopyConstant:  return new DeoptConstantInstr(from_index);
     case kCopyRegister:  return new DeoptRegisterInstr(from_index);
     case kCopyXmmRegister: return new DeoptXmmRegisterInstr(from_index);
+    case kCopyMintXmmRegister: return new DeoptMintXmmRegisterInstr(from_index);
     case kSetPcMarker:   return new DeoptPcMarkerInstr(from_index);
     case kSetCallerFp:   return new DeoptCallerFpInstr();
     case kSetCallerPc:   return new DeoptCallerPcInstr();
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 intptr_t DeoptInfoBuilder::FindOrAddObjectInTable(const Object& obj) const {
@@ skipping 43 matching lines @@
 void DeoptInfoBuilder::AddCopy(const Location& from_loc,
                                const Value& from_value,
                                const intptr_t to_index) {
   DeoptInstr* deopt_instr = NULL;
   if (from_loc.IsConstant()) {
     intptr_t object_table_index = FindOrAddObjectInTable(from_loc.constant());
     deopt_instr = new DeoptConstantInstr(object_table_index);
   } else if (from_loc.IsRegister()) {
     deopt_instr = new DeoptRegisterInstr(from_loc.reg());
   } else if (from_loc.IsXmmRegister()) {
-    deopt_instr = new DeoptXmmRegisterInstr(from_loc.xmm_reg());
+    if (from_loc.representation() == Location::kDouble) {
+      deopt_instr = new DeoptXmmRegisterInstr(from_loc.xmm_reg());
+    } else {
+      ASSERT(from_loc.representation() == Location::kMint);
+      deopt_instr = new DeoptMintXmmRegisterInstr(from_loc.xmm_reg());
+    }
   } else if (from_loc.IsStackSlot()) {
     intptr_t from_index = (from_loc.stack_index() < 0) ?
         from_loc.stack_index() + num_args_ :
         from_loc.stack_index() + num_args_ -
             ParsedFunction::kFirstLocalSlotIndex + 1;
     deopt_instr = new DeoptStackSlotInstr(from_index);
   } else if (from_loc.IsDoubleStackSlot()) {
     intptr_t from_index = (from_loc.stack_index() < 0) ?
         from_loc.stack_index() + num_args_ :
         from_loc.stack_index() + num_args_ -
             ParsedFunction::kFirstLocalSlotIndex + 1;
-    deopt_instr = new DeoptDoubleStackSlotInstr(from_index);
+    if (from_loc.representation() == Location::kDouble) {
+      deopt_instr = new DeoptDoubleStackSlotInstr(from_index);
+    } else {
+      ASSERT(from_loc.representation() == Location::kMint);
+      deopt_instr = new DeoptMintStackSlotInstr(from_index);
+    }
   } else {
     UNREACHABLE();
   }
   ASSERT(to_index == instructions_.length());
   instructions_.Add(deopt_instr);
 }
 
 
 void DeoptInfoBuilder::AddCallerFp(intptr_t to_index) {
   ASSERT(to_index == instructions_.length());
@@ skipping 11 matching lines @@
   const intptr_t len = instructions_.length();
   const DeoptInfo& deopt_info = DeoptInfo::Handle(DeoptInfo::New(len));
   for (intptr_t i = 0; i < len; i++) {
     DeoptInstr* instr = instructions_[i];
     deopt_info.SetAt(i, instr->kind(), instr->from_index());
   }
   return deopt_info.raw();
 }
 
 }  // namespace dart