/* Built-in and inline functions for gcj
- Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007
+ Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2009, 2010
Free Software Foundation, Inc.
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GCC is distributed in the hope that it will be useful,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+.
+
+.
Java and all Java-based marks are trademarks or registered trademarks
of Sun Microsystems, Inc. in the United States and other countries.
/* Written by Tom Tromey <tromey@redhat.com>. */
+/* FIXME: Still need to include rtl.h here (see below). */
+#undef IN_GCC_FRONTEND
+
#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "flags.h"
#include "langhooks.h"
#include "java-tree.h"
-#include <stdarg.h>
-#include "convert.h"
+
+/* FIXME: All these headers are necessary for sync_compare_and_swap.
+ Front ends should never have to look at that. */
#include "rtl.h"
#include "insn-codes.h"
#include "expr.h"
static tree compareAndSwapObject_builtin (tree, tree);
static tree putVolatile_builtin (tree, tree);
static tree getVolatile_builtin (tree, tree);
-
+static tree VMSupportsCS8_builtin (tree, tree);
\f
/* Functions of this type are used to inline a given call. Such a
function should either return an expression, if the call is to be
inlined, or NULL_TREE if a real call should be emitted. Arguments
- are method return type and arguments to call. */
+ are method return type and the original CALL_EXPR containing the
+ arguments to the call. */
typedef tree builtin_creator_function (tree, tree);
/* Hold a char*, before initialization, or a tree, after
initialization. */
-union string_or_tree GTY(())
-{
+union GTY(()) string_or_tree {
const char * GTY ((tag ("0"))) s;
tree GTY ((tag ("1"))) t;
};
/* Used to hold a single builtin record. */
-struct builtin_record GTY(())
-{
+struct GTY(()) builtin_record {
union string_or_tree GTY ((desc ("1"))) class_name;
union string_or_tree GTY ((desc ("1"))) method_name;
builtin_creator_function * GTY((skip)) creator;
static GTY(()) struct builtin_record java_builtins[] =
{
- { { "java.lang.Math" }, { "min" }, min_builtin, 0 },
- { { "java.lang.Math" }, { "max" }, max_builtin, 0 },
- { { "java.lang.Math" }, { "abs" }, abs_builtin, 0 },
+ { { "java.lang.Math" }, { "min" }, min_builtin, (enum built_in_function) 0 },
+ { { "java.lang.Math" }, { "max" }, max_builtin, (enum built_in_function) 0 },
+ { { "java.lang.Math" }, { "abs" }, abs_builtin, (enum built_in_function) 0 },
{ { "java.lang.Math" }, { "acos" }, NULL, BUILT_IN_ACOS },
{ { "java.lang.Math" }, { "asin" }, NULL, BUILT_IN_ASIN },
{ { "java.lang.Math" }, { "atan" }, NULL, BUILT_IN_ATAN },
{ { "java.lang.Math" }, { "sin" }, NULL, BUILT_IN_SIN },
{ { "java.lang.Math" }, { "sqrt" }, NULL, BUILT_IN_SQRT },
{ { "java.lang.Math" }, { "tan" }, NULL, BUILT_IN_TAN },
- { { "java.lang.Float" }, { "intBitsToFloat" }, convert_real, 0 },
- { { "java.lang.Double" }, { "longBitsToDouble" }, convert_real, 0 },
- { { "java.lang.Float" }, { "floatToRawIntBits" }, convert_real, 0 },
- { { "java.lang.Double" }, { "doubleToRawLongBits" }, convert_real, 0 },
- { { "sun.misc.Unsafe" }, { "putInt" }, putObject_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putLong" }, putObject_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putObject" }, putObject_builtin, 0},
- { { "sun.misc.Unsafe" }, { "compareAndSwapInt" },
- compareAndSwapInt_builtin, 0},
- { { "sun.misc.Unsafe" }, { "compareAndSwapLong" },
- compareAndSwapLong_builtin, 0},
- { { "sun.misc.Unsafe" }, { "compareAndSwapObject" },
- compareAndSwapObject_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putOrderedInt" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putOrderedLong" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putOrderedObject" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putIntVolatile" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putLongVolatile" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "putObjectVolatile" }, putVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "getObjectVolatile" }, getVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "getIntVolatile" }, getVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "getLongVolatile" }, getVolatile_builtin, 0},
- { { "sun.misc.Unsafe" }, { "getLong" }, getVolatile_builtin, 0},
+ { { "java.lang.Float" }, { "intBitsToFloat" }, convert_real,
+ (enum built_in_function) 0 },
+ { { "java.lang.Double" }, { "longBitsToDouble" }, convert_real,
+ (enum built_in_function) 0 },
+ { { "java.lang.Float" }, { "floatToRawIntBits" }, convert_real,
+ (enum built_in_function) 0 },
+ { { "java.lang.Double" }, { "doubleToRawLongBits" }, convert_real,
+ (enum built_in_function) 0 },
+ { { "sun.misc.Unsafe" }, { "putInt" }, putObject_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putLong" }, putObject_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putObject" }, putObject_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "compareAndSwapInt" },
+ compareAndSwapInt_builtin, (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "compareAndSwapLong" },
+ compareAndSwapLong_builtin, (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "compareAndSwapObject" },
+ compareAndSwapObject_builtin, (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putOrderedInt" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putOrderedLong" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putOrderedObject" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putIntVolatile" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putLongVolatile" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "putObjectVolatile" }, putVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "getObjectVolatile" }, getVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "getIntVolatile" }, getVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "getLongVolatile" }, getVolatile_builtin, (enum built_in_function) 0},
+ { { "sun.misc.Unsafe" }, { "getLong" }, getVolatile_builtin,
+ (enum built_in_function) 0},
+ { { "java.util.concurrent.atomic.AtomicLong" }, { "VMSupportsCS8" },
+ VMSupportsCS8_builtin, (enum built_in_function) 0},
{ { NULL }, { NULL }, NULL, END_BUILTINS }
};
/* Internal functions which implement various builtin conversions. */
static tree
-max_builtin (tree method_return_type, tree method_arguments)
+max_builtin (tree method_return_type, tree orig_call)
{
/* MAX_EXPR does not handle -0.0 in the Java style. */
if (TREE_CODE (method_return_type) == REAL_TYPE)
return NULL_TREE;
return fold_build2 (MAX_EXPR, method_return_type,
- TREE_VALUE (method_arguments),
- TREE_VALUE (TREE_CHAIN (method_arguments)));
+ CALL_EXPR_ARG (orig_call, 0),
+ CALL_EXPR_ARG (orig_call, 1));
}
static tree
-min_builtin (tree method_return_type, tree method_arguments)
+min_builtin (tree method_return_type, tree orig_call)
{
/* MIN_EXPR does not handle -0.0 in the Java style. */
if (TREE_CODE (method_return_type) == REAL_TYPE)
return NULL_TREE;
return fold_build2 (MIN_EXPR, method_return_type,
- TREE_VALUE (method_arguments),
- TREE_VALUE (TREE_CHAIN (method_arguments)));
+ CALL_EXPR_ARG (orig_call, 0),
+ CALL_EXPR_ARG (orig_call, 1));
}
static tree
-abs_builtin (tree method_return_type, tree method_arguments)
+abs_builtin (tree method_return_type, tree orig_call)
{
return fold_build1 (ABS_EXPR, method_return_type,
- TREE_VALUE (method_arguments));
+ CALL_EXPR_ARG (orig_call, 0));
}
-/* Mostly copied from ../builtins.c. */
+/* Construct a new call to FN using the arguments from ORIG_CALL. */
+
static tree
-java_build_function_call_expr (tree fn, tree arglist)
+java_build_function_call_expr (tree fn, tree orig_call)
{
- tree call_expr;
-
- call_expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (fn)), fn);
- return fold_build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (fn)),
- call_expr, arglist, NULL_TREE);
+ int nargs = call_expr_nargs (orig_call);
+ switch (nargs)
+ {
+ /* Although we could handle the 0-3 argument cases using the general
+ logic in the default case, splitting them out permits folding to
+ be performed without constructing a temporary CALL_EXPR. */
+ case 0:
+ return build_call_expr (fn, 0);
+ case 1:
+ return build_call_expr (fn, 1, CALL_EXPR_ARG (orig_call, 0));
+ case 2:
+ return build_call_expr (fn, 2,
+ CALL_EXPR_ARG (orig_call, 0),
+ CALL_EXPR_ARG (orig_call, 1));
+ case 3:
+ return build_call_expr (fn, 3,
+ CALL_EXPR_ARG (orig_call, 0),
+ CALL_EXPR_ARG (orig_call, 1),
+ CALL_EXPR_ARG (orig_call, 2));
+ default:
+ {
+ tree fntype = TREE_TYPE (fn);
+ fn = build1 (ADDR_EXPR, build_pointer_type (fntype), fn);
+ return fold (build_call_array (TREE_TYPE (fntype),
+ fn, nargs, CALL_EXPR_ARGP (orig_call)));
+ }
+ }
}
static tree
-convert_real (tree method_return_type, tree method_arguments)
+convert_real (tree method_return_type, tree orig_call)
{
return build1 (VIEW_CONVERT_EXPR, method_return_type,
- TREE_VALUE (method_arguments));
+ CALL_EXPR_ARG (orig_call, 0));
}
\f
*/
-/* Macros to unmarshal arguments from a TREE_LIST into a few
+/* Macros to unmarshal arguments from a CALL_EXPR into a few
variables. We also convert the offset arg from a long to an
integer that is the same size as a pointer. */
-#define UNMARSHAL3(METHOD_ARGUMENTS) \
+#define UNMARSHAL3(METHOD_CALL) \
tree this_arg, obj_arg, offset_arg; \
do \
{ \
- tree chain = METHOD_ARGUMENTS; \
- this_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
- obj_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
+ tree orig_method_call = METHOD_CALL; \
+ this_arg = CALL_EXPR_ARG (orig_method_call, 0); \
+ obj_arg = CALL_EXPR_ARG (orig_method_call, 1); \
offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0), \
- TREE_VALUE (chain)); \
+ CALL_EXPR_ARG (orig_method_call, 2)); \
} \
while (0)
-#define UNMARSHAL4(METHOD_ARGUMENTS) \
+#define UNMARSHAL4(METHOD_CALL) \
tree value_type, this_arg, obj_arg, offset_arg, value_arg; \
do \
{ \
- tree chain = METHOD_ARGUMENTS; \
- this_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
- obj_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
+ tree orig_method_call = METHOD_CALL; \
+ this_arg = CALL_EXPR_ARG (orig_method_call, 0); \
+ obj_arg = CALL_EXPR_ARG (orig_method_call, 1); \
offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0), \
- TREE_VALUE (chain)); \
- chain = TREE_CHAIN (chain); \
- value_arg = TREE_VALUE (chain); \
+ CALL_EXPR_ARG (orig_method_call, 2)); \
+ value_arg = CALL_EXPR_ARG (orig_method_call, 3); \
value_type = TREE_TYPE (value_arg); \
} \
while (0)
-#define UNMARSHAL5(METHOD_ARGUMENTS) \
+#define UNMARSHAL5(METHOD_CALL) \
tree value_type, this_arg, obj_arg, offset_arg, expected_arg, value_arg; \
do \
{ \
- tree chain = METHOD_ARGUMENTS; \
- this_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
- obj_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
+ tree orig_method_call = METHOD_CALL; \
+ this_arg = CALL_EXPR_ARG (orig_method_call, 0); \
+ obj_arg = CALL_EXPR_ARG (orig_method_call, 1); \
offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0), \
- TREE_VALUE (chain)); \
- chain = TREE_CHAIN (chain); \
- expected_arg = TREE_VALUE (chain); \
- chain = TREE_CHAIN (chain); \
- value_arg = TREE_VALUE (chain); \
+ CALL_EXPR_ARG (orig_method_call, 2)); \
+ expected_arg = CALL_EXPR_ARG (orig_method_call, 3); \
+ value_arg = CALL_EXPR_ARG (orig_method_call, 4); \
value_type = TREE_TYPE (value_arg); \
} \
while (0)
-/* Construct an arglist from a call. */
-
-static tree
-build_arglist_for_builtin (tree arg, ...)
-{
- va_list ap;
- tree nextarg;
- tree newarglist = build_tree_list (NULL_TREE, arg);
-
- va_start(ap, arg);
- while ((nextarg = va_arg(ap, tree)))
- newarglist = tree_cons (NULL_TREE, nextarg, newarglist);
-
- return nreverse (newarglist);
-}
-
/* Add an address to an offset, forming a sum. */
static tree
build_addr_sum (tree type, tree addr, tree offset)
{
tree ptr_type = build_pointer_type (type);
- return fold_build2 (PLUS_EXPR,
- ptr_type,
- fold_convert (ptr_type, addr), offset);
+ return fold_build_pointer_plus (fold_convert (ptr_type, addr), offset);
}
/* Make sure that this-arg is non-NULL. This is a security check. */
static tree
putObject_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
tree addr, stmt;
- UNMARSHAL4 (method_arguments);
+ UNMARSHAL4 (orig_call);
addr = build_addr_sum (value_type, obj_arg, offset_arg);
stmt = fold_build2 (MODIFY_EXPR, value_type,
static tree
compareAndSwapInt_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
enum machine_mode mode = TYPE_MODE (int_type_node);
- if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing
- || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+ if (can_compare_and_swap_p (mode, flag_use_atomic_builtins))
{
- tree newarglist, addr, stmt;
- UNMARSHAL5 (method_arguments);
+ tree addr, stmt;
+ enum built_in_function fncode = BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_4;
+ UNMARSHAL5 (orig_call);
+ (void) value_type; /* Avoid set but not used warning. */
addr = build_addr_sum (int_type_node, obj_arg, offset_arg);
-
- newarglist
- = build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
- stmt = (build_function_call_expr
- (built_in_decls[BUILT_IN_BOOL_COMPARE_AND_SWAP_4],
- newarglist));
+ stmt = build_call_expr (builtin_decl_explicit (fncode),
+ 3, addr, expected_arg, value_arg);
return build_check_this (stmt, this_arg);
}
static tree
compareAndSwapLong_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
enum machine_mode mode = TYPE_MODE (long_type_node);
- if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing
- || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+ /* We don't trust flag_use_atomic_builtins for multi-word compareAndSwap.
+ Some machines such as ARM have atomic libfuncs but not the multi-word
+ versions. */
+ if (can_compare_and_swap_p (mode,
+ (flag_use_atomic_builtins
+ && GET_MODE_SIZE (mode) <= UNITS_PER_WORD)))
{
- tree newarglist, addr, stmt;
- UNMARSHAL5 (method_arguments);
+ tree addr, stmt;
+ enum built_in_function fncode = BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_8;
+ UNMARSHAL5 (orig_call);
+ (void) value_type; /* Avoid set but not used warning. */
addr = build_addr_sum (long_type_node, obj_arg, offset_arg);
-
- newarglist
- = build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
- stmt = (build_function_call_expr
- (built_in_decls[BUILT_IN_BOOL_COMPARE_AND_SWAP_8],
- newarglist));
+ stmt = build_call_expr (builtin_decl_explicit (fncode),
+ 3, addr, expected_arg, value_arg);
return build_check_this (stmt, this_arg);
}
}
static tree
compareAndSwapObject_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
enum machine_mode mode = TYPE_MODE (ptr_type_node);
- if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing
- || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+ if (can_compare_and_swap_p (mode, flag_use_atomic_builtins))
{
- tree newarglist, addr, stmt;
- int builtin;
+ tree addr, stmt;
+ enum built_in_function builtin;
- UNMARSHAL5 (method_arguments);
+ UNMARSHAL5 (orig_call);
builtin = (POINTER_SIZE == 32
- ? BUILT_IN_BOOL_COMPARE_AND_SWAP_4
- : BUILT_IN_BOOL_COMPARE_AND_SWAP_8);
+ ? BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_4
+ : BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_8);
addr = build_addr_sum (value_type, obj_arg, offset_arg);
-
- newarglist
- = build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
- stmt = (build_function_call_expr
- (built_in_decls[builtin],
- newarglist));
+ stmt = build_call_expr (builtin_decl_explicit (builtin),
+ 3, addr, expected_arg, value_arg);
return build_check_this (stmt, this_arg);
}
static tree
putVolatile_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
- tree newarglist, addr, stmt, modify_stmt;
- UNMARSHAL4 (method_arguments);
+ tree addr, stmt, modify_stmt;
+ UNMARSHAL4 (orig_call);
addr = build_addr_sum (value_type, obj_arg, offset_arg);
addr
= fold_convert (build_pointer_type (build_type_variant (value_type, 0, 1)),
addr);
- newarglist = NULL_TREE;
- stmt = (build_function_call_expr
- (built_in_decls[BUILT_IN_SYNCHRONIZE],
- newarglist));
+ stmt = build_call_expr (builtin_decl_explicit (BUILT_IN_SYNC_SYNCHRONIZE), 0);
modify_stmt = fold_build2 (MODIFY_EXPR, value_type,
build_java_indirect_ref (value_type, addr,
flag_check_references),
static tree
getVolatile_builtin (tree method_return_type ATTRIBUTE_UNUSED,
- tree method_arguments)
+ tree orig_call)
{
- tree newarglist, addr, stmt, modify_stmt, tmp;
- UNMARSHAL3 (method_arguments);
-
+ tree addr, stmt, modify_stmt, tmp;
+ UNMARSHAL3 (orig_call);
+ (void) this_arg; /* Avoid set but not used warning. */
+
addr = build_addr_sum (method_return_type, obj_arg, offset_arg);
addr
= fold_convert (build_pointer_type (build_type_variant
(method_return_type, 0, 1)), addr);
- newarglist = NULL_TREE;
- stmt = (build_function_call_expr
- (built_in_decls[BUILT_IN_SYNCHRONIZE],
- newarglist));
-
- tmp = build_decl (VAR_DECL, NULL, method_return_type);
+ stmt = build_call_expr (builtin_decl_explicit (BUILT_IN_SYNC_SYNCHRONIZE), 0);
+ tmp = build_decl (BUILTINS_LOCATION, VAR_DECL, NULL, method_return_type);
DECL_IGNORED_P (tmp) = 1;
DECL_ARTIFICIAL (tmp) = 1;
pushdecl (tmp);
return stmt;
}
-
+
+static tree
+VMSupportsCS8_builtin (tree method_return_type,
+ tree orig_call ATTRIBUTE_UNUSED)
+{
+ enum machine_mode mode = TYPE_MODE (long_type_node);
+ gcc_assert (method_return_type == boolean_type_node);
+ if (can_compare_and_swap_p (mode, false))
+ return boolean_true_node;
+ else
+ return boolean_false_node;
+}
+
\f
#define BUILTIN_NOTHROW 1
{
tree decl;
- decl = build_decl (FUNCTION_DECL, get_identifier (name), type);
+ decl = build_decl (BUILTINS_LOCATION,
+ FUNCTION_DECL, get_identifier (name), type);
DECL_EXTERNAL (decl) = 1;
TREE_PUBLIC (decl) = 1;
SET_DECL_ASSEMBLER_NAME (decl, get_identifier (libname));
if (flags & BUILTIN_CONST)
TREE_READONLY (decl) = 1;
- implicit_built_in_decls[val] = decl;
- built_in_decls[val] = decl;
+ set_builtin_decl (val, decl, true);
}
\f
initialize_builtins (void)
{
tree double_ftype_double, double_ftype_double_double;
- tree float_ftype_float, float_ftype_float_float;
+ tree float_ftype_float_float;
tree boolean_ftype_boolean_boolean;
- tree t;
int i;
for (i = 0; java_builtins[i].builtin_code != END_BUILTINS; ++i)
void_list_node = end_params_node;
- t = tree_cons (NULL_TREE, float_type_node, end_params_node);
- float_ftype_float = build_function_type (float_type_node, t);
- t = tree_cons (NULL_TREE, float_type_node, t);
- float_ftype_float_float = build_function_type (float_type_node, t);
+ float_ftype_float_float
+ = build_function_type_list (float_type_node,
+ float_type_node, float_type_node, NULL_TREE);
- t = tree_cons (NULL_TREE, double_type_node, end_params_node);
- double_ftype_double = build_function_type (double_type_node, t);
- t = tree_cons (NULL_TREE, double_type_node, t);
- double_ftype_double_double = build_function_type (double_type_node, t);
+ double_ftype_double
+ = build_function_type_list (double_type_node, double_type_node, NULL_TREE);
+ double_ftype_double_double
+ = build_function_type_list (double_type_node,
+ double_type_node, double_type_node, NULL_TREE);
define_builtin (BUILT_IN_FMOD, "__builtin_fmod",
double_ftype_double_double, "fmod", BUILTIN_CONST);
double_ftype_double, "_ZN4java4lang4Math3tanEJdd",
BUILTIN_CONST);
- t = tree_cons (NULL_TREE, boolean_type_node, end_params_node);
- t = tree_cons (NULL_TREE, boolean_type_node, t);
- boolean_ftype_boolean_boolean = build_function_type (boolean_type_node, t);
+ boolean_ftype_boolean_boolean
+ = build_function_type_list (boolean_type_node,
+ boolean_type_node, boolean_type_node,
+ NULL_TREE);
define_builtin (BUILT_IN_EXPECT, "__builtin_expect",
boolean_ftype_boolean_boolean,
"__builtin_expect",
BUILTIN_CONST | BUILTIN_NOTHROW);
- define_builtin (BUILT_IN_BOOL_COMPARE_AND_SWAP_4,
+ define_builtin (BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_4,
"__sync_bool_compare_and_swap_4",
build_function_type_list (boolean_type_node,
int_type_node,
build_pointer_type (int_type_node),
int_type_node, NULL_TREE),
"__sync_bool_compare_and_swap_4", 0);
- define_builtin (BUILT_IN_BOOL_COMPARE_AND_SWAP_8,
+ define_builtin (BUILT_IN_SYNC_BOOL_COMPARE_AND_SWAP_8,
"__sync_bool_compare_and_swap_8",
build_function_type_list (boolean_type_node,
long_type_node,
build_pointer_type (long_type_node),
int_type_node, NULL_TREE),
"__sync_bool_compare_and_swap_8", 0);
- define_builtin (BUILT_IN_SYNCHRONIZE, "__sync_synchronize",
- build_function_type (void_type_node, void_list_node),
+ define_builtin (BUILT_IN_SYNC_SYNCHRONIZE, "__sync_synchronize",
+ build_function_type_list (void_type_node, NULL_TREE),
"__sync_synchronize", BUILTIN_NOTHROW);
define_builtin (BUILT_IN_RETURN_ADDRESS, "__builtin_return_address",
if (optimize && TREE_CODE (call) == CALL_EXPR)
{
int i;
- tree method_arguments = TREE_OPERAND (call, 1);
tree method_class = DECL_NAME (TYPE_NAME (DECL_CONTEXT (method)));
tree method_name = DECL_NAME (method);
tree method_return_type = TREE_TYPE (TREE_TYPE (method));
if (java_builtins[i].creator != NULL)
{
tree result
- = (*java_builtins[i].creator) (method_return_type,
- method_arguments);
+ = (*java_builtins[i].creator) (method_return_type, call);
return result == NULL_TREE ? call : result;
}
with the BC-ABI. */
if (flag_indirect_dispatch)
return call;
- fn = built_in_decls[java_builtins[i].builtin_code];
+ fn = builtin_decl_explicit (java_builtins[i].builtin_code);
if (fn == NULL_TREE)
return call;
- return java_build_function_call_expr (fn, method_arguments);
+ return java_build_function_call_expr (fn, call);
}
}
}
OSDN Git Service
