From: Bill Buzbee <buzbee@google.com>
Date: Sat, 6 Feb 2010 00:08:38 +0000 (-0800)
Subject: JIT: Replace missing ending comment marker MONITOR_ENTER template
X-Git-Tag: android-x86-4.0-r1~404^2~521^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6af13cf607de870de51ffe00f48552252946a00;p=android-x86%2Fdalvik.git

JIT: Replace missing ending comment marker MONITOR_ENTER template

...which, luckily, was followed by a debug version of the same handler
so everything magically worked anyway.  I should buy a lottery ticket today.
---

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]