am f7fb0086: Merge change 22659 into eclair

Merge commit 'f7fb00865dd05c32aab5b968fd79ae0ef63e9d6c'

* commit 'f7fb00865dd05c32aab5b968fd79ae0ef63e9d6c':
  Another round of scary indirect ref changes.

diff --cc vm/Dvm.mk
Simple merge

diff --cc vm/Thread.c
Simple merge

diff --cc vm/Thread.h
Simple merge

diff --cc vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
index fb656c0,b20d564..8d31807
--- 1/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
--- 2/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
@@@ -22,17 -22,13 +22,17 @@@
      str     r0, [r1, #(offStackSaveArea_method - sizeofStackSaveArea)]
      cmp     r8, #0                      @ suspendCount != 0
      ldr     r8, [r0, #offMethod_nativeFunc] @ r8<- method->nativeFunc
 +#if !defined(WITH_SELF_VERIFICATION)
      bxne    lr                          @ bail to the interpreter
 +#else
 +    bx      lr                          @ bail to interpreter unconditionally
 +#endif
  
      @ go ahead and transfer control to the native code
-     ldr     r9, [r3, #offThread_jniLocal_nextEntry] @ r9<- thread->refNext
+     ldr     r9, [r3, #offThread_jniLocal_topCookie] @ r9<- thread->localRef->...
      str     r1, [r3, #offThread_curFrame]   @ self->curFrame = newFp
-     str     r9, [r1, #(offStackSaveArea_localRefTop - sizeofStackSaveArea)]
-                                         @ newFp->localRefTop=refNext
+     str     r9, [r1, #(offStackSaveArea_localRefCookie - sizeofStackSaveArea)]
+                                         @ newFp->localRefCookie=top
      mov     r9, r3                      @ r9<- glue->self (preserve)
      SAVEAREA_FROM_FP(r10, r1)           @ r10<- new stack save area
  

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
index 815a0d4,0c433a1..fcea772
--- 1/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
--- 2/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
@@@ -403,17 -391,13 +403,17 @@@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATI
      str     r0, [r1, #(offStackSaveArea_method - sizeofStackSaveArea)]
      cmp     r8, #0                      @ suspendCount != 0
      ldr     r8, [r0, #offMethod_nativeFunc] @ r8<- method->nativeFunc
 +#if !defined(WITH_SELF_VERIFICATION)
      bxne    lr                          @ bail to the interpreter
 +#else
 +    bx      lr                          @ bail to interpreter unconditionally
 +#endif
  
      @ go ahead and transfer control to the native code
-     ldr     r9, [r3, #offThread_jniLocal_nextEntry] @ r9<- thread->refNext
+     ldr     r9, [r3, #offThread_jniLocal_topCookie] @ r9<- thread->localRef->...
      str     r1, [r3, #offThread_curFrame]   @ self->curFrame = newFp
-     str     r9, [r1, #(offStackSaveArea_localRefTop - sizeofStackSaveArea)]
-                                         @ newFp->localRefTop=refNext
+     str     r9, [r1, #(offStackSaveArea_localRefCookie - sizeofStackSaveArea)]
+                                         @ newFp->localRefCookie=top
      mov     r9, r3                      @ r9<- glue->self (preserve)
      SAVEAREA_FROM_FP(r10, r1)           @ r10<- new stack save area
  

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
index cb134e2,29dde74..801c0c7
--- 1/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
--- 2/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
@@@ -403,17 -391,13 +403,17 @@@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATI
      str     r0, [r1, #(offStackSaveArea_method - sizeofStackSaveArea)]
      cmp     r8, #0                      @ suspendCount != 0
      ldr     r8, [r0, #offMethod_nativeFunc] @ r8<- method->nativeFunc
 +#if !defined(WITH_SELF_VERIFICATION)
      bxne    lr                          @ bail to the interpreter
 +#else
 +    bx      lr                          @ bail to interpreter unconditionally
 +#endif
  
      @ go ahead and transfer control to the native code
-     ldr     r9, [r3, #offThread_jniLocal_nextEntry] @ r9<- thread->refNext
+     ldr     r9, [r3, #offThread_jniLocal_topCookie] @ r9<- thread->localRef->...
      str     r1, [r3, #offThread_curFrame]   @ self->curFrame = newFp
-     str     r9, [r1, #(offStackSaveArea_localRefTop - sizeofStackSaveArea)]
-                                         @ newFp->localRefTop=refNext
+     str     r9, [r1, #(offStackSaveArea_localRefCookie - sizeofStackSaveArea)]
+                                         @ newFp->localRefCookie=top
      mov     r9, r3                      @ r9<- glue->self (preserve)
      SAVEAREA_FROM_FP(r10, r1)           @ r10<- new stack save area
  

diff --cc vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
index 1382c2a,9e97b74..c5b1a52
--- 1/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
--- 2/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
@@@ -403,17 -391,13 +403,17 @@@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATI
      str     r0, [r1, #(offStackSaveArea_method - sizeofStackSaveArea)]
      cmp     r8, #0                      @ suspendCount != 0
      ldr     r8, [r0, #offMethod_nativeFunc] @ r8<- method->nativeFunc
 +#if !defined(WITH_SELF_VERIFICATION)
      bxne    lr                          @ bail to the interpreter
 +#else
 +    bx      lr                          @ bail to interpreter unconditionally
 +#endif
  
      @ go ahead and transfer control to the native code
-     ldr     r9, [r3, #offThread_jniLocal_nextEntry] @ r9<- thread->refNext
+     ldr     r9, [r3, #offThread_jniLocal_topCookie] @ r9<- thread->localRef->...
      str     r1, [r3, #offThread_curFrame]   @ self->curFrame = newFp
-     str     r9, [r1, #(offStackSaveArea_localRefTop - sizeofStackSaveArea)]
-                                         @ newFp->localRefTop=refNext
+     str     r9, [r1, #(offStackSaveArea_localRefCookie - sizeofStackSaveArea)]
+                                         @ newFp->localRefCookie=top
      mov     r9, r3                      @ r9<- glue->self (preserve)
      SAVEAREA_FROM_FP(r10, r1)           @ r10<- new stack save area
  

diff --cc vm/mterp/armv5te/footer.S
Simple merge

diff --cc vm/mterp/common/asm-constants.h
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv4t.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv5te-vfp.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv5te.S
Simple merge

diff --cc vm/mterp/out/InterpAsm-armv7-a.S
Simple merge

diff --cc vm/mterp/out/InterpC-portdbg.c
Simple merge

diff --cc vm/mterp/out/InterpC-portstd.c
Simple merge