X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=builtin.h;h=0cd80547c50402dabb8ec8347cd4cc34b6e966c7;hb=d3d2b044c34cac2bd897629548cef3b4cbcde7c4;hp=78e9b3a7883a4cde420d567980a992b46c16fd71;hpb=a0a303f434fdfaa9e313ac0bf25fcfdd8556b0fd;p=cacao.git diff --git a/builtin.h b/builtin.h index 78e9b3a78..0cd80547c 100644 --- a/builtin.h +++ b/builtin.h @@ -28,7 +28,7 @@ Changes: Edwin Steiner - $Id: builtin.h 890 2004-01-19 12:24:13Z edwin $ + $Id: builtin.h 1369 2004-08-01 21:53:32Z stefan $ */ @@ -37,7 +37,8 @@ #define _BUILTIN_H #include "config.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" +#include "threads/thread.h" /* define infinity for floating point numbers */ @@ -99,6 +100,7 @@ extern builtin_descriptor builtin_desc[]; #define THREADSPECIFIC #define exceptionptr (&_exceptionptr) +#define threadrootmethod (&_threadrootmethod) #if defined(USE_THREADS) && defined(NATIVE_THREADS) #ifdef HAVE___THREAD @@ -106,15 +108,18 @@ extern builtin_descriptor builtin_desc[]; #undef THREADSPECIFIC #define THREADSPECIFIC __thread -#else +#endif #undef exceptionptr +#undef threadrootmethod #define exceptionptr builtin_get_exceptionptrptr() - -#endif +#define threadrootmethod builtin_get_threadrootmethod() #endif -extern THREADSPECIFIC java_objectheader* _exceptionptr; +#if !defined(USE_THREADS) || !defined(NATIVE_THREADS) +extern java_objectheader *_exceptionptr; +extern methodinfo* _threadrootmethod; +#endif /**********************************************************************/ @@ -146,11 +151,11 @@ s4 builtin_instanceof(java_objectheader *obj, classinfo *class); #define BUILTIN_instanceof (functionptr) builtin_instanceof s4 builtin_isanysubclass (classinfo *sub, classinfo *super); /* NOT AN OP */ -s4 builtin_isanysubclass_vftbl (vftbl *sub, vftbl *super); +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 *target); +s4 builtin_arrayinstanceof(java_objectheader *obj, vftbl_t *target); #define BUILTIN_arrayinstanceof (functionptr) builtin_arrayinstanceof #if defined(__I386__) @@ -159,33 +164,35 @@ s4 asm_builtin_arrayinstanceof(java_objectheader *obj, classinfo *class); /* XXX #define BUILTIN_arrayinstanceof (functionptr) asm_builtin_arrayinstanceof #endif -s4 builtin_checkarraycast(java_objectheader *obj, vftbl *target); +s4 builtin_checkarraycast(java_objectheader *obj, vftbl_t *target); /* NOT AN OP */ -s4 asm_builtin_checkarraycast(java_objectheader *obj, vftbl *target); +s4 asm_builtin_checkarraycast(java_objectheader *obj, vftbl_t *target); #define BUILTIN_checkarraycast (functionptr) asm_builtin_checkarraycast java_objectheader *builtin_throw_exception(java_objectheader *exception); /* NOT AN OP */ -java_objectheader *builtin_trace_exception(java_objectheader *_exceptionptr, - methodinfo *method, - int *pos, int noindent); -/* NOT AN OP */ - -static inline java_objectheader **builtin_get_exceptionptrptr(); -/* NOT AN OP */ -void builtin_reset_exceptionptr(); +java_objectheader *builtin_trace_exception(java_objectheader *xptr, + methodinfo *m, + void *pos, + s4 line, + s4 noindent); /* NOT AN OP */ java_objectheader *builtin_new(classinfo *c); +#ifdef __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 *arrayvftbl); +java_arrayheader *builtin_newarray(s4 size, vftbl_t *arrayvftbl); #define BUILTIN_newarray (functionptr) builtin_newarray java_objectarray *builtin_anewarray(s4 size, classinfo *component); /* NOT AN OP */ #if defined(__I386__) -void asm_builtin_newarray(s4 size, vftbl *arrayvftbl); +void asm_builtin_newarray(s4 size, vftbl_t *arrayvftbl); #undef BUILTIN_newarray #define BUILTIN_newarray (functionptr) asm_builtin_newarray #endif @@ -206,8 +213,8 @@ 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_nmultianewarray(int n, - vftbl *arrayvftbl, long *dims); +java_arrayheader *builtin_nmultianewarray(int n, vftbl_t *arrayvftbl, long *dims); +/* java_arrayheader *builtin_nmultianewarray(int n, classinfo *arrayclass, long *dims); */ /* NOT AN OP */ s4 builtin_canstore(java_objectarray *a, java_objectheader *o); @@ -217,28 +224,27 @@ void asm_builtin_aastore(java_objectarray *a, s4 index, java_objectheader *o); #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); +void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, methodinfo *m); /* NOT AN OP */ #else -void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, s8 a6, s8 a7, methodinfo *method); +void builtin_trace_args(s8 a0, s8 a1, s8 a2, s8 a3, s8 a4, s8 a5, s8 a6, s8 a7, methodinfo *m); /* NOT AN OP */ #endif #endif -void builtin_displaymethodstart(methodinfo *method); -/* NOT AN OP */ -void builtin_displaymethodstop(methodinfo *method, s8 l, double d, float f); +void builtin_displaymethodstart(methodinfo *m); /* NOT AN OP */ -/* void builtin_displaymethodstop(methodinfo *method); */ -void builtin_displaymethodexception(methodinfo *method); +void builtin_displaymethodstop(methodinfo *m, s8 l, double d, float f); /* NOT AN OP */ void builtin_monitorenter(java_objectheader *o); /* NOT AN OP */ +void builtin_staticmonitorenter(classinfo *c); +/* NOT AN OP */ void asm_builtin_monitorenter(java_objectheader *o); #define BUILTIN_monitorenter (functionptr) asm_builtin_monitorenter -void builtin_monitorexit(java_objectheader *o); +void *builtin_monitorexit(java_objectheader *o); /* NOT AN OP */ -void asm_builtin_monitorexit(java_objectheader *o); +void *asm_builtin_monitorexit(java_objectheader *o); #define BUILTIN_monitorexit (functionptr) asm_builtin_monitorexit s4 builtin_idiv(s4 a, s4 b); @@ -360,25 +366,46 @@ s4 builtin_dummy(); /* NOT AN OP */ /* conversion helper functions */ - inline float intBitsToFloat(s4 i); inline float longBitsToDouble(s8 l); +/* this is a wrapper for calls from asmpart */ +java_objectheader **builtin_asm_get_exceptionptrptr(); -static inline java_objectheader **builtin_get_exceptionptrptr() -{ #if defined(USE_THREADS) && defined(NATIVE_THREADS) -#ifdef HAVE___THREAD - return &_exceptionptr; -#else - return &((nativethread*) pthread_getspecific(tkey_exceptionptr))->_exceptionptr; -#endif -#else - panic("builtin_get_exceptionptrptr should not be used in this configuration"); - return NULL; -#endif +static inline java_objectheader **builtin_get_exceptionptrptr(); +/* NOT AN OP */ +static inline methodinfo **builtin_get_threadrootmethod(); +/* NOT AN OP */ + +inline java_objectheader **builtin_get_exceptionptrptr() +{ + return &THREADINFO->_exceptionptr; +} + +inline methodinfo **builtin_get_threadrootmethod() +{ + return &THREADINFO->_threadrootmethod; } +#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(); + +/* 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(); +stacktraceelement *builtin_stacktrace_copy(stacktraceelement **,stacktraceelement *begin, stacktraceelement *end); #endif /* _BUILTIN_H */