commit f582258f0e296223a091fd64231a203ad71e9649
author Brian Carlstrom <bdc@google.com> Mon Mar 19 22:34:31 2012 -0700
committer Brian Carlstrom <bdc@google.com> Mon Mar 19 22:59:13 2012 -0700
tree 23049122f075220421803a1745cf634337360a40
parent a7c12688da57ea052e127776ad3043ca5079488d

oat file patching

Change-Id: Idbbdf19f3a77498d79d043fd33ca12ce39cafbb7

src/compiler.h

diff --git a/src/compiler.h b/src/compiler.h
index b7a04bb..cd2b2c8 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -118,11 +118,19 @@
                          int& vtable_idx, uintptr_t& direct_code, uintptr_t& direct_method);
 
   // Record patch information for later fix up
-  void AddCodePatch(DexCache* dex_cache, const DexFile* dex_file,
-                    uint32_t referrer_method_idx, uint32_t target_method_idx,
+  void AddCodePatch(DexCache* dex_cache,
+                    const DexFile* dex_file,
+                    uint32_t referrer_method_idx,
+                    uint32_t referrer_access_flags,
+                    uint32_t target_method_idx,
+                    bool target_is_direct,
                     size_t literal_offset);
-  void AddMethodPatch(DexCache* dex_cache, const DexFile* dex_file,
-                      uint32_t referrer_method_idx, uint32_t target_method_idx,
+  void AddMethodPatch(DexCache* dex_cache,
+                      const DexFile* dex_file,
+                      uint32_t referrer_method_idx,
+                      uint32_t referrer_access_flags,
+                      uint32_t target_method_idx,
+                      bool target_is_direct,
                       size_t literal_offset);
 
 #if defined(ART_USE_LLVM_COMPILER)
@@ -140,6 +148,66 @@
     return compiler_context_;
   }
 
+  class PatchInformation {
+   public:
+    DexCache* GetDexCache() const {
+      return dex_cache_;
+    }
+    const DexFile& GetDexFile() const {
+      return *dex_file_;
+    }
+    uint32_t GetReferrerMethodIdx() const {
+      return referrer_method_idx_;
+    }
+    bool GetReferrerIsDirect() const {
+      return referrer_is_direct_;
+    }
+    uint32_t GetTargetMethodIdx() const {
+      return target_method_idx_;
+    }
+    bool GetTargetIsDirect() const {
+      return target_is_direct_;
+    }
+    size_t GetLiteralOffset() const {;
+      return literal_offset_;
+    }
+
+   private:
+    PatchInformation(DexCache* dex_cache,
+                     const DexFile* dex_file,
+                     uint32_t referrer_method_idx,
+                     uint32_t referrer_access_flags,
+                     uint32_t target_method_idx,
+                     uint32_t target_is_direct,
+                     size_t literal_offset)
+      : dex_cache_(dex_cache),
+        dex_file_(dex_file),
+        referrer_method_idx_(referrer_method_idx),
+        referrer_is_direct_(Method::IsDirect(referrer_access_flags)),
+        target_method_idx_(target_method_idx),
+        target_is_direct_(target_is_direct),
+        literal_offset_(literal_offset) {
+      CHECK(dex_file_ != NULL);
+    }
+
+    DexCache* dex_cache_;
+    const DexFile* dex_file_;
+    uint32_t referrer_method_idx_;
+    bool referrer_is_direct_;
+    uint32_t target_method_idx_;
+    bool target_is_direct_;
+    size_t literal_offset_;
+
+    friend class Compiler;
+  };
+
+  const std::vector<const PatchInformation*>& GetCodeToPatch() const {
+    return code_to_patch_;
+  }
+  const std::vector<const PatchInformation*>& GetMethodsToPatch() const {
+    return methods_to_patch_;
+  }
+
  private:
 
   // Compute constant code and method pointers when possible
@@ -181,24 +249,8 @@
   void InsertInvokeStub(bool is_static, const char* shorty,
                         const CompiledInvokeStub* compiled_invoke_stub);
 
-  class PatchInformation {
-   public:
-    PatchInformation(DexCache* dex_cache, const DexFile* dex_file,
-                     uint32_t referrer_method_idx, uint32_t target_method_idx,
-                     size_t literal_offset) :
-                       dex_cache_(dex_cache), dex_file_(dex_file),
-                       referrer_method_idx_(referrer_method_idx),
-                       target_method_idx_(target_method_idx),
-                       literal_offset_(literal_offset) {}
-   private:
-    DexCache* dex_cache_;
-    const DexFile* dex_file_;
-    uint32_t referrer_method_idx_;
-    uint32_t target_method_idx_;
-    size_t literal_offset_;
-  };
-  std::vector<PatchInformation*> code_to_patch_;
-  std::vector<PatchInformation*> methods_to_patch_;
+  std::vector<const PatchInformation*> code_to_patch_;
+  std::vector<const PatchInformation*> methods_to_patch_;
 
   InstructionSet instruction_set_;