Enable virtual invokes, use new alloc, misc
Make use of the new alloc routines. Extended the filter to allow
simple virtual invoke test to get through. Fixed a register allocation
problem.
Note that the invoke sequeces are still the verbose & long path.
Will start using the new CodeandDirectMethods mechanism in upcoming CL
Change-Id: I8ff79f6392ff3da14d7679dcf65029ae48f18eba
diff --git a/src/compiler/codegen/arm/ArmRallocUtil.cc b/src/compiler/codegen/arm/ArmRallocUtil.cc
index 400fff6..b2217d0 100644
--- a/src/compiler/codegen/arm/ArmRallocUtil.cc
+++ b/src/compiler/codegen/arm/ArmRallocUtil.cc
@@ -248,12 +248,12 @@
if (base->fpLocation == kLocPhysReg) {
if (curr->wide) {
/* TUNING: consider alignment during allocation */
- if (base->fpLowReg & 1) {
- // Pair must start on even reg - don't promote
- continue;
- }
- /* Make sure upper half is also in reg or skip */
- if (baseNext->fpLocation != kLocPhysReg) {
+ if ((base->fpLowReg & 1) ||
+ (baseNext->fpLocation != kLocPhysReg)) {
+ /* Half-promoted or bad alignment - demote */
+ curr->location = kLocDalvikFrame;
+ curr->lowReg = INVALID_REG;
+ curr->highReg = INVALID_REG;
continue;
}
curr->highReg = baseNext->fpLowReg;
@@ -268,6 +268,10 @@
if (curr->wide) {
/* Make sure upper half is also in reg or skip */
if (baseNext->location != kLocPhysReg) {
+ /* Only half promoted; demote to frame */
+ curr->location = kLocDalvikFrame;
+ curr->lowReg = INVALID_REG;
+ curr->highReg = INVALID_REG;
continue;
}
curr->highReg = baseNext->lowReg;