Print can't find method and exit.
[cacao.git] / builtin.c
index 6e28c7c5dcc3822a4cd04b5c0d64795a1d58abcf..ec7e82ab4444fd9077e2163d281b5f2506a6cca5 100644 (file)
--- a/builtin.c
+++ b/builtin.c
-/* -*- mode: c; tab-width: 4; c-basic-offset: 4 -*- */
-/****************************** builtin.c **************************************
+/* builtin.c - functions for unsupported operations
 
-       Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
+   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
+   P. Tomsich, J. Wenninger
 
-       See file COPYRIGHT for information on usage and disclaimer of warranties
+   This file is part of CACAO.
 
-       Enthaelt die C-Funktionen fuer alle JavaVM-Befehle, die sich nicht direkt
-       auf Maschinencode "ubersetzen lassen. Im Code f"ur die Methoden steht
-       dann ein Funktionsaufruf (nat"urlich mit den Aufrufskonventionen von C).
+   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: 1996/12/03
+   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>
-#include <values.h>
+   Authors: Reinhard Grafl
+            Andreas Krall
+            Mark Probst
+
+   Contains C functions for JavaVM Instructions that cannot be
+   translated to machine language directly. Consequently, the
+   generated machine code for these instructions contains function
+   calls instead of machine instructions, using the C calling
+   convention.
+
+   $Id: builtin.c 557 2003-11-02 22:51:59Z twisti $
 
+*/
+
+
+#include <assert.h>
 #include "global.h"
 #include "builtin.h"
-
 #include "loader.h"
 #include "tables.h"
-
 #include "threads/thread.h"
-#include "threads/locks.h"              /* schani */
+#include "threads/locks.h"
+#include "toolbox/loging.h"
+
+#include "native-math.h"
 
-#include "sysdep/native-math.h"
 
 builtin_descriptor builtin_desc[] = {
-       {(functionptr) builtin_instanceof,         "instanceof"},
-       {(functionptr) builtin_checkcast,          "checkcast"},
-       {(functionptr) new_builtin_checkcast,      "checkcast"},
-       {(functionptr) new_builtin_checkclasscast, "checkclasscast"},
-       {(functionptr) new_builtin_checkintercast, "checkintercast"},
-       {(functionptr) builtin_arrayinstanceof,    "arrayinstanceof"},
-       {(functionptr) builtin_checkarraycast,     "checkarraycast"},
-       {(functionptr) new_builtin_checkarraycast, "checkarraycast"},
-       {(functionptr) new_builtin_aastore,        "aastore"},
-       {(functionptr) builtin_new,                "new"},
+       {(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"},
+       {(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_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) new_builtin_monitorenter,   "monitorenter"},
-       {(functionptr) builtin_monitorexit,        "monitorexit"},
-       {(functionptr) new_builtin_monitorexit,    "monitorexit"},
-       {(functionptr) builtin_idiv,               "idiv"},
-       {(functionptr) new_builtin_idiv,           "idiv"},
-       {(functionptr) builtin_irem,               "irem"},
-       {(functionptr) new_builtin_irem,           "irem"},
-       {(functionptr) builtin_ladd,               "ladd"},
-       {(functionptr) builtin_lsub,               "lsub"},
-       {(functionptr) builtin_lmul,               "lmul"},
-       {(functionptr) builtin_ldiv,               "ldiv"},
-       {(functionptr) new_builtin_ldiv,           "ldiv"},
-       {(functionptr) builtin_lrem,               "lrem"},
-       {(functionptr) new_builtin_lrem,           "lrem"},
-       {(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) builtin_f2l,                "f2l"},
-       {(functionptr) builtin_f2d,                "f2d"},
-       {(functionptr) builtin_d2i,                "d2i"},
-       {(functionptr) builtin_d2l,                "d2l"},
-       {(functionptr) builtin_d2f,                "d2f"},
-       {(functionptr) NULL,                       "unknown"}
-       };
+       {(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"},
+#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) builtin_f2l,                                "f2l"},
+       {(functionptr) builtin_f2d,                                "f2d"},
+       {(functionptr) builtin_d2i,                                "d2i"},
+       {(functionptr) builtin_d2l,                                "d2l"},
+#if defined(__I386__)
+       {(functionptr) asm_builtin_f2i,                    "f2i"},
+       {(functionptr) asm_builtin_f2l,                    "f2l"},
+       {(functionptr) asm_builtin_d2i,                    "d2i"},
+       {(functionptr) asm_builtin_d2l,                    "d2l"},
+#endif
+       {(functionptr) builtin_d2f,                                "d2f"},
+       {(functionptr) NULL,                                       "unknown"}
+};
 
 
 /*****************************************************************************
-                                TYPCHECKS
+                                                               TYPE CHECKS
 *****************************************************************************/
 
 
 
-/*************** interne Funktion: builtin_isanysubclass *********************
+/*************** internal function: builtin_isanysubclass *********************
 
-       "uberpr"uft, ob eine Klasse eine Unterklasse einer anderen Klasse ist.
-       Dabei gelten auch Interfaces, die eine Klasse implementiert, als
-       deren Oberklassen. 
-       R"uckgabewert:  1 ... es trifft zu
-                       0 ... es trifft nicht zu
-                       
-*****************************************************************************/                 
+       Checks a subclass relation between two classes. Implemented interfaces
+       are interpreted as super classes.
+       Return value:  1 ... sub is subclass of super
+                                  0 ... otherwise
+                                       
+*****************************************************************************/                                 
 
-static s4 builtin_isanysubclass (classinfo *sub, classinfo *super)
-{
-       if (super->flags & ACC_INTERFACE) {
-               s4 index = super->index;
-               if (index >= sub->vftbl->interfacetablelength) return 0;
-               return ( sub->vftbl->interfacevftbl[index] ) ? 1 : 0;
-               }
-       return (sub->vftbl->lowclassval >= super->vftbl->lowclassval) &
-              (sub->vftbl->lowclassval <= super->vftbl->highclassval);
+s4 builtin_isanysubclass (classinfo *sub, classinfo *super)
+{ 
+       if (super->flags & ACC_INTERFACE)
+               return (sub->vftbl->interfacetablelength > super->index) &&
+                       (sub->vftbl->interfacetable[-super->index] != NULL);
+
+       /*
+         while (sub != 0)
+         if (sub == super)
+         return 1;
+         else
+         sub = sub->super;
+
+         return 0;
+       */
+
+       return (unsigned) (sub->vftbl->baseval - super->vftbl->baseval) <=
+               (unsigned) (super->vftbl->diffval);
 }
 
 
-/****************** Funktion: builtin_instanceof *****************************
+/****************** function: builtin_instanceof *****************************
 
-       "Uberpr"uft, ob ein Objekt eine Instanz einer Klasse (oder einer davon
-       abgeleiteten Klasse) ist, oder ob die Klasse des Objekts ein Interface 
-       implementiert.
-       Return:   1, wenn ja
-                 0, wenn nicht, oder wenn Objekt ein NULL-Zeiger
-                
+       Checks if an object is an instance of some given class (or subclass of
+       that class). If class is an interface, checks if the interface is
+       implemented.
+       Return value:  1 ... obj is an instance of class or implements the interface
+                                  0 ... otherwise or if obj == NULL
+                        
 *****************************************************************************/
 
 s4 builtin_instanceof(java_objectheader *obj, classinfo *class)
@@ -159,14 +203,11 @@ s4 builtin_instanceof(java_objectheader *obj, classinfo *class)
 
 
 
-/**************** Funktion: builtin_checkcast *******************************
+/**************** function: builtin_checkcast *******************************
 
-       "Uberpr"uft, ob ein Objekt eine Instanz einer Klasse (oder einer davon
-       abgeleiteten Klasse ist).
-       Unterschied zu builtin_instanceof: Ein NULL-Zeiger ist immer richtig
-       Return:   1, wenn ja, oder wenn Objekt ein NULL-Zeiger 
-              0, wenn nicht
-              
+       The same as builtin_instanceof except that 1 is returned when
+       obj == NULL
+                         
 ****************************************************************************/
 
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class)
@@ -175,101 +216,61 @@ s4 builtin_checkcast(java_objectheader *obj, classinfo *class)
        log_text ("builtin_checkcast called");
 #endif
 
-       if (!obj) return 1;
-       if ( builtin_isanysubclass (obj->vftbl->class, class) ) {
+       if (obj == NULL)
                return 1;
-                               }
-#if DEBUG
-               printf ("#### checkcast failed ");
-               unicode_display (obj->vftbl->class->name);
-               printf (" -> ");
-               unicode_display (class->name);
-               printf ("\n");
-#endif
-               
-       return 0;
-}
-
-
-/***************** function: builtin_checkclasscast ****************************
-
-       Returns 1 (true) if the object "sub" is a subclass of the class "super",
-       otherwise returns 0 (false). If sub is NULL it also returns 1 (true).
-              
-*******************************************************************************/
-
-s4 builtin_checkclasscast(java_objectheader *sub, classinfo *super)
-{
-       if (!sub)
+       if (builtin_isanysubclass (obj->vftbl->class, class))
                return 1;
 
-       return (sub->vftbl->lowclassval >= super->vftbl->lowclassval) &
-              (sub->vftbl->lowclassval <= super->vftbl->highclassval);
-}
-
-
-/***************** function: builtin_checkintercast ****************************
-
-       Returns 1 (true) if the object "sub" is a subclass of the interface "super",
-       otherwise returns 0 (false). If "sub" is NULL it also returns 1 (true).
-              
-*******************************************************************************/
-
-s4 builtin_checkintercast(java_objectheader *sub, classinfo *super)
-{
-       if (!sub)
-               return 1;
+#if DEBUG
+       printf ("#### checkcast failed ");
+       utf_display (obj->vftbl->class->name);
+       printf (" -> ");
+       utf_display (class->name);
+       printf ("\n");
+#endif
 
-       return (sub->vftbl->interfacetablelength > super->index) &&
-              (sub->vftbl->interfacevftbl[super->index] != NULL);
        return 0;
 }
 
 
-/*********** interne Funktion: builtin_descriptorscompatible ******************
+/*********** internal function: builtin_descriptorscompatible ******************
 
-       "uberpr"uft, ob zwei Array-Typdescriptoren compartible sind, d.h.,
-       ob ein Array vom Typ 'desc' gefahrlos einer Variblen vom Typ 'target'
-       zugewiesen werden kann.
-       Return: 1, wenn ja
-               0, wenn nicht
-               
+       Checks if two array type descriptors are assignment compatible
+       Return value:  1 ... target = desc is possible
+                                  0 ... otherwise
+                       
 ******************************************************************************/
 
-static s4 builtin_descriptorscompatible
-       (constant_arraydescriptor *desc, constant_arraydescriptor *target)
+static s4 builtin_descriptorscompatible(constant_arraydescriptor *desc, constant_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;
-               }
+       case ARRAYTYPE_OBJECT: 
+               return builtin_isanysubclass (desc->objectclass, target->objectclass);
+       case ARRAYTYPE_ARRAY:
+               return builtin_descriptorscompatible 
+                       (desc->elementdescriptor, target->elementdescriptor);
+       default: return 1;
+       }
 }
 
 
 
