GNU header update.
[cacao.git] / src / vm / builtin.c
index 2c4f6b8b7ffc506d491627192ba745b2cd9f96eb..bdbd2d7df38fa2867ec6435811a16ebb68740ac7 100644 (file)
-/****************************** builtin.c **************************************
+/* vm/builtin.c - functions for unsupported operations
 
-       Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst
+   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
 
-       See file COPYRIGHT for information on usage and disclaimer of warranties
+   This file is part of CACAO.
 
-       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.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
 
-       Authors: Reinhard Grafl          EMAIL: cacao@complang.tuwien.ac.at
-                        Andreas  Krall          EMAIL: cacao@complang.tuwien.ac.at
-                        Mark Probst             EMAIL: cacao@complang.tuwien.ac.at
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
 
-       Last Change: 2003/02/12
+   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.
 
-*******************************************************************************/
+   Contact: cacao@complang.tuwien.ac.at
 
-#include <assert.h>
+   Authors: Reinhard Grafl
+            Andreas Krall
+            Mark Probst
 
-#include "global.h"
-#include "builtin.h"
+   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.
 
-#include "loader.h"
-#include "tables.h"
+   $Id: builtin.c 1735 2004-12-07 14:33:27Z twisti $
 
-#include "threads/thread.h"
-#include "threads/locks.h"                             /* schani */
+*/
 
-#include "native-math.h"
 
-builtin_descriptor builtin_desc[] = {
-       {(functionptr) builtin_instanceof,                 "instanceof"},
-       {(functionptr) builtin_checkcast,                  "checkcast"},
-       {(functionptr) asm_builtin_checkcast,      "checkcast"},
-       {(functionptr) builtin_arrayinstanceof,    "arrayinstanceof"},
-#if defined(__I386__)
-       {(functionptr) asm_builtin_arrayinstanceof,"arrayinstanceof"},
-#endif
-       {(functionptr) builtin_checkarraycast,     "checkarraycast"},
-       {(functionptr) asm_builtin_checkarraycast, "checkarraycast"},
-       {(functionptr) asm_builtin_aastore,                "aastore"},
-       {(functionptr) builtin_new,                                "new"},
-       {(functionptr) builtin_anewarray,          "anewarray"},
-       {(functionptr) builtin_newarray_array,     "newarray_array"},
-#if defined(__I386__)
-       /*
-        * have 2 parameters (needs stack manipulation)
-        */
-       {(functionptr) asm_builtin_anewarray,      "anewarray"},
-       {(functionptr) asm_builtin_newarray_array, "newarray_array"},
-#endif
-       {(functionptr) builtin_newarray_boolean,   "newarray_boolean"},
-       {(functionptr) builtin_newarray_char,      "newarray_char"},
-       {(functionptr) builtin_newarray_float,     "newarray_float"},
-       {(functionptr) builtin_newarray_double,    "newarray_double"},
-       {(functionptr) builtin_newarray_byte,      "newarray_byte"},
-       {(functionptr) builtin_newarray_short,     "newarray_short"},
-       {(functionptr) builtin_newarray_int,       "newarray_int"},
-       {(functionptr) builtin_newarray_long,      "newarray_long"},
-       {(functionptr) builtin_displaymethodstart, "displaymethodstart"},
-       {(functionptr) builtin_displaymethodstop,  "displaymethodstop"},
-       {(functionptr) builtin_monitorenter,       "monitorenter"},
-       {(functionptr) asm_builtin_monitorenter,   "monitorenter"},
-       {(functionptr) builtin_monitorexit,                "monitorexit"},
-       {(functionptr) asm_builtin_monitorexit,    "monitorexit"},
-#if !SUPPORT_DIVISION
-       {(functionptr) builtin_idiv,                       "idiv"},
-       {(functionptr) asm_builtin_idiv,                   "idiv"},
-       {(functionptr) builtin_irem,                       "irem"},
-       {(functionptr) asm_builtin_irem,                   "irem"},
-#endif
-       {(functionptr) builtin_ladd,                       "ladd"},
-       {(functionptr) builtin_lsub,                       "lsub"},
-       {(functionptr) builtin_lmul,                       "lmul"},
-#if !(SUPPORT_DIVISION && SUPPORT_LONG && SUPPORT_LONG_MULDIV)
-       {(functionptr) builtin_ldiv,                       "ldiv"},
-       {(functionptr) asm_builtin_ldiv,                   "ldiv"},
-       {(functionptr) builtin_lrem,                       "lrem"},
-       {(functionptr) asm_builtin_lrem,                   "lrem"},
+#include <assert.h>
+#include <string.h>
+#include <math.h>
+
+#include "mm/boehm.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
-       {(functionptr) builtin_lshl,                       "lshl"},
-       {(functionptr) builtin_lshr,                       "lshr"},
-       {(functionptr) builtin_lushr,                      "lushr"},
-       {(functionptr) builtin_land,                       "land"},
-       {(functionptr) builtin_lor,                                "lor"},
-       {(functionptr) builtin_lxor,                       "lxor"},
-       {(functionptr) builtin_lneg,                       "lneg"},
-       {(functionptr) builtin_lcmp,                       "lcmp"},
-       {(functionptr) builtin_fadd,                       "fadd"},
-       {(functionptr) builtin_fsub,                       "fsub"},
-       {(functionptr) builtin_fmul,                       "fmul"},
-       {(functionptr) builtin_fdiv,                       "fdiv"},
-       {(functionptr) builtin_frem,                       "frem"},
-       {(functionptr) builtin_fneg,                       "fneg"},
-       {(functionptr) builtin_fcmpl,                      "fcmpl"},
-       {(functionptr) builtin_fcmpg,                      "fcmpg"},
-       {(functionptr) builtin_dadd,                       "dadd"},
-       {(functionptr) builtin_dsub,                       "dsub"},
-       {(functionptr) builtin_dmul,                       "dmul"},
-       {(functionptr) builtin_ddiv,                       "ddiv"},
-       {(functionptr) builtin_drem,                       "drem"},
-       {(functionptr) builtin_dneg,                       "dneg"},
-       {(functionptr) builtin_dcmpl,                      "dcmpl"},
-       {(functionptr) builtin_dcmpg,                      "dcmpg"},
-       {(functionptr) builtin_i2l,                                "i2l"},
-       {(functionptr) builtin_i2f,                                "i2f"},
-       {(functionptr) builtin_i2d,                                "i2d"},
-       {(functionptr) builtin_l2i,                                "l2i"},
-       {(functionptr) builtin_l2f,                                "l2f"},
-       {(functionptr) builtin_l2d,                                "l2d"},
-       {(functionptr) builtin_f2i,                                "f2i"},
-       {(functionptr) asm_builtin_f2i,                    "f2i"},
-       {(functionptr) builtin_f2l,                                "f2l"},
-       {(functionptr) asm_builtin_f2l,                    "f2l"},
-       {(functionptr) builtin_f2d,                                "f2d"},
-       {(functionptr) builtin_d2i,                                "d2i"},
-       {(functionptr) asm_builtin_d2i,                    "d2i"},
-       {(functionptr) builtin_d2l,                                "d2l"},
-       {(functionptr) asm_builtin_d2l,                    "d2l"},
-       {(functionptr) builtin_d2f,                                "d2f"},
-       {(functionptr) NULL,                                       "unknown"}
-       };
+
+#include "toolbox/logging.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
 
 
+#undef DEBUG /*define DEBUG 1*/
+
+THREADSPECIFIC methodinfo* _threadrootmethod = NULL;
+THREADSPECIFIC void *_thread_nativestackframeinfo=NULL;
+
 /*****************************************************************************
                                                                TYPE CHECKS
 *****************************************************************************/
@@ -138,25 +87,69 @@ builtin_descriptor builtin_desc[] = {
                                   0 ... otherwise
                                        
 *****************************************************************************/                                 
-
-s4 builtin_isanysubclass (classinfo *sub, classinfo *super)
+s4 builtin_isanysubclass(classinfo *sub, classinfo *super)
 { 
+       s4 res;
+       castinfo classvalues;
+
+       /*classinfo *tmp;*/
        if (super->flags & ACC_INTERFACE)
                return (sub->vftbl->interfacetablelength > super->index) &&
-                          (sub->vftbl->interfacetable[-super->index] != NULL);
+                       (sub->vftbl->interfacetable[-super->index] != NULL);
 
        /*
-       while (sub != 0)
-               if (sub == super)
-                       return 1;
-               else
-                       sub = sub->super;
+         while (sub != 0)
+         if (sub == super)
+         return 1;
+         else
+         sub = sub->super;
 
-       return 0;
+         return 0;
        */
 
-       return (unsigned) (sub->vftbl->baseval - super->vftbl->baseval) <=
-                  (unsigned) (super->vftbl->diffval);
+/*
+       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); */
+
+       asm_getclassvalues_atomic(super->vftbl, sub->vftbl, &classvalues);
+
+       res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval) <=
+               (unsigned) classvalues.super_diffval;
+
+       return res;
+}
+
+s4 builtin_isanysubclass_vftbl(vftbl_t *sub,vftbl_t *super)
+{
+       s4 res;
+       int base;
+       castinfo classvalues;
+       
+       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) (classvalues.sub_baseval - classvalues.super_baseval)
+                       <= (unsigned) classvalues.super_diffval;
+
+       return res;
 }
 
 
@@ -170,12 +163,12 @@ s4 builtin_isanysubclass (classinfo *sub, classinfo *super)
                         
 *****************************************************************************/
 
+/* XXX should use vftbl */
 s4 builtin_instanceof(java_objectheader *obj, classinfo *class)
 {
-       #ifdef DEBUG
+#ifdef DEBUG
        log_text ("builtin_instanceof called");
-       #endif
-       
+#endif 
        if (!obj) return 0;
        return builtin_isanysubclass (obj->vftbl->class, class);
 }
