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

runtime/vm/instructions_arm.h

Index: runtime/vm/instructions_arm.h
diff --git a/runtime/vm/instructions_arm.h b/runtime/vm/instructions_arm.h
index 13ce9bc76b6b4542319d43cfeb9979c780dcc6e7..991b2b3eb1d2399378af0d7a18cacf869f3a0aa6 100644
--- a/runtime/vm/instructions_arm.h
+++ b/runtime/vm/instructions_arm.h
@@ -54,14 +54,14 @@ class CallPattern : public ValueObject {
 
   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_;
@@ -69,7 +69,7 @@ class CallPattern : public ValueObject {
   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);
@@ -80,8 +80,8 @@ 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;
@@ -91,12 +91,31 @@ class NativeCallPattern : public ValueObject {
 
   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);