* src/vm/jit/mips/arch.h (USES_NEW_SUBTYPE): Added define.

* src/vm/jit/mips/codegen.c (codegen_emit): Added new subtype checking code
to ICMD_CHECKCAST and ICMD_INSTANCEOF.
* src/vm/jit/emit-common.cpp (emit_label_beq): Added.
* src/vm/jit/emit-common.hpp (emit_label_beq): Likewise.

diff --git a/src/vm/jit/emit-common.cpp b/src/vm/jit/emit-common.cpp
index 370a64bd024fd6463f35a6bb03e6077bcc67d076..e0837c2eee0d15e78911da3f94e024d7df0bbd4e 100644 (file)
--- a/src/vm/jit/emit-common.cpp
+++ b/src/vm/jit/emit-common.cpp
@@ -690,6 +690,11 @@ void emit_label_bgtz(codegendata* cd, int label, int reg)
 
 #if SUPPORT_BRANCH_CONDITIONAL_TWO_INTEGER_REGISTERS
 
+void emit_label_beq(codegendata* cd, int label, int s1, int s2)
+{
+       emit_label_bccz(cd, label, BRANCH_EQ, PACK_REGS(s1, s2), BRANCH_OPT_NONE);
+}
+
 void emit_label_bne(codegendata* cd, int label, int s1, int s2)
 {
        emit_label_bccz(cd, label, BRANCH_NE, PACK_REGS(s1, s2), BRANCH_OPT_NONE);

diff --git a/src/vm/jit/emit-common.hpp b/src/vm/jit/emit-common.hpp
index 611eca43d943175d53a70e6dba14fe1a9b107aef..c3c3af73db15566eef07ba2290ce158d883859e8 100644 (file)
--- a/src/vm/jit/emit-common.hpp
+++ b/src/vm/jit/emit-common.hpp
@@ -168,6 +168,7 @@ void emit_label_bgtz(codegendata* cd, int label, int reg);
 #endif
 
 #if SUPPORT_BRANCH_CONDITIONAL_TWO_INTEGER_REGISTERS
+void emit_label_beq(codegendata* cd, int label, int s1, int s2);
 void emit_label_bne(codegendata* cd, int label, int s1, int s2);
 #endif
 

diff --git a/src/vm/jit/mips/arch.h b/src/vm/jit/mips/arch.h
index e2ed877694cd5993a90e5f7b22e2e2a6c1a49faf..37b90494bebef6b0e88e36f2699750bb54179f43 100644 (file)
--- a/src/vm/jit/mips/arch.h
+++ b/src/vm/jit/mips/arch.h
@@ -173,6 +173,10 @@
 
 #define REPLACEMENT_PATCH_SIZE           (2*4) /* bytes */
 
+/* subtype ********************************************************************/
+
+#define USES_NEW_SUBTYPE                 1
+
 #endif /* _ARCH_H */
 
 

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index 3d98fce851cc9d606ab6ace50419538dc7ff4b2a..4db7b0d74726fe0fab9b1864d38c99d401ebeaee 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -3298,26 +3298,75 @@ gen_method:
                                                emit_label_beqz(cd, BRANCH_LABEL_5, s1);
                                        }
 
+                                       // The following code checks whether object s is a subtype of class t.
+                                       // Represents the following semantic:
+                                       //    if (!fast_subtype_check(s->vftbl, t->vftbl)) throw;
+
                                        M_ALD(REG_ITMP2, s1, OFFSET(java_object_t, vftbl));
                                        M_ALD(REG_ITMP3, REG_PV, disp);
 
