commit 9ea1cb1a22be5b85dc2622e3836c46a1c48e3f25
author Brian Carlstrom <bdc@google.com> Wed Aug 24 23:18:18 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Aug 25 09:45:07 2011 -0700
tree 99dd5c0b0a3e6db3f8696197467ae4fec284bec2
parent 04ec7f0f244ef36fac1c7e590d2ea14e35dfe95a

First pass of compiler wrapping class

Change-Id: I343625310f69cc4de315af91b9cc72bb4da8f59b

src/dex_cache.h

diff --git a/src/dex_cache.h b/src/dex_cache.h
index f34dbe4..13c900e 100644
--- a/src/dex_cache.h
+++ b/src/dex_cache.h
@@ -3,6 +3,7 @@
 #ifndef ART_SRC_DEX_CACHE_H_
 #define ART_SRC_DEX_CACHE_H_
 
+#include "dex_file.h"
 #include "globals.h"
 #include "macros.h"
 #include "object.h"
@@ -21,7 +22,7 @@
   enum ArrayIndex {
     kLocation = 0,
     kStrings  = 1,
-    kClasses  = 2,
+    kTypes    = 2,
     kMethods  = 3,
     kFields   = 4,
     kMax      = 5,
@@ -29,7 +30,7 @@
 
   void Init(String* location,
             ObjectArray<String>* strings,
-            ObjectArray<Class>* classes,
+            ObjectArray<Class>* types,
             ObjectArray<Method>* methods,
             ObjectArray<Field>* fields);
 
@@ -41,8 +42,8 @@
     return GetStrings()->GetLength();
   }
 
-  size_t NumClasses() const {
-    return GetClasses()->GetLength();
+  size_t NumTypes() const {
+    return GetTypes()->GetLength();
   }
 
   size_t NumMethods() const {
@@ -61,12 +62,12 @@
     GetStrings()->Set(string_idx, resolved);
   }
 
-  Class* GetResolvedClass(uint32_t class_idx) const {
-    return GetClasses()->Get(class_idx);
+  Class* GetResolvedType(uint32_t type_idx) const {
+    return GetTypes()->Get(type_idx);
   }
 
-  void SetResolvedClass(uint32_t class_idx, Class* resolved) {
-    GetClasses()->Set(class_idx, resolved);
+  void SetResolvedType(uint32_t type_idx, Class* resolved) {
+    GetTypes()->Set(type_idx, resolved);
   }
 
   Method* GetResolvedMethod(uint32_t method_idx) const {
@@ -88,8 +89,8 @@
   ObjectArray<String>* GetStrings() const {
     return static_cast<ObjectArray<String>*>(GetNonNull(kStrings));
   }
-  ObjectArray<Class>* GetClasses() const {
-    return static_cast<ObjectArray<Class>*>(GetNonNull(kClasses));
+  ObjectArray<Class>* GetTypes() const {
+    return static_cast<ObjectArray<Class>*>(GetNonNull(kTypes));
   }
   ObjectArray<Method>* GetMethods() const {
     return static_cast<ObjectArray<Method>*>(GetNonNull(kMethods));