Replaced asm_wrapper_patcher_BUILTIN_* with PATCHER_builtin_* macros in
[cacao.git] / src / vm / builtin.c
index aa0165bd6ac284d22195eb506b130206d625b04b..4d9f4bdf643ffbc5decd79f62d3c687e5ba79147 100644 (file)
@@ -1,9 +1,9 @@
-/* builtin.c - functions for unsupported operations
+/* src/vm/builtin.c - functions for unsupported operations
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
             Andreas Krall
             Mark Probst
 
+   Changes: Christian Thalinger
+
    Contains C functions for JavaVM Instructions that cannot be
    translated to machine language directly. Consequently, the
    generated machine code for these instructions contains function
    calls instead of machine instructions, using the C calling
    convention.
 
-   $Id: builtin.c 967 2004-03-18 14:29:03Z jowenn $
+   $Id: builtin.c 2369 2005-04-25 14:06:16Z twisti $
 
 */
 
 
 #include <assert.h>
-#include <string.h>
 #include <math.h>
-#include "main.h"
-#include "global.h"
-#include "builtin.h"
-#include "native.h"
-#include "loader.h"
-#include "tables.h"
-#include "asmpart.h"
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "arch.h"
+#include "types.h"
 #include "mm/boehm.h"
-#include "threads/thread.h"
-#include "threads/locks.h"
-#include "toolbox/loging.h"
-#include "toolbox/memory.h"
-#include "nat/java_lang_Cloneable.h"
-#include "nat/java_lang_VMObject.h"
+#include "mm/memory.h"
+#include "native/native.h"
+#include "native/include/java_lang_Cloneable.h"
+#include "native/include/java_lang_VMObject.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+#  include "threads/native/threads.h"
+# else
+#  include "threads/green/threads.h"
+#  include "threads/green/locks.h"
+# endif
+#endif
 
+#include "toolbox/logging.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/initialize.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/stringlocal.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/patcher.h"
 
-#undef DEBUG /*define DEBUG 1*/
 
+#undef DEBUG /*define DEBUG 1*/
 
 THREADSPECIFIC methodinfo* _threadrootmethod = NULL;
