X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fbuiltin.h;h=ed2a820730346514c7aaf2e551f39e37019b9bd0;hb=54c62b0606d45da0d26db46f875785b19dfcb47f;hp=19f72985e9c223ec165ff291f1ab8f456866445b;hpb=a5d18da453ea44fe9bad145e330a00b6b3737b33;p=cacao.git diff --git a/src/vm/builtin.h b/src/vm/builtin.h index 19f72985e..ed2a82073 100644 --- a/src/vm/builtin.h +++ b/src/vm/builtin.h @@ -1,9 +1,9 @@ /* src/vm/builtin.h - prototypes of builtin functions - Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, - R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, - C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, - Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel, + C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, + E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, + J. Wenninger, Institut f. Computersprachen - TU Wien This file is part of CACAO. @@ -19,17 +19,17 @@ 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. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. - Contact: cacao@complang.tuwien.ac.at + Contact: cacao@cacaojvm.org Authors: Reinhard Grafl Changes: Edwin Steiner Christian Thalinger - $Id: builtin.h 3001 2005-07-12 16:01:56Z twisti $ + $Id: builtin.h 5251 2006-08-18 13:01:00Z twisti $ */ @@ -37,16 +37,13 @@ #ifndef _BUILTIN_H #define _BUILTIN_H -#include "arch.h" #include "config.h" + +#include "arch.h" #include "toolbox/logging.h" -#if defined(USE_THREADS) -# if defined(NATIVE_THREADS) -# include "threads/native/threads.h" -# else -# include "threads/green/threads.h" -# endif +#if defined(ENABLE_THREADS) +# include "threads/native/threads.h" #endif #include "vm/jit/stacktrace.h" @@ -65,7 +62,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 @@ -80,13 +77,16 @@ typedef struct builtintable_entry builtintable_entry; struct builtintable_entry { s4 opcode; /* opcode which is replaced */ functionptr fp; /* function pointer of builtin */ - char *descriptor; - char *name; + char *cclassname; /* char name of the class */ + char *cname; /* char name of the function */ + char *cdescriptor; /* char name of the descriptor */ + utf *classname; /* class of the function */ + utf *name; /* name of the function */ + utf *descriptor; /* descriptor of the function */ + bool checkexception; /* check for exception after return */ methoddesc *md; }; -void builtintable_entry_debug_dump(FILE *file,builtintable_entry *bte); - /* function prototypes ********************************************************/ @@ -95,6 +95,8 @@ bool builtin_init(void); builtintable_entry *builtintable_get_internal(functionptr fp); builtintable_entry *builtintable_get_automatic(s4 opcode); +bool builtintable_replace_function(instruction *iptr); + /**********************************************************************/ /* BUILTIN FUNCTIONS */ @@ -129,32 +131,26 @@ s4 builtin_isanysubclass_vftbl (vftbl_t *sub, vftbl_t *super); /* NOT AN OP */ s4 builtin_checkcast(java_objectheader *obj, classinfo *class); /* NOT AN OP */ -s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target); +s4 builtin_arrayinstanceof(java_objectheader *o, classinfo *targetclass); #define BUILTIN_arrayinstanceof (functionptr) builtin_arrayinstanceof -s4 builtin_arraycheckcast(java_objectheader *o, vftbl_t *target); +s4 builtin_arraycheckcast(java_objectheader *o, classinfo *targetclass); #define BUILTIN_arraycheckcast (functionptr) builtin_arraycheckcast -java_objectheader *builtin_throw_exception(java_objectheader *exception); +void *builtin_throw_exception(java_objectheader *exception); /* NOT AN OP */ java_objectheader *builtin_trace_exception(java_objectheader *xptr, methodinfo *m, void *pos, - s4 line, - s4 noindent); + s4 indent); /* 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); +java_arrayheader *builtin_newarray(s4 size, classinfo *arrayclass); #define BUILTIN_newarray (functionptr) builtin_newarray -java_objectarray *builtin_anewarray(s4 size, classinfo *component); +java_objectarray *builtin_anewarray(s4 size, classinfo *componentclass); #define BUILTIN_anewarray (functionptr) builtin_anewarray java_booleanarray *builtin_newarray_boolean(s4 size); @@ -173,14 +169,19 @@ 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); + +java_arrayheader *builtin_multianewarray(int n, classinfo *arrayclass, + long *dims); #define BUILTIN_multianewarray (functionptr) builtin_multianewarray -s4 builtin_canstore(java_objectarray *a, java_objectheader *o); +s4 builtin_canstore(java_objectarray *oa, java_objectheader *o); #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 */ @@ -194,15 +195,6 @@ void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, void builtin_displaymethodstop(methodinfo *m, s8 l, double d, float f); /* NOT AN OP */ -#if defined(USE_THREADS) -void builtin_monitorenter(java_objectheader *o); -#define BUILTIN_monitorenter (functionptr) builtin_monitorenter -void builtin_staticmonitorenter(classinfo *c); -#define BUILTIN_staticmonitorenter (functionptr) builtin_staticmonitorenter -void builtin_monitorexit(java_objectheader *o); -#define BUILTIN_monitorexit (functionptr) builtin_monitorexit -#endif - s4 builtin_idiv(s4 a, s4 b); #define BUILTIN_idiv (functionptr) builtin_idiv s4 builtin_irem(s4 a, s4 b); @@ -311,60 +303,17 @@ 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); +bool builtin_arraycopy(java_arrayheader *src, s4 srcStart, + java_arrayheader *dest, s4 destStart, s4 len); +#define BUILTIN_arraycopy (functionptr) builtin_arraycopy -/* this is a wrapper for calls from asmpart */ -java_objectheader **builtin_asm_get_exceptionptrptr(void); +s8 builtin_currenttimemillis(void); +#define BUILTIN_currenttimemillis (functionptr) builtin_currenttimemillis -#if defined(USE_THREADS) && defined(NATIVE_THREADS) -static inline java_objectheader **builtin_get_exceptionptrptr(void); -static inline u1 *builtin_get_dontfillinexceptionstacktrace(void); -/* NOT AN OP */ -static inline methodinfo **builtin_get_threadrootmethod(void); -/* NOT AN OP */ - -inline java_objectheader **builtin_get_exceptionptrptr(void) -{ - return &THREADINFO->_exceptionptr; -} - -inline u1 *builtin_get_dontfillinexceptionstacktrace(void) -{ - return &THREADINFO->_dontfillinexceptionstacktrace; -} - -inline methodinfo **builtin_get_threadrootmethod(void) -{ - return &THREADINFO->_threadrootmethod; -} +#if defined(ENABLE_CYCLES_STATS) +void builtin_print_cycles_stats(FILE *file); #endif - -/* returns the root method of a thread. this is used in asmpart.S and delivers the abort condition - for the stack unwinding for getClassContext and getClassLoader. For the main thread this is the main function. - Otherwhise it is the thread's run method (at least that's how I see it) (jowenn) */ -methodinfo *builtin_asm_get_threadrootmethod(void); - -/* returns the current top element of the stack frame info list (needed for unwinding across native functions) */ -/* on i386 this is a pointer to a structure - ------------------------------------------------ - | return adress out of native stub | - | pointer to method info | either i have to save an arbitrary adress within this native stub or the pointer to the method info, both are equaly costly, I have chosen the method info (JOWENN) - | pointer to thread specific top of this list |<----stack frame begin -points here---->| previous element in list | - ------------------------------------------------ -*/ -void *builtin_asm_get_stackframeinfo(void); -stacktraceelement *builtin_stacktrace_copy(stacktraceelement **el, - stacktraceelement *begin, - stacktraceelement *end); - #endif /* _BUILTIN_H */