summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/arm/CodegenDriver.c
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2009-12-21 11:42:59 -0800
committerCarl Shapiro <cshapiro@google.com>2009-12-21 15:43:29 -0800
commit94338aadf8355b28846f0d21c49142ca29479dc4 (patch)
treebfc4e126727a3758c21c3f51a111dea7bef41d11 /vm/compiler/codegen/arm/CodegenDriver.c
parent2692bae61c54b358248ec57de07e7e4b5dc18c2d (diff)
downloadandroid_dalvik-94338aadf8355b28846f0d21c49142ca29479dc4.tar.gz
android_dalvik-94338aadf8355b28846f0d21c49142ca29479dc4.tar.bz2
android_dalvik-94338aadf8355b28846f0d21c49142ca29479dc4.zip
Repurpose bits 1 and 2 of the lockword for encoding the hash state of
an object. Invert the meaning of the shape bit to match the encoding scheme described in Bacon's paper. Consequently, monitor pointers must have the lower 3 bits stripped before they may be dereferenced.
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
-rw-r--r--vm/compiler/codegen/arm/CodegenDriver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index f3648b9bd..249970cbe 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -2098,7 +2098,7 @@ static bool handleFmt11x(CompilationUnit *cUnit, MIR *mir)
}
case OP_MONITOR_EXIT:
case OP_MONITOR_ENTER:
-#if defined(WITH_DEADLOCK_PREDICTION) || defined(WITH_MONITOR_TRACKING)
+#if 1 || defined(WITH_DEADLOCK_PREDICTION) || defined(WITH_MONITOR_TRACKING)
genMonitorPortable(cUnit, mir);
#else
genMonitor(cUnit, mir);