Merged everything with MIPS version

[cacao.git] / src / vm / builtin.c

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index d8ab88116816f62d2ae79c049421593713d2171f..4da71058cc973a3bd57842d39c7c04c51fcf3614 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -350,7 +350,7 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o)
 
 
 
-/******************** Funktion: builtin_new **********************************
+/******************** Function: builtin_new **********************************
 
        Creates a new instance of class c on the heap.
        Return value:  pointer to the object or NULL if no memory is
@@ -595,7 +595,7 @@ java_shortarray *builtin_newarray_short (s4 size)
 }
 
 
-/******************** Funktion: builtin_newarray_int ***********************
+/******************** Function: builtin_newarray_int ***********************
 
        Creates an array of 32 bit Integers on the heap.
 
@@ -615,7 +615,7 @@ java_intarray *builtin_newarray_int (s4 size)
 }
 
 
-/******************** Funktion: builtin_newarray_long ***********************
+/******************** Function: builtin_newarray_long ***********************
 
        Creates an array of 64 bit Integers on the heap.
 
@@ -845,7 +845,11 @@ java_objectheader *builtin_trace_exception (java_objectheader *exceptionptr,
 }
 
 
+#ifdef TRACE_ARGS_NUM
 void builtin_trace_args(long a0, long a1, long a2, long a3, long a4, long a5,
+#if TRACE_ARGS_NUM > 6
+               long a6, long a7,
+#endif
                                                methodinfo *method)
 {
        sprintf (logtext, "                                                                                             ");
@@ -856,6 +860,16 @@ void builtin_trace_args(long a0, long a1, long a2, long a3, long a4, long a5,
        utf_sprint (logtext+strlen(logtext), method->descriptor);
        sprintf (logtext+strlen(logtext), "(");
        switch (method->paramcount) {
+#if TRACE_ARGS_NUM > 6
+               case 8:
+                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx",
+                                                                                          a0,  a1,      a2,  a3,  a4,  a5, a6, a7);
+                       break;
+               case 7:
+                       sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx, %lx",
+                                                                                          a0,  a1,      a2,  a3,  a4,  a5, a6);
+                       break;
+#endif
                case 6:
                        sprintf(logtext+strlen(logtext), "%lx, %lx, %lx, %lx, %lx, %lx",
                                                                                           a0,  a1,      a2,  a3,  a4,  a5);
@@ -883,6 +897,7 @@ void builtin_trace_args(long a0, long a1, long a2, long a3, long a4, long a5,
        dolog ();
        methodindent++;
 }
+#endif
 
 void builtin_displaymethodstart(methodinfo *method)
 {
@@ -896,7 +911,7 @@ void builtin_displaymethodstart(methodinfo *method)
        methodindent++;
 }
 
-void builtin_displaymethodstop(methodinfo *method, long l, double d)
+void builtin_displaymethodstop(methodinfo *method, long l, double d, float f)
 {
        methodindent--;
        sprintf (logtext, "                                                                                             ");
@@ -912,6 +927,8 @@ void builtin_displaymethodstop(methodinfo *method, long l, double d)
                        sprintf (logtext+strlen(logtext), "->%ld", l);
                        break;
                case TYPE_FLOAT:
+                       sprintf (logtext+strlen(logtext), "->%g", f);
+                       break;
                case TYPE_DOUBLE:
                        sprintf (logtext+strlen(logtext), "->%g", d);
                        break;