* src/vm/jit/i386/asmpart.S: Rewritten for PIC code.

[cacao.git] / src / vm / jit / patcher.h

diff --git a/src/vm/jit/patcher.h b/src/vm/jit/patcher.h
index 8f1648b1772f307d985c90bd988833b1415d1632..62c4f4b21ae986104413120dfd12ef7595f73055 100644 (file)
--- a/src/vm/jit/patcher.h
+++ b/src/vm/jit/patcher.h
@@ -1,9 +1,9 @@
 /* src/vm/jit/patcher.h - code patching 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,26 +19,69 @@
 
    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: Christian Thalinger
 
    Changes:
 
-   $Id: patcher.h 2326 2005-04-21 22:36:28Z twisti $
+   $Id: patcher.h 4530 2006-02-21 09:11:53Z twisti $
 
 */
 
+
 #ifndef _PATCHER_H
 #define _PATCHER_H
 
-#include "types.h"
+#include "config.h"
+#include "vm/types.h"
+
 #include "vm/global.h"
 
 
+/* patcher macros *************************************************************/
+
+#if defined(USE_THREADS)
+
+#define PATCHER_MONITORENTER \
+       /* enter a monitor on the patching position */       \
+                                                            \
+       builtin_monitorenter(o);                             \
+                                                            \
+       /* check if the position has already been patched */ \
+                                                            \
+       if (o->vftbl) {                                      \
+               builtin_monitorexit(o);                          \
+                                                            \
+               return true;                                     \
+       }                                                    \
+
+
+#define PATCHER_MONITOREXIT \
+       /* leave the monitor on the patching position */     \
+                                                            \
+       builtin_monitorexit(o);
+
+
+#define PATCHER_MARK_PATCHED_MONITOREXIT \
+       /* mark position as patched */                       \
+                                                            \
+       o->vftbl = (vftbl_t *) 1;                            \
+                                                            \
+       PATCHER_MONITOREXIT
+
+#else
+
+#define PATCHER_MONITORENTER                 /* nop */
+#define PATCHER_MONITOREXIT                  /* nop */
+#define PATCHER_MARK_PATCHED_MONITOREXIT     /* nop */
+
+#endif /* defined(USE_THREADS) */
+
+
 /* function prototypes ********************************************************/
 
 bool patcher_get_putstatic(u1 *sp);
@@ -59,12 +102,21 @@ bool patcher_get_putfield(u1 *sp);
 
 #endif /* defined(__I386__) */
 
-bool patcher_builtin_new(u1 *sp);
-bool patcher_builtin_newarray(u1 *sp, constant_classref *cr);
-bool patcher_builtin_multianewarray(u1 *sp, constant_classref *cr);
+#if defined(__I386__) || defined(__X86_64__)
+
+bool patcher_putfieldconst(u1 *sp);
+#define PATCHER_putfieldconst (functionptr) patcher_putfieldconst
+
+#endif /* defined(__I386__) || defined(__X86_64__) */
+
+bool patcher_aconst(u1 *sp);
+#define PATCHER_aconst (functionptr) patcher_aconst
 
-bool patcher_builtin_checkarraycast(u1 *sp, constant_classref *cr);
-bool patcher_builtin_arrayinstanceof(u1 *sp, constant_classref *cr);
+bool patcher_builtin_multianewarray(u1 *sp);
+#define PATCHER_builtin_multianewarray (functionptr) patcher_builtin_multianewarray
+
+bool patcher_builtin_arraycheckcast(u1 *sp);
+#define PATCHER_builtin_arraycheckcast (functionptr) patcher_builtin_arraycheckcast
 
 bool patcher_invokestatic_special(u1 *sp);
 #define PATCHER_invokestatic_special (functionptr) patcher_invokestatic_special
@@ -75,21 +127,60 @@ bool patcher_invokevirtual(u1 *sp);
 bool patcher_invokeinterface(u1 *sp);
 #define PATCHER_invokeinterface (functionptr) patcher_invokeinterface
 
+
+/* only for interpreter */
+bool patcher_checkcast_instanceof(u1 *sp);
+#define PATCHER_checkcast_instanceof (functionptr) patcher_checkcast_instanceof
+
+
 bool patcher_checkcast_instanceof_flags(u1 *sp);
 #define PATCHER_checkcast_instanceof_flags (functionptr) patcher_checkcast_instanceof_flags
 
 bool patcher_checkcast_instanceof_interface(u1 *sp);
 #define PATCHER_checkcast_instanceof_interface (functionptr) patcher_checkcast_instanceof_interface
 
+#if defined(__I386__) || defined(__X86_64__) || defined(__POWERPC__)
+
 bool patcher_checkcast_class(u1 *sp);
 #define PATCHER_checkcast_class (functionptr) patcher_checkcast_class
 
 bool patcher_instanceof_class(u1 *sp);
 #define PATCHER_instanceof_class (functionptr) patcher_instanceof_class
 
+#else /* defined(__I386__) || defined(__X86_64__) || defined(__POWERPC__) */
+
+bool patcher_checkcast_instanceof_class(u1 *sp);
+#define PATCHER_checkcast_instanceof_class (functionptr) patcher_checkcast_instanceof_class
+
+#endif /* defined(__I386__) || defined(__X86_64__) || defined(__POWERPC__) */
+
 bool patcher_clinit(u1 *sp);
 #define PATCHER_clinit (functionptr) patcher_clinit
 
+bool patcher_athrow_areturn(u1 *sp);
+#define PATCHER_athrow_areturn (functionptr) patcher_athrow_areturn
+
+#if !defined(WITH_STATIC_CLASSPATH)
+bool patcher_resolve_native(u1 *sp);
+#define PATCHER_resolve_native (functionptr) patcher_resolve_native
+#endif
+
+
+/* stuff for the interpreter **************************************************/
+
+#if defined(ENABLE_INTRP)
+bool intrp_patcher_get_putstatic(u1 *sp);
+bool intrp_patcher_get_putfield(u1 *sp);
+bool intrp_patcher_aconst(u1 *sp);
+bool intrp_patcher_builtin_multianewarray(u1 *sp);
+bool intrp_patcher_builtin_arraycheckcast(u1 *sp);
+bool intrp_patcher_invokestatic_special(u1 *sp);
+bool intrp_patcher_invokevirtual(u1 *sp);
+bool intrp_patcher_invokeinterface(u1 *sp);
+bool intrp_patcher_checkcast_instanceof(u1 *sp);
+bool intrp_patcher_resolve_native(u1 *sp);
+#endif /* defined(ENABLE_INTRP) */
+
 #endif /* _PATCHER_H */