@@ -189,23 +182,24 @@ s4 builtin_instanceof(java_objectheader *obj, classinfo *class)
                          
 ****************************************************************************/
 
+/* XXX should use vftbl */
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class)
 {
 #ifdef DEBUG
-       log_text ("builtin_checkcast called");
+       log_text("builtin_checkcast called");
 #endif
 
        if (obj == NULL)
                return 1;
-       if (builtin_isanysubclass (obj->vftbl->class, class))
+       if (builtin_isanysubclass(obj->vftbl->class, class))
                return 1;
 
 #if DEBUG
-       printf ("#### checkcast failed ");
-       utf_display (obj->vftbl->class->name);
-       printf (" -> ");
-       utf_display (class->name);
-       printf ("\n");
+       printf("#### checkcast failed ");
+       utf_display(obj->vftbl->class->name);
+       printf(" -> ");
+       utf_display(class->name);
+       printf("\n");
 #endif
 
        return 0;
@@ -220,20 +214,23 @@ s4 builtin_checkcast(java_objectheader *obj, classinfo *class)
                        
 ******************************************************************************/
 
-static s4 builtin_descriptorscompatible(constant_arraydescriptor *desc, constant_arraydescriptor *target)
+static s4 builtin_descriptorscompatible(arraydescriptor *desc,arraydescriptor *target)
 {
        if (desc==target) return 1;
        if (desc->arraytype != target->arraytype) return 0;
-       switch (target->arraytype) {
-               case ARRAYTYPE_OBJECT: 
-                       return builtin_isanysubclass (desc->objectclass, target->objectclass);
-               case ARRAYTYPE_ARRAY:
-                       return builtin_descriptorscompatible 
-                         (desc->elementdescriptor, target->elementdescriptor);
-               default: return 1;
-               }
-}
+       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;
+               return builtin_isanysubclass_vftbl(desc->elementvftbl,target->elementvftbl);
+       }
+       if (desc->dimension < target->dimension) return 0;
 
+       /* {desc has higher dimension than target} */
+       return builtin_isanysubclass_vftbl(pseudo_class_Arraystub_vftbl,target->elementvftbl);
+}
 
 
 /******************** function: builtin_checkarraycast ***********************
@@ -253,57 +250,21 @@ static s4 builtin_descriptorscompatible(constant_arraydescriptor *desc, constant
                        
 *****************************************************************************/
 
-s4 builtin_checkarraycast(java_objectheader *o, constant_arraydescriptor *desc)
+s4 builtin_checkarraycast(java_objectheader *o, vftbl_t *target)
 {
-       java_arrayheader *a = (java_arrayheader*) o;
-
-       if (!o) return 1;
-       if (o->vftbl->class != class_array) {
-#ifdef DEBUG
-               printf ("#### checkarraycast failed 1\n");
-#endif
-               return 0;
-               }
-               
-       if (a->arraytype != desc->arraytype) {
-#ifdef DEBUG
-               printf ("#### checkarraycast failed 2\n");
-#endif
-               return 0;
-               }
+       arraydescriptor *desc;
        
-       switch (a->arraytype) {
-               case ARRAYTYPE_OBJECT: {
-                       java_objectarray *oa = (java_objectarray*) o;
-                       int result = builtin_isanysubclass (oa->elementtype, desc->objectclass);
-
-#ifdef DEBUG
-                       if (!result)
-                               printf ("#### checkarraycast failed 3\n");
-#endif
-                       return result;
-                       }
-               case ARRAYTYPE_ARRAY: {
-                       java_arrayarray *aa = (java_arrayarray*) o;
-                       int result = builtin_descriptorscompatible
-                               (aa->elementdescriptor, desc->elementdescriptor);
+       if (!o) return 1;
+       if ((desc = o->vftbl->arraydesc) == NULL) return 0;
 
-#ifdef DEBUG
-                       if (!result)
-                               printf ("#### checkarraycast failed 4\n");
-#endif
-                       return result;
-                       }
-               default:   
-                       return 1;
-               }
+       return builtin_descriptorscompatible(desc, target->arraydesc);
 }
 
 
-s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *desc)
+s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target)
 {
        if (!obj) return 1;
-       return builtin_checkarraycast (obj, desc);
+       return builtin_checkarraycast(obj, target);
 }
 
 
@@ -311,17 +272,35 @@ s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *des
 
 ******************************************************************************/
 
-java_objectheader *builtin_throw_exception (java_objectheader *local_exceptionptr) {
-       if (verbose) {
+java_objectheader *builtin_throw_exception(java_objectheader *xptr)
+{
+       if (opt_verbose) {
+               char logtext[MAXLOGTEXT];
                sprintf(logtext, "Builtin exception thrown: ");
-               utf_sprint(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name);
-               dolog();
+               if (xptr) {
+                       java_lang_Throwable *t = (java_lang_Throwable *) xptr;
+
+                       utf_sprint_classname(logtext + strlen(logtext),
+                                                                xptr->vftbl->class->name);
+
+                       if (t->detailMessage) {
+                               sprintf(logtext + strlen(logtext), ": %s",
+                                               javastring_tochar((java_objectheader *) t->detailMessage));
+                       }
+
+               } else {
+                       sprintf(logtext + strlen(logtext), "Error: <Nullpointer instead of exception>");
                }
-       exceptionptr = local_exceptionptr;
-       return local_exceptionptr;
+               log_text(logtext);
+       }
+
+       *exceptionptr = xptr;
+
+       return xptr;
 }
 
 
+
 /******************* function: builtin_canstore *******************************
 
        Checks, if an object can be stored in an array.
@@ -330,39 +309,140 @@ java_objectheader *builtin_throw_exception (java_objectheader *local_exceptionpt
 
 ******************************************************************************/
 
-
 s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 {
+       arraydescriptor *desc;
+       arraydescriptor *valuedesc;
+       vftbl_t *componentvftbl;
+       vftbl_t *valuevftbl;
+    int dim_m1;
+       int base;
+       castinfo classvalues;
+       
        if (!o) return 1;
+
+       /* The following is guaranteed (by verifier checks):
+        *
+        *     *) a->...vftbl->arraydesc != NULL
+        *     *) a->...vftbl->arraydesc->componentvftbl != NULL
+        *     *) o->vftbl is not an interface vftbl
+        */
        
-       switch (a->header.arraytype) {
-       case ARRAYTYPE_OBJECT:
-               if ( ! builtin_checkcast (o, a->elementtype) ) {
-                       return 0;
-                       }
-               return 1;
-               break;
+       desc = a->header.objheader.vftbl->arraydesc;
+    componentvftbl = desc->componentvftbl;
+       valuevftbl = o->vftbl;
 
-       case ARRAYTYPE_ARRAY:
-               if ( ! builtin_checkarraycast 
-                                (o, ((java_arrayarray*)a)->elementdescriptor) ) {
-                       return 0;
-                       }
-               return 1;
-               break;
+    if ((dim_m1 = desc->dimension - 1) == 0) {
+               s4 res;
 
-       default:
-               panic ("builtin_canstore called with invalid arraytype");
+               /* {a is a one-dimensional array} */
+               /* {a is an array of references} */
+               
+               if (valuevftbl == componentvftbl)
+                       return 1;
+
+               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);
+               
+               res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+                       <= (unsigned) classvalues.super_diffval;
+
+               return res;
+    }
+    /* {a has dimension > 1} */
+       /* {componentvftbl->arraydesc != NULL} */
+
+       /* check if o is an array */
+       if ((valuedesc = valuevftbl->arraydesc) == NULL)
                return 0;
-       }
+       /* {o is an array} */
+
+       return builtin_descriptorscompatible(valuedesc,componentvftbl->arraydesc);
 }
 
 
+/* This is an optimized version where a is guaranteed to be one-dimensional */
+s4 builtin_canstore_onedim (java_objectarray *a, java_objectheader *o)
+{
+       arraydescriptor *desc;
+       vftbl_t *elementvftbl;
+       vftbl_t *valuevftbl;
+       s4 res;
+       int base;
+       castinfo classvalues;
+       
+       if (!o) return 1;
 
-/*****************************************************************************
-                                                 ARRAY OPERATIONS
-*****************************************************************************/
+       /* The following is guaranteed (by verifier checks):
+        *
+        *     *) a->...vftbl->arraydesc != NULL
+        *     *) a->...vftbl->arraydesc->elementvftbl != NULL
+        *     *) a->...vftbl->arraydesc->dimension == 1
+        *     *) o->vftbl is not an interface vftbl
+        */
+
+       desc = a->header.objheader.vftbl->arraydesc;
+    elementvftbl = desc->elementvftbl;
+       valuevftbl = o->vftbl;
+
+       /* {a is a one-dimensional array} */
+       
+       if (valuevftbl == elementvftbl)
+               return 1;
+
+       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);
+
+       res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+               <= (unsigned) classvalues.super_diffval;
+
+       return res;
+}
+
+
+/* This is an optimized version where a is guaranteed to be a
+ * one-dimensional array of a class type */
+s4 builtin_canstore_onedim_class(java_objectarray *a, java_objectheader *o)
+{
+       vftbl_t *elementvftbl;
+       vftbl_t *valuevftbl;
+       s4 res;
+       castinfo classvalues;
+       
+       if (!o) return 1;
+
+       /* The following is guaranteed (by verifier checks):
+        *
+        *     *) a->...vftbl->arraydesc != NULL
+        *     *) a->...vftbl->arraydesc->elementvftbl != NULL
+        *     *) a->...vftbl->arraydesc->elementvftbl is not an interface vftbl
+        *     *) a->...vftbl->arraydesc->dimension == 1
+        *     *) o->vftbl is not an interface vftbl
+        */
+
+    elementvftbl = a->header.objheader.vftbl->arraydesc->elementvftbl;
+       valuevftbl = o->vftbl;
+
+       /* {a is a one-dimensional array} */
+       
+       if (valuevftbl == elementvftbl)
+               return 1;
+
+       asm_getclassvalues_atomic(elementvftbl, valuevftbl, &classvalues);
+
+       res = (unsigned) (classvalues.sub_baseval - classvalues.super_baseval)
+               <= (unsigned) classvalues.super_diffval;
+
+       return res;
+}
 
 
 /******************** Function: builtin_new **********************************
@@ -380,7 +460,23 @@ java_objectheader *builtin_new(classinfo *c)
 {
        java_objectheader *o;
 
-       class_init(c);
+       /* is the class loaded */
+       if (!c->loaded)
+               if (!class_load(c))
+                       return NULL;
+
+       /* is the class linked */
+       if (!c->linked)
+               if (!class_link(c))
+                       return NULL;
+
+       if (!c->initialized) {
+               if (initverbose)
+                       log_message_class("Initialize class (from builtin_new): ", c);
+
+               if (!class_init(c))
+                       return NULL;
+       }
 
 #ifdef SIZE_FROM_CLASSINFO
        c->alignedsize = align_size(c->instancesize);
