projects / cacao.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3fd9404)
* src/vm/jit/arm/codegen.c (codegen): All the long compares have a different
authormichi <none@none>
Wed, 14 Mar 2007 17:31:05 +0000 (17:31 +0000)
committermichi <none@none>
Wed, 14 Mar 2007 17:31:05 +0000 (17:31 +0000)
implementation now.

src/vm/jit/arm/codegen.c patch | blob | history

diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c
index 529bdeb93eea828f578917c628bc84bb5fc5cc44..677763248c594144ea63683ed451679d25e9343a 100644 (file)
--- a/src/vm/jit/arm/codegen.c
+++ b/src/vm/jit/arm/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7511 2007-03-13 16:32:56Z michi $
+   $Id: codegen.c 7519 2007-03-14 17:31:05Z michi $
 
 */
 
@@ -1999,70 +1999,124 @@ bool codegen(jitdata *jd)
                        break;
 
                case ICMD_IF_LCMPEQ:    /* ..., value, value ==> ...                  */
-               case ICMD_IF_LCMPNE:    /* op1 = target JavaVM pc                     */
-               case ICMD_IF_LCMPLT:
-               case ICMD_IF_LCMPLE:
-               case ICMD_IF_LCMPGT:
-               case ICMD_IF_LCMPGE:
+                                       /* op1 = target JavaVM pc                     */
 
-                       /* ATTENTION: compare high words signed and low words unsigned */
                        s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
                        M_CMP(s1, s2);
 
-                       switch(iptr->opc) {
-                       case ICMD_IF_LCMPEQ: /* EQ and NE are the same for unsigned */
-                       case ICMD_IF_LCMPNE:
-                               break;
-                       case ICMD_IF_LCMPLT:
-                       case ICMD_IF_LCMPLE:
-                               M_BLT(0);
-                               codegen_addreference(cd, iptr->dst.block);
-                               break;
-                       case ICMD_IF_LCMPGT:
-                       case ICMD_IF_LCMPGE:
-                               M_BGT(0);
-                               codegen_addreference(cd, iptr->dst.block);
-                               break;
-                       default:
-                               assert(0);
-                       }
+                       s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMPEQ(s1, s2);
+
+                       M_BEQ(0);
+                       codegen_addreference(cd, iptr->dst.block);
+                       break;
+
+               case ICMD_IF_LCMPNE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
 
                        s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
                        s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMPEQ(s1, s2);
 
-                       switch(iptr->opc) {
-                       case ICMD_IF_LCMPEQ:
-                               M_DAT(COND_EQ,0x0a,0,s1,1,0,s2);
-                               M_BEQ(0);
-                               break;
-                       case ICMD_IF_LCMPNE:
-                               M_DAT(COND_EQ,0x0a,0,s1,1,0,s2);
-                               M_BNE(0);
-                               break;
-                       case ICMD_IF_LCMPLT:
-                               M_BNE(1);
-                               M_CMP(s1, s2);
-                               M_BLO(0);
-                               break;
-                       case ICMD_IF_LCMPLE:
-                               M_BNE(1);
-                               M_CMP(s1, s2);
-                               M_BLS(0);
-                               break;
-                       case ICMD_IF_LCMPGT:
-                               M_BNE(1);
-                               M_CMP(s1, s2);
-                               M_BHI(0);
-                               break;
-                       case ICMD_IF_LCMPGE:
-                               M_BNE(1);
-                               M_CMP(s1, s2);
-                               M_BHS(0);
-                               break;
-                       default:
-                               assert(0);
-                       }
+                       M_BNE(0);
+                       codegen_addreference(cd, iptr->dst.block);
+                       break;
+
+               case ICMD_IF_LCMPLT:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+                       s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+                       M_MOVGT_IMM(2, REG_ITMP3);
+                       M_MOVEQ_IMM(1, REG_ITMP3);
+
+                       /* low compare: x=x-1(ifLO) */
+                       s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_SUBLO_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+                       /* branch if (x LT 1) */
+                       M_CMP_IMM(REG_ITMP3, 1);
+                       M_BLT(0);
+                       codegen_addreference(cd, iptr->dst.block);
+                       break;
+
+               case ICMD_IF_LCMPLE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+                       s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+                       M_MOVGT_IMM(2, REG_ITMP3);
+                       M_MOVEQ_IMM(1, REG_ITMP3);
+
+                       /* low compare: x=x-1(ifLO) */
+                       s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_ADDHI_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+                       /* branch if (x LE 1) */
+                       M_CMP_IMM(REG_ITMP3, 1);
+                       M_BLE(0);
+                       codegen_addreference(cd, iptr->dst.block);
+                       break;
+
+               case ICMD_IF_LCMPGT:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+                       s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+                       M_MOVGT_IMM(2, REG_ITMP3);
+                       M_MOVEQ_IMM(1, REG_ITMP3);
+
+                       /* low compare: x=x-1(ifLO) */
+                       s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_ADDHI_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+                       /* branch if (x GT 1) */
+                       M_CMP_IMM(REG_ITMP3, 1);
+                       M_BGT(0);
+                       codegen_addreference(cd, iptr->dst.block);
+                       break;
+
+               case ICMD_IF_LCMPGE:    /* ..., value, value ==> ...                  */
+                                       /* op1 = target JavaVM pc                     */
+
+                       /* high compare: x=0(ifLT) ; x=1(ifEQ) ; x=2(ifGT) */
+                       s1 = emit_load_s1_high(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_high(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_EOR(REG_ITMP3, REG_ITMP3, REG_ITMP3);
+                       M_MOVGT_IMM(2, REG_ITMP3);
+                       M_MOVEQ_IMM(1, REG_ITMP3);
+
+                       /* low compare: x=x-1(ifLO) */
+                       s1 = emit_load_s1_low(jd, iptr, REG_ITMP1);
+                       s2 = emit_load_s2_low(jd, iptr, REG_ITMP2);
+                       M_CMP(s1, s2);
+                       M_SUBLO_IMM(REG_ITMP3, REG_ITMP3, 1);
+
+                       /* branch if (x GE 1) */
+                       M_CMP_IMM(REG_ITMP3, 1);
+                       M_BGE(0);
                        codegen_addreference(cd, iptr->dst.block);
                        break;
 
inofficial http://www.cacaojvm.org/ git mirror