commit 1d3f114124b140629a7d22fa5cfa20ab8fc96934
author Elliott Hughes <enh@google.com> Tue Sep 13 12:00:00 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Sep 13 13:27:51 2011 -0700
tree a4e8eb3d22aa2991a73dea85da1d31fda6114c91
parent 93e74e8d879270071c3aa163f8495ada8d21f42f

Support 32-bit volatiles.

Change-Id: If40ead8e13986d589ac1d1637034e25fc4108189

src/compiler/codegen/arm/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 7e09ccc..8070e8d 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -304,7 +304,7 @@
         rlDest = oatGetDestWide(cUnit, mir, 0, 1);
         RegLocation rlResult = oatEvalLoc(cUnit, rlDest, kAnyReg, true);
 #if ANDROID_SMP != 0
-        if (isVolatile) {
+        if (field->IsVolatile()) {
             oatGenMemBarrier(cUnit, kSY);
         }
 #endif
@@ -367,7 +367,7 @@
         rlDest = oatGetDest(cUnit, mir, 0);
         rlResult = oatEvalLoc(cUnit, rlDest, kAnyReg, true);
 #if ANDROID_SMP != 0
-        if (isVolatile) {
+        if (field->IsVolatile()) {
             oatGenMemBarrier(cUnit, kSY);
         }
 #endif

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 db4dd09..a763d6e 100644
--- a/src/compiler/codegen/arm/Thumb2/Gen.cc
+++ b/src/compiler/codegen/arm/Thumb2/Gen.cc
@@ -468,7 +468,7 @@
         storeValue(cUnit, rlDest, rlResult);
     } else {
 #if ANDROID_SMP != 0
-        bool isVolatile = dvmIsVolatileField(fieldPtr);
+        bool isVolatile = fieldPtr->IsVolatile();
 #else
         bool isVolatile = false;
 #endif
@@ -501,7 +501,7 @@
         storeBaseIndexed(cUnit, rlObj.lowReg, r0, rlSrc.lowReg, 0, size);
     } else {
 #if ANDROID_SMP != 0
-        bool isVolatile = dvmIsVolatileField(fieldPtr);
+        bool isVolatile = fieldPtr->IsVolatile();
 #else
         bool isVolatile = false;
 #endif
@@ -539,7 +539,7 @@
         storeValue(cUnit, rlDest, rlResult);
     } else {
 #if ANDROID_SMP != 0
-        bool isVolatile = dvmIsVolatileField(fieldPtr);
+        bool isVolatile = fieldPtr->IsVolatile();
 #else
         bool isVolatile = false;
 #endif
@@ -580,7 +580,7 @@
         storePair(cUnit, r0, rlSrc.lowReg, rlSrc.highReg);
     } else {
 #if ANDROID_SMP != 0
-        bool isVolatile = dvmIsVolatileField(fieldPtr);
+        bool isVolatile = fieldPtr->IsVolatile();
 #else
         bool isVolatile = false;
 #endif