-/******************** Funktion: builtin_checkarraycast ***********************
-
-       "uberpr"uft, ob ein gegebenes Objekt tats"achlich von einem 
-       Untertyp des geforderten Arraytyps ist.
-       Dazu muss das Objekt auf jeden Fall ein Array sein. 
-       Bei einfachen Arrays (int,short,double,etc.) muss der Typ genau 
-       "ubereinstimmen.
-       Bei Arrays von Objekten muss der Elementtyp des tats"achlichen Arrays
-       ein Untertyp (oder der selbe Typ) vom geforderten Elementtyp sein.
-       Bei Arrays vom Arrays (die eventuell wieder Arrays von Arrays
-       sein k"onnen) m"ussen die untersten Elementtypen in der entsprechenden
-       Unterklassenrelation stehen.
+/******************** function: builtin_checkarraycast ***********************
 
-       Return: 1, wenn Cast in Ordung ist
-                       0, wenn es nicht geht
+       Checks if an object is really a subtype of the requested array type.
+       The object has to be an array to begin with. For simple arrays (int, short,
+       double, etc.) the types have to match exactly.
+       For arrays of objects, the type of elements in the array has to be a
+       subtype (or the same type) of the requested element type. For arrays of
+       arrays (which in turn can again be arrays of arrays), the types at the
+       lowest level have to satisfy the corresponding sub class relation.
        
-       Achtung: ein Cast mit einem NULL-Zeiger geht immer gut.
+       Return value:  1 ... cast is possible
+                                  0 ... otherwise
+       
+       ATTENTION: a cast with a NULL pointer is always possible.
                        
 *****************************************************************************/
 
@@ -279,31 +280,48 @@ s4 builtin_checkarraycast(java_objectheader *o, constant_arraydescriptor *desc)
 
        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;
