X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fpatcher-common.h;h=91e46eda06bafdb9a1d498965f5624e7bd789078;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=8ec54b184103f097c609df6898cf86e9d9a248f1;hpb=3fd4086fd546754cddbd26a3fecbf834a2f2ab1b;p=cacao.git

diff --git a/src/vm/jit/patcher-common.h b/src/vm/jit/patcher-common.h
index 8ec54b184..91e46eda0 100644
--- a/src/vm/jit/patcher-common.h
+++ b/src/vm/jit/patcher-common.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
@@ -67,17 +65,18 @@ typedef struct patchref_t {
 /* function prototypes ********************************************************/
 
 void patcher_list_create(codeinfo *code);
+void patcher_list_reset(codeinfo *code);
 void patcher_list_free(codeinfo *code);
 
 void patcher_add_patch_ref(jitdata *jd, functionptr patcher, voidptr ref,
                            s4 disp);
 
-java_objectheader *patcher_handler(u1 *pc);
+java_handle_t *patcher_handler(u1 *pc);
 
 
 /* patcher prototypes and macros **********************************************/
 
-#if defined(__ALPHA__) || defined(__ARM__) || defined(__POWERPC__) || defined (__S390__)
+#if defined(__ALPHA__) || defined(__ARM__) || defined(__MIPS__) || defined(__POWERPC__) || defined (__S390__)
 
 /* new patcher functions */
 
@@ -140,7 +139,7 @@ bool patcher_invokevirtual(patchref_t *pr);
 bool patcher_invokeinterface(patchref_t *pr);
 #define PATCHER_invokeinterface (functionptr) patcher_invokeinterface
 
-#if defined(__ALPHA__) || defined(__POWERPC__) || defined(__S390__)
+#if defined(__ALPHA__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__S390__) 
 
 bool patcher_checkcast_interface(patchref_t *pr);
 #define PATCHER_checkcast_interface (functionptr) patcher_checkcast_interface
@@ -148,9 +147,13 @@ bool patcher_checkcast_interface(patchref_t *pr);
 bool patcher_instanceof_interface(patchref_t *pr);
 #define PATCHER_instanceof_interface (functionptr) patcher_instanceof_interface
 
-#endif /* defined(__ALPHA__) */
+#endif /* defined(__ALPHA__) || defined(__MIPS__) || defined(__POWERPC__) || defined(__S390__) */
+
+/* very old patcher functions */
+/* XXX use newer patcher function names above! */
 
 #if defined(__S390__)
+
 bool patcher_clinit(patchref_t *pr);
 #define PATCHER_clinit (functionptr) patcher_clinit
 
@@ -159,6 +162,7 @@ bool patcher_athrow_areturn(patchref_t *pr);
 
 bool patcher_checkcast_instanceof_interface(patchref_t *pr);
 #define PATCHER_checkcast_instanceof_interface (functionptr) patcher_checkcast_instanceof_interface
+
 #endif /* defined (__S390__) */
 
 #endif /* architecture list */