@@ -388,244 +484,137 @@ java_objectheader *builtin_new(classinfo *c)
 #else
        o = heap_allocate(c->instancesize, true, c->finalizer);
 #endif
-       if (!o) return NULL;
-       
+
+       if (!o)
+               return NULL;
+
        memset(o, 0, c->instancesize);
 
        o->vftbl = c->vftbl;
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock(o);
+#endif
 
        return o;
 }
 
 
+/********************** Function: builtin_newarray **************************
 
-/******************** function: builtin_anewarray ****************************
+       Creates an array with the given vftbl on the heap.
 
-       Creates an array of pointers to objects on the heap.
-       Parameters:
-               size ......... number of elements
-       elementtype .. pointer to the classinfo structure for the element type
-       
        Return value:  pointer to the array or NULL if no memory is available
 
-*****************************************************************************/
-
-void XXX_copy_vftbl(vftbl **dest, vftbl *src)
-{
-       *dest = mem_alloc(sizeof(vftbl) + sizeof(methodptr)*(src->vftbllength-1));
-       memcpy(*dest, src, sizeof(vftbl) - sizeof(methodptr));
-       memcpy(&(*dest)->table, &src->table, src->vftbllength * sizeof(methodptr));
-}
+    CAUTION: The given vftbl must be the vftbl of the *array* class,
+    not of the element class.
 
-void XXX_use_class_as_object(classinfo *c, char *cname)
-{
-       vftbl *vt = class_get(utf_new_char(cname))->vftbl;
-       vftbl *newtbl;
-       if (!c->classvftbl) {
-               c->classvftbl = true;
-               XXX_copy_vftbl(&newtbl, vt);
-               newtbl->class = c->header.vftbl->class;
-               newtbl->baseval = c->header.vftbl->baseval;
-               newtbl->diffval = c->header.vftbl->diffval;
-               c->header.vftbl = newtbl;
-       }
-}
+*****************************************************************************/
 
-static
-void* __builtin_newarray(s4 base_size,
-                                                s4 size, 
-                                                bool references,
-                                                int elementsize,
-                                                int arraytype,
-                                                classinfo *el)
+java_arrayheader *builtin_newarray(s4 size, vftbl_t *arrayvftbl)
 {
        java_arrayheader *a;
+       arraydescriptor *desc;
+       s4 dataoffset;
+       s4 componentsize;
+       s4 actualsize;
+
+       desc = arrayvftbl->arraydesc;
+       dataoffset = desc->dataoffset;
+       componentsize = desc->componentsize;
+
+       if (size < 0) {
+               *exceptionptr =
+                       new_exception(string_java_lang_NegativeArraySizeException);
+               return NULL;
+       }
 
 #ifdef SIZE_FROM_CLASSINFO
-       s4 alignedsize = align_size(base_size + (size-1) * elementsize);
-       a = heap_allocate( alignedsize, references, NULL );
-#else  
-       a = heap_allocate(sizeof(java_objectarray) + (size-1) * elementsize, 
-                                         references, 
-                                         NULL);
-#endif
-       if (!a) return NULL;
-
-#ifdef SIZE_FROM_CLASSINFO
-       memset(a, 0, alignedsize);
+       actualsize = align_size(dataoffset + size * componentsize);
+       actualsize = dataoffset + size * componentsize;
 #else
-       memset(a, 0, base_size + (size-1) * elementsize);
-#endif 
-
-#if 0
-       {
-       classinfo *c;
-
-       switch (arraytype) {
-       case ARRAYTYPE_INT:
-               c = create_array_class(utf_new_char("[I"));
-               XXX_use_class_as_object(c, "int");
-               break;
-
-       case ARRAYTYPE_LONG:
-               c = create_array_class(utf_new_char("[J"));
-               XXX_use_class_as_object(c, "long");
-               break;
-
-       case ARRAYTYPE_FLOAT:
-               c = create_array_class(utf_new_char("[F"));
-               XXX_use_class_as_object(c, "float");
-               break;
-
-       case ARRAYTYPE_DOUBLE:
-               c = create_array_class(utf_new_char("[D"));
-               XXX_use_class_as_object(c, "double");
-               break;
-
-       case ARRAYTYPE_BYTE:
-               c = create_array_class(utf_new_char("[B"));
-               XXX_use_class_as_object(c, "byte");
-               break;
-
-       case ARRAYTYPE_CHAR:
-               c = create_array_class(utf_new_char("[C"));
-               XXX_use_class_as_object(c, "char");
-               break;
-
-       case ARRAYTYPE_SHORT:
-               c = create_array_class(utf_new_char("[S"));
-               XXX_use_class_as_object(c, "short");
-               break;
+       actualsize = 0;
+#endif
 
-       case ARRAYTYPE_BOOLEAN:
-               c = create_array_class(utf_new_char("[Z"));
-               XXX_use_class_as_object(c, "boolean");
-               break;
+       if (((u4) actualsize) < ((u4) size)) { /* overflow */
+               *exceptionptr = new_exception(string_java_lang_OutOfMemoryError);
+               return NULL;
+       }
 
-       case ARRAYTYPE_OBJECT:
-               {
-               char *cname, *buf;
-               cname = heap_allocate(utf_strlen(el->name), false, NULL);
-               utf_sprint(cname, el->name);
-               buf = heap_allocate(strlen(cname) + 3, false, NULL);
-/*  printf("\n\n[L%s;\n\n", cname); */
-               sprintf(buf, "[L%s;", cname);
-               c = create_array_class(utf_new_char(buf));
-/*             MFREE(buf, char, strlen(cname) + 3); */
-/*             MFREE(cname, char, utf_strlen(el->name)); */
-               XXX_use_class_as_object(c, cname);
-               }
-               break;
+       a = heap_allocate(actualsize,
+                                         (desc->arraytype == ARRAYTYPE_OBJECT),
+                                         NULL);
 
-       case ARRAYTYPE_ARRAY:
-               c = create_array_class(utf_new_char("[["));
-               XXX_use_class_as_object(c, "java/lang/Boolean");
-               break;
+       if (!a)
+               return NULL;
 
-       default:
-               panic("unknown array type");
-       }
+       memset(a, 0, actualsize);
 
-       a->objheader.vftbl = c->vftbl;
-       }
-#else
-       a->objheader.vftbl = class_array->vftbl;
+       a->objheader.vftbl = arrayvftbl;
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock(&a->objheader);
 #endif
-       a -> size = size;
+       a->size = size;
 #ifdef SIZE_FROM_CLASSINFO
-       a -> alignedsize = alignedsize;
+       a->alignedsize = actualsize;
 #endif
-       a -> arraytype = arraytype;
 
        return a;
 }
 
 
-java_objectarray *builtin_anewarray (s4 size, classinfo *elementtype)
-{
-       java_objectarray *a;    
-       a = (java_objectarray*)__builtin_newarray(sizeof(java_objectarray),
-                                                                                         size, 
-                                                                                         true, 
-                                                                                         sizeof(void*), 
-                                                                                         ARRAYTYPE_OBJECT,
-                                                                                         elementtype);
-       if (!a) return NULL;
-
-       a -> elementtype = elementtype;
-       return a;
-}
+/********************** Function: builtin_anewarray *************************
 
+       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
 
-/******************** function: builtin_newarray_array ***********************
-
-       Creates an array of pointers to arrays on the heap.
-       Parameters:
-               size ......... number of elements
-       elementdesc .. pointer to the array description structure for the
-                                  element arrays
-       
-       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_arrayarray *builtin_newarray_array 
-               (s4 size, constant_arraydescriptor *elementdesc)
+java_objectarray *builtin_anewarray(s4 size, classinfo *component)
 {
-       java_arrayarray *a; 
-       a = (java_arrayarray*)__builtin_newarray(sizeof(java_arrayarray),
-                                                                                        size, 
-                                                                                        true, 
-                                                                                        sizeof(void*), 
-                                                                                        ARRAYTYPE_ARRAY,
-                                                                                        elementdesc->objectclass);
-       if (!a) return NULL;
+       /* is class loaded */
+       if (!component->loaded)
+               if (!class_load(component))
+                       return NULL;
 
-       a -> elementdescriptor = elementdesc;
-       return a;
+       /* is class linked */
+       if (!component->linked)
+               if (!class_link(component))
+                       return NULL;
+
+       return (java_objectarray *) builtin_newarray(size, class_array_of(component)->vftbl);
 }
 
 
-/******************** function: builtin_newarray_boolean ************************
+/******************** Function: builtin_newarray_int ***********************
+
+       Creates an array of 32 bit Integers on the heap.
 
-       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
 
 *****************************************************************************/
 
