Revert of More simplification and unification of frame handling

src/crankshaft/lithium.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/crankshaft/lithium.h"
 
 #include "src/ast/scopes.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/crankshaft/ia32/lithium-ia32.h"  // NOLINT
@@ skipping 228 matching lines @@
 
 void LPointerMap::PrintTo(StringStream* stream) {
   stream->Add("{");
   for (int i = 0; i < pointer_operands_.length(); ++i) {
     if (i != 0) stream->Add(";");
     pointer_operands_[i]->PrintTo(stream);
   }
   stream->Add("}");
 }
 
+
+int StackSlotOffset(int index) {
+  if (index >= 0) {
+    // Local or spill slot. Skip the frame pointer, function, and
+    // context in the fixed part of the frame.
+    return -(index + 1) * kPointerSize -
+        StandardFrameConstants::kFixedFrameSizeFromFp;
+  } else {
+    // Incoming parameter. Skip the return address.
+    return -(index + 1) * kPointerSize + kFPOnStackSize + kPCOnStackSize;
+  }
+}
+
+
 LChunk::LChunk(CompilationInfo* info, HGraph* graph)
-    : base_frame_slots_(StandardFrameConstants::kFixedFrameSize / kPointerSize),
-      current_frame_slots_(base_frame_slots_),
+    : spill_slot_count_(0),
       info_(info),
       graph_(graph),
       instructions_(32, info->zone()),
       pointer_maps_(8, info->zone()),
       inlined_functions_(1, info->zone()),
       deprecation_dependencies_(32, info->zone()),
       stability_dependencies_(8, info->zone()) {}
 
+
 LLabel* LChunk::GetLabel(int block_id) const {
   HBasicBlock* block = graph_->blocks()->at(block_id);
   int first_instruction = block->first_instruction_index();
   return LLabel::cast(instructions_[first_instruction]);
 }
 
 
 int LChunk::LookupDestination(int block_id) const {
   LLabel* cur = GetLabel(block_id);
   while (cur->replacement() != NULL) {
@@ skipping 204 matching lines @@
 }
 
 
 void LChunk::set_allocated_double_registers(BitVector* allocated_registers) {
   allocated_double_registers_ = allocated_registers;
   BitVector* doubles = allocated_double_registers();
   BitVector::Iterator iterator(doubles);
   while (!iterator.Done()) {
     if (info()->saves_caller_doubles()) {
       if (kDoubleSize == kPointerSize * 2) {
-        current_frame_slots_ += 2;
+        spill_slot_count_ += 2;
       } else {
-        current_frame_slots_++;
+        spill_slot_count_++;
       }
     }
     iterator.Advance();
   }
 }
 
 
 void LChunkBuilderBase::Abort(BailoutReason reason) {
   info()->AbortOptimization(reason);
   status_ = ABORTED;
@@ skipping 146 matching lines @@
 
 LPhase::~LPhase() {
   if (ShouldProduceTraceOutput()) {
     isolate()->GetHTracer()->TraceLithium(name(), chunk_);
   }
 }
 
 
 }  // namespace internal
 }  // namespace v8