Make deoptimization architecture dependent (it depends on the frame layout).

runtime/vm/deopt_instructions.h

 // 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.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 
 namespace dart {
 
 class Location;
 class Value;
 class MaterializeObjectInstr;
 
 // Holds all data relevant for execution of deoptimization instructions.
 class DeoptimizationContext : public ValueObject {
  public:
-  // 'to_frame_start' points to the return address just below the frame's
-  // stack pointer (kPcAddressOffsetFromSp). 'num_args' is 0 if there are no
-  // arguments or if there are optional arguments.
+  // 'to_frame_start' points to the fixed size portion of the frame under sp.
+  // 'num_args' is 0 if there are no arguments or if there are optional
+  // arguments.
   DeoptimizationContext(intptr_t* to_frame_start,
                         intptr_t to_frame_size,
                         const Array& object_table,
                         intptr_t num_args,
                         DeoptReasonId deopt_reason);
 
   intptr_t* GetFromFrameAddressAt(intptr_t index) const {
     ASSERT((0 <= index) && (index < from_frame_size_));
     return &from_frame_[index];
   }
 
   intptr_t* GetToFrameAddressAt(intptr_t index) const {
     ASSERT((0 <= index) && (index < to_frame_size_));
     return &to_frame_[index];
   }
 
   intptr_t GetFromFp() const;
+  intptr_t GetFromPp() const;
   intptr_t GetFromPc() const;
 
   intptr_t GetCallerFp() const;
   void SetCallerFp(intptr_t callers_fp);
 
   RawObject* ObjectAt(intptr_t index) const {
     return object_table_.At(index);
   }
 
   intptr_t RegisterValue(Register reg) const {
@@ skipping 49 matching lines @@
     kFpuRegister,
     kInt64FpuRegister,
     kFloat32x4FpuRegister,
     kUint32x4FpuRegister,
     kStackSlot,
     kDoubleStackSlot,
     kInt64StackSlot,
     kFloat32x4StackSlot,
     kUint32x4StackSlot,
     kPcMarker,
+    kPp,
     kCallerFp,
+    kCallerPp,
     kCallerPc,
     kSuffix,
     kMaterializedObjectRef,
     kMaterializeObject
   };
 
   static DeoptInstr* Create(intptr_t kind_as_int, intptr_t from_index);
 
   DeoptInstr() {}
   virtual ~DeoptInstr() {}
@@ skipping 50 matching lines @@
   const GrowableObjectArray& object_table() { return object_table_; }
 
   // Return address before instruction.
   void AddReturnAddress(const Function& function,
                         intptr_t deopt_id,
                         intptr_t to_index);
 
   // Copy from optimized frame to unoptimized.
   void AddCopy(Value* value, const Location& from_loc, intptr_t to_index);
   void AddPcMarker(const Function& function, intptr_t to_index);
+  void AddPp(const Function& function, intptr_t to_index);
   void AddCallerFp(intptr_t to_index);
+  void AddCallerPp(intptr_t to_index);
   void AddCallerPc(intptr_t to_index);
 
   // Add object to be materialized. Emit kMaterializeObject instruction.
   void AddMaterialization(MaterializeObjectInstr* mat);
 
   // For every materialized object emit instructions describing data required
   // for materialization: class of the instance to allocate and field-value
   // pairs for initialization.
-  // Emitted instructions are expected to follow return-address slot emitted
-  // first. This way they become a part of the bottom-most deoptimized frame
-  // and are discoverable by GC.
+  // Emitted instructions are expected to follow fixed size section of frame
+  // emitted first. This way they become a part of the bottom-most deoptimized
+  // frame and are discoverable by GC.
   // At deoptimization they will be removed by the stub at the very end:
   // after they were used to materialize objects.
   // Returns the index of the next stack slot. Used for verification.
-  intptr_t EmitMaterializationArguments();
+  intptr_t EmitMaterializationArguments(intptr_t to_index);
 
   RawDeoptInfo* CreateDeoptInfo();
 
   // Mark the actual start of the frame description after all materialization
   // instructions were emitted. Used for verification purposes.
   void MarkFrameStart() {
     ASSERT(frame_start_ == -1);
     frame_start_ = instructions_.length();
   }
 
@@ skipping 52 matching lines @@
                        DeoptInfo* info,
                        Smi* reason);
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_