*** empty log message ***

[cacao.git] / builtin.h

diff --git a/builtin.h b/builtin.h
index 9fcae7dddc0d6a4de1fd64dcc5c4cd54f4f2c3d6..cfd81f69da791259641658de9b5a29a6d1ad6ca2 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -22,15 +22,18 @@ typedef struct builtin_descriptor {
        } builtin_descriptor;
 
 extern builtin_descriptor builtin_desc[];
+extern java_objectheader* exceptionptr;
 
 s4 builtin_instanceof(java_objectheader *obj, classinfo *class);
+s4 builtin_isanysubclass (classinfo *sub, classinfo *super);
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class);
-s4 builtin_arrayinstanceof
-       (java_objectheader *obj, constant_arraydescriptor *desc);
-s4 builtin_checkarraycast
-       (java_objectheader *obj, constant_arraydescriptor *desc);
-s4 asm_builtin_checkarraycast
-       (java_objectheader *obj, constant_arraydescriptor *desc);
+s4 asm_builtin_checkcast(java_objectheader *obj, classinfo *class);
+s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *desc);
+#if defined(__I386__)
+s4 asm_builtin_arrayinstanceof(java_objectheader *obj, classinfo *class);
+#endif
+s4 builtin_checkarraycast(java_objectheader *obj, constant_arraydescriptor *desc);
+s4 asm_builtin_checkarraycast(java_objectheader *obj, constant_arraydescriptor *desc);
 
 java_objectheader *builtin_throw_exception (java_objectheader *exception);
 java_objectheader *builtin_trace_exception (java_objectheader *exceptionptr,
@@ -40,8 +43,11 @@ java_objectheader *builtin_new (classinfo *c);
 
 
 java_objectarray *builtin_anewarray (s4 size, classinfo *elementtype);
-java_arrayarray *builtin_newarray_array 
-        (s4 size, constant_arraydescriptor *elementdesc);
+#ifdef __I386__
+void asm_builtin_anewarray (s4 size, classinfo *elementtype);
+void asm_builtin_newarray_array (s4 size, constant_arraydescriptor *elementdesc);
+#endif
+java_arrayarray *builtin_newarray_array (s4 size, constant_arraydescriptor *elementdesc);
 java_booleanarray *builtin_newarray_boolean (s4 size);
 java_chararray *builtin_newarray_char (s4 size);
 java_floatarray *builtin_newarray_float (s4 size);
@@ -59,9 +65,15 @@ s4 builtin_canstore (java_objectarray *a, java_objectheader *o);
 s4 builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o);
 void asm_builtin_aastore (java_objectarray *a, s4 index, java_objectheader *o);
 
-void builtin_trace_args(long a0, long a1, long a2, long a3, long a4, long a5, methodinfo *method);
+#ifdef TRACE_ARGS_NUM
+#if TRACE_ARGS_NUM == 6
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, methodinfo *method);
+#else
+void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, s8 a6, s8 a7, methodinfo *method);
+#endif
+#endif
 void builtin_displaymethodstart(methodinfo *method);
-void builtin_displaymethodstop(methodinfo *method, long l, double d);
+void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f);
 /* void builtin_displaymethodstop(methodinfo *method); */
 void builtin_displaymethodexception(methodinfo *method);
 
@@ -115,10 +127,18 @@ double   builtin_i2d (s4 i);
 s4       builtin_l2i (s8 l);
 float    builtin_l2f (s8 l);
 double   builtin_l2d (s8 l);
+
 s4       builtin_f2i (float a);
+s4       asm_builtin_f2i (float a);
 s8       builtin_f2l (float a);
+s8       asm_builtin_f2l (float a);
+
 double   builtin_f2d (float a);
+
 s4       builtin_d2i (double a);
+s4       asm_builtin_d2i (double a);
 s8       builtin_d2l (double a);
+s8       asm_builtin_d2l (double a);
+
 float    builtin_d2f (double a);