commit 57b86d47b66322693a070185fadfb43cb9c12eab
author Ian Rogers <irogers@google.com> Tue Mar 27 16:05:41 2012 -0700
committer Ian Rogers <irogers@google.com> Thu Mar 29 11:51:44 2012 -0700
tree 81d53304a63a660a683917a19f7dd83723a397ad
parent 68aefb06c449df0bd8a34f3491f7594ee3f9dd0b

Refactor runtime support.

Change-Id: Id7470a4105838150d5ceb73ab2c8c83e739660df

src/compiler/codegen/arm/Thumb2/Gen.cc

diff --git a/src/compiler/codegen/arm/Thumb2/Gen.cc b/src/compiler/codegen/arm/Thumb2/Gen.cc
index 4319ec8..9477d2c 100644
--- a/src/compiler/codegen/arm/Thumb2/Gen.cc
+++ b/src/compiler/codegen/arm/Thumb2/Gen.cc
@@ -23,6 +23,7 @@
  */
 
 #include "oat_compilation_unit.h"
+#include "oat/runtime/oat_support_entrypoints.h"
 
 namespace art {
 
@@ -491,7 +492,7 @@
     oatFlushAllRegs(cUnit);   /* Everything to home location */
     loadValueDirectFixed(cUnit, rlSrc, r0);
     loadWordDisp(cUnit, rSELF,
-                 OFFSETOF_MEMBER(Thread, pHandleFillArrayDataFromCode), rLR);
+                 ENTRYPOINT_OFFSET(pHandleFillArrayDataFromCode), rLR);
     // Materialize a pointer to the fill data image
     newLIR3(cUnit, kThumb2Adr, r1, 0, (intptr_t)tabRec);
     oatClobberCalleeSave(cUnit);
@@ -565,7 +566,7 @@
     opRegImm(cUnit, kOpCmp, r1, 0);
     opIT(cUnit, kArmCondNe, "T");
     // Go expensive route - artLockObjectFromCode(self, obj);
-    loadWordDisp(cUnit, rSELF, OFFSETOF_MEMBER(Thread, pLockObjectFromCode),
+    loadWordDisp(cUnit, rSELF, ENTRYPOINT_OFFSET(pLockObjectFromCode),
                  rLR);
     oatClobberCalleeSave(cUnit);
     opReg(cUnit, kOpBlx, rLR);
@@ -596,7 +597,7 @@
     opIT(cUnit, kArmCondEq, "EE");
     storeWordDisp(cUnit, r0, Object::MonitorOffset().Int32Value(), r3);
     // Go expensive route - UnlockObjectFromCode(obj);
-    loadWordDisp(cUnit, rSELF, OFFSETOF_MEMBER(Thread, pUnlockObjectFromCode),
+    loadWordDisp(cUnit, rSELF, ENTRYPOINT_OFFSET(pUnlockObjectFromCode),
                  rLR);
     oatClobberCalleeSave(cUnit);
     opReg(cUnit, kOpBlx, rLR);