-               }
+       }
        
        switch (a->arraytype) {
-               case ARRAYTYPE_OBJECT: {
-                       java_objectarray *oa = (java_objectarray*) o;
-                       return builtin_isanysubclass (oa->elementtype, desc->objectclass);
-                       }
-               case ARRAYTYPE_ARRAY: {
-                       java_arrayarray *aa = (java_arrayarray*) o;
-                       return builtin_descriptorscompatible
-                          (aa->elementdescriptor, desc->elementdescriptor);
-                       }
-               default:   
-                       return 1;
-               }
+       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);
+
+#ifdef DEBUG
+               if (!result)
+                       printf ("#### checkarraycast failed 4\n");
+#endif
+               return result;
+       }
+       default:   
+               return 1;
+       }
 }
 
 
-s4 builtin_arrayinstanceof
-       (java_objectheader *obj, constant_arraydescriptor *desc)
+s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *desc)
 {
        if (!obj) return 1;
        return builtin_checkarraycast (obj, desc);
@@ -314,20 +332,22 @@ s4 builtin_arrayinstanceof
 
 ******************************************************************************/
 
-java_objectheader *builtin_throw_exception (java_objectheader *exceptionptr) {
-       unicode_display (exceptionptr->vftbl->class->name);
-       printf ("\n");
-       fflush (stdout);
-       return exceptionptr;
+java_objectheader *builtin_throw_exception (java_objectheader *local_exceptionptr) {
+       if (verbose) {
+               sprintf(logtext, "Builtin exception thrown: ");
+               utf_sprint(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name);
+               dolog();
+       }
+       exceptionptr = local_exceptionptr;
+       return local_exceptionptr;
 }
 
 
-/******************* Funktion: builtin_canstore *******************************
+/******************* function: builtin_canstore *******************************
 
-       "uberpr"uft, ob ein Objekt in einem Array gespeichert werden 
-       darf.
-       Return: 1, wenn es geht
-                       0, wenn nicht
+       Checks, if an object can be stored in an array.
+       Return value:  1 ... possible
+                                  0 ... otherwise
 
 ******************************************************************************/
 
@@ -340,15 +360,15 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
        case ARRAYTYPE_OBJECT:
                if ( ! builtin_checkcast (o, a->elementtype) ) {
                        return 0;
-                       }
+               }
                return 1;
                break;
 
        case ARRAYTYPE_ARRAY:
                if ( ! builtin_checkarraycast 
-                        (o, ((java_arrayarray*)a)->elementdescriptor) ) {
+                        (o, ((java_arrayarray*)a)->elementdescriptor) ) {
                        return 0;
-                       }
+               }
                return 1;
                break;
 
@@ -361,303 +381,418 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 
 
 /*****************************************************************************
-                          ARRAYOPERATIONEN
+                                                 ARRAY OPERATIONS
 *****************************************************************************/
 
 
 
-/******************** Funktion: builtin_new **********************************
+/******************** Function: builtin_new **********************************
 
-       Legt ein neues Objekt einer Klasse am Heap an.
-       Return: Der Zeiger auf das Objekt, oder NULL, wenn kein Speicher
-                       mehr frei ist.
+       Creates a new instance of class c on the heap.
+       Return value:  pointer to the object or NULL if no memory is
+                                  available
                        
 *****************************************************************************/
 
-java_objectheader *builtin_new (classinfo *c)
+#define ALIGNMENT 3
+#define align_size(size)       ((size + ((1 << ALIGNMENT) - 1)) & ~((1 << ALIGNMENT) - 1))
+
+java_objectheader *builtin_new(classinfo *c)
 {
        java_objectheader *o;
-       
-       o = heap_allocate ( c->instancesize, true, c->finalizer );
+
+       class_init(c);
+
+#ifdef SIZE_FROM_CLASSINFO
+       c->alignedsize = align_size(c->instancesize);
+       o = heap_allocate(c->alignedsize, true, c->finalizer);
+#else
+       o = heap_allocate(c->instancesize, true, c->finalizer);
+#endif
        if (!o) return NULL;
        
-       memset (o, 0, c->instancesize);
+       memset(o, 0, c->instancesize);
+
+       o->vftbl = c->vftbl;
 
-       o -> vftbl = c -> vftbl;
        return o;
 }
 
 
 
-/******************** Funktion: builtin_anewarray ****************************
-
-       Legt ein Array von Zeigern auf Objekte am Heap an.
-       Parameter: 
-               size ......... Anzahl der Elemente
-               elementtype .. ein Zeiger auf die classinfo-Struktur des Typs
-                              der Elemente
+/******************** function: builtin_anewarray ****************************
 
-       Return: Zeiger auf das Array, oder NULL (wenn kein Speicher frei)
+       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));
+}
+
+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 *a;
+
+#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);
+#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;
+
+               case ARRAYTYPE_BOOLEAN:
+                       c = create_array_class(utf_new_char("[Z"));
+                       XXX_use_class_as_object(c, "boolean");
+                       break;
+
+               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;
+
+               case ARRAYTYPE_ARRAY:
+                       c = create_array_class(utf_new_char("[["));
+                       XXX_use_class_as_object(c, "java/lang/Boolean");
+                       break;
+
+               default:
+                       panic("unknown array type");
+               }
+
+               a->objheader.vftbl = c->vftbl;
+       }
+#else
+       a->objheader.vftbl = class_array->vftbl;
+#endif
+       a -> size = size;
+#ifdef SIZE_FROM_CLASSINFO
+       a -> alignedsize = alignedsize;
+#endif
+       a -> arraytype = arraytype;
+
+       return a;
+}
+
+
 java_objectarray *builtin_anewarray (s4 size, classinfo *elementtype)
 {
-       s4 i;
-       java_objectarray *a;
-       
-       a = heap_allocate ( sizeof(java_objectarray) + (size-1) * sizeof(void*), 
-                           true, 0 /* FALSE */ );
+       java_objectarray *a;    
+       a = (java_objectarray*)__builtin_newarray(sizeof(java_objectarray),
+                                                                                         size, 
+                                                                                         true, 
+                                                                                         sizeof(void*), 
+                                                                                         ARRAYTYPE_OBJECT,
+                                                                                         elementtype);
        if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_OBJECT;
+
        a -> elementtype = elementtype;
-       for (i=0; i<size; i++) a->data[i] = NULL;
        return a;
 }
 
 
 
-/******************** Funktion: builtin_newarray_array ***********************
+/******************** function: builtin_newarray_array ***********************
 
-       Legt ein Array von Zeigern auf Arrays am Heap an.
-       Paramter: size ......... Anzahl der Elemente
-                 elementdesc .. Zeiger auf die Arraybeschreibungs-Struktur f"ur
-                                die Element-Arrays.
-
-       Return: Zeiger auf das Array, oder NULL
+       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
 
 *****************************************************************************/
 
 java_arrayarray *builtin_newarray_array 
