Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

[cacao.git] / src / vm / jit / builtin.hpp

diff --git a/src/vm/jit/builtin.hpp b/src/vm/jit/builtin.hpp
index 017e87cac839f94076e643e2e6cb09d52f9923fa..eb2d80e1c79138804eb221c8b89451024646a638 100644 (file)
--- a/src/vm/jit/builtin.hpp
+++ b/src/vm/jit/builtin.hpp
@@ -125,6 +125,10 @@ bool builtintable_replace_function(void *iptr);
  * ICMD_BUILTIN3.)
  */
 
+#if USES_NEW_SUBTYPE
+bool fast_subtype_check(struct _vftbl *, struct _vftbl *);
+#endif
+
 bool builtin_instanceof(java_handle_t *obj, classinfo *c);
 /* NOT AN OP */
 bool builtin_checkcast(java_handle_t *obj, classinfo *c);
@@ -280,14 +284,10 @@ s4 builtin_dcmpg(double a, double b);
 double builtin_drem(double a, double b);
 #define BUILTIN_drem (functionptr) builtin_drem
 
-s8       builtin_i2l(s4 i);
-/* NOT AN OP */
 float    builtin_i2f(s4 i);
 #define BUILTIN_i2f (functionptr) builtin_i2f
 double   builtin_i2d(s4 i);
 #define BUILTIN_i2d (functionptr) builtin_i2d
-s4       builtin_l2i(s8 l);
-/* NOT AN OP */
 float    builtin_l2f(s8 l);
 #define BUILTIN_l2f (functionptr) builtin_l2f
 double   builtin_l2d(s8 l);