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/compiler/codegen/arm/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 483d7a7..673aaba 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -26,7 +26,7 @@
 {
     oatFlushAllRegs(cUnit);  /* All temps to home location */
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(mir->dalvikInsn.vC);
+        GetResolvedType(mir->dalvikInsn.vC);
     if (classPtr == NULL) {
          LOG(FATAL) << "Unexpected null classPtr";
     } else {
@@ -62,7 +62,7 @@
     }
     oatFlushAllRegs(cUnit);  /* All temps to home location */
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(typeIndex);
+        GetResolvedType(typeIndex);
     if (classPtr == NULL) {
          LOG(FATAL) << "Unexpected null classPtr";
     } else {

src/compiler/codegen/arm/Thumb2/Gen.cc

diff --git a/src/compiler/codegen/arm/Thumb2/Gen.cc b/src/compiler/codegen/arm/Thumb2/Gen.cc
index 934a303..e06910d 100644
--- a/src/compiler/codegen/arm/Thumb2/Gen.cc
+++ b/src/compiler/codegen/arm/Thumb2/Gen.cc
@@ -521,7 +521,7 @@
                           RegLocation rlDest, RegLocation rlSrc)
 {
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(mir->dalvikInsn.vB);
+        GetResolvedType(mir->dalvikInsn.vB);
 
     if (classPtr == NULL) {
         LOG(FATAL) << "Unexpected null class pointer";
@@ -554,7 +554,7 @@
                            RegLocation rlDest)
 {
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(mir->dalvikInsn.vB);
+        GetResolvedType(mir->dalvikInsn.vB);
 
     if (classPtr == NULL) {
         /* Shouldn't happen */
@@ -590,7 +590,7 @@
    // May generate a call - use explicit registers
     RegLocation rlResult;
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(mir->dalvikInsn.vC);
+        GetResolvedType(mir->dalvikInsn.vC);
     if (classPtr == NULL) {
         /* Shouldn't happen */
         LOG(FATAL) << "Unexpected null class pointer";
@@ -625,7 +625,7 @@
 static void genCheckCast(CompilationUnit* cUnit, MIR* mir, RegLocation rlSrc)
 {
     Class* classPtr = cUnit->method->GetDeclaringClass()->GetDexCache()->
-        GetResolvedClass(mir->dalvikInsn.vB);
+        GetResolvedType(mir->dalvikInsn.vB);
     if (classPtr == NULL) {
         /* Shouldn't happen with our current model */
         LOG(FATAL) << "Unexpected null class pointer";