-        (s4 size, constant_arraydescriptor *elementdesc)
+(s4 size, constant_arraydescriptor *elementdesc)
 {
-       s4 i;
-       java_arrayarray *a;
-       
-       a = heap_allocate ( sizeof(java_arrayarray) + (size-1) * sizeof(void*), 
-                           true, NULL );
+       java_arrayarray *a; 
+       a = (java_arrayarray*)__builtin_newarray(sizeof(java_arrayarray),
+                                                                                        size, 
+                                                                                        true, 
+                                                                                        sizeof(void*), 
+                                                                                        ARRAYTYPE_ARRAY,
+                                                                                        elementdesc->objectclass);
        if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_ARRAY;
+
        a -> elementdescriptor = elementdesc;
-       for (i=0; i<size; i++) a->data[i] = NULL;
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_boolean ************************
+/******************** function: builtin_newarray_boolean ************************
 
-       Legt ein Array von Bytes am Heap an, das allerdings als Boolean-Array 
-       gekennzeichnet wird (wichtig bei Casts!)
-
-       Return: Zeiger auf das Array, oder NULL 
+       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_booleanarray *a;
-       
-       a = heap_allocate ( sizeof(java_booleanarray) + (size-1) * sizeof(u1), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_BOOLEAN;
-       memset (a->data, 0, sizeof(u1) * size);
-
+       java_booleanarray *a;   
+       a = (java_booleanarray*)__builtin_newarray(sizeof(java_booleanarray),
+                                                                                          size, 
+                                                                                          false, 
+                                                                                          sizeof(u1), 
+                                                                                          ARRAYTYPE_BOOLEAN,
+                                                                                          NULL);
        return a;
 }
 
-/******************** Funktion: builtin_newarray_char ************************
+/******************** function: builtin_newarray_char ************************
 
-       Legt ein Array von 16-bit-Integers am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Creates an array of characters on the heap.
+
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_chararray *builtin_newarray_char (s4 size)
 {
-       java_chararray *a;
-       
-       a = heap_allocate ( sizeof(java_chararray) + (size-1) * sizeof(u2), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_CHAR;
-       memset (a->data, 0, sizeof(u2) * size);
-
+       java_chararray *a;      
+       a = (java_chararray*)__builtin_newarray(sizeof(java_chararray),
+                                                                                       size, 
+                                                                                       false, 
+                                                                                       sizeof(u2), 
+                                                                                       ARRAYTYPE_CHAR,
+                                                                                       NULL);
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_float ***********************
+/******************** function: builtin_newarray_float ***********************
+
+       Creates an array of 32 bit IEEE floats on the heap.
 
-       Legt ein Array von 32-bit-IEEE-float am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_floatarray *builtin_newarray_float (s4 size)
 {
-       s4 i;
-       java_floatarray *a;
-       
-       a = heap_allocate ( sizeof(java_floatarray) + (size-1) * sizeof(float), 
-                           false, NULL );
-       if (!a) return NULL;
-
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_FLOAT;
-       for (i=0; i<size; i++) a->data[i] = 0.0;
+       java_floatarray *a; 
+       a = (java_floatarray*)__builtin_newarray(sizeof(java_floatarray),
+                                                                                        size, 
+                                                                                        false, 
+                                                                                        sizeof(float), 
+                                                                                        ARRAYTYPE_FLOAT,
+                                                                                        NULL);
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_double ***********************
+/******************** function: builtin_newarray_double ***********************
+
+       Creates an array of 64 bit IEEE floats on the heap.
 
-       Legt ein Array von 64-bit-IEEE-float am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_doublearray *builtin_newarray_double (s4 size)
 {
-       s4 i;
-       java_doublearray *a;
-       
-       a = heap_allocate ( sizeof(java_doublearray) + (size-1) * sizeof(double), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_DOUBLE;
-       for (i=0; i<size; i++) a->data[i] = 0.0;
+       java_doublearray *a;    
+       a = (java_doublearray*)__builtin_newarray(sizeof(java_doublearray),
+                                                                                         size, 
+                                                                                         false, 
+                                                                                         sizeof(double), 
+                                                                                         ARRAYTYPE_DOUBLE,
+                                                                                         NULL);
        return a;
 }
 
 
 
 
-/******************** Funktion: builtin_newarray_byte ***********************
+/******************** function: builtin_newarray_byte ***********************
+
+       Creates an array of 8 bit Integers on the heap.
 
-       Legt ein Array von 8-bit-Integers am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_bytearray *builtin_newarray_byte (s4 size)
 {
-       java_bytearray *a;
-       
-       a = heap_allocate ( sizeof(java_bytearray) + (size-1) * sizeof(s1), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array->vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_BYTE;
-       memset (a->data, 0, sizeof(u1) * size);
+       java_bytearray *a;      
+       a = (java_bytearray*)__builtin_newarray(sizeof(java_bytearray),
+                                                                                       size, 
+                                                                                       false, 
+                                                                                       sizeof(u1), 
+                                                                                       ARRAYTYPE_BYTE,
+                                                                                       NULL);
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_short ***********************
+/******************** function: builtin_newarray_short ***********************
 
-       Legt ein Array von 16-bit-Integers am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Creates an array of 16 bit Integers on the heap.
+
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_shortarray *builtin_newarray_short (s4 size)
 {
-       java_shortarray *a;
-       
-       a = heap_allocate ( sizeof(java_shortarray) + (size-1) * sizeof(s2), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_SHORT;
-       memset (a->data, 0, sizeof(s2) * size);
+       java_shortarray *a; 
+       a = (java_shortarray*)__builtin_newarray(sizeof(java_shortarray),
+                                                                                        size, 
+                                                                                        false, 
+                                                                                        sizeof(s2), 
+                                                                                        ARRAYTYPE_SHORT,
+                                                                                        NULL);
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_int ***********************
+/******************** Function: builtin_newarray_int ***********************
+
+       Creates an array of 32 bit Integers on the heap.
 
-       Legt ein Array von 32-bit-Integers am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_intarray *builtin_newarray_int (s4 size)
 {
-       java_intarray *a;
-       
-       a = heap_allocate ( sizeof(java_intarray) + (size-1) * sizeof(s4), 
-                           false, NULL );
-       if (!a) return NULL;
-       
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_INT;
-       memset (a->data, 0, sizeof(s4) * size);
+       java_intarray *a;       
+       a = (java_intarray*)__builtin_newarray(sizeof(java_intarray),
+                                                                                  size, 
+                                                                                  false, 
+                                                                                  sizeof(s4), 
+                                                                                  ARRAYTYPE_INT,
+                                                                                  NULL);
        return a;
 }
 
 
-/******************** Funktion: builtin_newarray_long ***********************
+/******************** Function: builtin_newarray_long ***********************
 
-       Legt ein Array von 64-bit-Integers am Heap an.
-       Return: Zeiger auf das Array, oder NULL 
+       Creates an array of 64 bit Integers on the heap.
+
+       Return value:  pointer to the array or NULL if no memory is available
 
 *****************************************************************************/
 
 java_longarray *builtin_newarray_long (s4 size)
 {
-       java_longarray *a;
-       
-       a = heap_allocate ( sizeof(java_longarray) + (size-1) * sizeof(s8), 
-                           false, NULL );
-       if (!a) return NULL;
-
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = size;
-       a -> header.arraytype = ARRAYTYPE_LONG;
-       memset (a->data, 0, sizeof(s8) * size);
+       java_longarray *a;      
+       a = (java_longarray*)__builtin_newarray(sizeof(java_longarray),
+                                                                                       size, 
+                                                                                       false, 
+                                                                                       sizeof(s8), 
+                                                                                       ARRAYTYPE_LONG,
+                                                                                       NULL);
        return a;
 }
 
 
 
-/***************** Funktion: builtin_multianewarray ***************************
+/***************** function: builtin_multianewarray ***************************
 
-       Legt ein mehrdimensionales Array am Heap an.
-       Die Gr"ossen der einzelnen Dimensionen werden in einem Integerarray
-       "ubergeben. Der Typ es zu erzeugenden Arrays wird als 
-       Referenz auf eine constant_arraydescriptor - Struktur "ubergeben.
+       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.
 
-       Return: Ein Zeiger auf das Array, oder NULL, wenn kein Speicher mehr
-               vorhanden ist.
+       Return value:  pointer to the array or NULL if no memory is available
 
 ******************************************************************************/
 
-       /* Hilfsfunktion */
+       /* Helper functions */
 
 static java_arrayheader *multianewarray_part (java_intarray *dims, int thisdim,
-                       constant_arraydescriptor *desc)
+                                                                                         constant_arraydescriptor *desc)
 {
        u4 size,i;
        java_arrayarray *a;
@@ -665,22 +800,22 @@ static java_arrayheader *multianewarray_part (java_intarray *dims, int thisdim,
        size = dims -> data[thisdim];
        
        if (thisdim == (dims->header.size-1)) {
-               /* letzte Dimension schon erreicht */
+               /* last dimension reached */
                
                switch (desc -> arraytype) {
-               case ARRAYTYPE_BOOLEAN:  
+               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:  
+               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:  
+               case ARRAYTYPE_INT:      
                        return (java_arrayheader*) builtin_newarray_int (size); 
                case ARRAYTYPE_LONG:  
                        return (java_arrayheader*) builtin_newarray_long (size); 
@@ -692,9 +827,9 @@ static java_arrayheader *multianewarray_part (java_intarray *dims, int thisdim,
                
                default: panic ("Invalid arraytype in multianewarray");
                }
-               }
+       }
 
-       /* wenn letzte Dimension noch nicht erreicht wurde */
+       /* if the last dimension has not been reached yet */
 
        if (desc->arraytype != ARRAYTYPE_ARRAY) 
                panic ("multianewarray with too many dimensions");
@@ -704,25 +839,25 @@ static java_arrayheader *multianewarray_part (java_intarray *dims, int thisdim,
        
        for (i=0; i<size; i++) {
                java_arrayheader *ea = 
-                 multianewarray_part (dims, thisdim+1, desc->elementdescriptor);
+                       multianewarray_part (dims, thisdim+1, desc->elementdescriptor);
                if (!ea) return NULL;
 
                a -> data[i] = ea;
-               }
+       }
                
        return (java_arrayheader*) a;
 }
 
 
 java_arrayheader *builtin_multianewarray (java_intarray *dims,
-                      constant_arraydescriptor *desc)
+                                                                                 constant_arraydescriptor *desc)
 {
        return multianewarray_part (dims, 0, desc);
 }
 
 
 static java_arrayheader *nmultianewarray_part (int n, long *dims, int thisdim,
-                       constant_arraydescriptor *desc)
+                                                                                          constant_arraydescriptor *desc)
 {
        int size, i;
        java_arrayarray *a;
@@ -730,37 +865,37 @@ static java_arrayheader *nmultianewarray_part (int n, long *dims, int thisdim,
        size = (int) dims[thisdim];
        
        if (thisdim == (n - 1)) {
-               /* letzte Dimension schon erreicht */
+               /* last dimension reached */
                
                switch (desc -> arraytype) {
-               case ARRAYTYPE_BOOLEAN:  
+               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:  
+               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:  
+               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);
+                                                                                                                desc->objectclass);
                case ARRAYTYPE_ARRAY:
                        return (java_arrayheader*) builtin_newarray_array(size,
-                                                  desc->elementdescriptor);
+                                                                                                                         desc->elementdescriptor);
                
                default: panic ("Invalid arraytype in multianewarray");
                }
