commit d45a88794c6470d96e2139cbe803002d9d5d3a6c
author Andy McFadden Tue Mar 24 20:41:52 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Mar 24 20:41:52 2009 -0700
tree eb76d5cfe8073b07c71838ab85dcd381a7a8cfea
parent be67c30dd6aaa833e130e723f5810ee7789694ea

Automated import from //branches/master/...@141645,141645

vm/oo/Class.c

diff --git a/vm/oo/Class.c b/vm/oo/Class.c
index 6dd2e8c..39bd2c8 100644
--- a/vm/oo/Class.c
+++ b/vm/oo/Class.c
@@ -1739,7 +1739,7 @@
 
     if (gDvm.preciseGc) {
         classMapData =
-            dvmGetRegisterMapClassData(pDexFile, classDefIdx, &numMethods);
+            dvmRegisterMapGetClassData(pDexFile, classDefIdx, &numMethods);
 
         /* sanity check */
         if (classMapData != NULL &&
@@ -1767,8 +1767,8 @@
             dexReadClassDataMethod(&pEncodedData, &method, &lastIndex);
             loadMethodFromDex(newClass, &method, &newClass->directMethods[i]);
             if (classMapData != NULL) {
-                const RegisterMap* pMap = dvmGetNextRegisterMap(&classMapData);
-                if (dvmGetRegisterMapFormat(pMap) != kRegMapFormatNone) {
+                const RegisterMap* pMap = dvmRegisterMapGetNext(&classMapData);
+                if (dvmRegisterMapGetFormat(pMap) != kRegMapFormatNone) {
                     newClass->directMethods[i].registerMap = pMap;
                     /* TODO: add rigorous checks */
                     assert((newClass->directMethods[i].registersSize+7) / 8 ==
@@ -1791,8 +1791,8 @@
             dexReadClassDataMethod(&pEncodedData, &method, &lastIndex);
             loadMethodFromDex(newClass, &method, &newClass->virtualMethods[i]);
             if (classMapData != NULL) {
-                const RegisterMap* pMap = dvmGetNextRegisterMap(&classMapData);
-                if (dvmGetRegisterMapFormat(pMap) != kRegMapFormatNone) {
+                const RegisterMap* pMap = dvmRegisterMapGetNext(&classMapData);
+                if (dvmRegisterMapGetFormat(pMap) != kRegMapFormatNone) {
                     newClass->virtualMethods[i].registerMap = pMap;
                     /* TODO: add rigorous checks */
                     assert((newClass->virtualMethods[i].registersSize+7) / 8 ==
@@ -1979,7 +1979,7 @@
      * verification or because we're caching an uncompressed form.
      */
     const RegisterMap* pMap = meth->registerMap;
-    if (pMap != NULL && dvmGetRegisterMapOnHeap(pMap)) {
+    if (pMap != NULL && dvmRegisterMapGetOnHeap(pMap)) {
         dvmFreeRegisterMap((RegisterMap*) pMap);
         meth->registerMap = NULL;
     }
@@ -4336,7 +4336,8 @@
     ClassObject* clazz = method->clazz;
 
     if (method->registerMap != NULL) {
-        LOGW("WARNING: registerMap already set for %s.%s\n",
+        /* unexpected during class loading, okay on first use (uncompress) */
+        LOGD("NOTE: registerMap already set for %s.%s\n",
             method->clazz->descriptor, method->name);
         /* keep going */
     }