commit ce9eca6de042f26e9eebc41c9bee8b4d14f753aa
author Ian Rogers <irogers@google.com> Fri Oct 07 17:11:03 2011 -0700
committer Ian Rogers <irogers@google.com> Fri Oct 07 18:24:23 2011 -0700
tree 7a141da8787f6653b30595f478ec656fd8dd01d6
parent 6384f644e8120a15bddb9a72976eac1c158aba16

Move from code field routines to runtime support.

Add support for exceptions from these routines. Use a macro for pending
exception delivery. Fix bug in object_test where the signature of a
FromCode function had changed.

Change-Id: If486eff8659e5f6bb38d95b1139e8981656e4fb0

src/object.h

diff --git a/src/object.h b/src/object.h
index d8eb179..80a4ce9 100644
--- a/src/object.h
+++ b/src/object.h
@@ -471,10 +471,6 @@
     return MemberOffset(OFFSETOF_MEMBER(Field, offset_));
   }
 
-  static Field* FindInstanceFieldFromCode(uint32_t field_idx, const Method* referrer);
-  static Field* FindStaticFieldFromCode(uint32_t field_idx, const Method* referrer);
-  static Field* FindFieldFromCode(uint32_t field_idx, const Method* referrer, bool is_static);
-
   MemberOffset GetOffsetDuringLinking() const;
 
   void SetOffset(MemberOffset num_bytes);
@@ -499,20 +495,13 @@
   Object* GetObject(const Object* object) const;
   void SetObject(Object* object, const Object* l) const;
 
-  // Slow path routines for static field access when field was unresolved at
-  // compile time
-  static uint32_t Get32StaticFromCode(uint32_t field_idx,
-                                      const Method* referrer);
-  static void Set32StaticFromCode(uint32_t field_idx, const Method* referrer,
-                                  uint32_t new_value);
-  static uint64_t Get64StaticFromCode(uint32_t field_idx,
-                                      const Method* referrer);
-  static void Set64StaticFromCode(uint32_t field_idx, const Method* referrer,
-                                  uint64_t new_value);
-  static Object* GetObjStaticFromCode(uint32_t field_idx,
-                                      const Method* referrer);
-  static void SetObjStaticFromCode(uint32_t field_idx, const Method* referrer,
-                                   Object* new_value);
+  // raw field accesses
+  uint32_t Get32(const Object* object) const;
+  void Set32(Object* object, uint32_t new_value) const;
+  uint64_t Get64(const Object* object) const;
+  void Set64(Object* object, uint64_t new_value) const;
+  Object* GetObj(const Object* object) const;
+  void SetObj(Object* object, const Object* new_value) const;
 
   static Class* GetJavaLangReflectField() {
     DCHECK(java_lang_reflect_Field_ != NULL);
@@ -529,14 +518,6 @@
   void InitJavaFields();
 
  private:
-  // private implementation of field access using raw data
-  uint32_t Get32(const Object* object) const;
-  void Set32(Object* object, uint32_t new_value) const;
-  uint64_t Get64(const Object* object) const;
-  void Set64(Object* object, uint64_t new_value) const;
-  Object* GetObj(const Object* object) const;
-  void SetObj(Object* object, const Object* new_value) const;
-
   void InitJavaFieldsLocked();
 
   // Field order required by test "ValidateFieldOrderOfJavaCppUnionClasses".