Another clarifying rename and a bit more automation.
kNumDalvikInstructions is now kNumPackedOpcodes, there is a new
kMaxOpcodeValue, and both are generated by opcode-gen.
Change-Id: Ic46f1f52d2d21382452c8e777024f4a985ad31d3
Bonus: Reworded the switch and array data comment for clarity.
diff --git a/vm/compiler/codegen/arm/CodegenCommon.c b/vm/compiler/codegen/arm/CodegenCommon.c
index 05cead3..4a20579 100644
--- a/vm/compiler/codegen/arm/CodegenCommon.c
+++ b/vm/compiler/codegen/arm/CodegenCommon.c
@@ -30,7 +30,7 @@
static intptr_t templateEntryOffsets[TEMPLATE_LAST_MARK];
/* Track exercised opcodes */
-static int opcodeCoverage[kNumDalvikInstructions];
+static int opcodeCoverage[kNumPackedOpcodes];
static void setMemRefType(ArmLIR *lir, bool isLoad, int memType)
{
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index 0c5b617..98236b6 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -4383,13 +4383,13 @@
streak = i = 0;
buf[0] = 0;
- while (opcodeCoverage[i] == 0 && i < kNumDalvikInstructions) {
+ while (opcodeCoverage[i] == 0 && i < kNumPackedOpcodes) {
i++;
}
- if (i == kNumDalvikInstructions) {
+ if (i == kNumPackedOpcodes) {
return;
}
- for (start = i++, streak = 1; i < kNumDalvikInstructions; i++) {
+ for (start = i++, streak = 1; i < kNumPackedOpcodes; i++) {
if (opcodeCoverage[i]) {
streak++;
} else {
@@ -4399,10 +4399,10 @@
sprintf(buf+strlen(buf), "%x-%x,", start, start + streak - 1);
}
streak = 0;
- while (opcodeCoverage[i] == 0 && i < kNumDalvikInstructions) {
+ while (opcodeCoverage[i] == 0 && i < kNumPackedOpcodes) {
i++;
}
- if (i < kNumDalvikInstructions) {
+ if (i < kNumPackedOpcodes) {
streak = 1;
start = i;
}
diff --git a/vm/compiler/codegen/x86/CodegenDriver.c b/vm/compiler/codegen/x86/CodegenDriver.c
index 60f003b..69f637e 100644
--- a/vm/compiler/codegen/x86/CodegenDriver.c
+++ b/vm/compiler/codegen/x86/CodegenDriver.c
@@ -24,7 +24,7 @@
* applicable directory below this one.
*/
-static int opcodeCoverage[kNumDalvikInstructions];
+static int opcodeCoverage[kNumPackedOpcodes];
static intptr_t templateEntryOffsets[TEMPLATE_LAST_MARK];
/*
@@ -196,13 +196,13 @@
streak = i = 0;
buf[0] = 0;
- while (opcodeCoverage[i] == 0 && i < kNumDalvikInstructions) {
+ while (opcodeCoverage[i] == 0 && i < kNumPackedOpcodes) {
i++;
}
- if (i == kNumDalvikInstructions) {
+ if (i == kNumPackedOpcodes) {
return;
}
- for (start = i++, streak = 1; i < kNumDalvikInstructions; i++) {
+ for (start = i++, streak = 1; i < kNumPackedOpcodes; i++) {
if (opcodeCoverage[i]) {
streak++;
} else {
@@ -212,10 +212,10 @@
sprintf(buf+strlen(buf), "%x-%x,", start, start + streak - 1);
}
streak = 0;
- while (opcodeCoverage[i] == 0 && i < kNumDalvikInstructions) {
+ while (opcodeCoverage[i] == 0 && i < kNumPackedOpcodes) {
i++;
}
- if (i < kNumDalvikInstructions) {
+ if (i < kNumPackedOpcodes) {
streak = 1;
start = i;
}