-java_booleanarray *builtin_newarray_boolean (s4 size)
+java_intarray *builtin_newarray_int(s4 size)
 {
-       java_booleanarray *a;   
-       a = (java_booleanarray*)__builtin_newarray(sizeof(java_booleanarray),
-                                                                                          size, 
-                                                                                          false, 
-                                                                                          sizeof(u1), 
-                                                                                          ARRAYTYPE_BOOLEAN,
-                                                                                          NULL);
-       return a;
+       return (java_intarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_INT].arrayvftbl);
 }
 
-/******************** function: builtin_newarray_char ************************
 
-       Creates an array of characters on the heap.
+/******************** Function: builtin_newarray_long ***********************
+
+       Creates an array of 64 bit Integers on the heap.
 
        Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
-java_chararray *builtin_newarray_char (s4 size)
+java_longarray *builtin_newarray_long(s4 size)
 {
-       java_chararray *a;      
-       a = (java_chararray*)__builtin_newarray(sizeof(java_chararray),
-                                                                                       size, 
-                                                                                       false, 
-                                                                                       sizeof(u2), 
-                                                                                       ARRAYTYPE_CHAR,
-                                                                                       NULL);
-       return a;
+       return (java_longarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_LONG].arrayvftbl);
 }
 
 
@@ -637,16 +626,9 @@ java_chararray *builtin_newarray_char (s4 size)
 
 *****************************************************************************/
 
-java_floatarray *builtin_newarray_float (s4 size)
+java_floatarray *builtin_newarray_float(s4 size)
 {
-       java_floatarray *a; 
-       a = (java_floatarray*)__builtin_newarray(sizeof(java_floatarray),
-                                                                                        size, 
-                                                                                        false, 
-                                                                                        sizeof(float), 
-                                                                                        ARRAYTYPE_FLOAT,
-                                                                                        NULL);
-       return a;
+       return (java_floatarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_FLOAT].arrayvftbl);
 }
 
 
@@ -658,21 +640,12 @@ java_floatarray *builtin_newarray_float (s4 size)
 
 *****************************************************************************/
 
-java_doublearray *builtin_newarray_double (s4 size)
+java_doublearray *builtin_newarray_double(s4 size)
 {
-       java_doublearray *a;    
-       a = (java_doublearray*)__builtin_newarray(sizeof(java_doublearray),
-                                                                                         size, 
-                                                                                         false, 
-                                                                                         sizeof(double), 
-                                                                                         ARRAYTYPE_DOUBLE,
-                                                                                         NULL);
-       return a;
+       return (java_doublearray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_DOUBLE].arrayvftbl);
 }
 
 
-
-
 /******************** function: builtin_newarray_byte ***********************
 
        Creates an array of 8 bit Integers on the heap.
@@ -681,252 +654,114 @@ java_doublearray *builtin_newarray_double (s4 size)
 
 *****************************************************************************/
 
-java_bytearray *builtin_newarray_byte (s4 size)
+java_bytearray *builtin_newarray_byte(s4 size)
 {
-       java_bytearray *a;      
-       a = (java_bytearray*)__builtin_newarray(sizeof(java_bytearray),
-                                                                                       size, 
-                                                                                       false, 
-                                                                                       sizeof(u1), 
-                                                                                       ARRAYTYPE_BYTE,
-                                                                                       NULL);
-       return a;
+       return (java_bytearray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_BYTE].arrayvftbl);
 }
 
 
-/******************** function: builtin_newarray_short ***********************
+/******************** function: builtin_newarray_char ************************
 
-       Creates an array of 16 bit Integers on the heap.
+       Creates an array of characters on the heap.
 
        Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
-java_shortarray *builtin_newarray_short (s4 size)
+java_chararray *builtin_newarray_char(s4 size)
 {
-       java_shortarray *a; 
-       a = (java_shortarray*)__builtin_newarray(sizeof(java_shortarray),
-                                                                                        size, 
-                                                                                        false, 
-                                                                                        sizeof(s2), 
-                                                                                        ARRAYTYPE_SHORT,
-                                                                                        NULL);
-       return a;
+       return (java_chararray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl);
 }
 
 
-/******************** Function: builtin_newarray_int ***********************
+/******************** function: builtin_newarray_short ***********************
 
-       Creates an array of 32 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
 
 *****************************************************************************/
 
-java_intarray *builtin_newarray_int (s4 size)
+java_shortarray *builtin_newarray_short(s4 size)
 {
-       java_intarray *a;       
-       a = (java_intarray*)__builtin_newarray(sizeof(java_intarray),
-                                                                                  size, 
-                                                                                  false, 
-                                                                                  sizeof(s4), 
-                                                                                  ARRAYTYPE_INT,
-                                                                                  NULL);
-       return a;
+       return (java_shortarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_SHORT].arrayvftbl);
 }
 
 
-/******************** Function: builtin_newarray_long ***********************
-
-       Creates an array of 64 bit Integers on the heap.
+/******************** function: builtin_newarray_boolean ************************
 
+       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
 
 *****************************************************************************/
 
-java_longarray *builtin_newarray_long (s4 size)
+java_booleanarray *builtin_newarray_boolean(s4 size)
 {
-       java_longarray *a;      
-       a = (java_longarray*)__builtin_newarray(sizeof(java_longarray),
-                                                                                       size, 
-                                                                                       false, 
-                                                                                       sizeof(s8), 
-                                                                                       ARRAYTYPE_LONG,
-                                                                                       NULL);
-       return a;
+       return (java_booleanarray*) builtin_newarray(size, primitivetype_table[ARRAYTYPE_BOOLEAN].arrayvftbl);
 }
 
 
-
-/***************** function: builtin_multianewarray ***************************
+/**************** function: builtin_nmultianewarray ***************************
 
        Creates a multi-dimensional array on the heap. The dimensions are passed in
-       an array of Integers. The type for the array is passed as a reference to a
-       constant_arraydescriptor structure.
+       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
 
        Return value:  pointer to the array or NULL if no memory is available
 
 ******************************************************************************/
 
-       /* Helper functions */
-
-static java_arrayheader *multianewarray_part (java_intarray *dims, int thisdim,
-                                          constant_arraydescriptor *desc)
+java_arrayheader *builtin_nmultianewarray(int n, vftbl_t *arrayvftbl, long *dims)
+/*  java_arrayheader *builtin_nmultianewarray(int n, classinfo *arrayclass, long *dims) */
 {
-       u4 size,i;
-       java_arrayarray *a;
-
-       size = dims -> data[thisdim];
-       
-       if (thisdim == (dims->header.size-1)) {
-               /* last dimension reached */
-               
-               switch (desc -> arraytype) {
-               case ARRAYTYPE_BOOLEAN:  
-                       return (java_arrayheader*) builtin_newarray_boolean (size); 
-               case ARRAYTYPE_CHAR:  
-                       return (java_arrayheader*) builtin_newarray_char (size); 
-               case ARRAYTYPE_FLOAT:  
-                       return (java_arrayheader*) builtin_newarray_float (size); 
-               case ARRAYTYPE_DOUBLE:  
-                       return (java_arrayheader*) builtin_newarray_double (size); 
-               case ARRAYTYPE_BYTE:  
-                       return (java_arrayheader*) builtin_newarray_byte (size); 
-               case ARRAYTYPE_SHORT:  
-                       return (java_arrayheader*) builtin_newarray_short (size); 
-               case ARRAYTYPE_INT:      
-                       return (java_arrayheader*) builtin_newarray_int (size); 
-               case ARRAYTYPE_LONG:  
-                       return (java_arrayheader*) builtin_newarray_long (size); 
-               case ARRAYTYPE_OBJECT:
-                       return (java_arrayheader*) builtin_anewarray (size, desc->objectclass);
-               
-               case ARRAYTYPE_ARRAY:
-                       return (java_arrayheader*) builtin_newarray_array (size, desc->elementdescriptor);
-               
-               default: panic ("Invalid arraytype in multianewarray");
-               }
-               }
-
-       /* if the last dimension has not been reached yet */
+       s4 size, i;
+       java_arrayheader *a;
+       vftbl_t *componentvftbl;
 
-       if (desc->arraytype != ARRAYTYPE_ARRAY) 
-               panic ("multianewarray with too many dimensions");
+/*     utf_display(arrayclass->name); */
 
-       a = builtin_newarray_array (size, desc->elementdescriptor);
-       if (!a) return NULL;
+/*     class_load(arrayclass); */
+/*     class_link(arrayclass); */
        
-       for (i=0; i<size; i++) {
-               java_arrayheader *ea = 
-                 multianewarray_part (dims, thisdim+1, desc->elementdescriptor);
-               if (!ea) return NULL;
-
-               a -> data[i] = ea;
-               }
-               
-       return (java_arrayheader*) a;
-}
+       /* create this dimension */
+       size = (s4) dims[0];
+       a = builtin_newarray(size, arrayvftbl);
+/*     a = builtin_newarray(size, arrayclass->vftbl); */
 
+       if (!a)
+               return NULL;
 
-java_arrayheader *builtin_multianewarray (java_intarray *dims,
-                                         constant_arraydescriptor *desc)
-{
-       return multianewarray_part (dims, 0, desc);
-}
+       /* if this is the last dimension return */
+       if (!--n)
+               return a;
 
+       /* get the vftbl of the components to create */
+       componentvftbl = arrayvftbl->arraydesc->componentvftbl;
+/*     component = arrayclass->vftbl->arraydesc; */
 
