commit b5d09b2f87202bc132ac3991d4b6d71f4f6d9264
author Ian Rogers <irogers@google.com> Tue Mar 06 22:14:17 2012 -0800
committer Ian Rogers <irogers@google.com> Mon Mar 12 16:01:37 2012 -0700
tree e9d805a956b42fd9958163a1f5feef68e8c7d97b
parent 79ab9e32c6880e7b342c192a479c858c9dccf496

Method prologue and epilogues, add missing x86 functionality.

Enables compiling and running a number of JNI internal managed code
methods on the host.

Change-Id: I56fceb813d0cb24637bc784ba57f2d1d16911d48

src/compiler/Frontend.cc

diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 4271722..1b8bcc1 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -1002,18 +1002,15 @@
     for (size_t i = 0 ; i < cUnit->coreVmapTable.size(); i++) {
         vmapTable.push_back(cUnit->coreVmapTable[i]);
     }
-    // Add a marker to take place of lr
-    vmapTable.push_back(INVALID_VREG);
+    if (cUnit->instructionSet != kX86) {
+        // Add a marker to take place of lr
+        vmapTable.push_back(INVALID_VREG);
+    }
     // Combine vmap tables - core regs, then fp regs
     for (uint32_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(kThumb2, cUnit->codeBuffer,
+    CompiledMethod* result = new CompiledMethod(cUnit->instructionSet, cUnit->codeBuffer,
                                                 cUnit->frameSize, cUnit->coreSpillMask,
                                                 cUnit->fpSpillMask, cUnit->mappingTable,
                                                 vmapTable);