Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / builtin.cpp

diff --git a/src/vm/jit/builtin.cpp b/src/vm/jit/builtin.cpp
index 9e927c39bc2e4ed299dcea29c3a4fa02d9211c42..491d48ce6c056cac6b6c212424807374485f3d46 100644 (file)
--- a/src/vm/jit/builtin.cpp
+++ b/src/vm/jit/builtin.cpp
@@ -640,6 +640,28 @@ bool builtin_canstore(java_handle_objectarray_t *oa, java_handle_t *o)
        return result;
 }
 
+#if USES_NEW_SUBTYPE
+/* fast_subtype_check **********************************************************
+
+   Checks if s is a subtype of t, using both the restricted subtype relation
+   and the overflow array (see Cliff Click and John Rose: Fast subtype checking
+   in the Hotspot JVM.)
+
+   RETURN VALUE:
+      1......s is a subtype of t.
+      0......otherwise
+
+*******************************************************************************/
+
+bool fast_subtype_check(struct _vftbl *s, struct _vftbl *t)
+{
+   if (s->subtype_display[t->subtype_depth] == t)
+       return true;
+   if (t->subtype_offset != OFFSET(vftbl_t, subtype_display[DISPLAY_SIZE]))
+       return false;
+   return s->subtype_depth >= t->subtype_depth && s->subtype_overflow[t->subtype_depth - DISPLAY_SIZE] == t;
+}
+#endif
 
 /* builtin_fast_canstore *******************************************************
 
@@ -685,7 +707,7 @@ bool builtin_fast_canstore(java_objectarray_t *oa, java_object_t *o)
                if (valuevftbl == componentvftbl)
                        return 1;
 
-               linker_classrenumber_mutex->lock();
+               LOCK_CLASSRENUMBER_LOCK;
 
                baseval = componentvftbl->baseval;
 
@@ -696,11 +718,15 @@ bool builtin_fast_canstore(java_objectarray_t *oa, java_object_t *o)
                                          (valuevftbl->interfacetable[baseval] != NULL));
                }
                else {
+#if USES_NEW_SUBTYPE
+                       result = fast_subtype_check(valuevftbl, componentvftbl);
+#else
                        diffval = valuevftbl->baseval - componentvftbl->baseval;
                        result  = diffval <= (uint32_t) componentvftbl->diffval;
+#endif
                }
 
-               linker_classrenumber_mutex->unlock();
+               UNLOCK_CLASSRENUMBER_LOCK;
        }
        else if (valuedesc == NULL) {
                /* {oa has dimension > 1} */
@@ -752,7 +778,7 @@ bool builtin_fast_canstore_onedim(java_objectarray_t *a, java_object_t *o)
        if (valuevftbl == elementvftbl)
                return 1;
 
-       linker_classrenumber_mutex->lock();
+       LOCK_CLASSRENUMBER_LOCK;
 
        baseval = elementvftbl->baseval;
 
@@ -762,11 +788,15 @@ bool builtin_fast_canstore_onedim(java_objectarray_t *a, java_object_t *o)
                                  (valuevftbl->interfacetable[baseval] != NULL));
        }
        else {
+#if USES_NEW_SUBTYPE
+               result = fast_subtype_check(valuevftbl, elementvftbl);
+#else
                diffval = valuevftbl->baseval - elementvftbl->baseval;
                result  = diffval <= (uint32_t) elementvftbl->diffval;
+#endif
        }
 
-       linker_classrenumber_mutex->unlock();
+       UNLOCK_CLASSRENUMBER_LOCK;
 
        return result;
 }
@@ -801,12 +831,16 @@ bool builtin_fast_canstore_onedim_class(java_objectarray_t *a, java_object_t *o)
        if (valuevftbl == elementvftbl)
                return 1;
 
-       linker_classrenumber_mutex->lock();
+       LOCK_CLASSRENUMBER_LOCK;
 
+#if USES_NEW_SUBTYPE
+       result = fast_subtype_check(valuevftbl, elementvftbl);
+#else
        diffval = valuevftbl->baseval - elementvftbl->baseval;
        result  = diffval <= (uint32_t) elementvftbl->diffval;
+#endif
 
-       linker_classrenumber_mutex->unlock();
+       UNLOCK_CLASSRENUMBER_LOCK;
 
        return result;
 }