* Merged with default branch at rev 16f3633aaa5a.

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

diff --git a/src/vm/jit/codegen-common.h b/src/vm/jit/codegen-common.h
index a571b71034273864c0b03b85b5565d17bec3be54..cd05415f41baf510f5efacc7230e6041a231b5ad 100644 (file)
--- a/src/vm/jit/codegen-common.h
+++ b/src/vm/jit/codegen-common.h
@@ -44,6 +44,7 @@ typedef struct linenumberref          linenumberref;
 #include "config.h"
 #include "vm/types.h"
 
+#include "vm/builtin.h"
 #include "vm/global.h"
 
 #include "vm/jit/dseg.h"
@@ -309,9 +310,11 @@ void codegen_disassemble_nativestub(methodinfo *m, u1 *start, u1 *end);
 /* stub functions */
 
 u1       *codegen_generate_stub_compiler(methodinfo *m);
+void      codegen_generate_stub_builtin(builtintable_entry *bte);
 codeinfo *codegen_generate_stub_native(methodinfo *m, functionptr f);
 
 void      codegen_emit_stub_compiler(jitdata *jd);
+void      codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte);
 void      codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f);
 
 #if defined(ENABLE_INTRP)
@@ -322,6 +325,9 @@ u1 *intrp_createnativestub(functionptr f, jitdata *jd, methoddesc *md);
 void removecompilerstub(u1 *stub);
 void removenativestub(u1 *stub);
 
+void codegen_stub_builtin_enter(u1 *datasp, u1 *pv, u1 *sp, u1 *ra);
+void codegen_stub_builtin_exit(u1 *datasp);
+
 void codegen_start_native_call(u1 *datasp, u1 *pv, u1 *sp, u1 *ra);
 java_object_t *codegen_finish_native_call(u1 *datasp);