-static java_arrayheader *nmultianewarray_part (int n, long *dims, int thisdim,
-                                          constant_arraydescriptor *desc)
-{
-       int size, i;
-       java_arrayarray *a;
+       /* The verifier guarantees this. */
+       /* if (!componentvftbl) */
+       /*      panic ("multianewarray with too many dimensions"); */
 
-       size = (int) dims[thisdim];
-       
-       if (thisdim == (n - 1)) {
-               /* last dimension reached */
-               
-               switch (desc -> arraytype) {
-               case ARRAYTYPE_BOOLEAN:  
-                       return (java_arrayheader*) builtin_newarray_boolean(size); 
-               case ARRAYTYPE_CHAR:  
-                       return (java_arrayheader*) builtin_newarray_char(size); 
-               case ARRAYTYPE_FLOAT:  
-                       return (java_arrayheader*) builtin_newarray_float(size); 
-               case ARRAYTYPE_DOUBLE:  
-                       return (java_arrayheader*) builtin_newarray_double(size); 
-               case ARRAYTYPE_BYTE:  
-                       return (java_arrayheader*) builtin_newarray_byte(size); 
-               case ARRAYTYPE_SHORT:  
-                       return (java_arrayheader*) builtin_newarray_short(size); 
-               case ARRAYTYPE_INT:      
-                       return (java_arrayheader*) builtin_newarray_int(size); 
-               case ARRAYTYPE_LONG:  
-                       return (java_arrayheader*) builtin_newarray_long(size); 
-               case ARRAYTYPE_OBJECT:
-                       return (java_arrayheader*) builtin_anewarray(size,
-                                                                          desc->objectclass);
-               case ARRAYTYPE_ARRAY:
-                       return (java_arrayheader*) builtin_newarray_array(size,
-                                                                          desc->elementdescriptor);
-               
-               default: panic ("Invalid arraytype in multianewarray");
-               }
-               }
-
-       /* if the last dimension has not been reached yet */
-
-       if (desc->arraytype != ARRAYTYPE_ARRAY) 
-               panic ("multianewarray with too many dimensions");
-
-       a = builtin_newarray_array(size, desc->elementdescriptor);
-       if (!a) return NULL;
-       
+       /* create the component arrays */
        for (i = 0; i < size; i++) {
                java_arrayheader *ea = 
-                       nmultianewarray_part(n, dims, thisdim + 1, desc->elementdescriptor);
-               if (!ea) return NULL;
+                       builtin_nmultianewarray(n, componentvftbl, dims + 1);
 
-               a -> data[i] = ea;
-               }
+               if (!ea)
+                       return NULL;
                
-       return (java_arrayheader*) a;
-}
-
-
-java_arrayheader *builtin_nmultianewarray (int size,
-                                         constant_arraydescriptor *desc, long *dims)
-{
-       (void) builtin_newarray_int(size); /* for compatibility with -old */
-       return nmultianewarray_part (size, dims, 0, desc);
-}
-
-
-
-
-/************************* function: builtin_aastore *************************
-
-       Stores a reference to an object into an object array or into an array
-       array. Before any action is performed, the validity of the operation is
-       checked.
-
-       Return value:  1 ... ok
-                                  0 ... this object cannot be stored into this array
-
-*****************************************************************************/
-
-s4 builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o)
-{
-       if (builtin_canstore(a,o)) {
-               a->data[index] = o;
-               return 1;
-               }
-       return 0;
-}
-
-
-
+               ((java_objectarray *) a)->data[i] = (java_objectheader *) ea;
+       }
 
+       return a;
+}
 
 
 /*****************************************************************************
@@ -937,33 +772,70 @@ s4 builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o)
        
 *****************************************************************************/
 
+u4 methodindent = 0;
 
-u4 methodindent=0;
-
-java_objectheader *builtin_trace_exception (java_objectheader *exceptionptr,
-                                  methodinfo *method, int *pos, int noindent) {
+java_objectheader *builtin_trace_exception(java_objectheader *xptr,
+                                                                                  methodinfo *m,
+                                                                                  void *pos,
+                                                                                  s4 line,
+                                                                                  s4 noindent)
+{
+       if (!noindent) {
+               if (methodindent)
+                       methodindent--;
+               else
+                       log_text("WARNING: unmatched methodindent--");
+       }
+       if (opt_verbose || runverbose || verboseexception) {
+               if (xptr) {
+                       printf("Exception ");
+                       utf_display_classname(xptr->vftbl->class->name);
 
-       if (!noindent)
-               methodindent--;
-       if (verbose || runverbose) {
-               printf("Exception ");
-               utf_display (exceptionptr->vftbl->class->name);
+               } else {
+                       printf("Some Throwable");
+               }
                printf(" thrown in ");
-               if (method) {
-                       utf_display (method->class->name);
+
+               if (m) {
+                       utf_display_classname(m->class->name);
                        printf(".");
-                       utf_display (method->name);
-                       if (method->flags & ACC_SYNCHRONIZED)
-                               printf("(SYNC)");
-                       else
-                               printf("(NOSYNC)");
-                       printf("(%p) at position %p\n", method->entrypoint, pos);
+                       utf_display(m->name);
+                       if (m->flags & ACC_SYNCHRONIZED) {
+                               printf("(SYNC");
+
+                       } else{
+                               printf("(NOSYNC");
                        }
-               else
+
+                       if (m->flags & ACC_NATIVE) {
+                               printf(",NATIVE");
+#if POINTERSIZE == 8
+                               printf(")(0x%016lx) at position %p\n", (s8) m->entrypoint, pos);
+#else
+                               printf(")(0x%08lx) at position %p\n", (s4) m->entrypoint, pos);
+#endif
+
+                       } else {
+#if POINTERSIZE == 8
+                               printf(")(0x%016lx) at position %p (", (s8) m->entrypoint, pos);
+#else
+                               printf(")(0x%08lx) at position %p (", (s4) m->entrypoint, pos);
+#endif
+                               if (m->class->sourcefile == NULL) {
+                                       printf("<NO CLASSFILE INFORMATION>");
+
+                               } else {
+                                       utf_display(m->class->sourcefile);
+                               }
+                               printf(":%d)\n", line);
+                       }
+
+               } else
                        printf("call_java_method\n");
-               fflush (stdout);
-               }
-       return exceptionptr;
+               fflush(stdout);
+       }
+
+       return xptr;
 }
 
 
@@ -972,190 +844,221 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
 #if TRACE_ARGS_NUM > 6
                                                s8 a6, s8 a7,
 #endif
-                                               methodinfo *method)
+                                               methodinfo *m)
 {
-       int i;
-       for (i=0; i<methodindent; i++)
+       s4 i;
+       char logtext[MAXLOGTEXT];
+       for (i = 0; i < methodindent; i++)
                logtext[i] = '\t';
-       sprintf (logtext+methodindent, "called: ");
-       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);
-       sprintf (logtext+strlen(logtext), "(");
-       switch (method->paramcount) {
-        case 0:
-            break;
-
-#if defined(__I386__)
-               case 1:
-                       sprintf(logtext+strlen(logtext), "%llx", a0);
-                       break;
-
-               case 2:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx", a0, a1);
-                       break;
-
-               case 3:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx", a0, a1, a2);
-                       break;
-
-               case 4:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx",
-                                                                                         a0,   a1,   a2,   a3);
-                       break;
-
-               case 5:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx",
-                                                                                         a0,   a1,   a2,   a3,   a4);
-                       break;
-
-               case 6:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx",
-                                                                                         a0,   a1,   a2,   a3,   a4,   a5);
-                       break;
+
+       sprintf(logtext + methodindent, "called: ");
+       utf_sprint_classname(logtext + strlen(logtext), m->class->name);
+       sprintf(logtext + strlen(logtext), ".");
+       utf_sprint(logtext + strlen(logtext), m->name);
+       utf_sprint_classname(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 (m->paramcount) {
+       case 0:
+               break;
+
+#if defined(__I386__) || defined(__POWERPC__)
+       case 1:
+               sprintf(logtext+strlen(logtext), "%llx", a0);
+               break;
+
+       case 2:
+               sprintf(logtext+strlen(logtext), "%llx, %llx", a0, a1);
+               break;
+
+       case 3:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx", a0, a1, a2);
+               break;
+
+       case 4:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx",
+                               a0,   a1,   a2,   a3);
+               break;
+
+       case 5:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx",
+                               a0,   a1,   a2,   a3,   a4);
+               break;
+
+       case 6:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx",
+                               a0,   a1,   a2,   a3,   a4,   a5);
+               break;
 
 #if TRACE_ARGS_NUM > 6
-               case 7:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx",
-                                                                                         a0,   a1,   a2,   a3,   a4,   a5,   a6);
-                       break;
-
-               case 8:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx, %llx",
-                                                                                         a0,   a1,   a2,   a3,   a4,   a5,   a6,   a7);
-                       break;
-
-               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);
-                       break;
+       case 7:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx",
+                               a0,   a1,   a2,   a3,   a4,   a5,   a6);
+               break;
+
+       case 8:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx, %llx",
+                               a0,   a1,   a2,   a3,   a4,   a5,   a6,   a7);
+               break;
+
+       default:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
+                               a0,   a1,   a2,   a3,   a4,   a5,   a6,   a7,   m->paramcount - 8);
+               break;
 #else
-               default:
-                       sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
-                                                                                         a0,   a1,   a2,   a3,   a4,   a5,   method->paramcount - 6);
-                       break;
+       default:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
+                               a0,   a1,   a2,   a3,   a4,   a5,   m->paramcount - 6);
+               break;
 #endif
 #else
-               case 1:
-                       sprintf(logtext+strlen(logtext), "%lx", a0);
-                       break;
+       case 1:
+               sprintf(logtext+strlen(logtext), "%lx", a0);
+               break;
 
-               case 2:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx", a0, a1);
-                       break;
+       case 2:
+               sprintf(logtext+strlen(logtext), "%lx, %lx", a0, a1);
+               break;
 
-               case 3:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx", a0, a1, a2);
-                       break;
+       case 3:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx", a0, a1, a2);
+               break;
 
-               case 4:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx",
-                                                                                         a0,  a1,  a2,  a3);
-                       break;
+       case 4:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx",
+                               a0,  a1,  a2,  a3);
+               break;
 
-               case 5:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx",
-                                                                                         a0,  a1,  a2,  a3,  a4);
-                       break;
+       case 5:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx",
+                               a0,  a1,  a2,  a3,  a4);
+               break;
 