-                                       M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                                       /*                              if (s1 != REG_ITMP1) { */
-                                       /*                                      M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, baseval)); */
-                                       /*                                      M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval)); */
-                                       /* #if defined(ENABLE_THREADS) */
-                                       /*                                      codegen_threadcritstop(cd, cd->mcodeptr - cd->mcodebase); */
-                                       /* #endif */
-                                       /*                                      M_ISUB(REG_ITMP2, REG_ITMP1, REG_ITMP2); */
-                                       /*                              } else { */
-                                       M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, baseval));
-                                       M_ISUB(REG_ITMP2, REG_ITMP3, REG_ITMP2); 
-                                       M_ALD(REG_ITMP3, REG_PV, disp);
-                                       M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, diffval));
+                                       if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+                                               // Represents the following semantic:
+                                               //    if (*(s->vftbl + t->vftbl->subtype_offset) == t->vftbl) good;
+                                               // Preconditions:
+                                               //    REG_ITMP2==s->vftbl; REG_ITMP3==t->vftbl;
+                                               M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                               M_AADD(REG_ITMP1, REG_ITMP2, REG_ITMP1);
+                                               M_ALD(REG_ITMP1, REG_ITMP1, 0);
+                                               emit_label_beq(cd, BRANCH_LABEL_6, REG_ITMP1, REG_ITMP3);  /* good */
+
+                                               // Represents the following semantic:
+                                               //    if (t->vftbl->subtype_offset != OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE])) throw;
+                                               // Preconditions:
+                                               //    REG_ITMP3==t->vftbl;
+                                               if (super == NULL) {
+                                                       M_ILD(REG_ITMP1, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                                       M_ISUB_IMM(REG_ITMP1, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP1);
+                                                       emit_label_bnez(cd, BRANCH_LABEL_9, REG_ITMP1);  /* throw */
+                                               }
 
-                                       /*                              } */
-                                       M_CMPULT(REG_ITMP3, REG_ITMP2, REG_ITMP3);
-                                       emit_classcast_check(cd, iptr, ICMD_IFNE, REG_ITMP3, s1);
+                                               // Represents the following semantic:
+                                               //    if (s->vftbl->subtype_depth < t->vftbl->subtype_depth) throw;
+                                               // Preconditions:
+                                               //    REG_ITMP2==s->vftbl; REG_ITMP3==t->vftbl;
+                                               M_ILD(REG_ITMP1, REG_ITMP2, OFFSET(vftbl_t, subtype_depth));
+                                               M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+                                               M_CMPULT(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+                                               emit_label_bnez(cd, BRANCH_LABEL_8, REG_ITMP1);  /* throw */
+
+                                               // Represents the following semantic:
+                                               //    if (s->vftbl->subtype_overflow[t->vftbl->subtype_depth - DISPLAY_SIZE] != t->vftbl) throw;
+                                               // Preconditions:
+                                               //    REG_ITMP2==s->vftbl; REG_ITMP3==t->vftbl->subtype_depth;
+                                               M_ALD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, subtype_overflow));
+                                               M_ASLL_IMM(REG_ITMP3, POINTERSHIFT, REG_ITMP3);
+                                               M_AADD(REG_ITMP2, REG_ITMP3, REG_ITMP2);
+                                               M_ALD(REG_ITMP2, REG_ITMP2, -DISPLAY_SIZE * SIZEOF_VOID_P);
+                                               M_ALD(REG_ITMP3, REG_PV, disp);  /* reload REG_ITMP3, was destroyed */
+                                               emit_label_beq(cd, BRANCH_LABEL_7, REG_ITMP2, REG_ITMP3);  /* good */
+
+                                               // Throw case
+                                               emit_label(cd, BRANCH_LABEL_8);
+                                               if (super == NULL)
+                                                       emit_label(cd, BRANCH_LABEL_9);
+                                               emit_load_s1(jd, iptr, REG_ITMP1);  /* reload s1, might have been destroyed */
+                                               M_ALD_INTERN(s1, REG_ZERO, TRAP_ClassCastException);
+
+                                               // Good case
+                                               emit_label(cd, BRANCH_LABEL_7);
+                                               emit_label(cd, BRANCH_LABEL_6);
+                                               emit_load_s1(jd, iptr, REG_ITMP1);  /* reload s1, might have been destroyed */
+                                       }
+                                       else {
+                                               // Represents the following semantic:
+                                               //    if (*(s->vftbl + t->vftbl->subtype_offset) != t->vftbl) throw;
+                                               // Preconditions:
+                                               //    REG_ITMP2==s->vftbl; REG_ITMP3==t->vftbl;
+                                               M_ALD(REG_ITMP2, REG_ITMP2, super->vftbl->subtype_offset);
+                                               M_BEQ(REG_ITMP2, REG_ITMP3, 2);
+                                               M_NOP;  /* delay slot */
+                                               M_ALD_INTERN(s1, REG_ZERO, TRAP_ClassCastException);
+                                       }
 
                                        if (super != NULL)
                                                emit_label(cd, BRANCH_LABEL_5);
@@ -3453,16 +3502,78 @@ gen_method:
                                        emit_label_beqz(cd, BRANCH_LABEL_5, s1);
                                }
 
+                               // The following code checks whether object s is a subtype of class t.
+                               // Represents the following semantic:
+                               //    fast_subtype_check(s->vftbl, t->vftbl));
+
                                M_ALD(REG_ITMP1, s1, OFFSET(java_object_t, vftbl));
