commit b3bd5f07884f5a1f2b84224363b1372d7c28d447
author Elliott Hughes <enh@google.com> Thu Mar 08 21:05:27 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Mar 09 15:37:46 2012 -0800
tree 6e2997ab64b4a4f32d7ef539a4649adc736ea553
parent ddbd01ac1660d57416879d5a576482f1048dde64

Refactor the compilers out of libart.

This builds three separate compilers and dynamically links with the right one
at runtime.

Change-Id: I59d22b9884f41de733c09f97e29ee290236d5f4b

src/compiler/Ralloc.cc

diff --git a/src/compiler/Ralloc.cc b/src/compiler/Ralloc.cc
index 3353437..abc573e 100644
--- a/src/compiler/Ralloc.cc
+++ b/src/compiler/Ralloc.cc
@@ -406,9 +406,10 @@
     }
 
     /* Figure out the frame size */
-    cUnit->numPadding = (STACK_ALIGN_WORDS -
+    static const int kStackAlignWords = kStackAlignment/sizeof(uint32_t);
+    cUnit->numPadding = (kStackAlignWords -
         (cUnit->numCoreSpills + cUnit->numFPSpills + cUnit->numRegs +
-         cUnit->numOuts + 2)) & (STACK_ALIGN_WORDS-1);
+             cUnit->numOuts + 2)) & (kStackAlignWords - 1);
     cUnit->frameSize = (cUnit->numCoreSpills + cUnit->numFPSpills +
                         cUnit->numRegs + cUnit->numOuts +
                         cUnit->numPadding + 2) * 4;