am 64520c8c: Merge change 21796 into eclair
Merge commit '64520c8c453b03190e33818306ffed3041133ea3'
* commit '64520c8c453b03190e33818306ffed3041133ea3':
Turn down RegisterMap paranoia.
diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 655179f..2aee9d0 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -86,7 +86,6 @@
# "-O2" is redundant for device (release) but useful for sim (debug)
#LOCAL_CFLAGS += -O2 -Winline
#LOCAL_CFLAGS += -DWITH_EXTRA_OBJECT_VALIDATION
- LOCAL_CFLAGS += -DWITH_EXTRA_GC_CHECKS=1
LOCAL_CFLAGS += -DDVM_SHOW_EXCEPTION=1
# if you want to try with assertions on the device, add:
#LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT
diff --git a/vm/Init.c b/vm/Init.c
index 4a2033e..45c66e1 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -932,7 +932,7 @@
} else if (strcmp(argv[i], "-Xgenregmap") == 0) {
gDvm.generateRegisterMaps = true;
- LOGD("Register maps will be generated during verification\n");
+ LOGV("Register maps will be generated during verification\n");
} else if (strncmp(argv[i], "-Xgc:", 5) == 0) {
if (strcmp(argv[i] + 5, "precise") == 0)
diff --git a/vm/Thread.c b/vm/Thread.c
index e0f986d..3f63132 100644
--- a/vm/Thread.c
+++ b/vm/Thread.c
@@ -3639,12 +3639,9 @@
* if it's present -- but if it's enabled it means we're
* unexpectedly falling back on a conservative scan, so it's
* worth yelling a little.
- *
- * TODO: we should be able to remove this for production --
- * no need to keep banging on the global.
*/
if (gDvm.preciseGc) {
- LOGV("PGC: no map for %s.%s\n",
+ LOGVV("PGC: no map for %s.%s\n",
method->clazz->descriptor, method->name);
}
regVector = NULL;
diff --git a/vm/analysis/RegisterMap.c b/vm/analysis/RegisterMap.c
index ad843d0..0e3445a 100644
--- a/vm/analysis/RegisterMap.c
+++ b/vm/analysis/RegisterMap.c
@@ -30,7 +30,7 @@
#include <stddef.h>
/* double-check the compression */
-#define REGISTER_MAP_VERIFY true
+#define REGISTER_MAP_VERIFY false
/* verbose logging */
#define REGISTER_MAP_VERBOSE false
@@ -270,10 +270,8 @@
LOGV("mapData=%p pMap=%p bufSize=%d\n", mapData, pMap, bufSize);
assert(mapData - (const u1*) pMap == bufSize);
-#if 1
- if (!verifyMap(vdata, pMap))
+ if (REGISTER_MAP_VERIFY && !verifyMap(vdata, pMap))
goto bail;
-#endif
#ifdef REGISTER_MAP_STATS
computeMapStats(pMap, vdata->method);
#endif