-THREADSPECIFIC void *_thread_nativestackframeinfo=NULL;
+THREADSPECIFIC void *_thread_nativestackframeinfo = NULL;
+
+
+#if defined(USEBUILTINTABLE)
+
+#if 0
+stdopdescriptor builtintable[] = {
+       { ICMD_LCMP,   TYPE_LONG, TYPE_LONG, TYPE_INT, ICMD_BUILTIN2,
+         (functionptr) builtin_lcmp , SUPPORT_LONG && SUPPORT_LONG_CMP, false },
+       { ICMD_LAND,   TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_land , SUPPORT_LONG && SUPPORT_LONG_LOGICAL, false },
+       { ICMD_LOR,    TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lor , SUPPORT_LONG && SUPPORT_LONG_LOGICAL, false },
+       { ICMD_LXOR,   TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lxor , SUPPORT_LONG && SUPPORT_LONG_LOGICAL, false },
+       { ICMD_LSHL,   TYPE_LONG, TYPE_INT,  TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lshl , SUPPORT_LONG && SUPPORT_LONG_SHIFT, false },
+       { ICMD_LSHR,   TYPE_LONG, TYPE_INT,  TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lshr, SUPPORT_LONG && SUPPORT_LONG_SHIFT, false },
+       { ICMD_LUSHR,  TYPE_LONG, TYPE_INT,  TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lushr, SUPPORT_LONG && SUPPORT_LONG_SHIFT, false },
+       { ICMD_LADD,   TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_ladd , SUPPORT_LONG && SUPPORT_LONG_ADD, false },
+       { ICMD_LSUB,   TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lsub , SUPPORT_LONG && SUPPORT_LONG_ADD, false },
+       { ICMD_LNEG,   TYPE_LONG, TYPE_VOID, TYPE_LONG, ICMD_BUILTIN1, 
+         (functionptr) builtin_lneg, SUPPORT_LONG && SUPPORT_LONG_ADD, true },
+       { ICMD_LMUL,   TYPE_LONG, TYPE_LONG, TYPE_LONG, ICMD_BUILTIN2,
+         (functionptr) builtin_lmul , SUPPORT_LONG && SUPPORT_LONG_MUL, false },
+       { ICMD_I2F,    TYPE_INT, TYPE_VOID, TYPE_FLOAT, ICMD_BUILTIN1,
+         (functionptr) builtin_i2f, SUPPORT_FLOAT && SUPPORT_IFCVT, true },
+       { ICMD_I2D,    TYPE_INT, TYPE_VOID, TYPE_DOUBLE, ICMD_BUILTIN1, 
+         (functionptr) builtin_i2d, SUPPORT_DOUBLE && SUPPORT_IFCVT, true },
+       { ICMD_L2F,    TYPE_LONG, TYPE_VOID, TYPE_FLOAT, ICMD_BUILTIN1,
+         (functionptr) builtin_l2f, SUPPORT_LONG && SUPPORT_FLOAT && SUPPORT_LONG_FCVT, true },
+       { ICMD_L2D,    TYPE_LONG, TYPE_VOID, TYPE_DOUBLE, ICMD_BUILTIN1, 
+         (functionptr) builtin_l2d, SUPPORT_LONG && SUPPORT_DOUBLE && SUPPORT_LONG_FCVT, true },
+       { ICMD_F2L,    TYPE_FLOAT, TYPE_VOID, TYPE_LONG, ICMD_BUILTIN1,
+         (functionptr) builtin_f2l, SUPPORT_FLOAT && SUPPORT_LONG && SUPPORT_LONG_ICVT, true },
+       { ICMD_D2L,    TYPE_DOUBLE, TYPE_VOID, TYPE_LONG, ICMD_BUILTIN1,
+         (functionptr) builtin_d2l, SUPPORT_DOUBLE && SUPPORT_LONG && SUPPORT_LONG_ICVT, true },
+       { ICMD_F2I,    TYPE_FLOAT, TYPE_VOID, TYPE_INT, ICMD_BUILTIN1,
+         (functionptr) builtin_f2i, SUPPORT_FLOAT && SUPPORT_FICVT, true },
+       { ICMD_D2I,    TYPE_DOUBLE, TYPE_VOID, TYPE_INT, ICMD_BUILTIN1,
+         (functionptr) builtin_d2i, SUPPORT_DOUBLE && SUPPORT_FICVT, true },
+       { 255, 0, 0, 0, 0, NULL, true, false },
+};
+
+#endif
+
+static int builtintablelen;
+
+#endif /* USEBUILTINTABLE */
+
+
+/*****************************************************************************
+                                                TABLE OF BUILTIN FUNCTIONS
+
+    This table lists the builtin functions which are used inside
+    BUILTIN* opcodes.
+
+    The first part of the table (up to the 255-marker) lists the
+    opcodes which are automatically replaced in stack.c.
+
+    The second part lists the builtin functions which are "manually"
+    used for BUILTIN* opcodes in parse.c and stack.c.
+
+*****************************************************************************/
+
+builtin_descriptor builtin_desc[] = {
+#if defined(USEBUILTINTABLE)
+       {ICMD_LCMP , BUILTIN_lcmp ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_INT   ,
+                    SUPPORT_LONG && SUPPORT_LONG_CMP,false,"lcmp"},
+       
+       {ICMD_LAND , BUILTIN_land ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_LOGICAL,false,"land"},
+       {ICMD_LOR  , BUILTIN_lor  ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_LOGICAL,false,"lor"},
+       {ICMD_LXOR , BUILTIN_lxor ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_LOGICAL,false,"lxor"},
+       
+       {ICMD_LSHL , BUILTIN_lshl ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_INT   ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_SHIFT,false,"lshl"},
+       {ICMD_LSHR , BUILTIN_lshr ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_INT   ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_SHIFT,false,"lshr"},
+       {ICMD_LUSHR, BUILTIN_lushr,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_INT   ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_SHIFT,false,"lushr"},
+       
+       {ICMD_LADD , BUILTIN_ladd ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_ADD,false,"ladd"},
+       {ICMD_LSUB , BUILTIN_lsub ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_ADD,false,"lsub"},
+       {ICMD_LNEG , BUILTIN_lneg ,ICMD_BUILTIN1,TYPE_LONG  ,TYPE_VOID  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_ADD,false,"lneg"},
+       {ICMD_LMUL , BUILTIN_lmul ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_LONG && SUPPORT_LONG_MUL,false,"lmul"},
+       
+       {ICMD_I2F  , BUILTIN_i2f  ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID ,TYPE_FLOAT ,
+                    SUPPORT_FLOAT && SUPPORT_IFCVT,true ,"i2f"},
+       {ICMD_I2D  , BUILTIN_i2d  ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID ,TYPE_DOUBLE,
+                    SUPPORT_DOUBLE && SUPPORT_IFCVT,true ,"i2d"},
+       {ICMD_L2F  , BUILTIN_l2f  ,ICMD_BUILTIN1,TYPE_LONG  ,TYPE_VOID  ,TYPE_VOID ,TYPE_FLOAT ,
+                    SUPPORT_LONG && SUPPORT_FLOAT && SUPPORT_LONG_FCVT,true ,"l2f"},
+       {ICMD_L2D  , BUILTIN_l2d  ,ICMD_BUILTIN1,TYPE_LONG  ,TYPE_VOID  ,TYPE_VOID ,TYPE_DOUBLE,
+                    SUPPORT_LONG && SUPPORT_DOUBLE && SUPPORT_LONG_FCVT,true ,"l2d"},
+       {ICMD_F2L  , BUILTIN_f2l  ,ICMD_BUILTIN1,TYPE_FLOAT ,TYPE_VOID  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_FLOAT && SUPPORT_LONG && SUPPORT_LONG_ICVT,true ,"f2l"},
+       {ICMD_D2L  , BUILTIN_d2l  ,ICMD_BUILTIN1,TYPE_DOUBLE,TYPE_VOID  ,TYPE_VOID ,TYPE_LONG  ,
+                    SUPPORT_DOUBLE && SUPPORT_LONG && SUPPORT_LONG_ICVT,true ,"d2l"},
+       {ICMD_F2I  , BUILTIN_f2i  ,ICMD_BUILTIN1,TYPE_FLOAT ,TYPE_VOID  ,TYPE_VOID ,TYPE_INT   ,
+                    SUPPORT_FLOAT && SUPPORT_FICVT,true ,"f2i"},
+       {ICMD_D2I  , BUILTIN_d2i  ,ICMD_BUILTIN1,TYPE_DOUBLE,TYPE_VOID  ,TYPE_VOID ,TYPE_INT   ,
+                    SUPPORT_DOUBLE && SUPPORT_FICVT,true ,"d2i"},
+
+       { ICMD_FADD , BUILTIN_fadd  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fadd"  },
+       { ICMD_FSUB , BUILTIN_fsub  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fsub"  },
+       { ICMD_FMUL , BUILTIN_fmul  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fmul"  },
+       { ICMD_FDIV , BUILTIN_fdiv  , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fdiv"  },
+       { ICMD_FNEG , BUILTIN_fneg  , ICMD_BUILTIN1, TYPE_FLT, TYPE_VOID , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT, true, "fneg"  },
+       { ICMD_FCMPL, BUILTIN_fcmpl , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_INT, SUPPORT_FLOAT, true, "fcmpl" },
+       { ICMD_FCMPG, BUILTIN_fcmpg , ICMD_BUILTIN2, TYPE_FLT, TYPE_FLT  , TYPE_VOID , TYPE_INT, SUPPORT_FLOAT, true, "fcmpg" },
+
+       { ICMD_DADD , BUILTIN_dadd  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dadd"  },
+       { ICMD_DSUB , BUILTIN_dsub  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dsub"  },
+       { ICMD_DMUL , BUILTIN_dmul  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dmul"  },
+       { ICMD_DDIV , BUILTIN_ddiv  , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "ddiv"  },
+       { ICMD_DNEG , BUILTIN_dneg  , ICMD_BUILTIN1, TYPE_DBL, TYPE_VOID , TYPE_VOID , TYPE_DBL, SUPPORT_DOUBLE, true, "dneg"  },
+       { ICMD_DCMPL, BUILTIN_dcmpl , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_INT, SUPPORT_DOUBLE, true, "dcmpl" },
+       { ICMD_DCMPG, BUILTIN_dcmpg , ICMD_BUILTIN2, TYPE_DBL, TYPE_DBL  , TYPE_VOID , TYPE_INT, SUPPORT_DOUBLE, true, "dcmpg" },
+
+       { ICMD_F2D,  BUILTIN_f2d  , ICMD_BUILTIN1, TYPE_FLT, TYPE_VOID , TYPE_VOID , TYPE_DBL, SUPPORT_FLOAT && SUPPORT_DOUBLE, true, "f2d" },
+       { ICMD_D2F,  BUILTIN_d2f  , ICMD_BUILTIN1, TYPE_DBL, TYPE_VOID , TYPE_VOID , TYPE_FLT, SUPPORT_FLOAT && SUPPORT_DOUBLE, true, "d2f" },
+#endif
+
+       /* this record marks the end of the automatically replaced opcodes */
+       {255,NULL,0,0,0,0,0,0,0,"<INVALID>"},
+
+       /* the following functions are not replaced automatically */
+       
+#if defined(__ALPHA__)
+       {255, BUILTIN_f2l  ,ICMD_BUILTIN1,TYPE_FLOAT ,TYPE_VOID  ,TYPE_VOID ,TYPE_LONG  ,0,0,"f2l"},
+       {255, BUILTIN_d2l  ,ICMD_BUILTIN1,TYPE_DOUBLE,TYPE_VOID  ,TYPE_VOID ,TYPE_LONG  ,0,0,"d2l"},
+       {255, BUILTIN_f2i  ,ICMD_BUILTIN1,TYPE_FLOAT ,TYPE_VOID  ,TYPE_VOID ,TYPE_INT   ,0,0,"f2i"},
+       {255, BUILTIN_d2i  ,ICMD_BUILTIN1,TYPE_DOUBLE,TYPE_VOID  ,TYPE_VOID ,TYPE_INT   ,0,0,"d2i"},
+#endif
+
+       {255,BUILTIN_instanceof      ,ICMD_BUILTIN2,TYPE_ADR   ,TYPE_ADR   ,TYPE_VOID  ,TYPE_INT   ,0,0,"instanceof"},
+       {255,BUILTIN_arrayinstanceof ,ICMD_BUILTIN2,TYPE_ADR   ,TYPE_ADR   ,TYPE_VOID  ,TYPE_INT   ,0,0,"arrayinstanceof"},
+       {255,BUILTIN_checkarraycast  ,ICMD_BUILTIN2,TYPE_ADR   ,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,0,0,"checkarraycast"},
+       {255,BUILTIN_aastore         ,ICMD_BUILTIN3,TYPE_ADR   ,TYPE_INT   ,TYPE_ADR   ,TYPE_VOID  ,0,0,"aastore"},
+       {255,BUILTIN_new             ,ICMD_BUILTIN1,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"new"},
+       {255,BUILTIN_newarray        ,ICMD_BUILTIN2,TYPE_INT   ,TYPE_ADR   ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray"},
+       {255,BUILTIN_newarray_boolean,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_boolean"},
+       {255,BUILTIN_newarray_char   ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_char"},
+       {255,BUILTIN_newarray_float  ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_float"},
+       {255,BUILTIN_newarray_double ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_double"},
+       {255,BUILTIN_newarray_byte   ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_byte"},
+       {255,BUILTIN_newarray_short  ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_short"},
+       {255,BUILTIN_newarray_int    ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_int"},
+       {255,BUILTIN_newarray_long   ,ICMD_BUILTIN1,TYPE_INT   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_ADR   ,0,0,"newarray_long"},
+#if defined(USE_THREADS)
+       {255,BUILTIN_monitorenter    ,ICMD_BUILTIN1,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_VOID  ,0,0,"monitorenter"},
+       {255,BUILTIN_monitorexit     ,ICMD_BUILTIN1,TYPE_ADR   ,TYPE_VOID  ,TYPE_VOID  ,TYPE_VOID  ,0,0,"monitorexit"},
+#endif
+#if !SUPPORT_DIVISION
+       {255,BUILTIN_idiv            ,ICMD_BUILTIN2,TYPE_INT   ,TYPE_INT   ,TYPE_VOID  ,TYPE_INT   ,0,0,"idiv"},
+       {255,BUILTIN_irem            ,ICMD_BUILTIN2,TYPE_INT   ,TYPE_INT   ,TYPE_VOID  ,TYPE_INT   ,0,0,"irem"},
+#endif
+#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_DIV)
+       {255,BUILTIN_ldiv            ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID  ,TYPE_LONG  ,0,0,"ldiv"},
+       {255,BUILTIN_lrem            ,ICMD_BUILTIN2,TYPE_LONG  ,TYPE_LONG  ,TYPE_VOID  ,TYPE_LONG  ,0,0,"lrem"},
+#endif
+       {255,BUILTIN_frem            ,ICMD_BUILTIN2,TYPE_FLOAT ,TYPE_FLOAT ,TYPE_VOID  ,TYPE_FLOAT ,0,0,"frem"},
+       {255,BUILTIN_drem            ,ICMD_BUILTIN2,TYPE_DOUBLE,TYPE_DOUBLE,TYPE_VOID  ,TYPE_DOUBLE,0,0,"drem"},
+
+
+#if defined(__X86_64__) || defined(__I386__)
+       /* assembler code patching functions */
+
+       { 255, PATCHER_builtin_new            , ICMD_BUILTIN1, TYPE_ADR   , TYPE_VOID  , TYPE_VOID  , TYPE_ADR   , 0, 0, "new (calling patcher_builtin_new)" },
+       { 255, PATCHER_builtin_newarray       , ICMD_BUILTIN1, TYPE_ADR   , TYPE_VOID  , TYPE_VOID  , TYPE_ADR   , 0, 0, "newarray (calling patcher_builtin_newarray)" },
+       { 255, PATCHER_builtin_checkarraycast , ICMD_BUILTIN2, TYPE_ADR   , TYPE_ADR   , TYPE_VOID  , TYPE_VOID  , 0, 0, "checkarraycast (calling patcher_builtin_checkarraycast)" },
+       { 255, PATCHER_builtin_arrayinstanceof, ICMD_BUILTIN2, TYPE_ADR   , TYPE_ADR   , TYPE_VOID  , TYPE_INT   , 0, 0, "arrayinstanceof (calling patcher_builtin_arrayinstanceof)" },
+#endif
+
+
+       /* this record marks the end of the list */
+
+       {   0, NULL, 0, 0, 0, 0, 0, 0, 0, "<END>" }
+};
+
+
+#if defined(USEBUILTINTABLE)
+
+static int stdopcompare(const void *a, const void *b)
+{
+       builtin_descriptor *o1 = (builtin_descriptor *) a;
+       builtin_descriptor *o2 = (builtin_descriptor *) b;
+       if (!o1->supported && o2->supported)
+               return -1;
+       if (o1->supported && !o2->supported)
+               return 1;
+       return (o1->opcode < o2->opcode) ? -1 : (o1->opcode > o2->opcode);
+}
+
+
+void sort_builtintable(void)
+{
+       int len;
+
+       len = 0;
+       while (builtin_desc[len].opcode != 255) len++;
+       qsort(builtin_desc, len, sizeof(builtin_descriptor), stdopcompare);
+
+       for (--len; len>=0 && builtin_desc[len].supported; len--);
+       builtintablelen = ++len;
+}
+
+
+builtin_descriptor *find_builtin(int icmd)
+{
+       builtin_descriptor *first = builtin_desc;
+       builtin_descriptor *last = builtin_desc + builtintablelen;
+       int len = last - first;
+       int half;
+       builtin_descriptor *middle;
+
+       while (len > 0) {
+               half = len / 2;
+               middle = first + half;
+               if (middle->opcode < icmd) {
+                       first = middle + 1;
+                       len -= half + 1;
+               } else
+                       len = half;
+       }
+       return first != last ? first : NULL;
+}
+
+#endif /* defined(USEBUILTINTABLE) */
+
 
 /*****************************************************************************
                                                                TYPE CHECKS
@@ -79,76 +337,44 @@ THREADSPECIFIC void *_thread_nativestackframeinfo=NULL;
                                        
 *****************************************************************************/                                 
 s4 builtin_isanysubclass(classinfo *sub, classinfo *super)
-{ 
+{
        s4 res;
+       castinfo classvalues;
+
+       if (sub == super)
+               return 1;
 
-       /*classinfo *tmp;*/
        if (super->flags & ACC_INTERFACE)
                return (sub->vftbl->interfacetablelength > super->index) &&
                        (sub->vftbl->interfacetable[-super->index] != NULL);
 
-       /*
-         while (sub != 0)
-         if (sub == super)
-         return 1;
-         else
-         sub = sub->super;
+       asm_getclassvalues_atomic(super->vftbl, sub->vftbl, &classvalues);
 
-         return 0;
-       */
-
-/*
-       for (tmp=sub;tmp!=0;tmp=tmp->super) {
-               printf("->");
-               utf_display(tmp->name);
-       }
-               printf("\n\n");
-       
-       for (tmp=super;tmp!=0;tmp=tmp->super) {
-               printf("->");
-               utf_display(tmp->name);
-       }
-               printf("\n");
-       
-
-       printf("sub->vftbl->baseval %d, super->vftbl->baseval %d\n diff %d, super->vftbl->diffval %d\n",
-                       sub->vftbl->baseval, super->vftbl->baseval, (unsigned)(sub->vftbl->baseval - super->vftbl->baseval),
-                       super->vftbl->diffval); */
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_lock();
-#endif
-
-       res = (unsigned) (sub->vftbl->baseval - super->vftbl->baseval) <=
-               (unsigned) (super->vftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_unlock();
-#endif
+       res = (u4) (classvalues.sub_baseval - classvalues.super_baseval) <=
+               (u4) classvalues.super_diffval;
 
        return res;
 }
 
-s4 builtin_isanysubclass_vftbl(vftbl *sub,vftbl *super)
+
+s4 builtin_isanysubclass_vftbl(vftbl_t *sub, vftbl_t *super)
 {
-       int base;
        s4 res;
-       
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_lock();
-#endif
+       s4 base;
+       castinfo classvalues;
+
+       if (sub == super)
+               return 1;
 
-       if ((base = super->baseval) <= 0)
+       asm_getclassvalues_atomic(super, sub, &classvalues);
+
+       if ((base = classvalues.super_baseval) <= 0)
                /* super is an interface */
                res = (sub->interfacetablelength > -base) &&
                        (sub->interfacetable[base] != NULL);
        else
-           res = (unsigned) (sub->baseval - base)
-                       <= (unsigned) (super->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_unlock();
-#endif
+           res = (u4) (classvalues.sub_baseval - classvalues.super_baseval)
+                       <= (u4) classvalues.super_diffval;
 
        return res;
 }
@@ -170,8 +396,10 @@ s4 builtin_instanceof(java_objectheader *obj, classinfo *class)
 #ifdef DEBUG
        log_text ("builtin_instanceof called");
 #endif 
-       if (!obj) return 0;
-       return builtin_isanysubclass (obj->vftbl->class, class);
+       if (!obj)
+               return 0;
+
+       return builtin_isanysubclass(obj->vftbl->class, class);
 }
 
 
@@ -207,21 +435,28 @@ s4 builtin_checkcast(java_objectheader *obj, classinfo *class)
 }
 
 
-/*********** internal function: builtin_descriptorscompatible ******************
+/* builtin_descriptorscompatible ***********************************************
 
-       Checks if two array type descriptors are assignment compatible
-       Return value:  1 ... target = desc is possible
-                                  0 ... otherwise
+   Checks if two array type descriptors are assignment compatible
+
+   Return value: 1 ... target = desc is possible
+                 0 ... otherwise
                        
-******************************************************************************/
+*******************************************************************************/
 
-static s4 builtin_descriptorscompatible(arraydescriptor *desc,arraydescriptor *target)
+static s4 builtin_descriptorscompatible(arraydescriptor *desc, arraydescriptor *target)
 {
-       if (desc==target) return 1;
-       if (desc->arraytype != target->arraytype) return 0;
-       if (desc->arraytype != ARRAYTYPE_OBJECT) return 1;
+       if (desc == target)
+               return 1;
+
+       if (desc->arraytype != target->arraytype)
+               return 0;
+
+       if (desc->arraytype != ARRAYTYPE_OBJECT)
+               return 1;
        
        /* {both arrays are arrays of references} */
+
        if (desc->dimension == target->dimension) {
                /* an array which contains elements of interface types is allowed to be casted to Object (JOWENN)*/
                if ( (desc->elementvftbl->baseval<0) && (target->elementvftbl->baseval==1) ) return 1;
@@ -230,39 +465,38 @@ static s4 builtin_descriptorscompatible(arraydescriptor *desc,arraydescriptor *t
        if (desc->dimension < target->dimension) return 0;
 
        /* {desc has higher dimension than target} */
-       return builtin_isanysubclass_vftbl(pseudo_class_Arraystub_vftbl,target->elementvftbl);
+       return builtin_isanysubclass_vftbl(pseudo_class_Arraystub->vftbl, target->elementvftbl);
 }
 
 
-/******************** function: builtin_checkarraycast ***********************
+/* builtin_checkarraycast ******************************************************
 
-       Checks if an object is really a subtype of the requested array type.
-       The object has to be an array to begin with. For simple arrays (int, short,
-       double, etc.) the types have to match exactly.
-       For arrays of objects, the type of elements in the array has to be a
-       subtype (or the same type) of the requested element type. For arrays of
-       arrays (which in turn can again be arrays of arrays), the types at the
-       lowest level have to satisfy the corresponding sub class relation.
+   Checks if an object is really a subtype of the requested array
+   type.  The object has to be an array to begin with. For simple
+   arrays (int, short, double, etc.) the types have to match exactly.
+   For arrays of objects, the type of elements in the array has to be
+   a subtype (or the same type) of the requested element type. For
+   arrays of arrays (which in turn can again be arrays of arrays), the
+   types at the lowest level have to satisfy the corresponding sub
+   class relation.
        
-       Return value:  1 ... cast is possible
-                                  0 ... otherwise
-       
-       ATTENTION: a cast with a NULL pointer is always possible.
-                       
-*****************************************************************************/
+*******************************************************************************/
 
-s4 builtin_checkarraycast(java_objectheader *o, vftbl *target)
+s4 builtin_checkarraycast(java_objectheader *o, vftbl_t *target)
 {
        arraydescriptor *desc;
-       
-       if (!o) return 1;
-       if ((desc = o->vftbl->arraydesc) == NULL) return 0;
 
+       if (!o)
+               return 1;
+
+       if ((desc = o->vftbl->arraydesc) == NULL)
+               return 0;
        return builtin_descriptorscompatible(desc, target->arraydesc);
 }
 
 
-s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl *target)
+s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target)
 {
        if (!obj) return 1;
        return builtin_checkarraycast(obj, target);
@@ -273,46 +507,40 @@ s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl *target)
 
 ******************************************************************************/
 
-java_objectheader *builtin_throw_exception(java_objectheader *local_exceptionptr)
+java_objectheader *builtin_throw_exception(java_objectheader *xptr)
 {
-       if (verbose) {
+       if (opt_verbose) {
                char logtext[MAXLOGTEXT];
                sprintf(logtext, "Builtin exception thrown: ");
-               if (local_exceptionptr)
-                       utf_sprint(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name);
-               else {
-                       sprintf(logtext+strlen(logtext),"%s","Error: <Nullpointer instead of exception>");
-                       if (!proto_java_lang_ClassCastException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ClassCastException==0");
-                       if (!proto_java_lang_NullPointerException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NullPointerException==0");
-                       if (!proto_java_lang_NullPointerException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NullPointerException==0");
-                       if (!proto_java_lang_ArrayIndexOutOfBoundsException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArrayIndexOutOfBoundsException==0");
-                       if (!proto_java_lang_NegativeArraySizeException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_NegativeArraySizeException==0");
-                       if (!proto_java_lang_OutOfMemoryError) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_OutOfMemoryError==0");
-                       if (!proto_java_lang_ArithmeticException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArithmeticException==0");
-                       if (!proto_java_lang_ArrayStoreException) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ArrayStoreException==0");
-                       if (!proto_java_lang_ThreadDeath) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ThreadDeath==0");
-                       if (!proto_java_lang_ThreadDeath) sprintf(logtext+strlen(logtext),"%s","proto_java_lang_ThreadDeath==0");
+
+               if (xptr) {
+                       java_lang_Throwable *t = (java_lang_Throwable *) xptr;
+
+                       utf_sprint_classname(logtext + strlen(logtext),
+                                                                xptr->vftbl->class->name);
+
+                       if (t->detailMessage) {
+                               char *buf;
+
+                               buf = javastring_tochar((java_objectheader *) t->detailMessage);
+                               sprintf(logtext + strlen(logtext), ": %s", buf);
+                               MFREE(buf, char, strlen(buf));
                        }
+
+               } else {
+                       sprintf(logtext + strlen(logtext), "Error: <Nullpointer instead of exception>");
+               }
+
                log_text(logtext);
        }
-       *exceptionptr = local_exceptionptr;
-       return local_exceptionptr;
-}
 
-void builtin_reset_exceptionptr()
-{
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-       _exceptionptr = NULL;
-#else
-       ((nativethread*) pthread_getspecific(tkey_exceptionptr))->_exceptionptr = 0;
-#endif
-#else
-       panic("builtin_reset_exceptionptr should not be used in this configuration");
-#endif
+       *exceptionptr = xptr;
+
+       return xptr;
 }
 
 
+
 /******************* function: builtin_canstore *******************************
 
        Checks, if an object can be stored in an array.
@@ -325,10 +553,11 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 {
        arraydescriptor *desc;
        arraydescriptor *valuedesc;
-       vftbl *componentvftbl;
-       vftbl *valuevftbl;
+       vftbl_t *componentvftbl;
+       vftbl_t *valuevftbl;
     int dim_m1;
        int base;
+       castinfo classvalues;
        
        if (!o) return 1;
 
@@ -352,21 +581,15 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
                if (valuevftbl == componentvftbl)
                        return 1;
 
-               if ((base = componentvftbl->baseval) <= 0)
+               asm_getclassvalues_atomic(componentvftbl, valuevftbl, &classvalues);
+
+               if ((base = classvalues.super_baseval) <= 0)
                        /* an array of interface references */
                        return (valuevftbl->interfacetablelength > -base &&
                                        valuevftbl->interfacetable[base] != NULL);
                
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-               cast_lock();
-#endif
-
-               res = (unsigned)(valuevftbl->baseval - base)
-                       <= (unsigned)(componentvftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-               cast_unlock();
-#endif
+               res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+                       <= (unsigned) classvalues.super_diffval;
 
                return res;
     }
@@ -386,10 +609,11 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
 {
        arraydescriptor *desc;
-       vftbl *elementvftbl;
-       vftbl *valuevftbl;
-       int base;
+       vftbl_t *elementvftbl;
+       vftbl_t *valuevftbl;
        s4 res;
+       int base;
+       castinfo classvalues;
        
        if (!o) return 1;
 
@@ -410,21 +634,15 @@ s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
        if (valuevftbl == elementvftbl)
                return 1;
 
-       if ((base = elementvftbl->baseval) <= 0)
+       asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
+
+       if ((base = classvalues.super_baseval) <= 0)
                /* an array of interface references */
                return (valuevftbl->interfacetablelength > -base &&
                                valuevftbl->interfacetable[base] != NULL);
-       
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_lock();
-#endif
 
-       res = (unsigned)(valuevftbl->baseval - base)
-               <= (unsigned)(elementvftbl->diffval);
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_unlock();
-#endif
+       res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+               <= (unsigned) classvalues.super_diffval;
 
        return res;
 }
@@ -434,9 +652,10 @@ s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
  * one-dimensional array of a class type */
 s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o)
 {
-       vftbl *elementvftbl;
-       vftbl *valuevftbl;
+       vftbl_t *elementvftbl;
+       vftbl_t *valuevftbl;
        s4 res;
+       castinfo classvalues;
        
        if (!o) return 1;
 
@@ -457,295 +676,313 @@ s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o)
        if (valuevftbl == elementvftbl)
                return 1;
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_lock();
-#endif
-
-       res = (unsigned)(valuevftbl->baseval - elementvftbl->baseval)
-               <= (unsigned)(elementvftbl->diffval);
+       asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-       cast_unlock();
-#endif
+       res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+               <= (unsigned) classvalues.super_diffval;
 
        return res;
 }
 
 
-/******************** Function: builtin_new **********************************
+/* builtin_new *****************************************************************
 
-       Creates a new instance of class c on the heap.
-       Return value:  pointer to the object or NULL if no memory is
-                                  available
-                       
-*****************************************************************************/
+   Creates a new instance of class c on the heap.
 
-#define ALIGNMENT 3
-#define align_size(size)       ((size + ((1 << ALIGNMENT) - 1)) & ~((1 << ALIGNMENT) - 1))
+   Return value: pointer to the object or NULL if no memory is
+   available
+                       
+*******************************************************************************/
 
 java_objectheader *builtin_new(classinfo *c)
 {
        java_objectheader *o;
-/*DEBUGING - NOT THREAD SAFE*/
-/*     static long depth=0;
-       depth++;
-       printf("Entering builtin_new:depth(%ld)",depth);*/
+
+       /* is the class loaded */
+       /*utf_fprint(stderr,c->name);fprintf(stderr,"\n");*/
+       assert(c->loaded);
+
+       /* is the class linked */
+       if (!c->linked)
+               if (!link_class(c))
+                       return NULL;
 
        if (!c->initialized) {
-               if (initverbose) {
-                       char logtext[MAXLOGTEXT];
-                       sprintf(logtext, "Initialize class ");
-                       utf_sprint(logtext + strlen(logtext), c->name);
-                       sprintf(logtext + strlen(logtext), " (from builtin_new)");
-                       log_text(logtext);
-               }
-               class_init(c);
+               if (initverbose)
+                       log_message_class("Initialize class (from builtin_new): ", c);
+
+               if (!initialize_class(c))
+                       return NULL;
        }
 
-#ifdef SIZE_FROM_CLASSINFO
-       c->alignedsize = align_size(c->instancesize);
-       o = heap_allocate(c->alignedsize, true, c->finalizer);
-#else
        o = heap_allocate(c->instancesize, true, c->finalizer);
-#endif
-       if (!o) {
-               /*DEBUGING - NOT THREAD SAFE*/
-               /*printf("Leaving builtin_new: depth(%ld): NULL",depth);
-               depth--;*/
+
+       if (!o)
                return NULL;
-       }
-       
-       memset(o, 0, c->instancesize);
+
+       MSET(o, 0, u1, c->instancesize);
 
        o->vftbl = c->vftbl;
 
-       /*DEBUGING - NOT THREAD SAFE*/
-       /* printf("Leaving builtin_new: depth(%ld): object",depth);
-       depth--;*/
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock(o);
+#endif
+
        return o;
 }
 
-/********************** Function: builtin_newarray **************************
 
-       Creates an array with the given vftbl on the heap.
+/* builtin_newarray ************************************************************
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Creates an array with the given vftbl on the heap.
 
-    CAUTION: The given vftbl must be the vftbl of the *array* class,
-    not of the element class.
+   Return value: pointer to the array or NULL if no memory is available
 
-*****************************************************************************/
+   CAUTION: The given vftbl must be the vftbl of the *array* class,
+   not of the element class.
+
+*******************************************************************************/
 
-java_arrayheader *builtin_newarray(s4 size, vftbl *arrayvftbl)
+java_arrayheader *builtin_newarray(s4 size, vftbl_t *arrayvftbl)
 {
        java_arrayheader *a;
-       arraydescriptor *desc = arrayvftbl->arraydesc;
-       s4 dataoffset = desc->dataoffset;
-       s4 componentsize = desc->componentsize;
+       arraydescriptor *desc;
+       s4 dataoffset;
+       s4 componentsize;
        s4 actualsize;
 
-       if (size<0) {
-               *exceptionptr=native_new_and_init(loader_load(utf_new_char("java/lang/NegativeArraySizeException")));
+       desc = arrayvftbl->arraydesc;
+       dataoffset = desc->dataoffset;
+       componentsize = desc->componentsize;
+
+       if (size < 0) {
+               *exceptionptr = new_negativearraysizeexception();
                return NULL;
        }
-#ifdef SIZE_FROM_CLASSINFO
-       actualsize = align_size(dataoffset + size * componentsize);
-#else
+
        actualsize = dataoffset + size * componentsize;
-#endif
 
-       if (((u4)actualsize)<((u4)size)) { /* overflow */
-               *exceptionptr = native_new_and_init(loader_load(utf_new_char("java/lang/OutOfMemoryError")));
+       if (((u4) actualsize) < ((u4) size)) { /* overflow */
+               *exceptionptr = new_exception(string_java_lang_OutOfMemoryError);
                return NULL;
        }
-       a = heap_allocate(actualsize,
-                                         (desc->arraytype == ARRAYTYPE_OBJECT),
-                                         NULL);
 
-       if (!a) return NULL;
-       memset(a, 0, actualsize);
+       a = heap_allocate(actualsize, (desc->arraytype == ARRAYTYPE_OBJECT), NULL);
 
+       if (!a)
+               return NULL;
 
-       /*printf("builtin_newarray: Created an array of size : %d\n",size);*/
+       MSET(a, 0, u1, actualsize);
 
        a->objheader.vftbl = arrayvftbl;
-       a->size = size;
-#ifdef SIZE_FROM_CLASSINFO
-       a->alignedsize = actualsize;
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock(&a->objheader);
 #endif
 
+       a->size = size;
+
        return a;
 }
 
 
-/********************** Function: builtin_anewarray *************************
+/* builtin_anewarray ***********************************************************
 
-       Creates an array of references to the given class type on the heap.
+   Creates an array of references to the given class type on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-    XXX This function does not do The Right Thing, because it uses a
-    classinfo pointer at runtime. builtin_newarray should be used
-    instead.
-
-*****************************************************************************/
+*******************************************************************************/
 
 java_objectarray *builtin_anewarray(s4 size, classinfo *component)
 {
-/*
-       printf("builtin_anewarray: classvftbl: %d\n",component->classvftbl);
-       printf("builtin_anewarray: baseval: %d\n",component->vftbl->baseval);
-       utf_display(component->vftbl->class->name);
-       printf("\nbuiltin_anewarray: linked: %d\n",component->linked);
-       utf_display(component->super->name);*/
-       return (java_objectarray*) builtin_newarray(size, class_array_of(component)->vftbl);
+       classinfo *c;
+       
+       /* is class loaded */
+       assert(component->loaded);
+
+       /* is class linked */
+       if (!component->linked)
+               if (!link_class(component))
+                       return NULL;
+
+       c = class_array_of(component, true);
+
+       if (!c)
+               return NULL;
+
+       return (java_objectarray *) builtin_newarray(size, c->vftbl);
 }
 
 
-/******************** Function: builtin_newarray_int ***********************
+/* builtin_newarray_int ********************************************************
 
-       Creates an array of 32 bit Integers on the heap.
+   Creates an array of 32 bit Integers on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_intarray *builtin_newarray_int(s4 size)
 {
-       return (java_intarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_INT].arrayvftbl);
+       return (java_intarray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_INT].arrayvftbl);
 }
 
 
-/******************** Function: builtin_newarray_long ***********************
+/* builtin_newarray_long *******************************************************
 
-       Creates an array of 64 bit Integers on the heap.
+   Creates an array of 64 bit Integers on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_longarray *builtin_newarray_long(s4 size)
 {
-       return (java_longarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_LONG].arrayvftbl);
+       return (java_longarray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_LONG].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_float ***********************
+/* builtin_newarray_float ******************************************************
 
-       Creates an array of 32 bit IEEE floats on the heap.
+   Creates an array of 32 bit IEEE floats on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_floatarray *builtin_newarray_float(s4 size)
 {
-       return (java_floatarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_FLOAT].arrayvftbl);
+       return (java_floatarray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_FLOAT].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_double ***********************
+/* builtin_newarray_double *****************************************************
 
-       Creates an array of 64 bit IEEE floats on the heap.
+   Creates an array of 64 bit IEEE floats on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_doublearray *builtin_newarray_double(s4 size)
 {
-       return (java_doublearray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_DOUBLE].arrayvftbl);
+       return (java_doublearray *)
+               builtin_newarray(size,
+                                                primitivetype_table[ARRAYTYPE_DOUBLE].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_byte ***********************
+/* builtin_newarray_byte *******************************************************
 
-       Creates an array of 8 bit Integers on the heap.
+   Creates an array of 8 bit Integers on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_bytearray *builtin_newarray_byte(s4 size)
 {
-       return (java_bytearray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_BYTE].arrayvftbl);
+       return (java_bytearray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_BYTE].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_char ************************
+/* builtin_newarray_char *******************************************************
 
-       Creates an array of characters on the heap.
+   Creates an array of characters on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_chararray *builtin_newarray_char(s4 size)
 {
-       return (java_chararray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl);
+       return (java_chararray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_short ***********************
+/* builtin_newarray_short ******************************************************
 
-       Creates an array of 16 bit Integers on the heap.
+   Creates an array of 16 bit Integers on the heap.
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_shortarray *builtin_newarray_short(s4 size)
 {
-       return (java_shortarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_SHORT].arrayvftbl);
+       return (java_shortarray *)
+               builtin_newarray(size, primitivetype_table[ARRAYTYPE_SHORT].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_boolean ************************
+/* builtin_newarray_boolean ****************************************************
 
-       Creates an array of bytes on the heap. The array is designated as an array
-       of booleans (important for casts)
+   Creates an array of bytes on the heap. The array is designated as
+   an array of booleans (important for casts)
        
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_booleanarray *builtin_newarray_boolean(s4 size)
 {
-       return (java_booleanarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_BOOLEAN].arrayvftbl);
+       return (java_booleanarray *)
+               builtin_newarray(size,
+                                                primitivetype_table[ARRAYTYPE_BOOLEAN].arrayvftbl);
 }
 
 
-/**************** function: builtin_nmultianewarray ***************************
+/* builtin_multianewarray ******************************************************
 
-       Creates a multi-dimensional array on the heap. The dimensions are passed in
-       an array of longs.
+   Creates a multi-dimensional array on the heap. The dimensions are
+   passed in an array of longs.
 
-    Arguments:
-        n............number of dimensions to create
-        arrayvftbl...vftbl of the array class
-        dims.........array containing the size of each dimension to create
+   Arguments:
+       n............number of dimensions to create
+       arrayvftbl...vftbl of the array class
+       dims.........array containing the size of each dimension to create
 
-       Return value:  pointer to the array or NULL if no memory is available
+   Return value: pointer to the array or NULL if no memory is
+   available
 
 ******************************************************************************/
 
-       /* Helper functions */
-
-java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
+java_arrayheader *builtin_multianewarray(int n, vftbl_t *arrayvftbl, long *dims)
 {
-       int size, i;
+       s4 size, i;
        java_arrayheader *a;
-       vftbl *componentvftbl;
+       vftbl_t *componentvftbl;
 
        /* create this dimension */
-       size = (int) dims[0];
-       a = builtin_newarray(size,arrayvftbl);
-       if (!a) return NULL;
+
+       size = (s4) dims[0];
+       a = builtin_newarray(size, arrayvftbl);
+
+       if (!a)
+               return NULL;
 
        /* if this is the last dimension return */
-       if (!--n) return a;
+
+       if (!--n)
+               return a;
 
        /* get the vftbl of the components to create */
+
        componentvftbl = arrayvftbl->arraydesc->componentvftbl;
 
        /* The verifier guarantees this. */
@@ -753,11 +990,15 @@ java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
        /*      panic ("multianewarray with too many dimensions"); */
 
        /* create the component arrays */
+
        for (i = 0; i < size; i++) {
                java_arrayheader *ea = 
-                       builtin_nmultianewarray(n,componentvftbl,dims+1);
-               if (!ea) return NULL;
-               ((java_objectarray*)a)->data[i] = (java_objectheader *) ea;
+                       builtin_multianewarray(n, componentvftbl, dims + 1);
+
+               if (!ea)
+                       return NULL;
+               
+               ((java_objectarray *) a)->data[i] = (java_objectheader *) ea;
        }
 
        return a;
@@ -774,103 +1015,114 @@ java_arrayheader *builtin_nmultianewarray (int n, vftbl *arrayvftbl, long *dims)
 
 u4 methodindent = 0;
 
-java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr,
-                                                                                  methodinfo *method, int *pos, 
-                                                                                  int line,
-                                                                                  int noindent)
+java_objectheader *builtin_trace_exception(java_objectheader *xptr,
+                                                                                  methodinfo *m,
+                                                                                  void *pos,
+                                                                                  s4 line,
+                                                                                  s4 noindent)
 {
+       char logtext[MAXLOGTEXT];
+       
        if (!noindent) {
                if (methodindent)
                        methodindent--;
                else
                        log_text("WARNING: unmatched methodindent--");
        }
-       if (verbose || runverbose || verboseexception) {
-               if (_exceptionptr) {
-                       printf("Exception ");
-                       utf_display(_exceptionptr->vftbl->class->name);
+       if (opt_verbose || runverbose || verboseexception) {
+               if (xptr) {
+                       sprintf(logtext,"Exception ");
+                       utf_sprint_classname(logtext+strlen(logtext), xptr->vftbl->class->name);
 
                } else {
-                       printf("Some Throwable");
-/*
-                       printf("Error: <Nullpointer instead of exception>");
-                       if (!proto_java_lang_ClassCastException) printf("%s","proto_java_lang_ClassCastException==0");
-                       if (!proto_java_lang_NullPointerException) printf("%s","proto_java_lang_NullPointerException==0");
-                       if (!proto_java_lang_NullPointerException) printf("%s","proto_java_lang_NullPointerException==0");
-                       if (!proto_java_lang_ArrayIndexOutOfBoundsException) printf("%s","proto_java_lang_ArrayIndexOutOfBoundsException==0");
-                       if (!proto_java_lang_NegativeArraySizeException) printf("%s","proto_java_lang_NegativeArraySizeException==0");
-                       if (!proto_java_lang_OutOfMemoryError) printf("%s","proto_java_lang_OutOfMemoryError==0");
-                       if (!proto_java_lang_ArithmeticException) printf("%s","proto_java_lang_ArithmeticException==0");
-                       if (!proto_java_lang_ArrayStoreException) printf("%s","proto_java_lang_ArrayStoreException==0");
-                       if (!proto_java_lang_ThreadDeath) printf("%s","proto_java_lang_ThreadDeath==0");
-                       if (!proto_java_lang_ThreadDeath) printf("%s","proto_java_lang_ThreadDeath==0");
-                       */
+                       sprintf(logtext,"Some Throwable");
                }
-               printf(" thrown in ");
-
-               if (method) {
-                       utf_display_classname(method->class->name);
-                       printf(".");
-                       utf_display(method->name);
-                       if (method->flags & ACC_SYNCHRONIZED)
-                               printf("(SYNC");
-                       else
-                               printf("(NOSYNC");
-                       if (method->flags & ACC_NATIVE) {
-                               printf(",NATIVE");
-                               printf(")(%p) at position %p\n", method->entrypoint, pos);
+               sprintf(logtext+strlen(logtext), " thrown in ");
+
+               if (m) {
+                       utf_sprint_classname(logtext+strlen(logtext), m->class->name);
+                       sprintf(logtext+strlen(logtext), ".");
+                       utf_sprint(logtext+strlen(logtext), m->name);
+                       if (m->flags & ACC_SYNCHRONIZED) {
+                               sprintf(logtext+strlen(logtext), "(SYNC");
+
+                       } else{
+                               sprintf(logtext+strlen(logtext), "(NOSYNC");
+                       }
+
+                       if (m->flags & ACC_NATIVE) {
+                               sprintf(logtext+strlen(logtext), ",NATIVE");
+#if POINTERSIZE == 8
+                               sprintf(logtext+strlen(logtext), ")(0x%016lx) at position 0x%016lx\n", (ptrint) m->entrypoint, (ptrint) pos);
+#else
+                               sprintf(logtext+strlen(logtext), ")(0x%08x) at position 0x%08x\n", (ptrint) m->entrypoint, (ptrint) pos);
+#endif
+
                        } else {
-                               printf(")(%p) at position %p (",method->entrypoint,pos);
-                               if (method->class->sourcefile==NULL)
-                                       printf("<NO CLASSFILE INFORMATION>");
-                               else
-                                       utf_display(method->class->sourcefile);
-                               printf(":%d)\n",line);
+#if POINTERSIZE == 8
+                               sprintf(logtext+strlen(logtext), ")(0x%016lx) at position 0x%016lx (", (ptrint) m->entrypoint, (ptrint) pos);
+#else
+                               sprintf(logtext+strlen(logtext), ")(0x%08x) at position 0x%08x (", (ptrint) m->entrypoint, (ptrint) pos);
+#endif
+                               if (m->class->sourcefile == NULL) {
+                                       sprintf(logtext+strlen(logtext), "<NO CLASSFILE INFORMATION>");
+
+                               } else {
+                                       utf_sprint(logtext+strlen(logtext), m->class->sourcefile);
+                               }
+                               sprintf(logtext+strlen(logtext), ":%d)\n", line);
                        }
 
                } else
-                       printf("call_java_method\n");
-               fflush (stdout);
+                       sprintf(logtext+strlen(logtext), "call_java_method\n");
+
+               log_text(logtext);
        }
 
-       return _exceptionptr;
+       return xptr;
 }
 
 
 #ifdef TRACE_ARGS_NUM
-void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
-#if TRACE_ARGS_NUM > 6
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3,
+#if TRACE_ARGS_NUM >= 6
+                                               s8 a4, s8 a5,
+#endif
+#if TRACE_ARGS_NUM == 8
                                                s8 a6, s8 a7,
 #endif
-                                               methodinfo *method)
+                                               methodinfo *m)
 {
-       int i;
+       s4 i;
        char logtext[MAXLOGTEXT];
        for (i = 0; i < methodindent; i++)
                logtext[i] = '\t';
+       if (methodindent == 0) 
+               sprintf(logtext + methodindent, "1st_call: ");
+       else
+               sprintf(logtext + methodindent, "called: ");
 
-       sprintf(logtext + methodindent, "called: ");
-       utf_sprint(logtext + strlen(logtext), method->class->name);
+       utf_sprint_classname(logtext + strlen(logtext), m->class->name);
        sprintf(logtext + strlen(logtext), ".");
-       utf_sprint(logtext + strlen(logtext), method->name);
-       utf_sprint(logtext + strlen(logtext), method->descriptor);
-
-       if ( method->flags & ACC_PUBLIC )       sprintf (logtext + strlen(logtext)," PUBLIC");
-       if ( method->flags & ACC_PRIVATE )      sprintf (logtext + strlen(logtext)," PRIVATE");
-       if ( method->flags & ACC_PROTECTED )    sprintf (logtext + strlen(logtext)," PROTECTED");
-       if ( method->flags & ACC_STATIC )       sprintf (logtext + strlen(logtext)," STATIC");
-       if ( method->flags & ACC_FINAL )        sprintf (logtext + strlen(logtext)," FINAL");
-       if ( method->flags & ACC_SYNCHRONIZED ) sprintf (logtext + strlen(logtext)," SYNCHRONIZED");
-       if ( method->flags & ACC_VOLATILE )     sprintf (logtext + strlen(logtext)," VOLATILE");
-       if ( method->flags & ACC_TRANSIENT )    sprintf (logtext + strlen(logtext)," TRANSIENT");
-       if ( method->flags & ACC_NATIVE )       sprintf (logtext + strlen(logtext)," NATIVE");
-       if ( method->flags & ACC_INTERFACE )    sprintf (logtext + strlen(logtext)," INTERFACE");
-       if ( method->flags & ACC_ABSTRACT )     sprintf (logtext + strlen(logtext)," ABSTRACT");
+       utf_sprint(logtext + strlen(logtext), m->name);
+       utf_sprint(logtext + strlen(logtext), m->descriptor);
+
+       if (m->flags & ACC_PUBLIC)       sprintf(logtext + strlen(logtext), " PUBLIC");
+       if (m->flags & ACC_PRIVATE)      sprintf(logtext + strlen(logtext), " PRIVATE");
+       if (m->flags & ACC_PROTECTED)    sprintf(logtext + strlen(logtext), " PROTECTED");
+       if (m->flags & ACC_STATIC)       sprintf(logtext + strlen(logtext), " STATIC");
+       if (m->flags & ACC_FINAL)        sprintf(logtext + strlen(logtext), " FINAL");
+       if (m->flags & ACC_SYNCHRONIZED) sprintf(logtext + strlen(logtext), " SYNCHRONIZED");
+       if (m->flags & ACC_VOLATILE)     sprintf(logtext + strlen(logtext), " VOLATILE");
+       if (m->flags & ACC_TRANSIENT)    sprintf(logtext + strlen(logtext), " TRANSIENT");
+       if (m->flags & ACC_NATIVE)       sprintf(logtext + strlen(logtext), " NATIVE");
+       if (m->flags & ACC_INTERFACE)    sprintf(logtext + strlen(logtext), " INTERFACE");
+       if (m->flags & ACC_ABSTRACT)     sprintf(logtext + strlen(logtext), " ABSTRACT");
        
 
        sprintf(logtext + strlen(logtext), "(");
 
-       switch (method->paramcount) {
+       switch (m->paramcount) {
        case 0:
                break;
 
@@ -892,6 +1144,7 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
                                a0,   a1,   a2,   a3);
                break;
 
+#if TRACE_ARGS_NUM >= 6
        case 5:
                sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx",
                                a0,   a1,   a2,   a3,   a4);
@@ -901,8 +1154,9 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
                sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx",
                                a0,   a1,   a2,   a3,   a4,   a5);
                break;
+#endif /* TRACE_ARGS_NUM >= 6 */
 
-#if TRACE_ARGS_NUM > 6
+#if TRACE_ARGS_NUM == 8
        case 7:
                sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx",
                                a0,   a1,   a2,   a3,   a4,   a5,   a6);
@@ -915,15 +1169,15 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 
        default:
                sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
-                               a0,   a1,   a2,   a3,   a4,   a5,   a6,   a7,   method->paramcount - 8);
+                               a0,   a1,   a2,   a3,   a4,   a5,   a6,   a7,   m->paramcount - 8);
                break;
-#else
+#else /* TRACE_ARGS_NUM == 8 */
        default:
                sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
-                               a0,   a1,   a2,   a3,   a4,   a5,   method->paramcount - 6);
+                               a0,   a1,   a2,   a3,   a4,   a5,   m->paramcount - 6);
                break;
-#endif
-#else
+#endif /* TRACE_ARGS_NUM == 8 */
+#else /* defined(__I386__) || defined(__POWERPC__) */
        case 1:
                sprintf(logtext+strlen(logtext), "%lx", a0);
                break;
@@ -941,6 +1195,7 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
                                a0,  a1,  a2,  a3);
                break;
 
+#if TRACE_ARGS_NUM >= 6
        case 5:
                sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx",
                                a0,  a1,  a2,  a3,  a4);
@@ -950,8 +1205,9 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
                sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx",
                                a0,  a1,  a2,  a3,  a4,  a5);
                break;
+#endif /* TRACE_ARGS_NUM >= 6 */
 
-#if TRACE_ARGS_NUM > 6
+#if TRACE_ARGS_NUM == 8
        case 7:
                sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx",
                                a0,  a1,  a2,  a3,  a4,  a5,  a6);
@@ -961,18 +1217,23 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
                sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx",
                                a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7);
                break;
+#endif /* TRACE_ARGS_NUM == 8 */
 
        default:
-               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
-                               a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  method->paramcount - 8);
-               break;
-#else
-       default:
+#if TRACE_ARGS_NUM == 4
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, ...(%d)",
+                               a0,  a1,  a2,  a3,   m->paramcount - 4);
+
+#elif TRACE_ARGS_NUM == 6
                sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
-                               a0,  a1,  a2,  a3,  a4,  a5,   method->paramcount - 6);
-               break;
-#endif
+                               a0,  a1,  a2,  a3,  a4,  a5,  m->paramcount - 6);
+
+#elif TRACE_ARGS_NUM == 8
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
+                               a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  m->paramcount - 8);
 #endif
+               break;
+#endif /* defined(__I386__) || defined(__POWERPC__) */
        }
 
        sprintf(logtext + strlen(logtext), ")");
@@ -983,34 +1244,34 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 #endif
 
 
-void builtin_displaymethodstart(methodinfo *method)
+void builtin_displaymethodstart(methodinfo *m)
 {
        char logtext[MAXLOGTEXT];
        sprintf(logtext, "                                                                                              ");
        sprintf(logtext + methodindent, "called: ");
-       utf_sprint(logtext + strlen(logtext), method->class->name);
+       utf_sprint(logtext + strlen(logtext), m->class->name);
        sprintf(logtext + strlen(logtext), ".");
-       utf_sprint(logtext + strlen(logtext), method->name);
-       utf_sprint(logtext + strlen(logtext), method->descriptor);
-
-       if ( method->flags & ACC_PUBLIC )       sprintf (logtext + strlen(logtext)," PUBLIC");
-       if ( method->flags & ACC_PRIVATE )      sprintf (logtext + strlen(logtext)," PRIVATE");
-       if ( method->flags & ACC_PROTECTED )    sprintf (logtext + strlen(logtext)," PROTECTED");
-       if ( method->flags & ACC_STATIC )       sprintf (logtext + strlen(logtext)," STATIC");
-       if ( method->flags & ACC_FINAL )        sprintf (logtext + strlen(logtext)," FINAL");
-       if ( method->flags & ACC_SYNCHRONIZED ) sprintf (logtext + strlen(logtext)," SYNCHRONIZED");
-       if ( method->flags & ACC_VOLATILE )     sprintf (logtext + strlen(logtext)," VOLATILE");
-       if ( method->flags & ACC_TRANSIENT )    sprintf (logtext + strlen(logtext)," TRANSIENT");
-       if ( method->flags & ACC_NATIVE )       sprintf (logtext + strlen(logtext)," NATIVE");
-       if ( method->flags & ACC_INTERFACE )    sprintf (logtext + strlen(logtext)," INTERFACE");
-       if ( method->flags & ACC_ABSTRACT )     sprintf (logtext + strlen(logtext)," ABSTRACT");
+       utf_sprint(logtext + strlen(logtext), m->name);
+       utf_sprint(logtext + strlen(logtext), m->descriptor);
+
+       if (m->flags & ACC_PUBLIC)       sprintf(logtext + strlen(logtext), " PUBLIC");
+       if (m->flags & ACC_PRIVATE)      sprintf(logtext + strlen(logtext), " PRIVATE");
+       if (m->flags & ACC_PROTECTED)    sprintf(logtext + strlen(logtext), " PROTECTED");
+       if (m->flags & ACC_STATIC)       sprintf(logtext + strlen(logtext), " STATIC");
+       if (m->flags & ACC_FINAL)        sprintf(logtext + strlen(logtext), " FINAL");
+       if (m->flags & ACC_SYNCHRONIZED) sprintf(logtext + strlen(logtext), " SYNCHRONIZED");
+       if (m->flags & ACC_VOLATILE)     sprintf(logtext + strlen(logtext), " VOLATILE");
+       if (m->flags & ACC_TRANSIENT)    sprintf(logtext + strlen(logtext), " TRANSIENT");
+       if (m->flags & ACC_NATIVE)       sprintf(logtext + strlen(logtext), " NATIVE");
+       if (m->flags & ACC_INTERFACE)    sprintf(logtext + strlen(logtext), " INTERFACE");
+       if (m->flags & ACC_ABSTRACT)     sprintf(logtext + strlen(logtext), " ABSTRACT");
 
        log_text(logtext);
        methodindent++;
 }
 
 
-void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
+void builtin_displaymethodstop(methodinfo *m, s8 l, double d, float f)
 {
        int i;
        char logtext[MAXLOGTEXT];
@@ -1022,12 +1283,12 @@ void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
                log_text("WARNING: unmatched methodindent--");
 
        sprintf(logtext + methodindent, "finished: ");
-       utf_sprint(logtext + strlen(logtext), method->class->name);
+       utf_sprint_classname(logtext + strlen(logtext), m->class->name);
        sprintf(logtext + strlen(logtext), ".");
-       utf_sprint(logtext + strlen(logtext), method->name);
-       utf_sprint(logtext + strlen(logtext), method->descriptor);
+       utf_sprint(logtext + strlen(logtext), m->name);
+       utf_sprint(logtext + strlen(logtext), m->descriptor);
 
-       switch (method->returntype) {
+       switch (m->returntype) {
        case TYPE_INT:
                sprintf(logtext + strlen(logtext), "->%d", (s4) l);
                break;
@@ -1060,31 +1321,16 @@ void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
 }
 
 
-void builtin_displaymethodexception(methodinfo *method)
-{
-       int i;
-       char logtext[MAXLOGTEXT];
-       for (i = 0; i < methodindent; i++)
-               logtext[i] = '\t';
-       sprintf(logtext + methodindent, "exception abort: ");
-       utf_sprint(logtext + strlen(logtext), method->class->name);
-       sprintf(logtext + strlen(logtext), ".");
-       utf_sprint(logtext + strlen(logtext), method->name);
-       utf_sprint(logtext + strlen(logtext), method->descriptor);
-       log_text(logtext);
-}
-
-
 /****************************************************************************
                         SYNCHRONIZATION FUNCTIONS
 *****************************************************************************/
 
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
 /*
  * Lock the mutex of an object.
  */
 void internal_lock_mutex_for_object(java_objectheader *object)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        mutexHashEntry *entry;
        int hashValue;
 
@@ -1125,16 +1371,16 @@ void internal_lock_mutex_for_object(java_objectheader *object)
                entry->object = object;
        
        internal_lock_mutex(&entry->mutex);
-#endif
 }
+#endif
 
 
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
 /*
  * Unlocks the mutex of an object.
  */
 void internal_unlock_mutex_for_object (java_objectheader *object)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        int hashValue;
        mutexHashEntry *entry;
 
@@ -1160,19 +1406,16 @@ void internal_unlock_mutex_for_object (java_objectheader *object)
                        firstFreeOverflowEntry = unlinked;
                }
        }
-#endif
 }
+#endif
 
 
+#if defined(USE_THREADS)
 void builtin_monitorenter(java_objectheader *o)
 {
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+#if !defined(NATIVE_THREADS)
        int hashValue;
 
-       /*log_text("Monitor enter");*/
-
-       assert(blockInts == 0);
-
        ++blockInts;
 
        hashValue = MUTEX_HASH_VALUE(o);
@@ -1183,21 +1426,33 @@ void builtin_monitorenter(java_objectheader *o)
                internal_lock_mutex_for_object(o);
 
        --blockInts;
-
-       assert(blockInts == 0);
+#else
+       monitorEnter((threadobject *) THREADOBJECT, o);
 #endif
 }
+#endif
 
 
-void builtin_monitorexit (java_objectheader *o)
+#if defined(USE_THREADS)
+/*
+ * Locks the class object - needed for static synchronized methods.
+ * The use_class_as_object call is needed in order to circumvent a
+ * possible deadlock with builtin_monitorenter called by another
+ * thread calling use_class_as_object.
+ */
+void builtin_staticmonitorenter(classinfo *c)
 {
+       use_class_as_object(c);
+       builtin_monitorenter(&c->header);
+}
+#endif
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       int hashValue;
-
-       /* log_text("Monitor leave"); */
 
-       assert(blockInts == 0);
+#if defined(USE_THREADS)
+void builtin_monitorexit(java_objectheader *o)
+{
+#if !defined(NATIVE_THREADS)
+       int hashValue;
 
        ++blockInts;
 
@@ -1213,10 +1468,11 @@ void builtin_monitorexit (java_objectheader *o)
                internal_unlock_mutex_for_object(o);
 
        --blockInts;
-
-       assert(blockInts == 0);
+#else
+       monitorExit((threadobject *) THREADOBJECT, o);
 #endif
 }
+#endif
 
 
 /*****************************************************************************
@@ -1811,9 +2067,11 @@ inline float longBitsToDouble(s8 l)
 
 java_arrayheader *builtin_clone_array(void *env, java_arrayheader *o)
 {
-       return (java_arrayheader *) Java_java_lang_VMObject_clone(0, 0, (java_lang_Cloneable *) o);
+       return (java_arrayheader *)
+               Java_java_lang_VMObject_clone(0, 0, (java_lang_Cloneable *) o);
 }
 
+
 s4 builtin_dummy()
 {
        panic("Internal error: builtin_dummy called (native function is missing)");
@@ -1821,24 +2079,37 @@ s4 builtin_dummy()
 }
 
 
-inline methodinfo *builtin_asm_get_threadrootmethod() {
-        return *threadrootmethod;
+/* builtin_asm_get_exceptionptrptr *********************************************
+
+   this is a wrapper for calls from asmpart
+
+*******************************************************************************/
+
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+java_objectheader **builtin_asm_get_exceptionptrptr()
+{
+       return builtin_get_exceptionptrptr();
+}
+#endif
+
+
+methodinfo *builtin_asm_get_threadrootmethod()
+{
+       return *threadrootmethod;
 }
 
 
-inline void* 
-builtin_asm_get_stackframeinfo(){
+inline void* builtin_asm_get_stackframeinfo()
+{
 /*log_text("builtin_asm_get_stackframeinfo()");*/
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-#ifdef HAVE___THREAD
-        return &_thread_nativestackframeinfo; /*support for __thread attribute*/
-#else
-    return &((nativethread*) pthread_getspecific(tkey_stackframeinfo))->_stackframeinfo /*copied from exception handling, is that really */
-        /*old pthread*/
-#endif
+       /*printf("stackframeinfo: %p,%p\n",&THREADINFO->_stackframeinfo,*(&THREADINFO->_stackframeinfo));*/
+       return &THREADINFO->_stackframeinfo;
 #else
+#if defined(__GNUC__)
 #warning FIXME FOR OLD THREAD IMPL (jowenn)
-        return &_thread_nativestackframeinfo; /* no threading, at least no native*/
+#endif
+               return &_thread_nativestackframeinfo; /* no threading, at least no native*/
 #endif
 }
 
@@ -1847,10 +2118,16 @@ stacktraceelement *builtin_stacktrace_copy(stacktraceelement **el,stacktraceelem
        size_t s;
        s=(end-begin);
        /*printf ("begin: %p, end: %p, diff: %ld, size :%ld\n",begin,end,s,s*sizeof(stacktraceelement));*/
-       *el=GCNEW(stacktraceelement,s+1);
+       *el=heap_allocate(sizeof(stacktraceelement)*(s+1), true, 0);
+#if 0
+       *el=MNEW(stacktraceelement,s+1); /*GC*/
+#endif
        memcpy(*el,begin,(end-begin)*sizeof(stacktraceelement));
        (*el)[s].method=0;
-       (*el)[s].linenumber=0;
+#if defined(__GNUC__)
+#warning change this if line numbers bigger than u2 are allowed, the currently supported class file format does no allow that
+#endif
+       (*el)[s].linenumber=-1; /* -1 can never be reched otherwise, since line numbers are only u2, so it is save to use that as flag */
        return *el;
 }