-               case 6:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx",
-                                                                                         a0,  a1,  a2,  a3,  a4,  a5);
-                       break;
+       case 6:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx",
+                               a0,  a1,  a2,  a3,  a4,  a5);
+               break;
 
 #if TRACE_ARGS_NUM > 6
-               case 7:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx",
-                                                                                         a0,  a1,  a2,  a3,  a4,  a5,  a6);
-                       break;
-
-               case 8:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx",
-                                                                                         a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7);
-                       break;
-
-               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;
+       case 7:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx",
+                               a0,  a1,  a2,  a3,  a4,  a5,  a6);
+               break;
+
+       case 8:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx",
+                               a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7);
+               break;
+
+       default:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
+                               a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  m->paramcount - 8);
+               break;
 #else
-               default:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
-                                                                                         a0,  a1,  a2,  a3,  a4,  a5,   method->paramcount - 6);
-                       break;
+       default:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
+                               a0,  a1,  a2,  a3,  a4,  a5,   m->paramcount - 6);
+               break;
 #endif
 #endif
-               }
-       sprintf (logtext+strlen(logtext), ")");
+       }
+
+       sprintf(logtext + strlen(logtext), ")");
+       log_text(logtext);
 
-       dolog ();
        methodindent++;
 }
 #endif
 
-void builtin_displaymethodstart(methodinfo *method)
+
+void builtin_displaymethodstart(methodinfo *m)
 {
-       sprintf (logtext, "                                                                                             ");
-       sprintf (logtext+methodindent, "called: ");
-       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);
-       dolog ();
+       char logtext[MAXLOGTEXT];
+       sprintf(logtext, "                                                                                              ");
+       sprintf(logtext + methodindent, "called: ");
+       utf_sprint(logtext + strlen(logtext), m->class->name);
+       sprintf(logtext + strlen(logtext), ".");
+       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;
-       for (i=0; i<methodindent; i++)
+       char logtext[MAXLOGTEXT];
+       for (i = 0; i < methodindent; i++)
                logtext[i] = '\t';
-       methodindent--;
-       sprintf (logtext+methodindent, "finished: ");
-       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);
-       switch (method->returntype) {
-               case TYPE_INT:
-                       sprintf (logtext+strlen(logtext), "->%d", (s4) l);
-                       break;
-               case TYPE_LONG:
-#if defined(__I386__)
-                       sprintf(logtext+strlen(logtext), "->%lld", (s8) l);
+       if (methodindent)
+               methodindent--;
+       else
+               log_text("WARNING: unmatched methodindent--");
+
+       sprintf(logtext + methodindent, "finished: ");
+       utf_sprint_classname(logtext + strlen(logtext), m->class->name);
+       sprintf(logtext + strlen(logtext), ".");
+       utf_sprint(logtext + strlen(logtext), m->name);
+       utf_sprint_classname(logtext + strlen(logtext), m->descriptor);
+
+       switch (m->returntype) {
+       case TYPE_INT:
+               sprintf(logtext + strlen(logtext), "->%d", (s4) l);
+               break;
+
+       case TYPE_LONG:
+#if defined(__I386__) || defined(__POWERPC__)
+               sprintf(logtext + strlen(logtext), "->%lld", (s8) l);
 #else
-                       sprintf(logtext+strlen(logtext), "->%ld", (s8) l);
+               sprintf(logtext + strlen(logtext), "->%ld", (s8) l);
 #endif
-                       break;
-               case TYPE_ADDRESS:
-#if defined(__I386__)
-                       sprintf(logtext+strlen(logtext), "->%p", (u1*) ((s4) l));
+               break;
+
+       case TYPE_ADDRESS:
+#if defined(__I386__) || defined(__POWERPC__)
+               sprintf(logtext + strlen(logtext), "->%p", (u1*) ((s4) l));
 #else
-                       sprintf(logtext+strlen(logtext), "->%p", (u1*) l);
+               sprintf(logtext + strlen(logtext), "->%p", (u1*) l);
 #endif
-                       break;
-               case TYPE_FLOAT:
-                       sprintf (logtext+strlen(logtext), "->%g", f);
-                       break;
-               case TYPE_DOUBLE:
-                       sprintf (logtext+strlen(logtext), "->%g", d);
-                       break;
-               }
-       dolog ();
-}
+               break;
 
-void builtin_displaymethodexception(methodinfo *method)
-{
-       int i;
-       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);
-       dolog ();
+       case TYPE_FLOAT:
+               sprintf(logtext + strlen(logtext), "->%g", f);
+               break;
+
+       case TYPE_DOUBLE:
+               sprintf(logtext + strlen(logtext), "->%g", d);
+               break;
+       }
+       log_text(logtext);
 }
 
 
@@ -1166,10 +1069,9 @@ void builtin_displaymethodexception(methodinfo *method)
 /*
  * Lock the mutex of an object.
  */
