Implement leaf runtime call stub on ARM and corresponding call redirection

runtime/vm/instructions_mips.h

Index: runtime/vm/instructions_mips.h
===================================================================
--- runtime/vm/instructions_mips.h	(revision 19723)
+++ runtime/vm/instructions_mips.h	(working copy)
@@ -10,85 +10,45 @@
 #error Do not include instructions_mips.h directly; use instructions.h instead.
 #endif
 
-#include "vm/allocation.h"
+#include "vm/constants_mips.h"
 #include "vm/object.h"
 
 namespace dart {
 
-// Forward declarations.
-class RawClass;
-class Immediate;
-class RawObject;
-
-// Abstract class for all instruction pattern classes.
-class InstructionPattern : public ValueObject {
+class CallPattern : public ValueObject {
  public:
-  explicit InstructionPattern(uword pc) : end_(pc) {
-    ASSERT(pc != 0);
-  }
-  virtual ~InstructionPattern() { }
+  CallPattern(uword pc, const Code& code);
 
-  // Check if the instruction ending at 'end_' matches the expected pattern.
-  virtual bool IsValid() const {
-    return TestBytesWith(pattern(), pattern_length_in_bytes());
-  }
-
-  // 'pattern' returns the expected byte pattern in form of an integer array
-  // with length of 'pattern_length_in_bytes'. A '-1' element means 'any byte'.
-  virtual const int* pattern() const = 0;
-  virtual int pattern_length_in_bytes() const = 0;
-
- protected:
-  uword end() const { return end_; }
-
- private:
-  // Returns true if the 'num_bytes' bytes at 'num_bytes' before 'end_'
-  // correspond to array of integers 'data'. 'data' elements are either a byte
-  // or -1, which represents any byte.
-  bool TestBytesWith(const int* data, int num_bytes) const;
-
-  const uword end_;
-
-  DISALLOW_COPY_AND_ASSIGN(InstructionPattern);
-};
-
-
-class CallPattern : public InstructionPattern {
- public:
-  CallPattern(uword pc, const Code& code)
-      : InstructionPattern(pc), code_(code) { }
-
-  static const int kLengthInBytes = 1*kWordSize;
-
-  virtual int pattern_length_in_bytes() const {
-    return kLengthInBytes;
-  }
   uword TargetAddress() const;
-  void SetTargetAddress(uword new_target) const;
+  void SetTargetAddress(uword target_address) const;
 
  private:
-  virtual const int* pattern() const;
+  uword Back(int n) const;
+  int DecodePoolIndex();
+  const uword* end_;
+  const int pool_index_;
+  const Array& object_pool_;
 
-  const Code& code_;
-
   DISALLOW_COPY_AND_ASSIGN(CallPattern);
 };
 
 
-class JumpPattern : public InstructionPattern {
+class JumpPattern : public ValueObject {
  public:
-  explicit JumpPattern(uword pc) : InstructionPattern(pc) { }
+  explicit JumpPattern(uword pc);
 
-  static const int kLengthInBytes = 3*kWordSize;
+  static const int kLengthInBytes = 3*Instr::kInstrSize;
 
-  virtual int pattern_length_in_bytes() const {
+  int pattern_length_in_bytes() const {
     return kLengthInBytes;
   }
+
+  bool IsValid() const;
   uword TargetAddress() const;
-  void SetTargetAddress(uword new_target) const;
+  void SetTargetAddress(uword target_address) const;
 
  private:
-  virtual const int* pattern() const;
+  const uword pc_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpPattern);
 };