From: Ben Cheng Date: Thu, 29 Apr 2010 22:22:59 +0000 (-0700) Subject: Use unsigned comparison for stack pointers. X-Git-Tag: android-x86-4.0-r1~404^2~148 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a62475ecfcc80c58add8f153c9605762dafb8227;p=android-x86%2Fdalvik.git Use unsigned comparison for stack pointers. Bug: 2613607 Change-Id: I6a8abd69fbf9cb9f8ec9d9febf1ea42fd631fe9c --- diff --git a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S index d6e67632a..61cdf45d4 100644 --- a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S +++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S @@ -18,7 +18,7 @@ sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt r12 @ return to raise stack overflow excep. + bxlo r12 @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] diff --git a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S index 0dbd6c091..6f655bfb1 100644 --- a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S +++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S @@ -8,7 +8,7 @@ SAVEAREA_FROM_FP(r10, r1) @ r10<- stack save area ldr r8, [r8] @ r3<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] str rPC, [r1, #(offStackSaveArea_savedPc - sizeofStackSaveArea)] diff --git a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NO_OPT.S b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NO_OPT.S index facce511d..6da78c961 100644 --- a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NO_OPT.S +++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NO_OPT.S @@ -15,7 +15,7 @@ sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz ldr r10, [r0, #offMethod_accessFlags] @ r10<- methodToCall->accessFlags diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S index d8a2784fd..60e33f1e4 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S @@ -245,7 +245,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NO_OPT: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz ldr r10, [r0, #offMethod_accessFlags] @ r10<- methodToCall->accessFlags @@ -308,7 +308,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_CHAIN: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt r12 @ return to raise stack overflow excep. + bxlo r12 @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] @@ -399,7 +399,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATIVE: SAVEAREA_FROM_FP(r10, r1) @ r10<- stack save area ldr r8, [r8] @ r3<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] str rPC, [r1, #(offStackSaveArea_savedPc - sizeofStackSaveArea)] diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S index eab49cff5..1801e6aec 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S @@ -245,7 +245,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NO_OPT: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz ldr r10, [r0, #offMethod_accessFlags] @ r10<- methodToCall->accessFlags @@ -308,7 +308,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_CHAIN: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt r12 @ return to raise stack overflow excep. + bxlo r12 @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] @@ -399,7 +399,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATIVE: SAVEAREA_FROM_FP(r10, r1) @ r10<- stack save area ldr r8, [r8] @ r3<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] str rPC, [r1, #(offStackSaveArea_savedPc - sizeofStackSaveArea)] diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S index cb00858b7..85eb31ed0 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S @@ -245,7 +245,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NO_OPT: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz ldr r10, [r0, #offMethod_accessFlags] @ r10<- methodToCall->accessFlags @@ -308,7 +308,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_CHAIN: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt r12 @ return to raise stack overflow excep. + bxlo r12 @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] @@ -399,7 +399,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATIVE: SAVEAREA_FROM_FP(r10, r1) @ r10<- stack save area ldr r8, [r8] @ r3<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] str rPC, [r1, #(offStackSaveArea_savedPc - sizeofStackSaveArea)] diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S index cf6fff90b..6755c2085 100644 --- a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S +++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S @@ -245,7 +245,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NO_OPT: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz ldr r10, [r0, #offMethod_accessFlags] @ r10<- methodToCall->accessFlags @@ -308,7 +308,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_CHAIN: sub r10, r10, r2, lsl #2 @ r10<- bottom (newsave - outsSize) ldr r8, [r8] @ r8<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt r12 @ return to raise stack overflow excep. + bxlo r12 @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite ldr r9, [r0, #offMethod_clazz] @ r9<- method->clazz str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] @@ -399,7 +399,7 @@ dvmCompiler_TEMPLATE_INVOKE_METHOD_NATIVE: SAVEAREA_FROM_FP(r10, r1) @ r10<- stack save area ldr r8, [r8] @ r3<- suspendCount (int) cmp r10, r9 @ bottom < interpStackEnd? - bxlt lr @ return to raise stack overflow excep. + bxlo lr @ return to raise stack overflow excep. @ r1 = newFP, r0 = methodToCall, r3 = returnCell, rPC = dalvikCallsite str rPC, [rFP, #(offStackSaveArea_currentPc - sizeofStackSaveArea)] str rPC, [r1, #(offStackSaveArea_savedPc - sizeofStackSaveArea)]