-               }
+       }
 
-       /* wenn letzte Dimension noch nicht erreicht wurde */
+       /* if the last dimension has not been reached yet */
 
        if (desc->arraytype != ARRAYTYPE_ARRAY) 
                panic ("multianewarray with too many dimensions");
@@ -774,14 +909,14 @@ static java_arrayheader *nmultianewarray_part (int n, long *dims, int thisdim,
                if (!ea) return NULL;
 
                a -> data[i] = ea;
-               }
+       }
                
        return (java_arrayheader*) a;
 }
 
 
 java_arrayheader *builtin_nmultianewarray (int size,
-                      constant_arraydescriptor *desc, long *dims)
+                                                                                  constant_arraydescriptor *desc, long *dims)
 {
        (void) builtin_newarray_int(size); /* for compatibility with -old */
        return nmultianewarray_part (size, dims, 0, desc);
@@ -790,16 +925,14 @@ java_arrayheader *builtin_nmultianewarray (int size,
 
 
 
-/************************* Funktion: builtin_aastore *************************
+/************************* function: builtin_aastore *************************
 
-       speichert eine Referenz auf ein Objekt in einem Object-Array oder
-       in einem Array-Array.
-       Dabei wird allerdings vorher "uberpr"uft, ob diese Operation 
-       zul"assig ist.
+       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: 1, wenn alles OK ist
-               0, wenn dieses Objekt nicht in dieses Array gespeichert werden
-                  darf
+       Return value:  1 ... ok
+                                  0 ... this object cannot be stored into this array
 
 *****************************************************************************/
 
@@ -808,7 +941,7 @@ s4 builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o)
        if (builtin_canstore(a,o)) {
                a->data[index] = o;
                return 1;
-               }
+       }
        return 0;
 }
 
