Move some verifier stuff around.
Once upon a time we started down the road of "just in time" register
map generation, which was intended to save flash and RAM storage by
generating register maps for methods as the GC needed them (rather than
doing them all up front, or on first load of a class). This required
a lot of duplication of code, and in the end just wasn't worth it.
This removes the (#ifdefed-out) partial implementation. Some functions
that were moved into VerifySubs to be shared with RegisterMap.c are
moved back to their previous homes.
Some temporary VERIFIER_STATS stuff is also getting checked in (#ifdefed
out).
Added an assert, tweaked a couple of comments. No changes in behavior
are expected.
Change-Id: I20b915992add9906cb3638ac9432c910443a9a47
diff --git a/vm/analysis/CodeVerify.c b/vm/analysis/CodeVerify.c
index b76ce75..49c1a3e 100644
--- a/vm/analysis/CodeVerify.c
+++ b/vm/analysis/CodeVerify.c
@@ -357,6 +357,32 @@
}
/*
+ * Given a 32-bit constant, return the most-restricted RegType enum entry
+ * that can hold the value.
+ */
+static char determineCat1Const(s4 value)
+{
+ if (value < -32768)
+ return kRegTypeInteger;
+ else if (value < -128)
+ return kRegTypeShort;
+ else if (value < 0)
+ return kRegTypeByte;
+ else if (value == 0)
+ return kRegTypeZero;
+ else if (value == 1)
+ return kRegTypeOne;
+ else if (value < 128)
+ return kRegTypePosByte;
+ else if (value < 32768)
+ return kRegTypePosShort;
+ else if (value < 65536)
+ return kRegTypeChar;
+ else
+ return kRegTypeInteger;
+}
+
+/*
* Create a new uninitialized instance map.
*
* The map is allocated and populated with address entries. The addresses
@@ -2337,9 +2363,10 @@
* Use the table if we can, and reject any attempts to merge something
* from the table with a reference type.
*
- * The uninitialized table entry at index zero *will* show up as a
- * simple kRegTypeUninit value. Since this cannot be merged with
- * anything but itself, the rules do the right thing.
+ * Uninitialized references are composed of the enum ORed with an
+ * index value. The uninitialized table entry at index zero *will*
+ * show up as a simple kRegTypeUninit value. Since this cannot be
+ * merged with anything but itself, the rules do the right thing.
*/
if (type1 < kRegTypeMAX) {
if (type2 < kRegTypeMAX) {
@@ -2416,6 +2443,9 @@
LOGVV("COPY into 0x%04x\n", nextInsn);
copyRegisters(targetRegs, workRegs, insnRegCount + kExtraRegs);
dvmInsnSetChanged(insnFlags, nextInsn, true);
+#ifdef VERIFIER_STATS
+ gDvm.verifierStats.copyRegCount++;
+#endif
} else {
if (gDebugVerbose) {
LOGVV("MERGE into 0x%04x\n", nextInsn);
@@ -2426,6 +2456,8 @@
bool changed = false;
int i;
+ assert(dvmInsnIsBranchTarget(insnFlags, nextInsn));
+
for (i = 0; i < insnRegCount + kExtraRegs; i++) {
targetRegs[i] = mergeTypes(targetRegs[i], workRegs[i], &changed);
}
@@ -2434,6 +2466,11 @@
//LOGI(" RESULT (changed=%d)\n", changed);
//dumpRegTypes(meth, insnFlags, targetRegs, 0, "rslt", NULL, 0);
}
+#ifdef VERIFIER_STATS
+ gDvm.verifierStats.mergeRegCount++;
+ if (changed)
+ gDvm.verifierStats.mergeRegChanged++;
+#endif
if (changed)
dvmInsnSetChanged(insnFlags, nextInsn, true);
@@ -3043,7 +3080,7 @@
*/
/*
- * Entry point for the detailed code-flow analysis.
+ * Entry point for the detailed code-flow analysis of a single method.
*/
bool dvmVerifyCodeFlow(VerifierData* vdata)
{
@@ -3055,6 +3092,10 @@
memset(®Table, 0, sizeof(regTable));
+#ifdef VERIFIER_STATS
+ gDvm.verifierStats.methodsExamined++;
+#endif
+
#ifndef NDEBUG
checkMergeTab(); // only need to do this if table gets updated
#endif
@@ -3432,6 +3473,14 @@
const u2* insns = meth->insns + insnIdx;
bool result = false;
+#ifdef VERIFIER_STATS
+ if (dvmInsnIsVisited(insnFlags, insnIdx)) {
+ gDvm.verifierStats.instrsReexamined++;
+ } else {
+ gDvm.verifierStats.instrsExamined++;
+ }
+#endif
+
/*
* Once we finish decoding the instruction, we need to figure out where
* we can go from here. There are three possible ways to transfer
@@ -3655,12 +3704,12 @@
case OP_CONST:
/* could be boolean, int, float, or a null reference */
setRegisterType(workRegs, decInsn.vA,
- dvmDetermineCat1Const((s4)decInsn.vB));
+ determineCat1Const((s4)decInsn.vB));
break;
case OP_CONST_HIGH16:
/* could be boolean, int, float, or a null reference */
setRegisterType(workRegs, decInsn.vA,
- dvmDetermineCat1Const((s4) decInsn.vB << 16));
+ determineCat1Const((s4) decInsn.vB << 16));
break;
case OP_CONST_WIDE_16:
case OP_CONST_WIDE_32: