* src/vm/builtin.c (builtintable_replace_function): Replaced

checkexception with flags and check for exception flag.

* src/vm/builtin.h (builtintable_entry): Removed checkexception, added
flags.
(BUILTINTABLE_FLAG_STUB): Defined.
(BUILTINTABLE_FLAG_EXCEPTION): Likewise.

* src/vm/builtintable.inc (builtintable_internal): Moved position of
flags.
(builtintable_automatic): Likewise.
(builtintable_function): Likewise.

--HG--
branch : exact-gc

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 426b538d87ccd0bc156cca6c61b3e5c4bf40763a..fca67d528f4347e06d3981204b30e43dcbb2f401 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -28,7 +28,7 @@
    calls instead of machine instructions, using the C calling
    convention.
 
-   $Id: builtin.c 7615 2007-03-29 23:10:59Z michi $
+   $Id: builtin.c 7696 2007-04-12 20:18:54Z twisti $
 
 */
 
@@ -300,7 +300,8 @@ builtintable_entry *builtintable_get_automatic(s4 opcode)
                if (middle->opcode < opcode) {
                        first = middle + 1;
                        entries -= half + 1;
-               } else
+               }
+               else
                        entries = half;
        }
 
@@ -345,14 +346,15 @@ bool builtintable_replace_function(void *iptr_)
 
        for (bte = builtintable_function; bte->fp != NULL; bte++) {
                if ((METHODREF_CLASSNAME(mr) == bte->classname) &&
-                       (mr->name             == bte->name) &&
-                       (mr->descriptor       == bte->descriptor)) {
+                       (mr->name                == bte->name) &&
+                       (mr->descriptor          == bte->descriptor)) {
 
                        /* set the values in the instruction */
 
-                       iptr->opc   = bte->opcode;
+                       iptr->opc           = bte->opcode;
                        iptr->sx.s23.s3.bte = bte;
-                       if (bte->checkexception)
+
+                       if (bte->flags & BUILTINTABLE_FLAG_EXCEPTION)
                                iptr->flags.bits |= INS_FLAG_CHECK;
                        else
                                iptr->flags.bits &= ~INS_FLAG_CHECK;

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index a7782ab3183e80cd8c1a4d383bed28b81c5c932f..bac56284b99c842b16411814a28c8aa3b60b97f3 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: builtin.h 7686 2007-04-11 10:53:53Z twisti $
+   $Id: builtin.h 7696 2007-04-12 20:18:54Z twisti $
 
 */
 
@@ -67,6 +67,7 @@ typedef struct builtintable_entry builtintable_entry;
 
 struct builtintable_entry {
        s4           opcode;                /* opcode which is replaced           */
+       u4           flags;                 /* e.g. check for exception           */
        functionptr  fp;                    /* function pointer of builtin        */
        char        *cclassname;            /* char name of the class             */
        char        *cname;                 /* char name of the function          */
@@ -74,11 +75,16 @@ struct builtintable_entry {
        utf         *classname;             /* class of the function              */
        utf         *name;                  /* name of the function               */
        utf         *descriptor;            /* descriptor of the function         */
-       bool         checkexception;        /* check for exception after return   */
        methoddesc  *md;
 };
 
 
+/* builtin table flag defines *************************************************/
+
+#define BUILTINTABLE_FLAG_STUB         0x0001 /* builtin needs a stub         */
+#define BUILTINTABLE_FLAG_EXCEPTION    0x0002 /* check for excepion on return */
+
+
 /* function prototypes ********************************************************/
 
 bool builtin_init(void);

diff --git a/src/vm/builtintable.inc b/src/vm/builtintable.inc
index e6c256ff768cedba105e5a14ff28ce5057c1ce34..c6caad789fea1f313dbe260b2e998aa9df74a0d8 100644 (file)
--- a/src/vm/builtintable.inc
+++ b/src/vm/builtintable.inc
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: builtintable.inc 7686 2007-04-11 10:53:53Z twisti $
+   $Id: builtintable.inc 7696 2007-04-12 20:18:54Z twisti $
 
 */
 
@@ -46,6 +46,7 @@ static builtintable_entry builtintable_internal[] = {
 #if defined(__ALPHA__) || defined(DISABLE_GC)
        {
                ICMD_F2L,
+               0,
                BUILTIN_f2l,
                NULL,
                "f2l",
@@ -53,11 +54,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_D2L,
+               0,
                BUILTIN_d2l,
                NULL,
                "d2l",
@@ -65,11 +66,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_F2I,
+               0,
                BUILTIN_f2i,
                NULL,
                "f2i",
@@ -77,11 +78,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_D2I,
+               0,
                BUILTIN_d2i,
                NULL,
                "d2i",
@@ -89,7 +90,6 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -97,6 +97,7 @@ static builtintable_entry builtintable_internal[] = {
 #if !SUPPORT_DIVISION || defined(DISABLE_GC)
        {
                ICMD_IDIV,
+               0,
                BUILTIN_idiv,
                NULL,
                "idiv",
@@ -104,11 +105,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_IREM,
+               0,
                BUILTIN_irem,
                NULL,
                "irem",
@@ -116,7 +117,6 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -124,6 +124,7 @@ static builtintable_entry builtintable_internal[] = {
 #if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV) || defined(DISABLE_GC)
        {
                ICMD_LDIV,
+               0,
                BUILTIN_ldiv,
                NULL,
                "ldiv",
@@ -131,11 +132,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LREM,
+               0,
                BUILTIN_lrem,
                NULL,
                "lrem",
@@ -143,13 +144,13 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
 
        {
                ICMD_FREM,
+               0,
                BUILTIN_frem,
                NULL,
                "frem",
@@ -157,11 +158,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DREM,
+               0,
                BUILTIN_drem,
                NULL,
                "drem",
@@ -169,7 +170,6 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 
@@ -178,6 +178,7 @@ static builtintable_entry builtintable_internal[] = {
 
        {
                ICMD_NEW,
+               0,
                BUILTIN_new,
                NULL,
                "new",
@@ -185,23 +186,23 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEW,
+               BUILTINTABLE_FLAG_STUB,
                BUILTIN_FAST_new,
                NULL,
-               "new (fast)",
+               "fast-new",
                "(Ljava/lang/Class;)Ljava/lang/Object;",
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_ANEWARRAY,
+               0,
                BUILTIN_newarray,
                NULL,
                "newarray",
@@ -209,11 +210,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_boolean,
                NULL,
                "newarray_boolean",
@@ -221,11 +222,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_byte,
                NULL,
                "newarray_byte",
@@ -233,11 +234,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_char,
                NULL,
                "newarray_char",
@@ -245,11 +246,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_short,
                NULL,
                "newarray_short",
@@ -257,11 +258,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_int,
                NULL,
                "newarray_int",
@@ -269,11 +270,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_long,
                NULL,
                "newarray_long",
@@ -281,11 +282,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_float,
                NULL,
                "newarray_float",
@@ -293,11 +294,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
+               0,
                BUILTIN_newarray_double,
                NULL,
                "newarray_double",
@@ -305,11 +306,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_CHECKCAST,
+               0,
                BUILTIN_arraycheckcast,
                NULL,
                "arraycheckcast",
@@ -317,11 +318,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_INSTANCEOF,
+               0,
                BUILTIN_arrayinstanceof,
                NULL,
                "arrayinstanceof",
@@ -329,11 +330,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_AASTORE,
+               0,
                BUILTIN_canstore,
                NULL,
                "canstore",
@@ -341,13 +342,13 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 
 #if defined(ENABLE_THREADS)
        {
                ICMD_MONITORENTER,
+               0,
                LOCK_monitor_enter,
                NULL,
                "monitorenter",
@@ -355,11 +356,11 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_MONITOREXIT,
+               0,
                LOCK_monitor_exit,
                NULL,
                "monitorexit",
@@ -367,7 +368,6 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -377,6 +377,7 @@ static builtintable_entry builtintable_internal[] = {
 
        {
                255,
+               0,
                NULL,
                NULL,
                NULL,
@@ -384,7 +385,6 @@ static builtintable_entry builtintable_internal[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 };
@@ -397,6 +397,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_LONG_CMP)
        {
                ICMD_LCMP,
+               0,
                BUILTIN_lcmp,
                NULL,
                "lcmp",
@@ -404,7 +405,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -412,6 +412,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_LONG_LOGICAL)
        {
                ICMD_LAND,
+               0,
                BUILTIN_land,
                NULL,
                "land",
@@ -419,11 +420,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LOR,
+               0,
                BUILTIN_lor,
                NULL,
                "lor",
@@ -431,11 +432,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LXOR,
+               0,
                BUILTIN_lxor,
                NULL,
                "lxor",
@@ -443,7 +444,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_LOGICAL) */
@@ -451,6 +451,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_LONG_SHIFT)
        {
                ICMD_LSHL,
+               0,
                BUILTIN_lshl,
                NULL,
                "lshl",
@@ -458,11 +459,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LSHR,
+               0,
                BUILTIN_lshr,
                NULL,
                "lshr",
@@ -470,11 +471,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LUSHR,
+               0,
                BUILTIN_lushr,
                NULL,
                "lushr",
@@ -482,7 +483,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_SHIFT) */
@@ -490,6 +490,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_LONG_ADD)
        {
                ICMD_LADD,
+               0,
                BUILTIN_ladd,
                NULL,
                "ladd",
@@ -497,11 +498,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LSUB,
+               0,
                BUILTIN_lsub,
                NULL,
                "lsub",
@@ -509,11 +510,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_LNEG,
+               0,
                BUILTIN_lneg,
                NULL,
                "lneg",
@@ -521,7 +522,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_ADD) */
@@ -529,6 +529,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_LONG_MUL)
        {
                ICMD_LMUL,
+               0,
                BUILTIN_lmul,
                NULL,
                "lmul",
@@ -536,7 +537,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -544,6 +544,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_FLOAT && SUPPORT_I2F)
        {
                ICMD_I2F,
+               0,
                BUILTIN_i2f,
                NULL,
                "i2f",
@@ -551,7 +552,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -559,6 +559,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_DOUBLE && SUPPORT_I2D)
        {
                ICMD_I2D,
+               0,
                BUILTIN_i2d,
                NULL,
                "i2d",
@@ -566,7 +567,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -574,6 +574,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_FLOAT && SUPPORT_L2F)
        {
                ICMD_L2F,
+               0,
                BUILTIN_l2f,
                NULL,
                "l2f",
@@ -581,7 +582,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -589,6 +589,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_LONG && SUPPORT_DOUBLE && SUPPORT_L2D)
        {
                ICMD_L2D,
+               0,
                BUILTIN_l2d,
                NULL,
                "l2d",
@@ -596,7 +597,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -604,6 +604,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_FLOAT && SUPPORT_F2I)
        {
                ICMD_F2I,
+               0,
                BUILTIN_f2i,
                NULL,
                "f2i",
@@ -611,7 +612,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -619,6 +619,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_FLOAT && SUPPORT_LONG && SUPPORT_F2L)
        {
                ICMD_F2L,
+               0,
                BUILTIN_f2l,
                NULL,
                "f2l",
@@ -626,7 +627,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -634,6 +634,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_DOUBLE && SUPPORT_D2I)
        {
                ICMD_D2I,
+               0,
                BUILTIN_d2i,
                NULL,
                "d2i",
@@ -641,7 +642,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -649,6 +649,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_DOUBLE && SUPPORT_LONG && SUPPORT_D2L)
        {
                ICMD_D2L,
+               0,
                BUILTIN_d2l,
                NULL,
                "d2l",
@@ -656,7 +657,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif
@@ -667,6 +667,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !SUPPORT_FLOAT
        {
                ICMD_FADD,
+               0,
                BUILTIN_fadd,
                NULL,
                "fadd",
@@ -674,11 +675,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_FSUB,
+               0,
                BUILTIN_fsub,
                NULL,
                "fsub",
@@ -686,11 +687,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_FMUL,
+               0,
                BUILTIN_fmul,
                NULL,
                "fmul",
@@ -698,11 +699,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_FDIV,
+               0,
                BUILTIN_fdiv,
                NULL,
                "fdiv",
@@ -710,11 +711,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_FNEG,
+               0,
                BUILTIN_fneg,
                NULL,
                "fneg",
@@ -722,7 +723,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !SUPPORT_FLOAT */
@@ -730,6 +730,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !SUPPORT_FLOAT || !SUPPORT_FLOAT_CMP
        {
                ICMD_FCMPL,
+               0,
                BUILTIN_fcmpl,
                NULL,
                "fcmpl",
@@ -737,11 +738,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_FCMPG,
+               0,
                BUILTIN_fcmpg,
                NULL,
                "fcmpg",
@@ -749,7 +750,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !SUPPORT_FLOAT || !SUPPORT_FLOAT_CMP */
@@ -760,6 +760,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !SUPPORT_DOUBLE
        {
                ICMD_DADD,
+               0,
                BUILTIN_dadd,
                NULL,
                "dadd",
@@ -767,11 +768,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DSUB,
+               0,
                BUILTIN_dsub,
                NULL,
                "dsub",
@@ -779,11 +780,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DMUL,
+               0,
                BUILTIN_dmul,
                NULL,
                "dmul",
@@ -791,11 +792,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DDIV,
+               0,
                BUILTIN_ddiv,
                NULL,
                "ddiv",
@@ -803,11 +804,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DNEG,
+               0,
                BUILTIN_dneg,
                NULL,
                "dneg",
@@ -815,7 +816,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !SUPPORT_DOUBLE */
@@ -823,6 +823,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !SUPPORT_DOUBLE || !SUPPORT_DOUBLE_CMP
        {
                ICMD_DCMPL,
+               0,
                BUILTIN_dcmpl,
                NULL,
                "dcmpl",
@@ -830,11 +831,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_DCMPG,
+               0,
                BUILTIN_dcmpg,
                NULL,
                "dcmpg",
@@ -842,7 +843,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !SUPPORT_DOUBLE || !SUPPORT_DOUBLE_CMP */
@@ -853,6 +853,7 @@ static builtintable_entry builtintable_automatic[] = {
 #if !(SUPPORT_FLOAT && SUPPORT_DOUBLE)
        {
                ICMD_F2D,
+               0,
                BUILTIN_f2d,
                NULL,
                "f2d",
@@ -860,11 +861,11 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
        {
                ICMD_D2F,
+               0,
                BUILTIN_d2f,
                NULL,
                "d2f",
@@ -872,7 +873,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 #endif /* !(SUPPORT_FLOAT && SUPPORT_DOUBLE) */
@@ -882,6 +882,7 @@ static builtintable_entry builtintable_automatic[] = {
 
        {
                255,
+               0,
                NULL,
                NULL,
                NULL,
@@ -889,7 +890,6 @@ static builtintable_entry builtintable_automatic[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 };
@@ -909,6 +909,7 @@ static builtintable_entry builtintable_function[] = {
 
        {
                ICMD_BUILTIN,
+               BUILTINTABLE_FLAG_EXCEPTION,
                BUILTIN_arraycopy,
                "java/lang/VMSystem",
                "arraycopy",
@@ -916,7 +917,6 @@ static builtintable_entry builtintable_function[] = {
                NULL,
                NULL,
                NULL,
-               true,
                NULL
        },
 #endif
@@ -929,6 +929,7 @@ static builtintable_entry builtintable_function[] = {
 
        {
                ICMD_BUILTIN,
+               BUILTINTABLE_FLAG_EXCEPTION,
                BUILTIN_arraycopy,
                "java/lang/System",
                "arraycopy",
@@ -936,7 +937,6 @@ static builtintable_entry builtintable_function[] = {
                NULL,
                NULL,
                NULL,
-               true,
                NULL
        },
 #endif
@@ -945,6 +945,7 @@ static builtintable_entry builtintable_function[] = {
 
        {
                ICMD_BUILTIN,
+               0,
                BUILTIN_currenttimemillis,
                "java/lang/VMSystem",
                "currentTimeMillis",
@@ -952,7 +953,6 @@ static builtintable_entry builtintable_function[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 
@@ -960,6 +960,7 @@ static builtintable_entry builtintable_function[] = {
 
        {
                ICMD_BUILTIN,
+               0,
                BUILTIN_currenttimemillis,
                "java/lang/System",
                "currentTimeMillis",
@@ -967,7 +968,6 @@ static builtintable_entry builtintable_function[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 
@@ -975,6 +975,7 @@ static builtintable_entry builtintable_function[] = {
 
        {
                255,
+               0,
                NULL,
                NULL,
                NULL,
@@ -982,7 +983,6 @@ static builtintable_entry builtintable_function[] = {
                NULL,
                NULL,
                NULL,
-               false,
                NULL
        },
 };

diff --git a/src/vm/jit/alpha/arch.h b/src/vm/jit/alpha/arch.h
index c0d4f719ae91f8aedc45604156d705a84dcd7e7c..ce684456d91756da50fdc235d482bf77f32db2b0 100644 (file)
--- a/src/vm/jit/alpha/arch.h
+++ b/src/vm/jit/alpha/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/arm/arch.h b/src/vm/jit/arm/arch.h
index 2f0fd01c4c189178fa29fbf3b87d4ecb721f97be..bbca00f95dc935ca86906d10cf57d7ad8d5bf922 100644 (file)
--- a/src/vm/jit/arm/arch.h
+++ b/src/vm/jit/arm/arch.h
@@ -27,7 +27,7 @@
    Authors: Michael Starzinger
             Christian Thalinger
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/i386/arch.h b/src/vm/jit/i386/arch.h
index bbda7d6af646e505202047ac13711aa1f8c3e26a..979ad514e356f5fdc6165fe15256617b35d9973b 100644 (file)
--- a/src/vm/jit/i386/arch.h
+++ b/src/vm/jit/i386/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/mips/arch.h b/src/vm/jit/mips/arch.h
index 4e3c01ac991b50a0f83a28764b4399f4d82d4cd1..6d8cfe45b8e9fc563445513d4d457942b3406f7f 100644 (file)
--- a/src/vm/jit/mips/arch.h
+++ b/src/vm/jit/mips/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/powerpc/arch.h b/src/vm/jit/powerpc/arch.h
index 901008ffa95cfd6920bc238298693ccf6d76f1df..d1cb3de5e98180de4c2c4fbf4a1a883271ea5eac 100644 (file)
--- a/src/vm/jit/powerpc/arch.h
+++ b/src/vm/jit/powerpc/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/powerpc64/arch.h b/src/vm/jit/powerpc64/arch.h
index 9b8de657a20605f6d8e984a1d28996783223e7be..48e93dee062506b65922da6a89ea2c5682eb5b12 100644 (file)
--- a/src/vm/jit/powerpc64/arch.h
+++ b/src/vm/jit/powerpc64/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7687 2007-04-11 16:39:22Z tbfg $
+   $Id: arch.h 7688 2007-04-12 09:05:12Z michi $
 
 */
 

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index 8155854f628da756d24ebc48f5beff711a5768fc..81add2a4971c9be90613b38870aabdb5341d292c 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7692 2007-04-12 14:47:24Z twisti $
+   $Id: codegen.c 7693 2007-04-12 14:56:49Z michi $
 
 */
 

diff --git a/src/vm/jit/powerpc64/patcher.c b/src/vm/jit/powerpc64/patcher.c
index 4da8f67931f0cc32566162eb0f47f7c7c7f2f767..3a8063f93f8da86d8d77abc4feda795b702f8f6c 100644 (file)
--- a/src/vm/jit/powerpc64/patcher.c
+++ b/src/vm/jit/powerpc64/patcher.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: patcher.c 7596 2007-03-28 21:05:53Z twisti $
+   $Id: patcher.c 7601 2007-03-28 23:02:50Z michi $
 
 */
 

diff --git a/src/vm/jit/s390/arch.h b/src/vm/jit/s390/arch.h
index 68426c2c69cf7dcdff8eda3c1eb1abf9ded24335..f8b13f1f49d4f2f5755c5c5eb5f194b2834d2af4 100644 (file)
--- a/src/vm/jit/s390/arch.h
+++ b/src/vm/jit/s390/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7680 2007-04-10 05:02:20Z pm $
+   $Id: arch.h 7688 2007-04-12 09:05:12Z michi $
 
 */
 

diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 938eea2128c36a0d6b3d94c769c6f774c5d00805..541f8269cf69d0175d644742cbc8e55789fc500c 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: stack.c 7663 2007-04-04 22:14:42Z twisti $
+   $Id: stack.c 7667 2007-04-05 00:16:05Z michi $
 
 */
 

diff --git a/src/vm/jit/x86_64/arch.h b/src/vm/jit/x86_64/arch.h
index 4db3d27a94e5e8acd3c951665da094343b096224..de8dac8649055b0ec91f8c848d630c3adf131929 100644 (file)
--- a/src/vm/jit/x86_64/arch.h
+++ b/src/vm/jit/x86_64/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7601 2007-03-28 23:02:50Z michi $
 
 */