-                               M_ALD(REG_ITMP2, REG_PV, disp);
+                               M_ALD(REG_ITMP3, REG_PV, disp);
+
+                               if (super == NULL || super->vftbl->subtype_depth >= DISPLAY_SIZE) {
+                                               // Represents the following semantic:
+                                               //    if (*(s->vftbl + t->vftbl->subtype_offset) == t->vftbl) true;
+                                               // Preconditions:
+                                               //    REG_ITMP1==s->vftbl; REG_ITMP3==t->vftbl;
+                                               M_ILD(REG_ITMP2, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                               M_AADD(REG_ITMP2, REG_ITMP1, REG_ITMP2);
+                                               M_ALD(REG_ITMP2, REG_ITMP2, 0);
+                                               emit_label_beq(cd, BRANCH_LABEL_6, REG_ITMP2, REG_ITMP3);  /* true */
+
+                                               // Represents the following semantic:
+                                               //    if (t->vftbl->subtype_offset != OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE])) false;
+                                               // Preconditions:
+                                               //    REG_ITMP3==t->vftbl;
+                                               if (super == NULL) {
+                                                       M_ILD(REG_ITMP2, REG_ITMP3, OFFSET(vftbl_t, subtype_offset));
+                                                       M_ISUB_IMM(REG_ITMP2, OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]), REG_ITMP2);
+                                                       emit_label_bnez(cd, BRANCH_LABEL_9, REG_ITMP2);  /* false */
+                                               }
 
-                               M_ILD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, baseval));
-                               M_ILD(REG_ITMP3, REG_ITMP2, OFFSET(vftbl_t, baseval));
-                               M_ILD(REG_ITMP2, REG_ITMP2, OFFSET(vftbl_t, diffval));
+                                               // Represents the following semantic:
+                                               //    if (s->vftbl->subtype_depth < t->vftbl->subtype_depth) false;
+                                               // Preconditions:
+                                               //    REG_ITMP1==s->vftbl; REG_ITMP3==t->vftbl;
+                                               M_ILD(REG_ITMP2, REG_ITMP1, OFFSET(vftbl_t, subtype_depth));
+                                               M_ILD(REG_ITMP3, REG_ITMP3, OFFSET(vftbl_t, subtype_depth));
+                                               M_CMPULT(REG_ITMP2, REG_ITMP3, REG_ITMP2);
+                                               emit_label_bnez(cd, BRANCH_LABEL_8, REG_ITMP2);  /* false */
+
+                                               // Represents the following semantic:
+                                               //    if (s->vftbl->subtype_overflow[t->vftbl->subtype_depth - DISPLAY_SIZE] != t->vftbl) false;
+                                               // Preconditions:
+                                               //    REG_ITMP1==s->vftbl; REG_ITMP3==t->vftbl->subtype_depth;
+                                               M_ALD(REG_ITMP1, REG_ITMP1, OFFSET(vftbl_t, subtype_overflow));
+                                               M_ASLL_IMM(REG_ITMP3, POINTERSHIFT, REG_ITMP3);
+                                               M_AADD(REG_ITMP1, REG_ITMP3, REG_ITMP1);
+                                               M_ALD(REG_ITMP1, REG_ITMP1, -DISPLAY_SIZE * SIZEOF_VOID_P);
+                                               M_ALD(REG_ITMP3, REG_PV, disp);  /* reload REG_ITMP3, was destroyed */
+                                               emit_label_bne(cd, BRANCH_LABEL_7, REG_ITMP1, REG_ITMP3);  /* false */
+
+                                               // True case
+                                               emit_label(cd, BRANCH_LABEL_6);
+                                               M_MOV(1, d);
+                                               if (d == REG_ITMP2) {
+                                                       M_BR(2);  /* branch over M_CLR */
+                                                       M_NOP;  /* delay slot */
+                                               }
 
-                               M_ISUB(REG_ITMP1, REG_ITMP3, REG_ITMP1); 
-                               M_CMPULT(REG_ITMP2, REG_ITMP1, d);
-                               M_XOR_IMM(d, 1, d);
+                                               // False (fall-through) case
+                                               emit_label(cd, BRANCH_LABEL_7);
+                                               emit_label(cd, BRANCH_LABEL_8);
+                                               if (super == NULL)
+                                                       emit_label(cd, BRANCH_LABEL_9);
+                                               if (d == REG_ITMP2)
+                                                       M_CLR(d);  /* if d == REG_ITMP2, it was destroyed */
+                               }
+                               else {
+                                       // Represents the following semantic:
+                                       //    *(s->vftbl + t->vftbl->subtype_offset) == t->vftbl;
+                                       // Preconditions:
+                                       //    REG_ITMP1==s->vftbl; REG_ITMP3==t->vftbl;
+                                       M_ALD(REG_ITMP1, REG_ITMP1, super->vftbl->subtype_offset);
+                                       M_XOR(REG_ITMP1, REG_ITMP3, d);
+                                       M_CMPULT_IMM(d, 1, d);
+                               }
 
                                if (super != NULL)
                                        emit_label(cd, BRANCH_LABEL_5);