-#ifdef USE_THREADS
-void
-internal_lock_mutex_for_object (java_objectheader *object)
+void internal_lock_mutex_for_object(java_objectheader *object)
 {
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        mutexHashEntry *entry;
        int hashValue;
 
@@ -1178,34 +1080,29 @@ internal_lock_mutex_for_object (java_objectheader *object)
        hashValue = MUTEX_HASH_VALUE(object);
        entry = &mutexHashTable[hashValue];
 
-       if (entry->object != 0)
-       {
-               if (entry->mutex.count == 0 && entry->conditionCount == 0)
-               {
+       if (entry->object != 0) {
+               if (entry->mutex.count == 0 && entry->conditionCount == 0) {
                        entry->object = 0;
                        entry->mutex.holder = 0;
                        entry->mutex.count = 0;
                        entry->mutex.muxWaiters = 0;
-               }
-       else
-       {
-               while (entry->next != 0 && entry->object != object)
-               entry = entry->next;
 
-               if (entry->object != object)
-               {
-                       entry->next = firstFreeOverflowEntry;
-                       firstFreeOverflowEntry = firstFreeOverflowEntry->next;
+               } else {
+                       while (entry->next != 0 && entry->object != object)
+                               entry = entry->next;
 
-                       entry = entry->next;
-                       entry->object = 0;
-                       entry->next = 0;
-                       assert(entry->conditionCount == 0);
+                       if (entry->object != object) {
+                               entry->next = firstFreeOverflowEntry;
+                               firstFreeOverflowEntry = firstFreeOverflowEntry->next;
+
+                               entry = entry->next;
+                               entry->object = 0;
+                               entry->next = 0;
+                               assert(entry->conditionCount == 0);
+                       }
                }
-       }
-       }
-       else
-       {
+
+       } else {
                entry->mutex.holder = 0;
                entry->mutex.count = 0;
                entry->mutex.muxWaiters = 0;
@@ -1215,27 +1112,26 @@ internal_lock_mutex_for_object (java_objectheader *object)
                entry->object = object;
        
        internal_lock_mutex(&entry->mutex);
-}
 #endif
+}
 
 
 /*
  * Unlocks the mutex of an object.
  */
-#ifdef USE_THREADS
-void
-internal_unlock_mutex_for_object (java_objectheader *object)
+void internal_unlock_mutex_for_object (java_objectheader *object)
 {
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        int hashValue;
        mutexHashEntry *entry;
 
        hashValue = MUTEX_HASH_VALUE(object);
        entry = &mutexHashTable[hashValue];
 
-       if (entry->object == object)
+       if (entry->object == object) {
                internal_unlock_mutex(&entry->mutex);
-       else
-       {
+
+       } else {
                while (entry->next != 0 && entry->next->object != object)
                        entry = entry->next;
 
@@ -1243,8 +1139,7 @@ internal_unlock_mutex_for_object (java_objectheader *object)
 
                internal_unlock_mutex(&entry->next->mutex);
 
-               if (entry->next->mutex.count == 0 && entry->conditionCount == 0)
-               {
+               if (entry->next->mutex.count == 0 && entry->conditionCount == 0) {
                        mutexHashEntry *unlinked = entry->next;
 
                        entry->next = unlinked->next;
@@ -1252,56 +1147,71 @@ internal_unlock_mutex_for_object (java_objectheader *object)
                        firstFreeOverflowEntry = unlinked;
                }
        }
-}
 #endif
+}
+
 
-void
-builtin_monitorenter (java_objectheader *o)
+void builtin_monitorenter(java_objectheader *o)
 {
-#ifdef USE_THREADS
+#if defined(USE_THREADS)
+#if !defined(NATIVE_THREADS)
        int hashValue;
 
-       assert(blockInts == 0);
-
        ++blockInts;
 
        hashValue = MUTEX_HASH_VALUE(o);
-       if (mutexHashTable[hashValue].object == o
+       if (mutexHashTable[hashValue].object == o 
                && mutexHashTable[hashValue].mutex.holder == currentThread)
                ++mutexHashTable[hashValue].mutex.count;
        else
                internal_lock_mutex_for_object(o);
 
        --blockInts;
-
-       assert(blockInts == 0);
+#else
+       monitorEnter((threadobject *) THREADOBJECT, o);
+#endif
 #endif
+
 }
 
-void builtin_monitorexit (java_objectheader *o)
+/*
+ * 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)
 {
-#ifdef USE_THREADS
-       int hashValue;
+       use_class_as_object(c);
+       builtin_monitorenter(&c->header);
+}
+
 
-       assert(blockInts == 0);
+void *builtin_monitorexit(java_objectheader *o)
+{
+#if defined(USE_THREADS)
+#if !defined(NATIVE_THREADS)
+       int hashValue;
 
        ++blockInts;
 
        hashValue = MUTEX_HASH_VALUE(o);
-       if (mutexHashTable[hashValue].object == o)
-       {
+       if (mutexHashTable[hashValue].object == o) {
                if (mutexHashTable[hashValue].mutex.count == 1
                        && mutexHashTable[hashValue].mutex.muxWaiters != 0)
                        internal_unlock_mutex_for_object(o);
                else
                        --mutexHashTable[hashValue].mutex.count;
-       }
-       else
+
+       else
                internal_unlock_mutex_for_object(o);
 
        --blockInts;
-
-       assert(blockInts == 0);
+       return o;
+#else
+       monitorExit((threadobject *) THREADOBJECT, o);
+       return o;
+#endif
 #endif
 }
 
@@ -1319,8 +1229,8 @@ void builtin_monitorexit (java_objectheader *o)
 
 ******************************************************************************/
 
-s4 builtin_idiv (s4 a, s4 b) { return a/b; }
-s4 builtin_irem (s4 a, s4 b) { return a%b; }
+s4 builtin_idiv(s4 a, s4 b) { return a / b; }
+s4 builtin_irem(s4 a, s4 b) { return a % b; }
 
 
 /************** Functions for long arithmetics *******************************
@@ -1331,106 +1241,106 @@ s4 builtin_irem (s4 a, s4 b) { return a%b; }
 ******************************************************************************/
 
 
-s8 builtin_ladd (s8 a, s8 b) 
+s8 builtin_ladd(s8 a, s8 b)
 { 
 #if U8_AVAILABLE
-       return a+b; 
+       return a + b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lsub (s8 a, s8 b) 
+s8 builtin_lsub(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a-b; 
+       return a - b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lmul (s8 a, s8 b) 
+s8 builtin_lmul(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a*b; 
+       return a * b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_ldiv (s8 a, s8 b) 
+s8 builtin_ldiv(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a/b; 
+       return a / b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lrem (s8 a, s8 b) 
+s8 builtin_lrem(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a%b; 
+       return a % b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lshl (s8 a, s4 b) 
+s8 builtin_lshl(s8 a, s4 b) 
 { 
 #if U8_AVAILABLE
-       return a<<(b&63);
+       return a << (b & 63);
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lshr (s8 a, s4 b) 
+s8 builtin_lshr(s8 a, s4 b) 
 { 
 #if U8_AVAILABLE
-       return a>>(b&63);
+       return a >> (b & 63);
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lushr (s8 a, s4 b) 
+s8 builtin_lushr(s8 a, s4 b) 
 { 
 #if U8_AVAILABLE
-       return ((u8)a)>>(b&63);
+       return ((u8) a) >> (b & 63);
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_land (s8 a, s8 b) 
+s8 builtin_land(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a&b; 
+       return a & b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lor (s8 a, s8 b) 
+s8 builtin_lor(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a|b; 
+       return a | b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lxor (s8 a, s8 b) 
+s8 builtin_lxor(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       return a^b; 
+       return a ^ b; 
 #else
        return builtin_i2l(0);
 #endif
 }
 
-s8 builtin_lneg (s8 a) 
+s8 builtin_lneg(s8 a) 
 { 
 #if U8_AVAILABLE
        return -a;
@@ -1439,11 +1349,11 @@ s8 builtin_lneg (s8 a)
 #endif
 }
 
-s4 builtin_lcmp (s8 a, s8 b) 
+s4 builtin_lcmp(s8 a, s8 b) 
 { 
 #if U8_AVAILABLE
-       if (a<b) return -1;
-       if (a>b) return 1;
+       if (a < b) return -1;
+       if (a > b) return 1;
        return 0;
 #else
        return 0;
@@ -1456,103 +1366,114 @@ s4 builtin_lcmp (s8 a, s8 b)
 
 /*********** Functions for floating point operations *************************/
 
-float builtin_fadd (float a, float b)
+float builtin_fadd(float a, float b)
 {
-       if (isnanf(a)) return FLT_NAN;
-       if (isnanf(b)) return FLT_NAN;
+       if (isnanf(a)) return intBitsToFloat(FLT_NAN);
+       if (isnanf(b)) return intBitsToFloat(FLT_NAN);
        if (finitef(a)) {
-               if (finitef(b)) return a+b;
-               else return b;
-               }
+               if (finitef(b))
+                       return a + b;
+               else
+                       return b;
+       }
        else {
-               if (finitef(b)) return a;
+               if (finitef(b))
+                       return a;
                else {
-                       if (copysignf(1.0, a)==copysignf(1.0, b)) return a;
-                       else  return FLT_NAN;
-                       }
+                       if (copysignf(1.0, a) == copysignf(1.0, b))
+                               return a;
+                       else
+                               return intBitsToFloat(FLT_NAN);
                }
+       }
 }
 
-float builtin_fsub (float a, float b)
+
+float builtin_fsub(float a, float b)
 {
-       return builtin_fadd (a, builtin_fneg(b));
+       return builtin_fadd(a, builtin_fneg(b));
 }
 
-float builtin_fmul (float a, float b)
+
+float builtin_fmul(float a, float b)
 {
-       if (isnanf(a)) return FLT_NAN;
-       if (isnanf(b)) return FLT_NAN;
+       if (isnanf(a)) return intBitsToFloat(FLT_NAN);
+       if (isnanf(b)) return intBitsToFloat(FLT_NAN);
        if (finitef(a)) {
-               if (finitef(b)) return a*b;
+               if (finitef(b)) return a * b;
                else {
-                       if (a==0) return FLT_NAN;
-                                else return copysignf(b, copysignf(1.0, b)*a);
-                       }
+                       if (a == 0) return intBitsToFloat(FLT_NAN);
+                       else return copysignf(b, copysignf(1.0, b)*a);
                }
+       }
        else {
                if (finitef(b)) {
-                       if (b==0) return FLT_NAN;
-                                else return copysignf(a, copysignf(1.0, a)*b);
-                       }
+                       if (b == 0) return intBitsToFloat(FLT_NAN);
+                       else return copysignf(a, copysignf(1.0, a)*b);
+               }
                else {
                        return copysignf(a, copysignf(1.0, a)*copysignf(1.0, b));
-                       }
                }
+       }
 }
 
-float builtin_fdiv (float a, float b)
+
+float builtin_fdiv(float a, float b)
 {
        if (finitef(a) && finitef(b)) {
                if (b != 0)
                        return a / b;
                else {
                        if (a > 0)
-                               return FLT_POSINF;
+                               return intBitsToFloat(FLT_POSINF);
                        else if (a < 0)
-                               return FLT_NEGINF;
-                       }
+                               return intBitsToFloat(FLT_NEGINF);
                }
-       return FLT_NAN;
+       }
+       return intBitsToFloat(FLT_NAN);
 }
 
-float builtin_frem (float a, float b)
+
+float builtin_frem(float a, float b)
 {
        return fmodf(a, b);
 }
 
 
-float builtin_fneg (float a)
+float builtin_fneg(float a)
 {
        if (isnanf(a)) return a;
        else {
                if (finitef(a)) return -a;
-                                  else return copysignf(a,-copysignf(1.0, a));
-               }
+               else return copysignf(a, -copysignf(1.0, a));
+       }
 }
 
-s4 builtin_fcmpl (float a, float b)
+
+s4 builtin_fcmpl(float a, float b)
 {
        if (isnanf(a)) return -1;
        if (isnanf(b)) return -1;
        if (!finitef(a) || !finitef(b)) {
-               a = finitef(a) ? 0 : copysignf(1.0,      a);
+               a = finitef(a) ? 0 : copysignf(1.0,     a);
                b = finitef(b) ? 0 : copysignf(1.0, b);
-               }
-       if (a>b) return 1;
-       if (a==b) return 0;
+       }
+       if (a > b) return 1;
+       if (a == b) return 0;
        return -1;
 }
 
-s4 builtin_fcmpg (float a, float b)
+
+s4 builtin_fcmpg(float a, float b)
 {
        if (isnanf(a)) return 1;
        if (isnanf(b)) return 1;
        if (!finitef(a) || !finitef(b)) {
                a = finitef(a) ? 0 : copysignf(1.0, a);
                b = finitef(b) ? 0 : copysignf(1.0, b);
-               }
-       if (a>b) return 1;
-       if (a==b) return 0;
+       }
+       if (a > b) return 1;
+       if (a == b) return 0;
        return -1;
 }
 
@@ -1560,131 +1481,167 @@ s4 builtin_fcmpg (float a, float b)
 
 /************************* Functions for doubles ****************************/
 
-double builtin_dadd (double a, double b)
+double builtin_dadd(double a, double b)
 {
-       if (isnan(a)) return DBL_NAN;
-       if (isnan(b)) return DBL_NAN;
+       if (isnan(a)) return longBitsToDouble(DBL_NAN);
+       if (isnan(b)) return longBitsToDouble(DBL_NAN);
        if (finite(a)) {
-               if (finite(b)) return a+b;
+               if (finite(b)) return a + b;
                else return b;
-               }
+       }
        else {
                if (finite(b)) return a;
                else {
                        if (copysign(1.0, a)==copysign(1.0, b)) return a;
-                       else  return DBL_NAN;
-                       }
+                       else return longBitsToDouble(DBL_NAN);
                }
+       }
 }
 
-double builtin_dsub (double a, double b)
+
+double builtin_dsub(double a, double b)
 {
-       return builtin_dadd (a, builtin_dneg(b));
+       return builtin_dadd(a, builtin_dneg(b));
 }
 
-double builtin_dmul (double a, double b)
+
+double builtin_dmul(double a, double b)
 {
-       if (isnan(a)) return DBL_NAN;
-       if (isnan(b)) return DBL_NAN;
+       if (isnan(a)) return longBitsToDouble(DBL_NAN);
+       if (isnan(b)) return longBitsToDouble(DBL_NAN);
        if (finite(a)) {
-               if (finite(b)) return a*b;
+               if (finite(b)) return a * b;
                else {
-                       if (a==0) return DBL_NAN;
-                                else return copysign(b, copysign(1.0, b)*a);
-                       }
+                       if (a == 0) return longBitsToDouble(DBL_NAN);
+                       else return copysign(b, copysign(1.0, b) * a);
                }
+       }
        else {
                if (finite(b)) {
-                       if (b==0) return DBL_NAN;
-                                else return copysign(a, copysign(1.0, a)*b);
-                       }
+                       if (b == 0) return longBitsToDouble(DBL_NAN);
+                       else return copysign(a, copysign(1.0, a) * b);
+               }
                else {
-                       return copysign(a, copysign(1.0, a)*copysign(1.0, b));
-                       }
+                       return copysign(a, copysign(1.0, a) * copysign(1.0, b));
                }
+       }
 }
 
-double builtin_ddiv (double a, double b)
+
+double builtin_ddiv(double a, double b)
 {
-       if (finite(a) && finite(b)) {
-               if (b != 0)
+       if (finite(a)) {
+               if (finite(b)) {
                        return a / b;
-               else {
+
+               } else {
+                       if (isnan(b))
+                               return longBitsToDouble(DBL_NAN);
+                       else
+                               return copysign(0.0, b);
+               }
+
+       } else {
+               if (finite(b)) {
                        if (a > 0)
-                               return DBL_POSINF;
+                               return longBitsToDouble(DBL_POSINF);
                        else if (a < 0)
-                               return DBL_NEGINF;
-                       }
-               }
-       return DBL_NAN;
+                               return longBitsToDouble(DBL_NEGINF);
+
+               } else
+                       return longBitsToDouble(DBL_NAN);
+       }
+
+/*     if (finite(a) && finite(b)) { */
+/*             if (b != 0) */
+/*                     return a / b; */
+/*             else { */
+/*                     if (a > 0) */
+/*                             return longBitsToDouble(DBL_POSINF); */
+/*                     else if (a < 0) */
+/*                             return longBitsToDouble(DBL_NEGINF); */
+/*             } */
+/*     } */
+
+       /* keep compiler happy */
+       return 0;
 }
 
-double builtin_drem (double a, double b)
+
+double builtin_drem(double a, double b)
 {
        return fmod(a, b);
 }
 
-double builtin_dneg (double a)
+
+double builtin_dneg(double a)
 {
        if (isnan(a)) return a;
        else {
                if (finite(a)) return -a;
-                                 else return copysign(a,-copysign(1.0, a));
-               }
+               else return copysign(a, -copysign(1.0, a));
+       }
 }
 
