* src/vm/jit/stack.c (GET_NEW_VAR): Fixed macro argument.
[cacao.git] / src / vm / builtintable.inc
index 1f4852bd194176c4d0089e6dde2f0e82d15e7a11..6d85bc7f10124b959587c0612f20d8c99eedb29d 100644 (file)
@@ -1,9 +1,9 @@
 /* src/vm/builtintable.inc - tables of builtin functions
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: builtintable.inc 2545 2005-06-06 14:35:29Z twisti $
+   $Id: builtintable.inc 5251 2006-08-18 13:01:00Z twisti $
 
 */
 
 
 #include "config.h"
+
 #include "arch.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#endif
+
 #include "vm/builtin.h"
 #include "vm/jit/jit.h"
 
 
 static builtintable_entry builtintable_internal[] = {
 
-#if defined(__ALPHA__)
+#if defined(__ALPHA__) || defined(DISABLE_GC)
        {
                ICMD_F2L,
                BUILTIN_f2l,
-               "(F)L",
+               NULL,
                "f2l",
+               "(F)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_D2L,
                BUILTIN_d2l,
-               "(D)L",
+               NULL,
                "d2l",
+               "(D)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_F2I,
                BUILTIN_f2i,
-               "(F)I",
+               NULL,
                "f2i",
+               "(F)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_D2I,
                BUILTIN_d2i,
-               "(D)I",
+               NULL,
                "d2i",
+               "(D)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-
-#if !SUPPORT_DIVISION
+#if !SUPPORT_DIVISION || defined(DISABLE_GC)
        {
                ICMD_IDIV,
                BUILTIN_idiv,
-               "(II)I",
+               NULL,
                "idiv",
+               "(II)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_IREM,
                BUILTIN_irem,
-               "(II)I",
+               NULL,
                "irem",
+               "(II)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
+#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV) || defined(DISABLE_GC)
        {
                ICMD_LDIV,
                BUILTIN_ldiv,
-               "(JJ)J",
+               NULL,
                "ldiv",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LREM,
                BUILTIN_lrem,
-               "(JJ)J",
+               NULL,
                "lrem",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
@@ -112,15 +157,25 @@ static builtintable_entry builtintable_internal[] = {
        {
                ICMD_FREM,
                BUILTIN_frem,
-               "(FF)F",
+               NULL,
                "frem",
+               "(FF)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DREM,
                BUILTIN_drem,
-               "(DD)D",
+               NULL,
                "drem",
+               "(DD)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 
@@ -130,141 +185,200 @@ static builtintable_entry builtintable_internal[] = {
        {
                ICMD_NEW,
                BUILTIN_new,
-               "(Ljava/lang/Class;)Ljava/lang/Object;",
+               NULL,
                "new",
+               "(Ljava/lang/Class;)Ljava/lang/Object;",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_ANEWARRAY,
                BUILTIN_newarray,
-        "(ILjava/lang/Class;)[Ljava/lang/Object;",
+               NULL,
                "newarray",
+        "(ILjava/lang/Class;)[Ljava/lang/Object;",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_boolean,
-               "(I)[Z",
+               NULL,
                "newarray_boolean",
+               "(I)[Z",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_byte,
-               "(I)[B",
+               NULL,
                "newarray_byte",
+               "(I)[B",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_char,
-               "(I)[C",
+               NULL,
                "newarray_char",
+               "(I)[C",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_short,
-               "(I)[S",
+               NULL,
                "newarray_short",
+               "(I)[S",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_int,
-               "(I)[I",
+               NULL,
                "newarray_int",
+               "(I)[I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_long,
-               "(I)[J",
+               NULL,
                "newarray_long",
+               "(I)[J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_float,
-               "(I)[F",
+               NULL,
                "newarray_float",
+               "(I)[F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_NEWARRAY,
                BUILTIN_newarray_double,
-               "(I)[D",
+               NULL,
                "newarray_double",
+               "(I)[D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_CHECKCAST,
                BUILTIN_arraycheckcast,
-               "([Ljava/lang/Object;[Ljava/lang/Object;)[Ljava/lang/Object;",
+               NULL,
                "arraycheckcast",
+               "([Ljava/lang/Object;[Ljava/lang/Object;)[Ljava/lang/Object;",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_INSTANCEOF,
                BUILTIN_arrayinstanceof,
-               "([Ljava/lang/Object;[Ljava/lang/Object;)I",
+               NULL,
                "arrayinstanceof",
+               "([Ljava/lang/Object;[Ljava/lang/Object;)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_AASTORE,
-               BUILTIN_aastore,
-               "([Ljava/lang/Object;ILjava/lang/Object;)V",
-               "aastore",
+               BUILTIN_canstore,
+               NULL,
+               "canstore",
+               "([Ljava/lang/Object;Ljava/lang/Object;)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 
-#if defined(USE_THREADS)
+#if defined(ENABLE_THREADS)
        {
                ICMD_MONITORENTER,
-               BUILTIN_monitorenter,
-               "(Ljava/lang/Object;)V",
+               LOCK_monitor_enter,
+               NULL,
                "monitorenter",
+               "(Ljava/lang/Object;)V",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_MONITOREXIT,
-               BUILTIN_monitorexit,
-               "(Ljava/lang/Object;)V",
+               LOCK_monitor_exit,
+               NULL,
                "monitorexit",
+               "(Ljava/lang/Object;)V",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
 
-       /* assembler code patching functions **************************************/
+       /* stop entry */
 
        {
-               ICMD_NEW,
-               PATCHER_builtin_new,
-               "(Ljava/lang/Class;)Ljava/lang/Object;",
-               "new (NOT RESOLVED)",
-               NULL
-       },
-       {
-               ICMD_ANEWARRAY,
-               PATCHER_builtin_newarray,
-               "(ILjava/lang/Class;)[Ljava/lang/Object;",
-               "newarray (NOT RESOLVED)",
-               NULL
-       },
-       {
-               ICMD_CHECKCAST,
-               PATCHER_builtin_arraycheckcast,
-               "([Ljava/lang/Class;[Ljava/lang/Class;)[Ljava/lang/Object;",
-               "arraycheckcast (NOT RESOLVED)",
-               NULL
-       },
-       {
-               ICMD_INSTANCEOF,
-               PATCHER_builtin_arrayinstanceof,
-               "([Ljava/lang/Class;[Ljava/lang/Class;)I",
-               "arrayinstanceof (NOT RESOLVED)",
+               255,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 };
@@ -278,8 +392,13 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_LCMP,
                BUILTIN_lcmp,
-               "(JJ)I",
+               NULL,
                "lcmp",
+               "(JJ)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
@@ -288,22 +407,37 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_LAND,
                BUILTIN_land,
-               "(JJ)J",
+               NULL,
                "land",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LOR,
                BUILTIN_lor,
-               "(JJ)J",
+               NULL,
                "lor",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LXOR,
                BUILTIN_lxor,
-               "(JJ)J",
+               NULL,
                "lxor",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_LOGICAL) */
@@ -312,22 +446,37 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_LSHL,
                BUILTIN_lshl,
-               "(JI)J",
+               NULL,
                "lshl",
+               "(JI)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LSHR,
                BUILTIN_lshr,
-               "(JI)J",
+               NULL,
                "lshr",
+               "(JI)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LUSHR,
                BUILTIN_lushr,
-               "(JI)J",
+               NULL,
                "lushr",
+               "(JI)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_SHIFT) */
@@ -336,22 +485,37 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_LADD,
                BUILTIN_ladd,
-               "(JJ)J",
+               NULL,
                "ladd",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LSUB,
                BUILTIN_lsub,
-               "(JJ)J",
+               NULL,
                "lsub",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_LNEG,
                BUILTIN_lneg,
-               "(J)J",
+               NULL,
                "lneg",
+               "(J)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !(SUPPORT_LONG && SUPPORT_LONG_ADD) */
@@ -360,88 +524,133 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_LMUL,
                BUILTIN_lmul,
-               "(JJ)J",
+               NULL,
                "lmul",
+               "(JJ)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_FLOAT && SUPPORT_IFCVT)
+#if !(SUPPORT_FLOAT && SUPPORT_I2F)
        {
                ICMD_I2F,
                BUILTIN_i2f,
-               "(I)F",
+               NULL,
                "i2f",
+               "(I)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_DOUBLE && SUPPORT_IFCVT)
+#if !(SUPPORT_DOUBLE && SUPPORT_I2D)
        {
                ICMD_I2D,
                BUILTIN_i2d,
-               "(I)D",
+               NULL,
                "i2d",
+               "(I)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_FLOAT && SUPPORT_FICVT)
+#if !(SUPPORT_LONG && SUPPORT_FLOAT && SUPPORT_L2F)
        {
-               ICMD_F2I,
-               BUILTIN_f2i,
-               "(F)I",
-               "f2i",
+               ICMD_L2F,
+               BUILTIN_l2f,
+               NULL,
+               "l2f",
+               "(J)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_DOUBLE && SUPPORT_FICVT)
+#if !(SUPPORT_LONG && SUPPORT_DOUBLE && SUPPORT_L2D)
        {
-               ICMD_D2I,
-               BUILTIN_d2i,
-               "(D)I",
-               "d2i",
+               ICMD_L2D,
+               BUILTIN_l2d,
+               NULL,
+               "l2d",
+               "(J)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_LONG && SUPPORT_FLOAT && SUPPORT_LONG_FCVT)
+#if !(SUPPORT_FLOAT && SUPPORT_F2I)
        {
-               ICMD_L2F,
-               BUILTIN_l2f,
-               "(J)F",
-               "l2f",
+               ICMD_F2I,
+               BUILTIN_f2i,
+               NULL,
+               "f2i",
+               "(F)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_LONG && SUPPORT_DOUBLE && SUPPORT_LONG_FCVT)
+#if !(SUPPORT_FLOAT && SUPPORT_LONG && SUPPORT_F2L)
        {
-               ICMD_L2D,
-               BUILTIN_l2d,
-               "(J)D",
-               "l2d",
+               ICMD_F2L,
+               BUILTIN_f2l,
+               NULL,
+               "f2l",
+               "(F)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_FLOAT && SUPPORT_LONG && SUPPORT_LONG_ICVT)
+#if !(SUPPORT_DOUBLE && SUPPORT_D2I)
        {
-               ICMD_F2L,
-               BUILTIN_f2l,
-               "(F)J",
-               "f2l",
+               ICMD_D2I,
+               BUILTIN_d2i,
+               NULL,
+               "d2i",
+               "(D)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
 
-#if !(SUPPORT_DOUBLE && SUPPORT_LONG && SUPPORT_LONG_ICVT)
+#if !(SUPPORT_DOUBLE && SUPPORT_LONG && SUPPORT_D2L)
        {
                ICMD_D2L,
                BUILTIN_d2l,
-               "(D)J",
+               NULL,
                "d2l",
+               "(D)J",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif
@@ -453,50 +662,85 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_FADD,
                BUILTIN_fadd,
-               "(FF)F",
+               NULL,
                "fadd",
+               "(FF)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FSUB,
                BUILTIN_fsub,
-               "(FF)F",
+               NULL,
                "fsub",
+               "(FF)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FMUL,
                BUILTIN_fmul,
-               "(FF)F",
+               NULL,
                "fmul",
+               "(FF)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FDIV,
                BUILTIN_fdiv,
-               "(FF)F",
+               NULL,
                "fdiv",
+               "(FF)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FNEG,
                BUILTIN_fneg,
-               "(F)F",
+               NULL,
                "fneg",
+               "(F)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FCMPL,
                BUILTIN_fcmpl,
-               "(FF)I",
+               NULL,
                "fcmpl",
+               "(FF)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_FCMPG,
                BUILTIN_fcmpg,
-               "(FF)I",
+               NULL,
                "fcmpg",
+               "(FF)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !SUPPORT_FLOAT */
@@ -508,50 +752,85 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_DADD,
                BUILTIN_dadd,
-               "(DD)D",
+               NULL,
                "dadd",
+               "(DD)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DSUB,
                BUILTIN_dsub,
-               "(DD)D",
+               NULL,
                "dsub",
+               "(DD)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DMUL,
                BUILTIN_dmul,
-               "(DD)D",
+               NULL,
                "dmul",
+               "(DD)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DDIV,
                BUILTIN_ddiv,
-               "(DD)D",
+               NULL,
                "ddiv",
+               "(DD)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DNEG,
                BUILTIN_dneg,
-               "(D)D",
+               NULL,
                "dneg",
+               "(D)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DCMPL,
                BUILTIN_dcmpl,
-               "(DD)I",
+               NULL,
                "dcmpl",
+               "(DD)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_DCMPG,
                BUILTIN_dcmpg,
-               "(DD)I",
+               NULL,
                "dcmpg",
+               "(DD)I",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !SUPPORT_DOUBLE */
@@ -563,18 +842,130 @@ static builtintable_entry builtintable_automatic[] = {
        {
                ICMD_F2D,
                BUILTIN_f2d,
-               "(F)D",
+               NULL,
                "f2d",
+               "(F)D",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
        {
                ICMD_D2F,
                BUILTIN_d2f,
-               "(D)F",
+               NULL,
                "d2f",
+               "(D)F",
+               NULL,
+               NULL,
+               NULL,
+               false,
                NULL
        },
 #endif /* !(SUPPORT_FLOAT && SUPPORT_DOUBLE) */
+
+
+       /* prevent a compiler warning if everything is supported (e.g. i386) */
+
+       {
+               255,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               false,
+               NULL
+       },
+};
+
+
+/* automatically replaced functions *******************************************/
+
+static builtintable_entry builtintable_function[] = {
+
+       /* java.lang.VMSystem.arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V STATIC NATIVE */
+
+       {
+               ICMD_BUILTIN,
+               BUILTIN_arraycopy,
+               "java/lang/VMSystem",
+               "arraycopy",
+               "(Ljava/lang/Object;ILjava/lang/Object;II)V",
+               NULL,
+               NULL,
+               NULL,
+               true,
+               NULL
+       },
+
+       /* java.lang.System.arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V PUBLIC STATIC */
+
+#if 0
+       /* We disable this one until we have a fix for the stacktrace
+          issue. */
+
+       {
+               ICMD_BUILTIN,
+               BUILTIN_arraycopy,
+               "java/lang/System",
+               "arraycopy",
+               "(Ljava/lang/Object;ILjava/lang/Object;II)V",
+               NULL,
+               NULL,
+               NULL,
+               true,
+               NULL
+       },
+#endif
+
+       /* java.lang.VMSystem.currentTimeMillis()J PUBLIC STATIC */
+
+       {
+               ICMD_BUILTIN,
+               BUILTIN_currenttimemillis,
+               "java/lang/VMSystem",
+               "currentTimeMillis",
+               "()J",
+               NULL,
+               NULL,
+               NULL,
+               false,
+               NULL
+       },
+
+       /* java.lang.System.currentTimeMillis()J PUBLIC STATIC */
+
+       {
+               ICMD_BUILTIN,
+               BUILTIN_currenttimemillis,
+               "java/lang/System",
+               "currentTimeMillis",
+               "()J",
+               NULL,
+               NULL,
+               NULL,
+               false,
+               NULL
+       },
+
+       /* stop entry */
+
+       {
+               255,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               false,
+               NULL
+       },
 };