@@ -818,134 +951,237 @@ s4 builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o)
 
 
 /*****************************************************************************
-                      METHODEN-PROTOKOLLIERUNG
-
-       Verschiedene Funktionen, mit denen eine Meldung ausgegeben werden
-       kann, wann immer Methoden aufgerufen oder beendet werden.
-       (f"ur Debug-Zwecke)
+                                         METHOD LOGGING
 
+       Various functions for printing a message at method entry or exit (for
+       debugging)
+       
 *****************************************************************************/
 
 
 u4 methodindent=0;
 
 java_objectheader *builtin_trace_exception (java_objectheader *exceptionptr,
-                   methodinfo *method, int *pos, int noindent) {
+                                                                                       methodinfo *method, int *pos, int noindent) {
 
        if (!noindent)
                methodindent--;
        if (verbose || runverbose) {
                printf("Exception ");
-               unicode_display (exceptionptr->vftbl->class->name);
+               utf_display (exceptionptr->vftbl->class->name);
                printf(" thrown in ");
                if (method) {
-                       unicode_display (method->class->name);
+                       utf_display (method->class->name);
                        printf(".");
-                       unicode_display (method->name);
+                       utf_display (method->name);
                        if (method->flags & ACC_SYNCHRONIZED)
                                printf("(SYNC)");
                        else
                                printf("(NOSYNC)");
                        printf("(%p) at position %p\n", method->entrypoint, pos);
-                       }
+               }
                else
                        printf("call_java_method\n");
                fflush (stdout);
-               }
+       }
        return exceptionptr;
 }
 
 
-void builtin_trace_args(long a0, long a1, long a2, long a3, long a4, long a5,
-                        methodinfo *method)
+#ifdef TRACE_ARGS_NUM
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5,
+#if TRACE_ARGS_NUM > 6
+                                               s8 a6, s8 a7,
+#endif
+                                               methodinfo *method)
 {
-       sprintf (logtext, "                                             ");
+       int i;
+       for (i=0; i<methodindent; i++)
+               logtext[i] = '\t';
        sprintf (logtext+methodindent, "called: ");
-       unicode_sprint (logtext+strlen(logtext), method->class->name);
+       utf_sprint (logtext+strlen(logtext), method->class->name);
        sprintf (logtext+strlen(logtext), ".");
-       unicode_sprint (logtext+strlen(logtext), method->name);
-       unicode_sprint (logtext+strlen(logtext), method->descriptor);
+       utf_sprint (logtext+strlen(logtext), method->name);
+       utf_sprint (logtext+strlen(logtext), method->descriptor);
        sprintf (logtext+strlen(logtext), "(");
        switch (method->paramcount) {
-               case 6:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx",
-                                                  a0,  a1,  a2,  a3,  a4,  a5);
-                       break;
-               case 5:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx",
-                                                  a0,  a1,  a2,  a3,  a4);
-                       break;
-               case 4:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx",
-                                                  a0,  a1,  a2,  a3);
-                       break;
-               case 3:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx", a0,  a1,  a2);
-                       break;
-               case 2:
-                       sprintf(logtext+strlen(logtext), "%lx, %lx", a0,  a1);
-                       break;
-               case 1:
-                       sprintf(logtext+strlen(logtext), "%lx", a0);
-                       break;
-               }
+       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;
+
+#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;
+#else
+       default:
+               sprintf(logtext+strlen(logtext), "%llx, %llx, %llx, %llx, %llx, %llx, ...(%d)",
+                               a0,   a1,   a2,   a3,   a4,   a5,   method->paramcount - 6);
+               break;
+#endif
+#else
+       case 1:
+               sprintf(logtext+strlen(logtext), "%lx", a0);
+               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 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 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;
+#else
+       default:
+               sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, ...(%d)",
+                               a0,  a1,  a2,  a3,  a4,  a5,   method->paramcount - 6);
+               break;
+#endif
+#endif
+       }
        sprintf (logtext+strlen(logtext), ")");
 
        dolog ();
        methodindent++;
 }
+#endif
 
 void builtin_displaymethodstart(methodinfo *method)
 {
-       sprintf (logtext, "                                             ");
+       sprintf (logtext, "                                                                                             ");
        sprintf (logtext+methodindent, "called: ");
-       unicode_sprint (logtext+strlen(logtext), method->class->name);
+       utf_sprint (logtext+strlen(logtext), method->class->name);
        sprintf (logtext+strlen(logtext), ".");
-       unicode_sprint (logtext+strlen(logtext), method->name);
-       unicode_sprint (logtext+strlen(logtext), method->descriptor);
+       utf_sprint (logtext+strlen(logtext), method->name);
+       utf_sprint (logtext+strlen(logtext), method->descriptor);
        dolog ();
        methodindent++;
 }
 
