diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-02-05 16:14:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-05 16:14:51 -0800 |
| commit | dbcc7c432976ca3f71dc866b4f8125fdeecd7134 (patch) | |
| tree | 75403ac8144caf8d70b83b9c103b0a92b97df9e3 /vm/compiler | |
| parent | 90d5f6b0abffdd1f151014558d664872ace36976 (diff) | |
| parent | 79842ac67e2a23cb544bfe1ee3961d325a2552e7 (diff) | |
| download | android_dalvik-dbcc7c432976ca3f71dc866b4f8125fdeecd7134.tar.gz android_dalvik-dbcc7c432976ca3f71dc866b4f8125fdeecd7134.tar.bz2 android_dalvik-dbcc7c432976ca3f71dc866b4f8125fdeecd7134.zip | |
Merge "JIT: Replace missing ending comment marker MONITOR_ENTER template"
Diffstat (limited to 'vm/compiler')
3 files changed, 3 insertions, 3 deletions
diff --git a/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S b/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S index 52b0fbb8b..bf073cb76 100644 --- a/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S +++ b/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S @@ -8,7 +8,7 @@ * r0 - self pointer * r1 - the object (which has already been null-checked by the caller * r4 - the Dalvik PC of the following instruction. - * + */ ldr r2, .LdvmLockObject mov r3, #0 @ Record that we're not returning str r3, [r0, #offThread_inJitCodeCache] diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S index ef4bc8ab7..71cb12058 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S @@ -1382,7 +1382,7 @@ dvmCompiler_TEMPLATE_MONITOR_ENTER: * r0 - self pointer * r1 - the object (which has already been null-checked by the caller * r4 - the Dalvik PC of the following instruction. - * + */ ldr r2, .LdvmLockObject mov r3, #0 @ Record that we're not returning str r3, [r0, #offThread_inJitCodeCache] diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S index a57907a7b..1da4cb854 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S @@ -1110,7 +1110,7 @@ dvmCompiler_TEMPLATE_MONITOR_ENTER: * r0 - self pointer * r1 - the object (which has already been null-checked by the caller * r4 - the Dalvik PC of the following instruction. - * + */ ldr r2, .LdvmLockObject mov r3, #0 @ Record that we're not returning str r3, [r0, #offThread_inJitCodeCache] |