Experimental: switch back to using MacroAssembler::Set instead of...

src/virtual-frame-ia32.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 178 matching lines @@
 // The element must be on the physical stack, or the first
 // element below the stack pointer (created by a single push).
 void VirtualFrame::RawSyncElementAt(int index) {
   FrameElement element = elements_[index];
 
   if (!element.is_synced()) {
     if (index <= stack_pointer_) {
       // Write elements below the stack pointer to their (already allocated)
       // actual frame location.
       if (element.is_constant()) {
-        __ mov(Operand(ebp, fp_relative(index)), Immediate(element.handle()));
+        ASSERT(!cgen_->has_cc());
+        __ Set(Operand(ebp, fp_relative(index)), Immediate(element.handle()));
       } else {
         ASSERT(element.is_register());
         __ mov(Operand(ebp, fp_relative(index)), element.reg());
       }
     } else {
       // Push elements above the stack pointer to allocate space and sync
       // them.  Space should have already been allocated in the actual frame
       // for all the elements below this one.
       ASSERT(index == stack_pointer_ + 1);
       stack_pointer_++;
@@ skipping 95 matching lines @@
 
   return false;
 }
 
 
 void VirtualFrame::MakeMergable() {
   Comment cmnt(masm_, "[ Make frame mergable");
   // We should always be merging the code generator's current frame to an
   // expected frame.
   ASSERT(cgen_->frame() == this);
+  ASSERT(!cgen_->has_cc());
   ASSERT(cgen_->HasValidEntryRegisters());
 
   // Remove constants from the frame and ensure that no registers are
   // multiply referenced within the frame.  Allocate elements to their new
   // locations from the top down so that the topmost elements have a chance
   // to be in registers, then fill them into memory from the bottom up.
   // (NB: Currently when spilling registers that are multiply referenced, it
   // is the lowermost occurrence that gets to stay in the register.)
 
   // The elements of new_elements are initially invalid.
@@ skipping 35 matching lines @@
     }
   }
 
   // Perform the moves.
   for (int i = 0; i < elements_.length(); i++) {
     FrameElement source = elements_[i];
     FrameElement target = new_elements[i];
     ASSERT(!target.is_valid() || target.is_register() || target.is_memory());
     if (target.is_register()) {
       if (source.is_constant()) {
-        __ mov(target.reg(), Immediate(source.handle()));
+        __ Set(target.reg(), Immediate(source.handle()));
       } else if (source.is_register() && !source.reg().is(target.reg())) {
         __ mov(target.reg(), source.reg());
       }
       elements_[i] = target;
     } else if (target.is_memory()) {
       if (!source.is_memory()) {
         // Spilling a source register would decrement its reference count,
         // but we have already done that when computing new target elements,
         // so we use a raw spill.
         RawSpillElementAt(i);
       }
     }
     // Invalid elements do not need to be moved.
   }
 
   delete[] new_elements;
   ASSERT(cgen_->HasValidEntryRegisters());
 }
 
 
 void VirtualFrame::MergeTo(VirtualFrame* expected) {
   Comment cmnt(masm_, "[ Merge frame");
   // We should always be merging the code generator's current frame to an
   // expected frame.
   ASSERT(cgen_->frame() == this);
+  ASSERT(!cgen_->has_cc());
 
   ASSERT(cgen_ == expected->cgen_);
   ASSERT(masm_ == expected->masm_);
   ASSERT(elements_.length() == expected->elements_.length());
   ASSERT(parameter_count_ == expected->parameter_count_);
   ASSERT(local_count_ == expected->local_count_);
   ASSERT(frame_pointer_ == expected->frame_pointer_);
 
   // Mergable frames have all elements in locations, either memory or
   // register.  We thus have a series of to-memory and to-register moves.
   // First perform all to-memory moves, register-to-memory moves because
   // they can free registers and constant-to-memory moves because they do
   // not use registers.
   MergeMoveRegistersToMemory(expected);
   MergeMoveRegistersToRegisters(expected);
   MergeMoveMemoryToRegisters(expected);
 
   int height_difference = stack_pointer_ - expected->stack_pointer_;
   if (stack_pointer_ > expected->stack_pointer_) {
 #ifdef DEBUG
     for (int i = stack_pointer_; i > expected->stack_pointer_; i--) {
       ASSERT(!elements_[i].is_memory());
       ASSERT(!elements_[i].is_synced());
     }
 #endif
-    ASSERT(!cgen_->has_cc());
     __ add(Operand(esp), Immediate(height_difference * kPointerSize));
     stack_pointer_ = expected->stack_pointer_;
   } else if (stack_pointer_ < expected->stack_pointer_) {
     // Put valid data on the stack, that will only be accessed by GC.
     while (stack_pointer_ < expected->stack_pointer_) {
       __ push(Immediate(Smi::FromInt(0)));
       stack_pointer_++;
     }
   }
 
@@ skipping 118 matching lines @@
           if (stack_pointer_ > i) {
             // Sync elements between i and stack pointer, and bring
             // stack pointer down to i.
 #ifdef DEBUG
             // In debug builds check to ensure this is safe.
             for (int j = stack_pointer_; j > i; j--) {
               ASSERT(!elements_[j].is_memory());
             }
 #endif
             int difference = stack_pointer_ - i;
-            ASSERT(!cgen_->has_cc());
             __ add(Operand(esp), Immediate(difference * kPointerSize));
             stack_pointer_ = i;
           }
           stack_pointer_--;
           __ pop(target.reg());
         }
       } else {
         // Source is constant.
         __ Set(target.reg(), Immediate(source.handle()));
         if (target.is_synced()) {
@@ skipping 86 matching lines @@
   Drop(height());
 
   // Validate state: The expression stack should be empty and the
   // stack pointer should have been updated to reflect this.
   ASSERT(height() == 0);
   ASSERT(stack_pointer_ == expression_base_index() - 1);
 }
 
 
 void VirtualFrame::AllocateStackSlots(int count) {
+  ASSERT(!cgen_->has_cc());
   ASSERT(height() == 0);
   local_count_ = count;
 
   if (count > 0) {
     Comment cmnt(masm_, "[ Allocate space for locals");
     // The locals are initialized to a constant (the undefined value), but
     // we sync them with the actual frame to allocate space for spilling
     // them later.  First sync everything above the stack pointer so we can
     // use pushes to allocate and initialize the locals.
     SyncRange(stack_pointer_ + 1, elements_.length());
@@ skipping 241 matching lines @@
   ASSERT(cgen_->HasValidEntryRegisters());
   PrepareForCall(frame_arg_count);
   __ call(code, rmode);
   Result result = cgen_->allocator()->Allocate(eax);
   ASSERT(result.is_valid());
   return result;
 }
 
 
 void VirtualFrame::Drop(int count) {
+  ASSERT(!cgen_->has_cc());
   ASSERT(height() >= count);
   int num_virtual_elements = (elements_.length() - 1) - stack_pointer_;
 
   // Emit code to lower the stack pointer if necessary.
   if (num_virtual_elements < count) {
     int num_dropped = count - num_virtual_elements;
     stack_pointer_ -= num_dropped;
-    ASSERT(!cgen_->has_cc());
     __ add(Operand(esp), Immediate(num_dropped * kPointerSize));
   }
 
   // Discard elements from the virtual frame and free any registers.
   for (int i = 0; i < count; i++) {
     FrameElement dropped = elements_.RemoveLast();
     if (dropped.is_register()) {
       Unuse(dropped.reg());
     }
   }
 }
 
 
 Result VirtualFrame::Pop() {
+  ASSERT(!cgen_->has_cc());
   FrameElement popped = elements_.RemoveLast();
   bool pop_needed = (stack_pointer_ == elements_.length());
 
   if (popped.is_constant()) {
     if (pop_needed) {
       stack_pointer_--;
-      ASSERT(!cgen_->has_cc());
       __ add(Operand(esp), Immediate(kPointerSize));
     }
     return Result(popped.handle(), cgen_);
   } else if (popped.is_register()) {
     Unuse(popped.reg());
     if (pop_needed) {
       stack_pointer_--;
-      ASSERT(!cgen_->has_cc());
       __ add(Operand(esp), Immediate(kPointerSize));
     }
     return Result(popped.reg(), cgen_);
   } else {
     ASSERT(popped.is_memory());
     Result temp = cgen_->allocator()->Allocate();
     ASSERT(temp.is_valid());
     ASSERT(pop_needed);
     stack_pointer_--;
     __ pop(temp.reg());
@@ skipping 84 matching lines @@
       return false;
     }
   }
   return true;
 }
 #endif
 
 #undef __
 
 } }  // namespace v8::internal