* src/vm/array.hpp: Implemented array access classes in C++.

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

diff --git a/src/vm/jit/builtin.hpp b/src/vm/jit/builtin.hpp
index 2f94b09fd9c3df8d4a43b69c74f1f5661b5f6cb0..af81aced2d3c8adbc2d5cced00f3f0eae663ddb3 100644 (file)
--- a/src/vm/jit/builtin.hpp
+++ b/src/vm/jit/builtin.hpp
@@ -36,9 +36,9 @@ typedef struct builtintable_entry builtintable_entry;
 #include "arch.h"
 #include "md-abi.h"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
-#include "vm/descriptor.h"
+#include "vm/descriptor.hpp"
 #include "vm/utf8.h"
 
 
@@ -125,7 +125,9 @@ 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 */
@@ -166,14 +168,9 @@ java_handle_t *builtin_escape_reason_new(classinfo *c);
 java_object_t *builtin_fast_new(classinfo *c);
 #define BUILTIN_FAST_new (functionptr) builtin_fast_new
 
-java_handle_t *builtin_newarray(int32_t size, classinfo *arrayclass);
-/* NOT AN OP */
-java_handle_t *builtin_java_newarray(int32_t size, java_handle_t *arrayclass);
+java_handle_array_t *builtin_java_newarray(int32_t size, java_handle_t *arrayclass);
 #define BUILTIN_newarray (functionptr) builtin_java_newarray
 
-java_handle_objectarray_t *builtin_anewarray(int32_t size, classinfo *componentclass);
-/* NOT AN OP */
-
 java_handle_booleanarray_t *builtin_newarray_boolean(int32_t size);
 #define BUILTIN_newarray_boolean (functionptr) builtin_newarray_boolean
 java_handle_chararray_t *builtin_newarray_char(int32_t size);
@@ -282,14 +279,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);