Updating the compiler to use the new-world model
New compiler is integrated and passes first test (Fibonacci).
Change-Id: Ic5448ab89ebd22baa30fafc3d1300324687d1fc2
diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index 41bf8bc..5cfddc0 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -2092,11 +2092,11 @@
* blocks.
*/
bb->dataFlowInfo->dalvikToSSAMap =
- (int *)oatNew(sizeof(int) * cUnit->method->registersSize,
+ (int *)oatNew(sizeof(int) * cUnit->method->num_registers_,
false);
memcpy(bb->dataFlowInfo->dalvikToSSAMap, cUnit->dalvikToSSAMap,
- sizeof(int) * cUnit->method->registersSize);
+ sizeof(int) * cUnit->method->num_registers_);
return true;
}
@@ -2184,7 +2184,7 @@
void oatInitializeSSAConversion(CompilationUnit* cUnit)
{
int i;
- int numDalvikReg = cUnit->method->registersSize;
+ int numDalvikReg = cUnit->method->num_registers_;
cUnit->ssaToDalvikMap = (GrowableList *)oatNew(sizeof(GrowableList),
false);