X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fbuiltin.h;h=ebbc0eea8e85be5e69ba9b62bf275d103106358e;hb=657f4b749e318a0a97d2caea14ba4a2b096eae92;hp=c1ee7f1a7071315c0c6faaf4a9aeab0d693b12c4;hpb=fe6e6b47933b909dc6de448b285c04735f58e164;p=cacao.git diff --git a/src/vm/builtin.h b/src/vm/builtin.h index c1ee7f1a7..ebbc0eea8 100644 --- a/src/vm/builtin.h +++ b/src/vm/builtin.h @@ -29,7 +29,7 @@ Changes: Edwin Steiner Christian Thalinger - $Id: builtin.h 5049 2006-06-23 12:07:26Z twisti $ + $Id: builtin.h 5165 2006-07-21 09:24:03Z twisti $ */ @@ -188,21 +188,6 @@ void builtin_trace_args(s8 a0, s8 a1, void builtin_displaymethodstop(methodinfo *m, s8 l, double d, float f); /* NOT AN OP */ -#if defined(ENABLE_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 - -# define BUILTIN_MONITOR_ENTER(o) builtin_monitorenter((java_objectheader *) o) -# define BUILTIN_MONITOR_EXIT(o) builtin_monitorexit((java_objectheader *) o) -#else -# define BUILTIN_MONITOR_ENTER(o) /* noop */ -# define BUILTIN_MONITOR_EXIT(o) /* noop */ -#endif - s4 builtin_idiv(s4 a, s4 b); #define BUILTIN_idiv (functionptr) builtin_idiv s4 builtin_irem(s4 a, s4 b); @@ -314,15 +299,6 @@ java_arrayheader *builtin_clone_array(void *env, java_arrayheader *o); /* this is a wrapper for calls from asmpart */ java_objectheader **builtin_asm_get_exceptionptrptr(void); -#if defined(ENABLE_THREADS) -static inline java_objectheader **builtin_get_exceptionptrptr(void); - -inline java_objectheader **builtin_get_exceptionptrptr(void) -{ - return &(THREADOBJECT->_exceptionptr); -} -#endif - #if defined(ENABLE_CYCLES_STATS) void builtin_print_cycles_stats(FILE *file); #endif