-s4 builtin_dcmpl (double a, double b)
+
+s4 builtin_dcmpl(double a, double b)
 {
        if (isnan(a)) return -1;
        if (isnan(b)) return -1;
        if (!finite(a) || !finite(b)) {
                a = finite(a) ? 0 : copysign(1.0, a);
                b = finite(b) ? 0 : copysign(1.0, b);
-               }
-       if (a>b) return 1;
-       if (a==b) return 0;
+       }
+       if (a > b) return 1;
+       if (a == b) return 0;
        return -1;
 }
 
-s4 builtin_dcmpg (double a, double b)
+
+s4 builtin_dcmpg(double a, double b)
 {
        if (isnan(a)) return 1;
        if (isnan(b)) return 1;
        if (!finite(a) || !finite(b)) {
                a = finite(a) ? 0 : copysign(1.0, a);
                b = finite(b) ? 0 : copysign(1.0, b);
-               }
-       if (a>b) return 1;
-       if (a==b) return 0;
+       }
+       if (a > b) return 1;
+       if (a == b) return 0;
        return -1;
 }
 
 
 /*********************** Conversion operations ****************************/
 
-s8 builtin_i2l (s4 i)
+s8 builtin_i2l(s4 i)
 {
 #if U8_AVAILABLE
        return i;
 #else
-       s8 v; v.high = 0; v.low=i; return v;
+       s8 v;
+       v.high = 0;
+       v.low = i;
+       return v;
 #endif
 }
 
-float builtin_i2f (s4 a)
+
+float builtin_i2f(s4 a)
 {
-float f = (float) a;
-return f;
+       float f = (float) a;
+       return f;
 }
 
-double builtin_i2d (s4 a)
+
+double builtin_i2d(s4 a)
 {
-double d = (double) a;
-return d;
+       double d = (double) a;
+       return d;
 }
 
 
-s4 builtin_l2i (s8 l)
+s4 builtin_l2i(s8 l)
 {
 #if U8_AVAILABLE
        return (s4) l;
@@ -1693,7 +1650,8 @@ s4 builtin_l2i (s8 l)
 #endif
 }
 
-float builtin_l2f (s8 a)
+
+float builtin_l2f(s8 a)
 {
 #if U8_AVAILABLE
        float f = (float) a;
@@ -1703,7 +1661,8 @@ float builtin_l2f (s8 a)
 #endif
 }
 
-double builtin_l2d (s8 a)
+
+double builtin_l2d(s8 a)
 {
 #if U8_AVAILABLE
        double d = (double) a;
@@ -1717,60 +1676,62 @@ double builtin_l2d (s8 a)
 s4 builtin_f2i(float a) 
 {
 
-return builtin_d2i((double) a);
+       return builtin_d2i((double) a);
 
-/*     float f;
+       /*      float f;
        
-       if (isnanf(a))
+               if (isnanf(a))
                return 0;
-       if (finitef(a)) {
+               if (finitef(a)) {
                if (a > 2147483647)
-                       return 2147483647;
+               return 2147483647;
                if (a < (-2147483648))
-                       return (-2147483648);
+               return (-2147483648);
                return (s4) a;
                }
-       f = copysignf((float) 1.0, a);
-       if (f > 0)
+               f = copysignf((float) 1.0, a);
+               if (f > 0)
                return 2147483647;
-       return (-2147483648); */
+               return (-2147483648); */
 }
 
 
-s8 builtin_f2l (float a)
+s8 builtin_f2l(float a)
 {
 
-return builtin_d2l((double) a);
+       return builtin_d2l((double) a);
 
-/*     float f;
+       /*      float f;
        
-       if (finitef(a)) {
+               if (finitef(a)) {
                if (a > 9223372036854775807L)
-                       return 9223372036854775807L;
+               return 9223372036854775807L;
                if (a < (-9223372036854775808L))
-                       return (-9223372036854775808L);
+               return (-9223372036854775808L);
                return (s8) a;
                }
-       if (isnanf(a))
+               if (isnanf(a))
                return 0;
-       f = copysignf((float) 1.0, a);
-       if (f > 0)
+               f = copysignf((float) 1.0, a);
+               if (f > 0)
                return 9223372036854775807L;
-       return (-9223372036854775808L); */
+               return (-9223372036854775808L); */
 }
 
 
-double builtin_f2d (float a)
+double builtin_f2d(float a)
 {
        if (finitef(a)) return (double) a;
        else {
-               if (isnanf(a)) return DBL_NAN;
-               else               return copysign(DBL_POSINF, (double) copysignf(1.0, a) );
-               }
+               if (isnanf(a))
+                       return longBitsToDouble(DBL_NAN);
+               else
+                       return copysign(longBitsToDouble(DBL_POSINF), (double) copysignf(1.0, a) );
+       }
 }
 
 
-s4 builtin_d2i (double a) 
+s4 builtin_d2i(double a) 
 { 
        double d;
        
@@ -1780,7 +1741,7 @@ s4 builtin_d2i (double a)
                if (a <= (-2147483647-1))
                        return (-2147483647-1);
                return (s4) a;
-               }
+       }
        if (isnan(a))
                return 0;
        d = copysign(1.0, a);
@@ -1790,7 +1751,7 @@ s4 builtin_d2i (double a)
 }
 
 
-s8 builtin_d2l (double a)
+s8 builtin_d2l(double a)
 {
        double d;
        
@@ -1800,7 +1761,7 @@ s8 builtin_d2l (double a)
                if (a <= (-9223372036854775807LL-1))
                        return (-9223372036854775807LL-1);
                return (s8) a;
-               }
+       }
        if (isnan(a))
                return 0;
        d = copysign(1.0, a);
@@ -1810,16 +1771,106 @@ s8 builtin_d2l (double a)
 }
 
 
-float builtin_d2f (double a)
+float builtin_d2f(double a)
 {
-       if (finite(a)) return (float) a;
+       if (finite(a))
+               return (float) a;
        else {
-               if (isnan(a)) return FLT_NAN;
-               else              return copysignf (FLT_POSINF, (float) copysign(1.0, a));
-               }
+               if (isnan(a))
+                       return intBitsToFloat(FLT_NAN);
+               else
+                       return copysignf(intBitsToFloat(FLT_POSINF), (float) copysign(1.0, a));
+       }
+}
+
+
+/* used to convert FLT_xxx defines into float values */
+
+inline float intBitsToFloat(s4 i)
+{
+       imm_union imb;
+
+       imb.i = i;
+       return imb.f;
+}
+
+
+/* used to convert DBL_xxx defines into double values */
+
+inline float longBitsToDouble(s8 l)
+{
+       imm_union imb;
+
+       imb.l = l;
+       return imb.d;
 }
 
 
+java_arrayheader *builtin_clone_array(void *env, java_arrayheader *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)");
+       return 0; /* for the compiler */
+}
+
+
+/* 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()
+{
+/*log_text("builtin_asm_get_stackframeinfo()");*/
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       return &THREADINFO->_stackframeinfo;
+#else
+#if defined(__GNUC__)
+#warning FIXME FOR OLD THREAD IMPL (jowenn)
+#endif
+               return &_thread_nativestackframeinfo; /* no threading, at least no native*/
+#endif
+}
+
+stacktraceelement *builtin_stacktrace_copy(stacktraceelement **el,stacktraceelement *begin, stacktraceelement *end) {
+/*     stacktraceelement *el;*/
+       size_t s;
+       s=(end-begin);
+       /*printf ("begin: %p, end: %p, diff: %ld, size :%ld\n",begin,end,s,s*sizeof(stacktraceelement));*/
+       *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;
+#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;
+}
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where