Revert "VM: New calling convention for generated code."

runtime/vm/instructions_arm.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.
 // Classes that describe assembly patterns as used by inline caches.
 
 #ifndef VM_INSTRUCTIONS_ARM_H_
 #define VM_INSTRUCTIONS_ARM_H_
 
 #ifndef VM_INSTRUCTIONS_H_
 #error Do not include instructions_arm.h directly; use instructions.h instead.
@@ skipping 36 matching lines @@
                                       intptr_t* index);
 };
 
 
 class CallPattern : public ValueObject {
  public:
   CallPattern(uword pc, const Code& code);
 
   RawICData* IcData();
 
-  RawCode* TargetCode() const;
-  void SetTargetCode(const Code& code) const;
+  uword TargetAddress() const;
+  void SetTargetAddress(uword target_address) const;
 
   // This constant length is only valid for inserted call patterns used for
   // lazy deoptimization. Regular call pattern may vary in length.
-  static int DeoptCallPatternLengthInBytes();
+  static int LengthInBytes();
 
-  static void InsertDeoptCallAt(uword pc, uword target_address);
+  static void InsertAt(uword pc, uword target_address);
 
  private:
   const ObjectPool& object_pool_;
 
   uword end_;
   uword ic_data_load_end_;
 
-  intptr_t target_code_pool_index_;
+  intptr_t target_address_pool_index_;
   ICData& ic_data_;
 
   DISALLOW_COPY_AND_ASSIGN(CallPattern);
 };
 
 
 class NativeCallPattern : public ValueObject {
  public:
   NativeCallPattern(uword pc, const Code& code);
 
-  RawCode* target() const;
-  void set_target(const Code& target) const;
+  uword target() const;
+  void set_target(uword target_address) const;
 
   NativeFunction native_function() const;
   void set_native_function(NativeFunction target) const;
 
  private:
   const ObjectPool& object_pool_;
 
   uword end_;
   intptr_t native_function_pool_index_;
-  intptr_t target_code_pool_index_;
+  intptr_t target_address_pool_index_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeCallPattern);
 };
 
 
+class JumpPattern : public ValueObject {
+ public:
+  JumpPattern(uword pc, const Code& code);
+
+  static const int kLengthInBytes = 3 * Instr::kInstrSize;
+
+  static int pattern_length_in_bytes();
+
+  bool IsValid() const;
+  uword TargetAddress() const;
+  void SetTargetAddress(uword target_address) const;
+
+ private:
+  const uword pc_;
+
+  DISALLOW_COPY_AND_ASSIGN(JumpPattern);
+};
+
+
 class ReturnPattern : public ValueObject {
  public:
   explicit ReturnPattern(uword pc);
 
   // bx_lr = 1.
   static const int kLengthInBytes = 1 * Instr::kInstrSize;
 
   int pattern_length_in_bytes() const {
     return kLengthInBytes;
   }
 
   bool IsValid() const;
 
  private:
   const uword pc_;
 };
 
 }  // namespace dart
 
 #endif  // VM_INSTRUCTIONS_ARM_H_