summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/x86
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2011-01-04 16:03:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-04 16:03:46 -0800
commit2088bf0b9ebaf0d09ea3f531e1dd798430bfe8ce (patch)
treee733a61f6a377b0efab5f1f22ef2739e98477377 /vm/compiler/codegen/x86
parentaa3ce5dd2c7e978681bafedf3363b84df651ad03 (diff)
parentaf5aa1f4ce7eecc1b47a4c038cebb67d33f08f18 (diff)
downloadandroid_dalvik-2088bf0b9ebaf0d09ea3f531e1dd798430bfe8ce.tar.gz
android_dalvik-2088bf0b9ebaf0d09ea3f531e1dd798430bfe8ce.tar.bz2
android_dalvik-2088bf0b9ebaf0d09ea3f531e1dd798430bfe8ce.zip
am af5aa1f4: Don\'t treat dvmJitToPatchPredictedChain as a Jit-to-Interp entry point.
* commit 'af5aa1f4ce7eecc1b47a4c038cebb67d33f08f18': Don't treat dvmJitToPatchPredictedChain as a Jit-to-Interp entry point.
Diffstat (limited to 'vm/compiler/codegen/x86')
-rw-r--r--vm/compiler/codegen/x86/Assemble.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/vm/compiler/codegen/x86/Assemble.c b/vm/compiler/codegen/x86/Assemble.c
index 3c0b3c7d6..dbb9b024a 100644
--- a/vm/compiler/codegen/x86/Assemble.c
+++ b/vm/compiler/codegen/x86/Assemble.c
@@ -95,12 +95,8 @@ void* dvmJitChain(void* tgtAddr, u4* branchAddr)
* rechain attempt to happen.
* 2) Chain is not setup because the callee has not been created yet. Reset
* the rechain count to a small number and retry in the near future.
- * 3) Ask all other threads to stop before patching this chaining cell.
- * This is required because another thread may have passed the class check
- * but hasn't reached the chaining cell yet to follow the chain. If we
- * patch the content before halting the other thread, there could be a
- * small window for race conditions to happen that it may follow the new
- * but wrong chain to invoke a different method.
+ * 3) Enqueue the new content for the chaining cell which will be appled in
+ * next safe point.
*/
const Method *dvmJitToPatchPredictedChain(const Method *method,
InterpState *interpState,