-void builtin_displaymethodstop(methodinfo *method, long l, double d)
+void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f)
 {
+       int i;
+       for (i=0; i<methodindent; i++)
+               logtext[i] = '\t';
        methodindent--;
-       sprintf (logtext, "                                             ");
        sprintf (logtext+methodindent, "finished: ");
-       unicode_sprint (logtext+strlen(logtext), method->class->name);
+       utf_sprint (logtext+strlen(logtext), method->class->name);
        sprintf (logtext+strlen(logtext), ".");
-       unicode_sprint (logtext+strlen(logtext), method->name);
-       unicode_sprint (logtext+strlen(logtext), method->descriptor);
+       utf_sprint (logtext+strlen(logtext), method->name);
+       utf_sprint (logtext+strlen(logtext), method->descriptor);
        switch (method->returntype) {
-               case TYPE_INT:
-               case TYPE_LONG:
-                       sprintf (logtext+strlen(logtext), "->%ld", l);
-                       break;
-               case TYPE_FLOAT:
-               case TYPE_DOUBLE:
-                       sprintf (logtext+strlen(logtext), "->%g", d);
-                       break;
-               case TYPE_ADDRESS:
-                       sprintf (logtext+strlen(logtext), "->%p", (void*) l);
-                       break;
-               }
+       case TYPE_INT:
+               sprintf (logtext+strlen(logtext), "->%d", (s4) l);
+               break;
+       case TYPE_LONG:
+#if defined(__I386__)
+               sprintf(logtext+strlen(logtext), "->%lld", (s8) l);
+#else
+               sprintf(logtext+strlen(logtext), "->%ld", (s8) l);
+#endif
+               break;
+       case TYPE_ADDRESS:
+#if defined(__I386__)
+               sprintf(logtext+strlen(logtext), "->%p", (u1*) ((s4) l));
+#else
+               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 ();
 }
 
 void builtin_displaymethodexception(methodinfo *method)
 {
-       sprintf (logtext, "                                             ");
+       int i;
+       for (i=0; i<methodindent; i++)
+               logtext[i] = '\t';
        sprintf (logtext+methodindent, "exception abort: ");
-       unicode_sprint (logtext+strlen(logtext), method->class->name);
+       utf_sprint (logtext+strlen(logtext), method->class->name);
        sprintf (logtext+strlen(logtext), ".");
-       unicode_sprint (logtext+strlen(logtext), method->name);
-       unicode_sprint (logtext+strlen(logtext), method->descriptor);
+       utf_sprint (logtext+strlen(logtext), method->name);
+       utf_sprint (logtext+strlen(logtext), method->descriptor);
        dolog ();
 }
 
 
 /****************************************************************************
-             SYNCHRONIZATION FUNCTIONS
+                        SYNCHRONIZATION FUNCTIONS
 *****************************************************************************/
 
 /*
@@ -955,51 +1191,51 @@ void builtin_displaymethodexception(methodinfo *method)
 void
 internal_lock_mutex_for_object (java_objectheader *object)
 {
-    mutexHashEntry *entry;
-    int hashValue;
+       mutexHashEntry *entry;
+       int hashValue;
 
-    assert(object != 0);
+       assert(object != 0);
 
-    hashValue = MUTEX_HASH_VALUE(object);
-    entry = &mutexHashTable[hashValue];
+       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;
+
+                                                       entry = entry->next;
+                                                       entry->object = 0;
+                                                       entry->next = 0;
+                                                       assert(entry->conditionCount == 0);
+                                               }
+                               }
+               }
+       else
                {
-                       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;
-
-                       entry = entry->next;
-                       entry->object = 0;
-                       entry->next = 0;
-                       assert(entry->conditionCount == 0);
-           }
-       }
-    }
-    else
-    {
-               entry->mutex.holder = 0;
-               entry->mutex.count = 0;
-               entry->mutex.muxWaiters = 0;
-    }
-
-    if (entry->object == 0)
-        entry->object = object;
-    
-    internal_lock_mutex(&entry->mutex);
+
+       if (entry->object == 0)
+               entry->object = object;
+       
+       internal_lock_mutex(&entry->mutex);
 }
 #endif
 
@@ -1011,32 +1247,32 @@ internal_lock_mutex_for_object (java_objectheader *object)
 void
 internal_unlock_mutex_for_object (java_objectheader *object)
 {
-    int hashValue;
-    mutexHashEntry *entry;
+       int hashValue;
+       mutexHashEntry *entry;
 
-    hashValue = MUTEX_HASH_VALUE(object);
-    entry = &mutexHashTable[hashValue];
+       hashValue = MUTEX_HASH_VALUE(object);
+       entry = &mutexHashTable[hashValue];
 
-    if (entry->object == object)
+       if (entry->object == object)
                internal_unlock_mutex(&entry->mutex);
-    else
-    {
-               while (entry->next != 0 && entry->next->object != object)
-                       entry = entry->next;
+       else
+               {
+                       while (entry->next != 0 && entry->next->object != object)
+                               entry = entry->next;
 
-               assert(entry->next != 0);
+                       assert(entry->next != 0);
 
-               internal_unlock_mutex(&entry->next->mutex);
+                       internal_unlock_mutex(&entry->next->mutex);
 
-               if (entry->next->mutex.count == 0 && entry->conditionCount == 0)
-               {
-                       mutexHashEntry *unlinked = entry->next;
+                       if (entry->next->mutex.count == 0 && entry->conditionCount == 0)
+                               {
+                                       mutexHashEntry *unlinked = entry->next;
 
-                       entry->next = unlinked->next;
-                       unlinked->next = firstFreeOverflowEntry;
-                       firstFreeOverflowEntry = unlinked;
+                                       entry->next = unlinked->next;
+                                       unlinked->next = firstFreeOverflowEntry;
+                                       firstFreeOverflowEntry = unlinked;
+                               }
                }
-    }
 }
 #endif
 
@@ -1044,17 +1280,17 @@ void
 builtin_monitorenter (java_objectheader *o)
 {
 #ifdef USE_THREADS
-    int hashValue;
+       int hashValue;
 
        assert(blockInts == 0);
 
-    ++blockInts;
+       ++blockInts;
 
-    hashValue = MUTEX_HASH_VALUE(o);
-    if (mutexHashTable[hashValue].object == o
+       hashValue = MUTEX_HASH_VALUE(o);
+       if (mutexHashTable[hashValue].object == o
                && mutexHashTable[hashValue].mutex.holder == currentThread)
                ++mutexHashTable[hashValue].mutex.count;
-    else
+       else
                internal_lock_mutex_for_object(o);
 
        --blockInts;
@@ -1066,22 +1302,22 @@ builtin_monitorenter (java_objectheader *o)
 void builtin_monitorexit (java_objectheader *o)
 {
 #ifdef USE_THREADS
-    int hashValue;
+       int hashValue;
 
        assert(blockInts == 0);
 
-    ++blockInts;
+       ++blockInts;
 
-    hashValue = MUTEX_HASH_VALUE(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
+       hashValue = MUTEX_HASH_VALUE(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
                internal_unlock_mutex_for_object(o);
 
        --blockInts;
@@ -1092,16 +1328,15 @@ void builtin_monitorexit (java_objectheader *o)
 
 
 /*****************************************************************************
-                      DIVERSE HILFSFUNKTIONEN
+                         MISCELLANEOUS HELPER FUNCTIONS
 *****************************************************************************/
 
 
 
-/*********** Funktionen f"ur die Integerdivision *****************************
+/*********** Functions for integer divisions *****************************
  
-       Auf manchen Systemen (z.B. DEC ALPHA) wird durch die CPU keine Integer-
-       division unterst"utzt.
-       Daf"ur gibt es dann diese Hilfsfunktionen
+       On some systems (eg. DEC ALPHA), integer division is not supported by the
+       CPU. These helper functions implement the missing functionality.
 
 ******************************************************************************/
 
@@ -1109,10 +1344,10 @@ s4 builtin_idiv (s4 a, s4 b) { return a/b; }
 s4 builtin_irem (s4 a, s4 b) { return a%b; }
 
 
-/************** Funktionen f"ur Long-Arithmetik *******************************
+/************** Functions for long arithmetics *******************************
 
-       Auf Systemen, auf denen die CPU keine 64-Bit-Integers unterst"utzt,
-       werden diese Funktionen gebraucht
+       On systems where 64 bit Integers are not supported by the CPU, these
+       functions are needed.
 
 ******************************************************************************/
 
@@ -1240,7 +1475,7 @@ s4 builtin_lcmp (s8 a, s8 b)
 
 
 
