0823efedd0
Merge from cxx-conversion branch (http://gcc.gnu.org/wiki/cxx-conversion). As described in http://gcc.gnu.org/ml/gcc/2012-08/msg00015.html, this patch changes the default bootstrap process so that stage 1 always builds with a C++ compiler. Other than the bootstrap change, the patch makes no functional changes to the compiler. Everything should build as it does now in trunk. The main changes in this patch are: 1- Configuration changes. 2- Re-write of VEC. 3- Re-write of gengtype to support C++ templates and user-provided marking functions. 4- New hash table class. 5- Re-write double_int. 6- Implement tree macros as inline functions so they can be called from gdb. As discussed before, several of these changes do not fully change the call sites to use the new APIs. The bootstrap changes have already been tested on a wide range of targets (http://gcc.gnu.org/wiki/CppBuildStatus). Additionally, I have tested the merged trunk on: x86_64-unknown-linux-gnu, mips64el-unknown-linux-gnu, powerpc64-unknown-linux-gnu, i686-pc-linux-gnu, and ia64-unknown-linux-gnu. ChangeLog 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. * Makefile.tpl (STAGE[+id+]_CXXFLAGS): Remove POSTSTAGE1_CONFIGURE_FLAGS. * Makefile.in: Regenerate. * configure.ac (ENABLE_BUILD_WITH_CXX): Remove. Update all users. Force C++ when bootstrapping. * configure: Regenerate. libcpp/ChangeLog 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. Configury. * Makefile.in: Remove all handlers of ENABLE_BUILD_WITH_CXX. * configure.ac: Likewise. * configure: Regenerate. 2012-08-14 Lawrence Crowl <crowl@google.com> Merge from cxx-conversion branch. New C++ hash table. * include/symtab.h (typedef struct ht hash_table): Change the typedef name to cpp_hash_table. Update all users of the typedef. gcc/ChangeLog 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. Configury. * configure.ac (CXX_FOR_BUILD): Define and substitute. (BUILD_CXXFLAGS): Define. Remove all handlers of ENABLE_BUILD_WITH_CXX. Force all build to be with C++. * Makefile.in (BUILD_CXXFLAGS): Use it. Remove all handlers of ENABLE_BUILD_WITH_CXX. * configure: Regenerate. * config.in: Regenerate. * doc/install.texi: Remove documentation for --enable-build-with-cxx and --enable-build-poststage1-with-cxx. 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. Re-implement VEC in C++. * vec.c (vec_heap_free): Convert into a template function. (vec_gc_o_reserve_1): Make extern. (vec_gc_p_reserve): Remove. (vec_gc_p_reserve_exact): Remove. (vec_gc_o_reserve): Remove. (vec_gc_o_reserve_exact): Remove. (vec_heap_o_reserve_1): Make extern. (vec_heap_p_reserve): Remove. (vec_heap_p_reserve_exact): Remove. (vec_heap_o_reserve): Remove. (vec_heap_o_reserve_exact): Remove. (vec_stack_p_reserve): Remove. (vec_stack_p_reserve_exact): Remove. * vec.h (VEC_CHECK_INFO, VEC_CHECK_DECL, VEC_CHECK_PASS, VEC_ASSERT, VEC_ASSERT_FAIL, vec_assert_fail): Move earlier in the file. (VEC): Define to vec_t<T>. (vec_allocation_t): Define. (struct vec_prefix): Move earlier in the file. (vec_t<T>): New template. (DEF_VEC_I, DEF_VECL_ALLOC_I, DEF_VEC_P, DEF_VEC_ALLOC_P, DEF_VEC_O, DEF_VEC_ALLOC_P, DEF_VEC_O, DEF_VEC_ALLOC_O, DEF_VEC_ALLOC_P_STACK, DEF_VEC_ALLOC_O_STACK, DEF_VEC_ALLOC_I_STACK): Expand to 'struct vec_swallow_trailing_semi'. (DEF_VEC_A): Provide template instantiations for GC/PCH markers that do not traverse the vector. (vec_stack_p_reserve): Remove. (vec_stack_p_reserve_exact): Remove. (vec_stack_p_reserve_exact_1): Remove. (vec_stack_o_reserve): Remove. (vec_stack_o_reserve_exact): Remove. (vec_stack_free): Re-write as a template function. (vec_reserve): New template function. (vec_reserve_exact): New template function. (vec_heap_free): New template function if GATHER_STATISTICS is defined. Otherwise, macro that expands to free(). (VEC_length_1): New template function. (VEC_length): Call it. (VEC_empty_1): New template function. (VEC_empty): Call it. (VEC_address_1): New template function. (VEC_address): Call it. (VEC_last_1): New template function. (VEC_last): Call it. Change return type to T&. Change all users that used VEC_Os. (VEC_index_1): New template function. (VEC_index): Call it. Return a T& instead of a T*. Update all callers that were using VEC_O before. (VEC_iterate_1): New template function. (VEC_iterate): Call it. (VEC_embedded_size_1): New template function. (VEC_embedded_size): Call it. (VEC_embedded_init_1): New template function. (VEC_embedded_init): Call it. (VEC_alloc_1): New template function. (VEC_alloc): Call it. If A is 'stack', call XALLOCAVAR to do the allocation. (VEC_free_1): New template function. (VEC_free): Call it. (VEC_copy_1): New template function. (VEC_copy): Call it. (VEC_space_1): New template function (VEC_space): Call it. (VEC_reserve_1): New template function. (VEC_reserve): Call it. (VEC_reserve_exact_1): New template function. (VEC_reserve_exact): Call it. (VEC_splice_1): New template function. (VEC_splice): Call it. (VEC_safe_splice_1): New template function. (VEC_safe_splice): Call it. (VEC_quick_push_1): New template function. Create two overloads, one accepting T, the other accepting T *. Update all callers where T and T * are ambiguous. (VEC_quick_push): Call it. (VEC_safe_push_1): New template function. Create two overloads, one accepting T, the other accepting T *. Update all callers where T and T * are ambiguous. (VEC_safe_push): Call it. (VEC_pop_1): New template function. (VEC_pop): Call it. (VEC_truncate_1): New template function. (VEC_truncate): Call it. (VEC_safe_grow_1): New template function. (VEC_safe_grow): Call it. (VEC_safe_grow_cleared_1): New template function. (VEC_safe_grow_cleared): Call it. (VEC_replace_1): New template function. (VEC_replace): Call it. Always accept T instead of T*. Update all callers that used VEC_Os. (VEC_quick_insert_1): New template function. (VEC_quick_insert): Call it. (VEC_safe_insert_1): New template function. (VEC_safe_insert): Call it. (VEC_ordered_remove_1): New template function. (VEC_ordered_remove): Call it. (VEC_unordered_remove_1): New template function. (VEC_unordered_remove): Call it. (VEC_block_remove_1): New template function. (VEC_block_remove): Call it. (VEC_lower_bound_1): New template function. (VEC_lower_bound): Call it. (VEC_OP): Remove. (DEF_VEC_FUNC_P): Remove. (DEF_VEC_ALLOC_FUNC_P): Remove. (DEF_VEC_NONALLOC_FUNCS_P): Remove. (DEF_VEC_FUNC_O): Remove. (DEF_VEC_ALLOC_FUNC_O): Remove. (DEF_VEC_NONALLOC_FUNCS_O): Remove. (DEF_VEC_ALLOC_FUNC_I): Remove. (DEF_VEC_NONALLOC_FUNCS_I): Remove. (DEF_VEC_ALLOC_FUNC_P_STACK): Remove. (DEF_VEC_ALLOC_FUNC_O_STACK): Remove. (DEF_VEC_ALLOC_FUNC_I_STACK): Remove. (vec_reserve_exact): New template function. * gengtype-lex.l (DEF_VEC_ALLOC_[IOP]/{EOID}): Remove. * gengtype-parse.c (token_names): Remove DEF_VEC_ALLOC_[IOP]. (typedef_name): Emit vec_t<C1> instead of VEC_C1_C2. (def_vec_alloc): Remove. Update all callers. * gengtype.c (filter_type_name): New. (output_mangled_typename): Call it. (write_func_for_structure): Likewise. (write_types): Likewise. (write_root): Likewise. (write_typed_alloc_def): Likewise. (note_def_vec): Emit vec_t<TYPE_NAME> instead of VEC_TYPE_NAME_base. (note_def_vec_alloc): Remove. * gengtype.h (note_def_vec_alloc): Remove. (DEFVEC_ALLOC): Remove token code. * df-scan.c (df_bb_verify): Remove call to df_free_collection_rec inside the insn traversal loop. * gimplify.c (gimplify_compound_lval): Rename STACK to EXPR_STACK. * ipa-inline.c (inline_small_functions): Rename HEAP to EDGE_HEAP. * reg-stack.c (stack): Rename to STACK_PTR. Update all users. * tree-vrp.c (stack): Rename to EQUIV_STACK. Update all users. * config/bfin/bfin.c (hwloop_optimize): Update some calls to VEC_* for vectors of non-pointers. * config/c6x/c6x.c (try_rename_operands): Likewise. (reshuffle_units): Likewise. * config/mips/mips.c (mips_multi_start): Likewise. (mips_multi_add): Likewise. (mips_multi_copy_insn): Likewise. (mips_multi_set_operand): Likewise. * hw-doloop.c (discover_loop): Likewise. (discover_loops): Likewise. (reorg_loops): Likewise. 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. C++ support in gengtype. * coretypes.h (gt_pointer_operator): Move from ... * ggc.h: ... here. * doc/gty.texi: Document support for C++ templates and user-provided markers. * gcc/gengtype-lex.l: Update copyright year. Remove support for recognizing DEF_VEC_O, DEF_VEC_P and DEFVEC_I. * gengtype-parse.c: Update copyright year. (token_names): Remove DEF_VEC_O, DEF_VEC_P and DEF_VEC_I. (require_template_declaration): New. (typedef_name): Call it. (type): Replace IS_UNION with KIND. Replace all users. (def_vec): Remove. Update all users. * gengtype-state.c (type_lineloc): Handle TYPE_USER_STRUCT. (write_state_user_struct_type): New. (write_state_type): Call it. (read_state_user_struct_type): New. (read_state_type): Call it. * gengtype.c: Update copyright year. (dump_pair): Move declaration to the top. (dump_type): Likewise. (dump_type_list): Likewise. (dbgprint_count_type_at): Handle TYPE_USER_STRUCT. (create_user_defined_type): New. (resolve_typedef): Call it. (new_structure): Replace argument ISUNION with KIND. Change users to refer to KIND directly. Update all callers. (find_structure): Likewise. (set_gc_used_type): Handle TYPE_USER_STRUCT. (create_file): Update HDR to include new copyright year. (struct walk_type_data): Add field IN_PTR_FIELD. (output_mangled_typename): Handle TYPE_USER_STRUCT. (walk_type): Set D->IN_PTR_FIELD when walking a TYPE_POINTER. Clear it afterwards. Handle TYPE_USER_STRUCT. (write_types_process_field): Handle TYPE_USER_STRUCT. (get_type_specifier): Move earlier in the file. (write_type_decl): New. (write_marker_function_name): New. (write_user_func_for_structure_ptr): New. (write_user_func_for_structure_body): New. (write_user_marking_functions): New. (write_func_for_structure): Call write_marker_function_name and write_type_decl. Do not call walk_type for TYPE_USER_STRUCT. Emit a call to the user function directly. Call write_user_marking_functions on TYPE_USER_STRUCTs. (write_types_local_user_process_field): New. (write_pch_user_walking_for_structure_body): New. (write_pch_user_walking_functions): New. (write_types_local_process_field): Handle TYPE_USER_STRUCT. (write_local_func_for_structure): Do not call walk_type for TYPE_USER_STRUCT. Instead, emit the call to gt_pch_nx directly. Call write_pch_user_walking_functions for TYPE_USER_STRUCTs. (write_root): Handle TYPE_USER_STRUCT. (vec_prefix_type): Remove. Update all users. (note_def_vec): Remove. Update all users. (dump_typekind): Handle TYPE_USER_STRUCT. (dump_type): Initialize SEEN_TYPES, if needed. Handle TYPE_USER_STRUCT. (dump_everything): Do not initialize SEEN_TYPES. * gengtype.h: Update copyright year. (enum typekind): Add TYPE_USER_STRUCT. (union_or_struct_p): Rename from UNION_OR_STRUCT_P. Convert into function. Add an overload taking const_type_p. Update all callers. (new_structure): Change second field to type enum typekind. Update all users. (find_structure): Likewise. (note_def_vec): Remove. (DEFVEC_OP): Remove. (DEFVEC_I): Remove. * ggc-page.c (gt_ggc_mx): Add entry points for marking 'const char *&', 'unsigned char *&' and 'unsigned char&'. * ggc-zone.c (gt_ggc_mx): Add entry points for marking 'const char *&' and 'unsigned char *&'. * stringpool.c (gt_pch_nx): Add entry points for marking 'const char *&', 'unsigned char *&' and 'unsigned char&'. Add an entry point for the overload taking arguments 'unsigned char *', 'gt_pointer_operator' and 'void *'. * vec.h (struct vec_prefix): Remove GTY marker. (struct vec_t): Remove GTY((length)) attribute from field 'vec'. (gt_ggc_mx (vec_t<T> *)): New template function. (gt_pch_nx (vec_t<T> *)): New template function. (gt_pch_nx (vec_t<T *> *, gt_pointer_operator, void *)): New template function. (gt_pch_nx (vec_t<T> *, gt_pointer_operator, void *)): New template function. * basic-block.h (struct edge_def): Mark GTY((user)). Remove all GTY markers from fields. (gt_ggc_mx): Declare. (gt_pch_nx): Declare. * tree-cfg.c (gt_ggc_mx): New. (gt_pch_nx): New. * gengtype-lex.l (USER_GTY): Add pattern for "user". * gengtype-parse.c (option): Handle USER_GTY. (opts_have): New. (type): Call it. If the keyword 'user' is used, do not walk the fields of the structure. * gengtype.h (USER_GTY): Add. * doc/gty.texi: Update. 2012-08-14 Lawrence Crowl <crowl@google.com> Merge cxx-conversion branch. Implement C++ hash table. * hash-table.h: New. Implementation borrowed from libiberty/hashtab.c. * hash-table.c: Likewise. * tree-ssa-tail-merge.c: Include hash-table.h instead of hashtab.h. (static htab_t same_succ_htab): Change type to hash_table; move specification of helper functions from create call to declaration. Change users to invoke member functions. (same_succ_print_traverse): Make extern ssa_.... Change callers. Remove void* casting. (same_succ_hash): Likewise. (same_succ_equal): Likewise. (same_succ_delete): Likewise. * tree-ssa-threadupdate.c: Include hash-table.h. (struct local_info): Rename to ssa_local_info_t to avoid overloading the type name local_info with the variable name local_info. (static htab_t redirection_data): Change type to hash_table. Move specification of helper functions from create call to declaration. Change users to invoke member functions. (redirection_data_hash): Make extern ssa_.... Change callers. Remove void* casting. (redirection_data_eq): Likewise. (fix_duplicate_block_edges): Likewise. (create_duplicates): Likewise. (fixup_template_block): Likewise. (redirect_edges): Likewise. (lookup_redirection_data): Change types associated with the hash table from void* to their actual type. Remove unnecessary casts. * tree-ssa-ccp.c: Include hash-table.h. (typedef gimple_htab): New. Uses hash_table. Replace specific uses of htab_t with gimple_htab. Change users to invoke member functions. Move specification of helper functions from create call to declaration. * tree-ssa-coalesce.c: Include hash-table.h instead of hashtab.h. (hash_ssa_name_by_var): Make extern. Remove void* casting. (eq_ssa_name_by_var): Likewise. (coalesce_ssa_name): Change type of local static htab_t ssa_name_hash to hash_table. Change users to invoke member functions. Move specification of helper functions from create call to declaration. * coverage.c: Include hash-table.h instead of hashtab.h. (static htab_t counts_hash): Change type to hash_table; move specification of helper functions from create call to declaration. Change users to invoke member functions. (htab_counts_entry_hash): Make extern. Rename with coverage_... instead of htab_... Remove void* casting. (htab_counts_entry_eq): Likewise. (htab_counts_entry_del): Likewise. * tree-ssa-pre.c: Include hash-table.h instead of hashtab.h. (static htab_t expression_to_id): Change type to hash_table. Move specification of helper functions from create call to declaration. Change users to invoke member functions. (static htab_t phi_translate_table): Likewise. (pre_expr_eq): Make extern ssa_.... Change callers. Remove void* casting. (pre_expr_hash): Likewise. (expr_pred_trans_hash): Likewise. (expr_pred_trans_eq): Likewise. (alloc_expression_id): Change types associated with the hash table from void* to their actual type. Remove unnecessary casts. (lookup_expression_id): Likewise. (phi_trans_lookup): Likewise. (phi_trans_add): Likewise. * stringpool.c: Rename uses of libcpp typedef hash_table to cpp_hash_table. * Makefile.in: Add hash-table.o to OBJS-libcommon-target. Add $(HASH_TABLE_H). Add new dependences on $(HASH_TABLE_H). 2012-08-14 Lawrence Crowl <crowl@google.com> Merge from cxx-conversion branch. Re-write double_int in C++. * hash-table.h (typedef double_int): Change to struct (POD). (double_int::make): New overloads for int to double-int conversion. (double_int::mask): New. (double_int::max_value): New. (double_int::min_value): New. (double_int::operator ++): New. (double_int::operator --): New. (double_int::operator *=): New. (double_int::operator +=): New. (double_int::operator -=): New. (double_int::to_signed): New. (double_int::to_unsigned): New. (double_int::fits_unsigned): New. (double_int::fits_signed): New. (double_int::fits): New. (double_int::trailing_zeros): New. (double_int::popcount): New. (double_int::multiple_of): New. (double_int::set_bit): New. (double_int::mul_with_sign): New. (double_int::operator * (binary)): New. (double_int::operator + (binary)): New. (double_int::operator - (binary)): New. (double_int::operator - (unary)): New. (double_int::operator ~ (unary)): New. (double_int::operator & (binary)): New. (double_int::operator | (binary)): New. (double_int::operator ^ (binary)): New. (double_int::and_not): New. (double_int::lshift): New. (double_int::rshift): New. (double_int::alshift): New. (double_int::arshift): New. (double_int::llshift): New. (double_int::lrshift): New. (double_int::lrotate): New. (double_int::rrotate): New. (double_int::div): New. (double_int::sdiv): New. (double_int::udiv): New. (double_int::mod): New. (double_int::smod): New. (double_int::umod): New. (double_int::divmod): New. (double_int::sdivmod): New. (double_int::udivmod): New. (double_int::ext): New. (double_int::zext): New. (double_int::sext): New. (double_int::is_zero): New. (double_int::is_one): New. (double_int::is_minus_one): New. (double_int::is_negative): New. (double_int::cmp): New. (double_int::ucmp): New. (double_int::scmp): New. (double_int::ult): New. (double_int::ugt): New. (double_int::slt): New. (double_int::sgt): New. (double_int::max): New. (double_int::smax): New. (double_int::umax): New. (double_int::min): New. (double_int::smin): New. (double_int::umin): New. (double_int::operator ==): New. (double_int::operator !=): New. (shwi_to_double_int): Change implementation to use member function. (double_int_minus_one): Likewise. (double_int_zero): Likewise. (double_int_one): Likewise. (double_int_two): Likewise. (double_int_ten): Likewise. (uhwi_to_double_int): Likewise. (double_int_to_shwi): Likewise. (double_int_to_uhwi): Likewise. (double_int_fits_in_uhwi_p): Likewise. (double_int_fits_in_shwi_p): Likewise. (double_int_fits_in_hwi_p): Likewise. (double_int_mul): Likewise. (double_int_mul_with_sign): Likewise. (double_int_add): Likewise. (double_int_sub): Likewise. (double_int_neg): Likewise. (double_int_div): Likewise. (double_int_sdiv): Likewise. (double_int_udiv): Likewise. (double_int_mod): Likewise. (double_int_smod): Likewise. (double_int_umod): Likewise. (double_int_divmod): Likewise. (double_int_sdivmod): Likewise. (double_int_udivmod): Likewise. (double_int_multiple_of): Likewise. (double_int_setbit): Likewise. (double_int_ctz): Likewise. (double_int_not): Likewise. (double_int_ior): Likewise. (double_int_and): Likewise. (double_int_and_not): Likewise. (double_int_xor): Likewise. (double_int_lshift): Likewise. (double_int_rshift): Likewise. (double_int_lrotate): Likewise. (double_int_rrotate): Likewise. (double_int_cmp): Likewise. (double_int_scmp): Likewise. (double_int_ucmp): Likewise. (double_int_max): Likewise. (double_int_smax): Likewise. (double_int_umax): Likewise. (double_int_min): Likewise. (double_int_smin): Likewise. (double_int_umin): Likewise. (double_int_ext): Likewise. (double_int_sext): Likewise. (double_int_zext): Likewise. (double_int_mask): Likewise. (double_int_max_value): Likewise. (double_int_min_value): Likewise. (double_int_zero_p): Likewise. (double_int_one_p): Likewise. (double_int_minus_one_p): Likewise. (double_int_equal_p): Likewise. (double_int_popcount): Likewise. * hash-table.c (double_int_mask): Reuse implementation for double_int::mask. (double_int_max_value): Likewise. (double_int_min_value): Likewise. (double_int_ext): Likewise. (double_int_zext): Likewise. (double_int_sext): Likewise. (double_int_mul_with_sign): Likewise. (double_int_divmod): Likewise. (double_int_sdivmod): Likewise. (double_int_udivmod): Likewise. (double_int_div): Likewise. (double_int_sdiv): Likewise. (double_int_udiv): Likewise. (double_int_mod): Likewise. (double_int_smod): Likewise. (double_int_umod): Likewise. (double_int_multiple_of): Likewise. (double_int_lshift): Likewise. (double_int_rshift): Likewise. (double_int_lrotate): Likewise. (double_int_rrotate): Likewise. (double_int_cmp): Likewise. (double_int_ucmp): Likewise. (double_int_scmp): Likewise. (double_int_max): Likewise. (double_int_smax): Likewise. (double_int_umax): Likewise. (double_int_min): Likewise. (double_int_smin): Likewise. (double_int_umin): Likewise. (double_int_min): Likewise. (double_int_min): Likewise. (double_int_min): Likewise. (double_int_min): Likewise. (double_int_min): Likewise. (double_int_min): Likewise. (double_int::alshift): New. (double_int::arshift): New. (double_int::llshift): New. (double_int::lrshift): New. (double_int::ult): New. (double_int::ugt): New. (double_int::slt): New. (double_int::sgt): New. (double_int_setbit): Reuse implementation for double_int::set_bit, which avoids a name conflict with a macro. (double_int_double_int_ctz): Reuse implementation for double_int::trailing_zeros. (double_int_fits_in_shwi_p): Reuse implementation for double_int::fits_signed. (double_int_fits_in_hwi_p): Reuse implementation for double_int::fits. (double_int_mul): Reuse implementation for binary double_int::operator *. (double_int_add): Likewise. (double_int_sub): Likewise. (double_int_neg): Reuse implementation for unary double_int::operator -. (double_int_max_value): Likewise. * fixed-value.c: Change to use member functions introduced above. 2012-08-14 Lawrence Crowl <crowl@google.com> Merge cxx-conversion branch. Support tree macro calling from gdb. * tree.h (tree_check): New. (TREE_CHECK): Use inline function above instead of __extension__. (tree_not_check): New. (TREE_NOT_CHECK): Use inline function above instead of __extension__. (tree_check2): New. (TREE_CHECK2): Use inline function above instead of __extension__. (tree_not_check2): New. (TREE_NOT_CHECK2): Use inline function above instead of __extension__. (tree_check3): New. (TREE_CHECK3): Use inline function above instead of __extension__. (tree_not_check3): New. (TREE_NOT_CHECK3): Use inline function above instead of __extension__. (tree_check4): New. (TREE_CHECK4): Use inline function above instead of __extension__. (tree_not_check4): New. (TREE_NOT_CHECK4): Use inline function above instead of __extension__. (tree_check5): New. (TREE_CHECK5): Use inline function above instead of __extension__. (tree_not_check5): New. (TREE_NOT_CHECK5): Use inline function above instead of __extension__. (contains_struct_check): New. (CONTAINS_STRUCT_CHECK): Use inline function above instead of __extension__. (tree_class_check): New. (TREE_CLASS_CHECK): Use inline function above instead of __extension__. (tree_range_check): New. (TREE_RANGE_CHECK): Use inline function above instead of __extension__. (omp_clause_subcode_check): New. (OMP_CLAUSE_SUBCODE_CHECK): Use inline function above instead of __extension__. (omp_clause_range_check): New. (OMP_CLAUSE_RANGE_CHECK): Use inline function above instead of __extension__. (expr_check): New. (EXPR_CHECK): Use inline function above instead of __extension__. (non_type_check): New. (NON_TYPE_CHECK): Use inline function above instead of __extension__. (tree_vec_elt_check): New. (TREE_VEC_ELT_CHECK): Use inline function above instead of __extension__. (omp_clause_elt_check): New. (OMP_CLAUSE_ELT_CHECK): Use inline function above instead of __extension__. (tree_operand_check): New. (TREE_OPERAND_CHECK): Use inline function above instead of __extension__. (tree_operand_check_code): New. (TREE_OPERAND_CHECK_CODE): Use inline function above instead of __extension__. (TREE_CHAIN): Simplify implementation. (TREE_TYPE): Simplify implementation. (tree_operand_length): Move for compilation dependences. * gdbinit.in: (macro define __FILE__): New. (macro define __LINE__): New. (skip "tree.h"): New. gcc/cp/ChangeLog 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. Re-write VEC in C++. * call.c (add_function_candidate): Remove const qualifier from call to VEC_index. 2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. Configury. * go-c.h: Remove all handlers of ENABLE_BUILD_WITH_CXX. * go-gcc.cc: Likewise. * go-system.h: Likewise. From-SVN: r190402
465 lines
18 KiB
C
465 lines
18 KiB
C
/* Communication between reload.c, reload1.c and the rest of compiler.
|
|
Copyright (C) 1987, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999,
|
|
2000, 2001, 2003, 2004, 2007, 2008, 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 3, or (at your option) any later
|
|
version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of 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 COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
/* If secondary reloads are the same for inputs and outputs, define those
|
|
macros here. */
|
|
|
|
#ifdef SECONDARY_RELOAD_CLASS
|
|
#define SECONDARY_INPUT_RELOAD_CLASS(CLASS, MODE, X) \
|
|
SECONDARY_RELOAD_CLASS (CLASS, MODE, X)
|
|
#define SECONDARY_OUTPUT_RELOAD_CLASS(CLASS, MODE, X) \
|
|
SECONDARY_RELOAD_CLASS (CLASS, MODE, X)
|
|
#endif
|
|
|
|
extern int register_move_cost (enum machine_mode, reg_class_t, reg_class_t);
|
|
extern int memory_move_cost (enum machine_mode, reg_class_t, bool);
|
|
extern int memory_move_secondary_cost (enum machine_mode, reg_class_t, bool);
|
|
|
|
/* Maximum number of reloads we can need. */
|
|
#define MAX_RELOADS (2 * MAX_RECOG_OPERANDS * (MAX_REGS_PER_ADDRESS + 1))
|
|
|
|
/* Encode the usage of a reload. The following codes are supported:
|
|
|
|
RELOAD_FOR_INPUT reload of an input operand
|
|
RELOAD_FOR_OUTPUT likewise, for output
|
|
RELOAD_FOR_INSN a reload that must not conflict with anything
|
|
used in the insn, but may conflict with
|
|
something used before or after the insn
|
|
RELOAD_FOR_INPUT_ADDRESS reload for parts of the address of an object
|
|
that is an input reload
|
|
RELOAD_FOR_INPADDR_ADDRESS reload needed for RELOAD_FOR_INPUT_ADDRESS
|
|
RELOAD_FOR_OUTPUT_ADDRESS like RELOAD_FOR INPUT_ADDRESS, for output
|
|
RELOAD_FOR_OUTADDR_ADDRESS reload needed for RELOAD_FOR_OUTPUT_ADDRESS
|
|
RELOAD_FOR_OPERAND_ADDRESS reload for the address of a non-reloaded
|
|
operand; these don't conflict with
|
|
any other addresses.
|
|
RELOAD_FOR_OPADDR_ADDR reload needed for RELOAD_FOR_OPERAND_ADDRESS
|
|
reloads; usually secondary reloads
|
|
RELOAD_OTHER none of the above, usually multiple uses
|
|
RELOAD_FOR_OTHER_ADDRESS reload for part of the address of an input
|
|
that is marked RELOAD_OTHER.
|
|
|
|
This used to be "enum reload_when_needed" but some debuggers have trouble
|
|
with an enum tag and variable of the same name. */
|
|
|
|
enum reload_type
|
|
{
|
|
RELOAD_FOR_INPUT, RELOAD_FOR_OUTPUT, RELOAD_FOR_INSN,
|
|
RELOAD_FOR_INPUT_ADDRESS, RELOAD_FOR_INPADDR_ADDRESS,
|
|
RELOAD_FOR_OUTPUT_ADDRESS, RELOAD_FOR_OUTADDR_ADDRESS,
|
|
RELOAD_FOR_OPERAND_ADDRESS, RELOAD_FOR_OPADDR_ADDR,
|
|
RELOAD_OTHER, RELOAD_FOR_OTHER_ADDRESS
|
|
};
|
|
|
|
#ifdef GCC_INSN_CODES_H
|
|
/* Each reload is recorded with a structure like this. */
|
|
struct reload
|
|
{
|
|
/* The value to reload from */
|
|
rtx in;
|
|
/* Where to store reload-reg afterward if nec (often the same as
|
|
reload_in) */
|
|
rtx out;
|
|
|
|
/* The class of registers to reload into. */
|
|
enum reg_class rclass;
|
|
|
|
/* The mode this operand should have when reloaded, on input. */
|
|
enum machine_mode inmode;
|
|
/* The mode this operand should have when reloaded, on output. */
|
|
enum machine_mode outmode;
|
|
|
|
/* The mode of the reload register. */
|
|
enum machine_mode mode;
|
|
|
|
/* the largest number of registers this reload will require. */
|
|
unsigned int nregs;
|
|
|
|
/* Positive amount to increment or decrement by if
|
|
reload_in is a PRE_DEC, PRE_INC, POST_DEC, POST_INC.
|
|
Ignored otherwise (don't assume it is zero). */
|
|
int inc;
|
|
/* A reg for which reload_in is the equivalent.
|
|
If reload_in is a symbol_ref which came from
|
|
reg_equiv_constant, then this is the pseudo
|
|
which has that symbol_ref as equivalent. */
|
|
rtx in_reg;
|
|
rtx out_reg;
|
|
|
|
/* Used in find_reload_regs to record the allocated register. */
|
|
int regno;
|
|
/* This is the register to reload into. If it is zero when `find_reloads'
|
|
returns, you must find a suitable register in the class specified by
|
|
reload_reg_class, and store here an rtx for that register with mode from
|
|
reload_inmode or reload_outmode. */
|
|
rtx reg_rtx;
|
|
/* The operand number being reloaded. This is used to group related reloads
|
|
and need not always be equal to the actual operand number in the insn,
|
|
though it current will be; for in-out operands, it is one of the two
|
|
operand numbers. */
|
|
int opnum;
|
|
|
|
/* Gives the reload number of a secondary input reload, when needed;
|
|
otherwise -1. */
|
|
int secondary_in_reload;
|
|
/* Gives the reload number of a secondary output reload, when needed;
|
|
otherwise -1. */
|
|
int secondary_out_reload;
|
|
/* If a secondary input reload is required, gives the INSN_CODE that uses the
|
|
secondary reload as a scratch register, or CODE_FOR_nothing if the
|
|
secondary reload register is to be an intermediate register. */
|
|
enum insn_code secondary_in_icode;
|
|
/* Likewise, for a secondary output reload. */
|
|
enum insn_code secondary_out_icode;
|
|
|
|
/* Classifies reload as needed either for addressing an input reload,
|
|
addressing an output, for addressing a non-reloaded mem ref, or for
|
|
unspecified purposes (i.e., more than one of the above). */
|
|
enum reload_type when_needed;
|
|
|
|
/* Nonzero for an optional reload. Optional reloads are ignored unless the
|
|
value is already sitting in a register. */
|
|
unsigned int optional:1;
|
|
/* nonzero if this reload shouldn't be combined with another reload. */
|
|
unsigned int nocombine:1;
|
|
/* Nonzero if this is a secondary register for one or more reloads. */
|
|
unsigned int secondary_p:1;
|
|
/* Nonzero if this reload must use a register not already allocated to a
|
|
group. */
|
|
unsigned int nongroup:1;
|
|
};
|
|
|
|
extern struct reload rld[MAX_RELOADS];
|
|
extern int n_reloads;
|
|
#endif
|
|
|
|
/* Target-dependent globals. */
|
|
struct target_reload {
|
|
/* Nonzero if indirect addressing is supported when the innermost MEM is
|
|
of the form (MEM (SYMBOL_REF sym)). It is assumed that the level to
|
|
which these are valid is the same as spill_indirect_levels, above. */
|
|
bool x_indirect_symref_ok;
|
|
|
|
/* Nonzero if an address (plus (reg frame_pointer) (reg ...)) is valid. */
|
|
bool x_double_reg_address_ok;
|
|
|
|
/* Nonzero if indirect addressing is supported on the machine; this means
|
|
that spilling (REG n) does not require reloading it into a register in
|
|
order to do (MEM (REG n)) or (MEM (PLUS (REG n) (CONST_INT c))). The
|
|
value indicates the level of indirect addressing supported, e.g., two
|
|
means that (MEM (MEM (REG n))) is also valid if (REG n) does not get
|
|
a hard register. */
|
|
bool x_spill_indirect_levels;
|
|
|
|
/* True if caller-save has been reinitialized. */
|
|
bool x_caller_save_initialized_p;
|
|
|
|
/* Modes for each hard register that we can save. The smallest mode is wide
|
|
enough to save the entire contents of the register. When saving the
|
|
register because it is live we first try to save in multi-register modes.
|
|
If that is not possible the save is done one register at a time. */
|
|
enum machine_mode (x_regno_save_mode
|
|
[FIRST_PSEUDO_REGISTER]
|
|
[MAX_MOVE_MAX / MIN_UNITS_PER_WORD + 1]);
|
|
|
|
/* We will only make a register eligible for caller-save if it can be
|
|
saved in its widest mode with a simple SET insn as long as the memory
|
|
address is valid. We record the INSN_CODE is those insns here since
|
|
when we emit them, the addresses might not be valid, so they might not
|
|
be recognized. */
|
|
int x_cached_reg_save_code[FIRST_PSEUDO_REGISTER][MAX_MACHINE_MODE];
|
|
int x_cached_reg_restore_code[FIRST_PSEUDO_REGISTER][MAX_MACHINE_MODE];
|
|
};
|
|
|
|
extern struct target_reload default_target_reload;
|
|
#if SWITCHABLE_TARGET
|
|
extern struct target_reload *this_target_reload;
|
|
#else
|
|
#define this_target_reload (&default_target_reload)
|
|
#endif
|
|
|
|
#define indirect_symref_ok \
|
|
(this_target_reload->x_indirect_symref_ok)
|
|
#define double_reg_address_ok \
|
|
(this_target_reload->x_double_reg_address_ok)
|
|
#define caller_save_initialized_p \
|
|
(this_target_reload->x_caller_save_initialized_p)
|
|
|
|
/* Register equivalences. Indexed by register number. */
|
|
typedef struct reg_equivs
|
|
{
|
|
/* The constant value to which pseudo reg N is equivalent,
|
|
or zero if pseudo reg N is not equivalent to a constant.
|
|
find_reloads looks at this in order to replace pseudo reg N
|
|
with the constant it stands for. */
|
|
rtx constant;
|
|
|
|
/* An invariant value to which pseudo reg N is equivalent.
|
|
eliminate_regs_in_insn uses this to replace pseudos in particular
|
|
contexts. */
|
|
rtx invariant;
|
|
|
|
/* A memory location to which pseudo reg N is equivalent,
|
|
prior to any register elimination (such as frame pointer to stack
|
|
pointer). Depending on whether or not it is a valid address, this value
|
|
is transferred to either equiv_address or equiv_mem. */
|
|
rtx memory_loc;
|
|
|
|
/* The address of stack slot to which pseudo reg N is equivalent.
|
|
This is used when the address is not valid as a memory address
|
|
(because its displacement is too big for the machine.) */
|
|
rtx address;
|
|
|
|
/* The memory slot to which pseudo reg N is equivalent,
|
|
or zero if pseudo reg N is not equivalent to a memory slot. */
|
|
rtx mem;
|
|
|
|
/* An EXPR_LIST of REG_EQUIVs containing MEMs with
|
|
alternate representations of the location of pseudo reg N. */
|
|
rtx alt_mem_list;
|
|
|
|
/* The list of insns that initialized reg N from its equivalent
|
|
constant or memory slot. */
|
|
rtx init;
|
|
} reg_equivs_t;
|
|
|
|
#define reg_equiv_constant(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).constant
|
|
#define reg_equiv_invariant(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).invariant
|
|
#define reg_equiv_memory_loc(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).memory_loc
|
|
#define reg_equiv_address(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).address
|
|
#define reg_equiv_mem(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).mem
|
|
#define reg_equiv_alt_mem_list(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).alt_mem_list
|
|
#define reg_equiv_init(ELT) \
|
|
VEC_index (reg_equivs_t, reg_equivs, (ELT)).init
|
|
|
|
DEF_VEC_O(reg_equivs_t);
|
|
DEF_VEC_ALLOC_O(reg_equivs_t, gc);
|
|
extern VEC(reg_equivs_t,gc) *reg_equivs;
|
|
|
|
/* All the "earlyclobber" operands of the current insn
|
|
are recorded here. */
|
|
extern int n_earlyclobbers;
|
|
extern rtx reload_earlyclobbers[MAX_RECOG_OPERANDS];
|
|
|
|
/* Save the number of operands. */
|
|
extern int reload_n_operands;
|
|
|
|
/* First uid used by insns created by reload in this function.
|
|
Used in find_equiv_reg. */
|
|
extern int reload_first_uid;
|
|
|
|
extern int num_not_at_initial_offset;
|
|
|
|
#if defined SET_HARD_REG_BIT && defined CLEAR_REG_SET
|
|
/* This structure describes instructions which are relevant for reload.
|
|
Apart from all regular insns, this also includes CODE_LABELs, since they
|
|
must be examined for register elimination. */
|
|
struct insn_chain
|
|
{
|
|
/* Links to the neighbor instructions. */
|
|
struct insn_chain *next, *prev;
|
|
|
|
/* Link through a chains set up by calculate_needs_all_insns, containing
|
|
all insns that need reloading. */
|
|
struct insn_chain *next_need_reload;
|
|
|
|
/* The rtx of the insn. */
|
|
rtx insn;
|
|
|
|
/* The basic block this insn is in. */
|
|
int block;
|
|
|
|
/* Nonzero if find_reloads said the insn requires reloading. */
|
|
unsigned int need_reload:1;
|
|
/* Nonzero if find_reloads needs to be run during reload_as_needed to
|
|
perform modifications on any operands. */
|
|
unsigned int need_operand_change:1;
|
|
/* Nonzero if eliminate_regs_in_insn said it requires eliminations. */
|
|
unsigned int need_elim:1;
|
|
/* Nonzero if this insn was inserted by perform_caller_saves. */
|
|
unsigned int is_caller_save_insn:1;
|
|
|
|
/* Register life information: record all live hard registers, and
|
|
all live pseudos that have a hard register. This set also
|
|
contains pseudos spilled by IRA. */
|
|
bitmap_head live_throughout;
|
|
bitmap_head dead_or_set;
|
|
|
|
/* Copies of the global variables computed by find_reloads. */
|
|
struct reload *rld;
|
|
int n_reloads;
|
|
|
|
/* Indicates which registers have already been used for spills. */
|
|
HARD_REG_SET used_spill_regs;
|
|
};
|
|
|
|
/* A chain of insn_chain structures to describe all non-note insns in
|
|
a function. */
|
|
extern struct insn_chain *reload_insn_chain;
|
|
|
|
/* Allocate a new insn_chain structure. */
|
|
extern struct insn_chain *new_insn_chain (void);
|
|
#endif
|
|
|
|
#if defined SET_HARD_REG_BIT
|
|
extern void compute_use_by_pseudos (HARD_REG_SET *, bitmap);
|
|
#endif
|
|
|
|
/* Functions from reload.c: */
|
|
|
|
extern reg_class_t secondary_reload_class (bool, reg_class_t,
|
|
enum machine_mode, rtx);
|
|
|
|
#ifdef GCC_INSN_CODES_H
|
|
extern enum reg_class scratch_reload_class (enum insn_code);
|
|
#endif
|
|
|
|
/* Return a memory location that will be used to copy X in mode MODE.
|
|
If we haven't already made a location for this mode in this insn,
|
|
call find_reloads_address on the location being returned. */
|
|
extern rtx get_secondary_mem (rtx, enum machine_mode, int, enum reload_type);
|
|
|
|
/* Clear any secondary memory locations we've made. */
|
|
extern void clear_secondary_mem (void);
|
|
|
|
/* Transfer all replacements that used to be in reload FROM to be in
|
|
reload TO. */
|
|
extern void transfer_replacements (int, int);
|
|
|
|
/* IN_RTX is the value loaded by a reload that we now decided to inherit,
|
|
or a subpart of it. If we have any replacements registered for IN_RTX,
|
|
cancel the reloads that were supposed to load them.
|
|
Return nonzero if we canceled any reloads. */
|
|
extern int remove_address_replacements (rtx in_rtx);
|
|
|
|
/* Like rtx_equal_p except that it allows a REG and a SUBREG to match
|
|
if they are the same hard reg, and has special hacks for
|
|
autoincrement and autodecrement. */
|
|
extern int operands_match_p (rtx, rtx);
|
|
|
|
/* Return 1 if altering OP will not modify the value of CLOBBER. */
|
|
extern int safe_from_earlyclobber (rtx, rtx);
|
|
|
|
/* Search the body of INSN for values that need reloading and record them
|
|
with push_reload. REPLACE nonzero means record also where the values occur
|
|
so that subst_reloads can be used. */
|
|
extern int find_reloads (rtx, int, int, int, short *);
|
|
|
|
/* Compute the sum of X and Y, making canonicalizations assumed in an
|
|
address, namely: sum constant integers, surround the sum of two
|
|
constants with a CONST, put the constant as the second operand, and
|
|
group the constant on the outermost sum. */
|
|
extern rtx form_sum (enum machine_mode, rtx, rtx);
|
|
|
|
/* Substitute into the current INSN the registers into which we have reloaded
|
|
the things that need reloading. */
|
|
extern void subst_reloads (rtx);
|
|
|
|
/* Make a copy of any replacements being done into X and move those copies
|
|
to locations in Y, a copy of X. We only look at the highest level of
|
|
the RTL. */
|
|
extern void copy_replacements (rtx, rtx);
|
|
|
|
/* Change any replacements being done to *X to be done to *Y */
|
|
extern void move_replacements (rtx *x, rtx *y);
|
|
|
|
/* If LOC was scheduled to be replaced by something, return the replacement.
|
|
Otherwise, return *LOC. */
|
|
extern rtx find_replacement (rtx *);
|
|
|
|
/* Nonzero if modifying X will affect IN. */
|
|
extern int reg_overlap_mentioned_for_reload_p (rtx, rtx);
|
|
|
|
/* Check the insns before INSN to see if there is a suitable register
|
|
containing the same value as GOAL. */
|
|
extern rtx find_equiv_reg (rtx, rtx, enum reg_class, int, short *,
|
|
int, enum machine_mode);
|
|
|
|
/* Return 1 if register REGNO is the subject of a clobber in insn INSN. */
|
|
extern int regno_clobbered_p (unsigned int, rtx, enum machine_mode, int);
|
|
|
|
/* Return 1 if X is an operand of an insn that is being earlyclobbered. */
|
|
extern int earlyclobber_operand_p (rtx);
|
|
|
|
/* Record one reload that needs to be performed. */
|
|
extern int push_reload (rtx, rtx, rtx *, rtx *, enum reg_class,
|
|
enum machine_mode, enum machine_mode,
|
|
int, int, int, enum reload_type);
|
|
|
|
/* Functions in reload1.c: */
|
|
|
|
/* Initialize the reload pass once per compilation. */
|
|
extern void init_reload (void);
|
|
|
|
/* The reload pass itself. */
|
|
extern bool reload (rtx, int);
|
|
|
|
/* Mark the slots in regs_ever_live for the hard regs
|
|
used by pseudo-reg number REGNO. */
|
|
extern void mark_home_live (int);
|
|
|
|
/* Scan X and replace any eliminable registers (such as fp) with a
|
|
replacement (such as sp), plus an offset. */
|
|
extern rtx eliminate_regs (rtx, enum machine_mode, rtx);
|
|
extern bool elimination_target_reg_p (rtx);
|
|
|
|
/* Called from the register allocator to estimate costs of eliminating
|
|
invariant registers. */
|
|
extern void calculate_elim_costs_all_insns (void);
|
|
|
|
/* Deallocate the reload register used by reload number R. */
|
|
extern void deallocate_reload_reg (int r);
|
|
|
|
/* Functions in caller-save.c: */
|
|
|
|
/* Initialize for caller-save. */
|
|
extern void init_caller_save (void);
|
|
|
|
/* Initialize save areas by showing that we haven't allocated any yet. */
|
|
extern void init_save_areas (void);
|
|
|
|
/* Allocate save areas for any hard registers that might need saving. */
|
|
extern void setup_save_areas (void);
|
|
|
|
/* Find the places where hard regs are live across calls and save them. */
|
|
extern void save_call_clobbered_regs (void);
|
|
|
|
/* Replace (subreg (reg)) with the appropriate (reg) for any operands. */
|
|
extern void cleanup_subreg_operands (rtx);
|
|
|
|
/* Debugging support. */
|
|
extern void debug_reload_to_stream (FILE *);
|
|
extern void debug_reload (void);
|
|
|
|
/* Compute the actual register we should reload to, in case we're
|
|
reloading to/from a register that is wider than a word. */
|
|
extern rtx reload_adjust_reg_for_mode (rtx, enum machine_mode);
|
|
|
|
/* Allocate or grow the reg_equiv tables, initializing new entries to 0. */
|
|
extern void grow_reg_equivs (void);
|