* builtin_new: Removed i386 asm_builtin_new define

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

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index faf8ae13a2792f08951925ac5cc33dec5048854d..7cfe035e1b3b1040daf84e517f8df013ca8e3a61 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -29,7 +29,7 @@
    Changes: Edwin Steiner
             Christian Thalinger
 
-   $Id: builtin.h 2558 2005-06-06 15:00:29Z twisti $
+   $Id: builtin.h 3133 2005-08-23 14:34:49Z cacao $
 
 */
 
@@ -65,7 +65,7 @@
 #define DBL_NEGINF  0xfff0000000000000LL
 
 
-/* float versions are not defined in gnu classpath's fdlibm */
+/* float versions are not defined in GNU classpath's fdlibm */
 
 #define copysignf    copysign
 #define finitef      finite
@@ -129,11 +129,8 @@ s4 builtin_checkcast(java_objectheader *obj, classinfo *class);
 /* NOT AN OP */
 s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target);
 #define BUILTIN_arrayinstanceof (functionptr) builtin_arrayinstanceof
-
 s4 builtin_arraycheckcast(java_objectheader *o, vftbl_t *target);
-/* NOT AN OP */
-s4 asm_builtin_arraycheckcast(java_objectheader *o, vftbl_t *target);
-#define BUILTIN_arraycheckcast (functionptr) asm_builtin_arraycheckcast
+#define BUILTIN_arraycheckcast (functionptr) builtin_arraycheckcast
 
 java_objectheader *builtin_throw_exception(java_objectheader *exception);
 /* NOT AN OP */
@@ -145,12 +142,7 @@ java_objectheader *builtin_trace_exception(java_objectheader *xptr,
 /* NOT AN OP */
 
 java_objectheader *builtin_new(classinfo *c);
-/*  #if defined(__I386__) */
-/*  java_objectheader *asm_builtin_new(classinfo *c); */
-/*  #define BUILTIN_new (functionptr) asm_builtin_new */
-/*  #else */
 #define BUILTIN_new (functionptr) builtin_new
-/*  #endif */
 
 java_arrayheader *builtin_newarray(s4 size, vftbl_t *arrayvftbl);
 #define BUILTIN_newarray (functionptr) builtin_newarray
@@ -174,16 +166,18 @@ java_intarray *builtin_newarray_int(s4 size);
 #define BUILTIN_newarray_int (functionptr) builtin_newarray_int
 java_longarray *builtin_newarray_long(s4 size);
 #define BUILTIN_newarray_long (functionptr) builtin_newarray_long
+
 java_arrayheader *builtin_multianewarray(int n, vftbl_t *arrayvftbl, long *dims);
 #define BUILTIN_multianewarray (functionptr) builtin_multianewarray
 
 s4 builtin_canstore(java_objectarray *a, java_objectheader *o);
-/* NOT AN OP */
-void asm_builtin_aastore(java_objectarray *a, s4 index, java_objectheader *o);
-#define BUILTIN_aastore (functionptr) asm_builtin_aastore
+#define BUILTIN_canstore (functionptr) builtin_canstore
 
 #if defined(TRACE_ARGS_NUM)
-void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3,
+void builtin_trace_args(s8 a0, s8 a1,
+#if TRACE_ARGS_NUM >= 4
+                                               s8 a2, s8 a3,
+#endif /* TRACE_ARGS_NUM >= 4 */
 #if TRACE_ARGS_NUM >= 6
                                                s8 a4, s8 a5,
 #endif /* TRACE_ARGS_NUM >= 6 */
@@ -207,13 +201,9 @@ void builtin_monitorexit(java_objectheader *o);
 #endif
 
 s4 builtin_idiv(s4 a, s4 b);
-/* NOT AN OP */
-s4 asm_builtin_idiv(s4 a, s4 b);
-#define BUILTIN_idiv (functionptr) asm_builtin_idiv
+#define BUILTIN_idiv (functionptr) builtin_idiv
 s4 builtin_irem(s4 a, s4 b);
-/* NOT AN OP */
-s4 asm_builtin_irem(s4 a, s4 b);
-#define BUILTIN_irem (functionptr) asm_builtin_irem
+#define BUILTIN_irem (functionptr) builtin_irem
 
 s8 builtin_ladd(s8 a, s8 b);
 #define BUILTIN_ladd (functionptr) builtin_ladd
@@ -221,14 +211,12 @@ s8 builtin_lsub(s8 a, s8 b);
 #define BUILTIN_lsub (functionptr) builtin_lsub
 s8 builtin_lmul(s8 a, s8 b);
 #define BUILTIN_lmul (functionptr) builtin_lmul
+
 s8 builtin_ldiv(s8 a, s8 b);
-/* NOT AN OP */
-s8 asm_builtin_ldiv(s8 a, s8 b);
-#define BUILTIN_ldiv (functionptr) asm_builtin_ldiv
+#define BUILTIN_ldiv (functionptr) builtin_ldiv
 s8 builtin_lrem(s8 a, s8 b);
-/* NOT AN OP */
-s8 asm_builtin_lrem(s8 a, s8 b);
-#define BUILTIN_lrem (functionptr) asm_builtin_lrem
+#define BUILTIN_lrem (functionptr) builtin_lrem
+
 s8 builtin_lshl(s8 a, s4 b);
 #define BUILTIN_lshl (functionptr) builtin_lshl
 s8 builtin_lshr(s8 a, s4 b);
@@ -320,10 +308,6 @@ float    builtin_d2f(double a);
 java_arrayheader *builtin_clone_array(void *env, java_arrayheader *o);
 /* NOT AN OP */
 
-/* builtin_dummy just exits if it is executed. */
-s4 builtin_dummy(void);
-/* NOT AN OP */
-
 /* conversion helper functions */
 inline float intBitsToFloat(s4 i);
 inline float longBitsToDouble(s8 l);
@@ -370,7 +354,10 @@ points here---->| previous element in list                 |
                ------------------------------------------------
 */
 void *builtin_asm_get_stackframeinfo(void);
-stacktraceelement *builtin_stacktrace_copy(stacktraceelement **,stacktraceelement *begin, stacktraceelement *end);
+stacktraceelement *builtin_stacktrace_copy(stacktraceelement **el,
+                                                                                  stacktraceelement *begin,
+                                                                                  stacktraceelement *end);
+
 #endif /* _BUILTIN_H */