-/*********** Funktionen f"ur die Floating-Point-Operationen ******************/
+/*********** Functions for floating point operations *************************/
 
 float builtin_fadd (float a, float b)
 {
@@ -1249,14 +1484,14 @@ float builtin_fadd (float a, float b)
        if (finitef(a)) {
                if (finitef(b)) return a+b;
                else return b;
-               }
+       }
        else {
                if (finitef(b)) return a;
                else {
                        if (copysignf(1.0, a)==copysignf(1.0, b)) return a;
                        else  return FLT_NAN;
-                       }
                }
+       }
 }
 
 float builtin_fsub (float a, float b)
@@ -1272,18 +1507,18 @@ float builtin_fmul (float a, float b)
                if (finitef(b)) return a*b;
                else {
                        if (a==0) return FLT_NAN;
-                            else return copysignf(b, copysignf(1.0, b)*a);
-                       }
+                       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);
-                       }
+                       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)
@@ -1296,43 +1531,14 @@ float builtin_fdiv (float a, float b)
                                return FLT_POSINF;
                        else if (a < 0)
                                return FLT_NEGINF;
-                       }
                }
+       }
        return FLT_NAN;
 }
 
 float builtin_frem (float a, float b)
 {
-
-/* return (float) builtin_drem((double) a, (double) b); */
-
-       float f;
-
-       if (finite((double) a) && finite((double) b)) {
-               f = a / b;
-               if (finite((double) f))
-                       return fmodf(a, b);
-               return FLT_NAN;
-               }
-       if (isnan((double) b))
-               return FLT_NAN;
-       if (finite((double) a))
-               return a;
-       return FLT_NAN;
-
-/*     float f;
-
-       if (finitef(a) && finitef(b)) {
-               f = a / b;
-               if (finitef(f))
-                       return a - floorf(f) * b;
-               return FLT_NAN;
-               }
-       if (isnanf(b))
-               return FLT_NAN;
-       if (finitef(a))
-               return a;
-       return FLT_NAN; */
+       return fmodf(a, b);
 }
 
 
@@ -1341,8 +1547,8 @@ 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)
@@ -1350,9 +1556,9 @@ 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;
        return -1;
@@ -1365,7 +1571,7 @@ s4 builtin_fcmpg (float a, float b)
        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;
        return -1;
@@ -1373,7 +1579,7 @@ s4 builtin_fcmpg (float a, float b)
 
 
 
-/*********** Funktionen f"ur doppelt genaue Fliesskommazahlen ***************/
+/************************* Functions for doubles ****************************/
 
 double builtin_dadd (double a, double b)
 {
@@ -1382,14 +1588,14 @@ double builtin_dadd (double a, double b)
        if (finite(a)) {
                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;
-                       }
                }
+       }
 }
 
 double builtin_dsub (double a, double b)
@@ -1405,18 +1611,18 @@ double builtin_dmul (double a, double b)
                if (finite(b)) return a*b;
                else {
                        if (a==0) return DBL_NAN;
-                            else return copysign(b, copysign(1.0, b)*a);
-                       }
+                       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);
-                       }
+                       else return copysign(a, copysign(1.0, a)*b);
+               }
                else {
                        return copysign(a, copysign(1.0, a)*copysign(1.0, b));
-                       }
                }
+       }
 }
 
 double builtin_ddiv (double a, double b)
@@ -1429,29 +1635,14 @@ double builtin_ddiv (double a, double b)
                                return DBL_POSINF;
                        else if (a < 0)
                                return DBL_NEGINF;
-                       }
                }
+       }
        return DBL_NAN;
 }
 
 double builtin_drem (double a, double b)
 {
-       double d;
-
-       if (finite(a) && finite(b)) {
-               d = a / b;
-               if (finite(d)) {
-                       if ((d < 1.0) && (d > 0.0))
-                               return a;
-                       return fmod(a, b);
-                       }
-               return DBL_NAN;
-               }
-       if (isnan(b))
-               return DBL_NAN;
-       if (finite(a))
-               return a;
-       return DBL_NAN;
+       return fmod(a, b);
 }
 
 double builtin_dneg (double a)
@@ -1459,8 +1650,8 @@ 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)
@@ -1470,7 +1661,7 @@ s4 builtin_dcmpl (double a, double b)
        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;
        return -1;
@@ -1483,14 +1674,14 @@ s4 builtin_dcmpg (double a, double b)
        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;
        return -1;
 }
 
 
-/*********************** Umwandlungsoperationen ****************************/
+/*********************** Conversion operations ****************************/
 
 s8 builtin_i2l (s4 i)
 {
@@ -1503,14 +1694,14 @@ s8 builtin_i2l (s4 i)
 
 float builtin_i2f (s4 a)
 {
-float f = (float) a;
-return f;
+       float f = (float) a;
+       return f;
 }
 
 double builtin_i2d (s4 a)
 {
-double d = (double) a;
-return d;
+       double d = (double) a;
+       return d;
 }
 
 
@@ -1547,46 +1738,46 @@ 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)
 {
 
-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); */
 }
 
 
@@ -1595,8 +1786,8 @@ 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) );
-               }
+               else               return copysign(DBL_POSINF, (double) copysignf(1.0, a) );
+       }
 }
 
 
@@ -1607,16 +1798,16 @@ s4 builtin_d2i (double a)
        if (finite(a)) {
                if (a >= 2147483647)
                        return 2147483647;
-               if (a <= (-2147483648))
-                       return (-2147483648);
+               if (a <= (-2147483647-1))
+                       return (-2147483647-1);
                return (s4) a;
-               }
+       }
        if (isnan(a))
                return 0;
        d = copysign(1.0, a);
        if (d > 0)
                return 2147483647;
-       return (-2147483648);
+       return (-2147483647-1);
 }
 
 
@@ -1625,18 +1816,18 @@ s8 builtin_d2l (double a)
        double d;
        
        if (finite(a)) {
-               if (a >= 9223372036854775807L)
-                       return 9223372036854775807L;
-               if (a <= (-9223372036854775807L-1))
-                       return (-9223372036854775807L-1);
+               if (a >= 9223372036854775807LL)
+                       return 9223372036854775807LL;
+               if (a <= (-9223372036854775807LL-1))
+                       return (-9223372036854775807LL-1);
                return (s8) a;
-               }
+       }
        if (isnan(a))
                return 0;
        d = copysign(1.0, a);
        if (d > 0)
-               return 9223372036854775807L;
-       return (-9223372036854775807L-1);
+               return 9223372036854775807LL;
+       return (-9223372036854775807LL-1);
 }
 
 
@@ -1645,7 +1836,20 @@ float builtin_d2f (double a)
        if (finite(a)) return (float) a;
        else {
                if (isnan(a)) return FLT_NAN;
-               else          return copysignf (FLT_POSINF, (float) copysign(1.0, a));
-               }
+               else              return copysignf (FLT_POSINF, (float) copysign(1.0, a));
+       }
 }
 
+
+/*
+ * 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
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */