Merged revisions 8299-8320 via svnmerge from

[cacao.git] / src / vm / jit / emit-common.h

diff --git a/src/vm/jit/emit-common.h b/src/vm/jit/emit-common.h
index 030ee7466ca61b14c792d95cf95c6a02bfcf174e..0f4880ccfadf80381543fac8e480c60b0bb91431 100644 (file)
--- a/src/vm/jit/emit-common.h
+++ b/src/vm/jit/emit-common.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: emitfuncs.c 4398 2006-01-31 23:43:08Z twisti $
+   $Id: emit-common.h 8265 2007-08-06 16:10:42Z twisti $
 
 */
 
@@ -46,6 +46,7 @@
 #define BRANCH_LABEL_3    3
 #define BRANCH_LABEL_4    4
 #define BRANCH_LABEL_5    5
+#define BRANCH_LABEL_6    6
 
 
 /* constant range macros ******************************************************/
@@ -144,7 +145,7 @@ void emit_buge(codegendata *cd, basicblock *target);
 void emit_bugt(codegendata *cd, basicblock *target);
 #endif
 
-#if defined(__POWERPC__)
+#if defined(__POWERPC__) || defined(__POWERPC64__)
 void emit_bnan(codegendata *cd, basicblock *target);
 #endif
 
@@ -177,10 +178,10 @@ void emit_classcast_check(codegendata *cd, instruction *iptr, s4 condition, s4 r
 void emit_nullpointer_check(codegendata *cd, instruction *iptr, s4 reg);
 void emit_exception_check(codegendata *cd, instruction *iptr);
 
+uint32_t emit_trap(codegendata *cd);
+
 void emit_patcher_stubs(jitdata *jd);
-#if defined(ENABLE_REPLACEMENT)
-void emit_replacement_stubs(jitdata *jd);
-#endif
+void emit_patcher_traps(jitdata *jd);
 
 void emit_verbosecall_enter(jitdata *jd);
 void emit_verbosecall_exit(jitdata *jd);