commit 0dd7ddaa36a2cf37490dc166ebc21818364130a7
author Brian Carlstrom <bdc@google.com> Tue Oct 25 15:47:53 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 25 20:28:07 2011 -0700
tree e381ae0cc965d2135ad99f07826333ccd03dfe90
parent ed6d78ed93c9b5b1988af6ca502a7e2eee0f2aaf

Several fixes for proper creation and use of vmap tables

Change-Id: I7696115af4263df18ede0777ae14de7a3a7ada3b

src/compiler/Frontend.cc

diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 95bff2b..a0e7713 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -895,20 +895,19 @@
         vmapTable.push_back(cUnit->coreVmapTable[i]);
     }
     // Add a marker to take place of lr
-    cUnit->coreVmapTable.push_back(INVALID_VREG);
+    vmapTable.push_back(INVALID_VREG);
     // Combine vmap tables - core regs, then fp regs
     for (uint32_t i = 0; i < cUnit->fpVmapTable.size(); i++) {
-        cUnit->coreVmapTable.push_back(cUnit->fpVmapTable[i]);
-    }
-    DCHECK(cUnit->coreVmapTable.size() == (uint32_t)
-        (__builtin_popcount(cUnit->coreSpillMask) + __builtin_popcount(cUnit->fpSpillMask)));
-    vmapTable.push_back(-1);
-    for (size_t i = 0; i < cUnit->fpVmapTable.size(); i++) {
         vmapTable.push_back(cUnit->fpVmapTable[i]);
     }
+    DCHECK_EQ(vmapTable.size(),
+              static_cast<uint32_t>(__builtin_popcount(cUnit->coreSpillMask)
+                                    + __builtin_popcount(cUnit->fpSpillMask)));
+    DCHECK_GE(vmapTable.size(), 1U);  // should always at least one INVALID_VREG for lr
+
     CompiledMethod* result = new CompiledMethod(art::kThumb2,
         cUnit->codeBuffer, cUnit->frameSize, cUnit->frameSize - sizeof(intptr_t),
-        cUnit->coreSpillMask, cUnit->fpSpillMask, cUnit->mappingTable, cUnit->coreVmapTable);
+        cUnit->coreSpillMask, cUnit->fpSpillMask, cUnit->mappingTable, vmapTable);
 
     if (compiler.IsVerbose()) {
         LOG(INFO) << "Compiled " << PrettyMethod(method)