From 4a90aeeb51438af9f31cf57ccbba6fdd7c331398 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Sun, 15 Aug 2004 15:45:33 +0000 Subject: tree.h (build_int_cst): New. .: * tree.h (build_int_cst): New. (build_int_2): Remove. * tree.c (build_int_2): Remove. (build_int_cst): New. (make_vector_type, build_common_tree_nodes, build_common_tree_nodes_2): Use build_int_cst. * builtins.c (expand_builtin_prefetch, expand_builtin_strstr, expand_builtin_strpbrk, expand_builtin_fputs, build_string_literal, expand_builtin_printf, expand_builtin_sprintf, fold_builtin_lround, fold_builtin_bitop, fold_builtin_bitop, fold_builtin_isascii, fold_builtin_toascii, fold_builtin_isdigit, simplify_builtin_strstr, simplify_builtin_strpbrk, fold_builtin_fputs, simplify_builtin_sprintf): Use build_int_cst. * c-common.c (start_fname_decls, fix_string_type, c_common_nodes_and_builtins, c_init_attributes, shorten_compare): Likewise. * c-decl.c (complete_array_type, check_bitfield_type_and_width): Likewise. * c-lex.c (interpret_integer, lex_charconst): Likewise. * c-parse.in (primary): Likewise. * c-pretty-print.c (pp_c_integer_constant): Likewise. * c-typeck.c (really_start_incremental_init, push_init_level, set_nonincremental_init_from_string): Likewise. * calls.c (load_register_parameters): Likewise. * convert.c (convert_to_pointer): Likewise. * coverage.c (coverage_counter_alloc, tree_coverage_counter_ref, build_fn_info_type, build_ctr_info_value, build_gcov_info): Likewise. * except.c (init_eh, assign_filter_values, assign_filter_values): Likewise. * expmed.c (store_fixed_bit_field, extract_bit_field, extract_fixed_bit_field, extract_split_bit_field, expand_shift, expand_mult_const, expand_mult_highpart_adjust, extract_high_half, expand_sdiv_pow2, expand_divmod, make_tree): Likewise. * expr.c (convert_move, emit_group_load, emit_group_store, expand_assignment, store_constructor, store_field, expand_expr_real_1, reduce_to_bit_field_precision): Likewise. * fold-const.c (force_fit_type, int_const_binop, fold_convert_const, invert_truthvalue, optimize_bit_field_compare, decode_field_reference, all_ones_mask_p, constant_boolean_node, fold_div_compare, fold, fold_read_from_constant_string, fold_negate_const, fold_abs_const, fold_not_const): Likewise. * function.c (assign_parm_setup_block): Likewise. * stmt.c (shift_return_value, expand_end_case_type, estimate_case_costs): Likewise. * stor-layout.c (layout_type, initialize_sizetypes, set_min_and_max_values_for_integral_type): Likewise. * tree-chrec.c (chrec_fold_multiply_poly_poly, reset_evolution_in_loop): Likewise. * tree-chrec.h (build_polynomial_chrec): Likewise. * tree-complex.c (build_replicated_const): Likewise. * tree-eh.c (honor_protect_cleanup_actions, lower_try_finally_onedest, lower_try_finally_copy, lower_try_finally_switch): Likewise. * tree-mudflap.c (mf_build_string, mx_register_decls, mudflap_register_call, mudflap_enqueue_constant): Likewise. * tree-nested.c (get_trampoline_type, get_nl_goto_field): Likewise. * tree-pretty-print.c (dump_generic_node): Likewise. * tree-ssa-ccp.c (widen_bitfield, maybe_fold_offset_to_array_ref): Likewise. * tree-ssa-dom.c (simplify_rhs_and_lookup_avail_expr): Likewise. * tree-ssa-loop-niter.c (number_of_iterations_cond, loop_niter_by_eval, upper_bound_in_type, lower_bound_in_type): Likewise. * config/alpha/alpha.c (alpha_initialize_trampoline, alpha_va_start, alpha_gimplify_va_arg_1): Use build_int_cst. * config/arm/arm.c (arm_get_cookie_size): Likewise. * config/c4x/c4x.c (c4x_gimplify_va_arg_expr): Likewise. * config/i386/i386.c (ix86_va_start, ix86_gimplify_va_arg): Likewise. * config/i860/i860.c (i860_va_start): Likewise. * config/ia64/ia64.c (ia64_gimplify_va_arg): Likewise. * config/mips/mips.c (mips_build_builtin_va_list, mips_va_start, mips_gimplify_va_arg_expr): Likewise. * config/pa/pa.c (hppa_gimplify_va_arg_expr): Likewise. * config/rs6000/rs6000.c (rs6000_va_start, rs6000_gimplify_va_arg, add_compiler_branch_island): Likewise. * config/s390/s390.c (s390_va_start): Likewise. * config/sh/sh.c (sh_va_start): Likewise. * config/stormy16/stormy16.c (xstormy16_expand_builtin_va_start): Likewise. * config/xtensa/xtensa.c (xtensa_va_start, xtensa_gimplify_va_arg_expr): Likewise. * objc/objc-act.c (build_objc_string_object, build_objc_symtab_template, init_def_list, init_objc_symtab, init_module_descriptor, generate_static_references, build_selector_translation_table, get_proto_encoding, build_typed_selector_reference, build_selector_reference, build_next_objc_exception_stuff, build_method_prototype_list_template, generate_descriptor_table, generate_protocols, build_protocol_initializer, build_ivar_list_template, build_method_list_template, build_ivar_list_initializer, generate_ivars_list, generate_dispatch_table, generate_protocol_list, build_category_initializer, build_shared_structure_initializer, generate_shared_structures, handle_impent, generate_objc_image_info): Use build_int_cst. ada: * cuintp.c (UI_To_gnu): Use build_int_cst.. * trans.c (Exception_Handler_to_gnu_sjlj, gnat_to_gnu): Likewise. * utils.c (init_gigi_decls): Likewise. * utils2.c (build_call_raise): Likewise. cp: * call.c (convert_class_to_reference, build_user_type_conversion_1, convert_like_real, build_java_interface_fn_ref, build_special_member_call): Use build_int_cst. * class.c (build_vtbl_initializer): Likewise. * cp-gimplify.c (cp_gimplify_expr): Likewise. * cvt.c (cp_convert_to_pointer): Likewise. * decl.c (cxx_init_decl_processing, complete_array_type): Likewise. * decl2.c (start_static_initialization_or_destruction, generate_ctor_or_dtor_function): Likewise. * except.c (build_throw): Likewise. * lex.c (cxx_init): Likewise. * mangle.c (write_integer_cst): Likewise. * rtti.c (build_headof, get_tinfo_decl_dynamic, build_dynamic_cast_1, ptr_initializer, ptm_initializer, get_pseudo_ti_init): Likewise. * search.c (get_dynamic_cast_base_type): Likewise. * tree.c (build_shared_int_cst): Likewise. fortran: * trans-array.c (gfc_trans_array_constructor_value): Use build_int_cst. * trans-const.c (gfc_build_string_const, gfc_init_constants, gfc_conv_mpz_to_tree, gfc_conv_constant_to_tree): Likewise. * trans-decl.c (gfc_get_symbol_decl): Likewise. * trans-intrinsic.c (gfc_conv_intrinsic_ibits, gfc_conv_intrinsic_len, prepare_arg_info): Likewise. * trans-io.c (add_case, set_error_locus, build_dt, transfer_expr): Likewise. * trans-stmt.c (gfc_trans_label_assign, gfc_trans_pause, gfc_trans_stop, gfc_trans_character_select): Likewise. * trans-types.c (gfc_init_types, gfc_get_dtype): Likewise. * trans.c (gfc_trans_runtime_check): Likewise. java: * boehm.c (get_boehm_type_descriptor): Use build_int_cst. * class.c (build_utf8_ref, build_static_field_ref, make_field_value, make_method_value, get_dispatch_table, make_class_data, emit_symbol_table, emit_catch_table): Likewise. * constants.c (get_tag_node, build_ref_from_constant_pool, build_constants_constructor): Likewise. * decl.c (java_init_decl_processing): Likewise. * expr.c (build_java_array_length_access, build_newarray, expand_java_multianewarray, expand_java_pushc, expand_iinc, build_java_binop, build_field_ref, expand_java_add_case, expand_java_call, build_known_method_ref, build_invokevirtual, build_invokeinterface, build_jni_stub): Likewise. * java-gimplify.c (java_gimplify_new_array_init): Likewise. * jcf-parse.c (get_constant): Likewise. * lex.c (do_java_lex): Likewise. * parse.y (patch_binop, patch_unaryop, patch_cast, build_null_of_type, patch_newarray): Likewise. * resource.c (compile_resource_data): Likewise. * typeck.c (build_prim_array_type): Likewise. From-SVN: r86022 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/cuintp.c | 18 ++++++++++-------- gcc/ada/trans.c | 18 ++++++++---------- gcc/ada/utils.c | 2 +- gcc/ada/utils2.c | 4 ++-- 5 files changed, 28 insertions(+), 21 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2819c7b..6316847 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2004-08-15 Nathan Sidwell + + * cuintp.c (UI_To_gnu): Use build_int_cst.. + * trans.c (Exception_Handler_to_gnu_sjlj, gnat_to_gnu): Likewise. + * utils.c (init_gigi_decls): Likewise. + * utils2.c (build_call_raise): Likewise. + 2004-08-13 Olivier Hainque * decl.c (gnat_to_gnu_entity) : When building an allocator diff --git a/gcc/ada/cuintp.c b/gcc/ada/cuintp.c index 3b8495c..c0338af 100644 --- a/gcc/ada/cuintp.c +++ b/gcc/ada/cuintp.c @@ -62,8 +62,10 @@ UI_To_gnu (Uint Input, tree type) tree gnu_ret; if (Input <= Uint_Direct_Last) - gnu_ret = convert (type, build_int_2 (Input - Uint_Direct_Bias, - Input < Uint_Direct_Bias ? -1 : 0)); + gnu_ret = convert (type, build_int_cst (NULL_TREE, + Input - Uint_Direct_Bias, + Input < Uint_Direct_Bias + ? -1 : 0)); else { Int Idx = Uints_Ptr[Input].Loc; @@ -74,26 +76,26 @@ UI_To_gnu (Uint Input, tree type) tree comp_type = (TYPE_PRECISION (type) >= TYPE_PRECISION (integer_type_node) ? type : integer_type_node); - tree gnu_base = convert (comp_type, build_int_2 (Base, 0)); + tree gnu_base = build_int_cst (comp_type, Base, 0); if (Length <= 0) abort (); - gnu_ret = convert (comp_type, build_int_2 (First, First < 0 ? -1 : 0)); + gnu_ret = build_int_cst (comp_type, First, First < 0 ? -1 : 0); if (First < 0) for (Idx++, Length--; Length; Idx++, Length--) gnu_ret = fold (build (MINUS_EXPR, comp_type, fold (build (MULT_EXPR, comp_type, gnu_ret, gnu_base)), - convert (comp_type, - build_int_2 (Udigits_Ptr[Idx], 0)))); + build_int_cst (comp_type, + Udigits_Ptr[Idx], 0))); else for (Idx++, Length--; Length; Idx++, Length--) gnu_ret = fold (build (PLUS_EXPR, comp_type, fold (build (MULT_EXPR, comp_type, gnu_ret, gnu_base)), - convert (comp_type, - build_int_2 (Udigits_Ptr[Idx], 0)))); + build_int_cst (comp_type, + Udigits_Ptr[Idx], 0))); } gnu_ret = convert (type, gnu_ret); diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c index 91b0518..e004002 100644 --- a/gcc/ada/trans.c +++ b/gcc/ada/trans.c @@ -2217,8 +2217,8 @@ Exception_Handler_to_gnu_sjlj (Node_Id gnat_node) = build_binary_op (TRUTH_ORIF_EXPR, integer_type_node, build_binary_op (EQ_EXPR, integer_type_node, gnu_comp, - convert (TREE_TYPE (gnu_comp), - build_int_2 ('V', 0))), + build_int_cst (TREE_TYPE (gnu_comp), + 'V', 0)), this_choice); } } @@ -2504,8 +2504,8 @@ gnat_to_gnu (Node_Id gnat_node) if (Present (Entity (gnat_node))) gnu_result = DECL_INITIAL (get_gnu_tree (Entity (gnat_node))); else - gnu_result = convert (gnu_result_type, - build_int_2 (Char_Literal_Value (gnat_node), 0)); + gnu_result = build_int_cst (gnu_result_type, + Char_Literal_Value (gnat_node), 0); break; case N_Real_Literal: @@ -2617,12 +2617,10 @@ gnat_to_gnu (Node_Id gnat_node) for (i = 0; i < length; i++) { gnu_list - = tree_cons (gnu_idx, - convert (TREE_TYPE (gnu_result_type), - build_int_2 - (Get_String_Char (gnat_string, i + 1), - 0)), - gnu_list); + = tree_cons (gnu_idx, build_int_cst + (TREE_TYPE (gnu_result_type), + Get_String_Char (gnat_string, i + 1), 0), + gnu_list); gnu_idx = int_const_binop (PLUS_EXPR, gnu_idx, integer_one_node, 0); diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c index 4f23629..ff57b9a 100644 --- a/gcc/ada/utils.c +++ b/gcc/ada/utils.c @@ -580,7 +580,7 @@ init_gigi_decls (tree long_long_float_type, tree exception_type) /* Make the types and functions used for exception processing. */ jmpbuf_type = build_array_type (gnat_type_for_mode (Pmode, 0), - build_index_type (build_int_2 (5, 0))); + build_index_type (build_int_cst (NULL_TREE, 5, 0))); create_type_decl (get_identifier ("JMPBUF_T"), jmpbuf_type, NULL, false, true, Empty); jmpbuf_ptr_type = build_pointer_type (jmpbuf_type); diff --git a/gcc/ada/utils2.c b/gcc/ada/utils2.c index 6d8ba35..726c9f2 100644 --- a/gcc/ada/utils2.c +++ b/gcc/ada/utils2.c @@ -1444,13 +1444,13 @@ build_call_raise (int msg) TREE_TYPE (filename) = build_array_type (char_type_node, - build_index_type (build_int_2 (len, 0))); + build_index_type (build_int_cst (NULL_TREE, len, 0))); return build_call_2_expr (fndecl, build1 (ADDR_EXPR, build_pointer_type (char_type_node), filename), - build_int_2 (input_line, 0)); + build_int_cst (NULL_TREE, input_line, 0)); } /* Return a CONSTRUCTOR of TYPE whose list is LIST. */ -- cgit v1.1