diff options
| author | Bernd Schmidt <bernds@cygnus.co.uk> | 1999-08-09 14:00:21 +0000 |
|---|---|---|
| committer | Bernd Schmidt <crux@gcc.gnu.org> | 1999-08-09 14:00:21 +0000 |
| commit | 49ad7cfa7ac804b56cff13d70022020126f24c55 (patch) | |
| tree | 0c9ea6c13240638f450e4b7c92af4127356208c0 /gcc | |
| parent | 0dde4175efc346c70069a8a090590d3e63be04fa (diff) | |
| download | gcc-49ad7cfa7ac804b56cff13d70022020126f24c55.zip gcc-49ad7cfa7ac804b56cff13d70022020126f24c55.tar.gz gcc-49ad7cfa7ac804b56cff13d70022020126f24c55.tar.bz2 | |
Include function.h in most files.
Include function.h in most files. Remove most of the global variables
duplicated in function.h. Add accessor macros for them which access
current_function. Delete INLINE_HEADER rtx and related code, replace
with code using struct function to store inlining related data.
From-SVN: r28626
Diffstat (limited to 'gcc')
104 files changed, 1120 insertions, 1531 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 19cb026..38d40c0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,291 @@ +Mon Aug 9 10:08:50 1999 Bernd Schmidt <bernds@cygnus.co.uk> + + * Makefile.in: Update dependencies. + * alias.c: Include "function.h" + * c-decl.c: Likewise. + * caller-save.c: Likewise. + * calls.c: Likewise. + * combine.c: Likewise. + * cse.c: Likewise. + * explow.c: Likewise. + * final.c: Likewise. + * global.c: Likewise. + * graph.c: Likewise. + * local-alloc.c: Likewise. + * loop.c: Likewise. + * optabs.c: Likewise. + * profile.c: Likewise. + * recog.c: Likewise. + * regclass.c: Likewise. + * regmove.c: Likewise. + * reload.c: Likewise. + * reorg.c: Likewise. + * resource.c: Likewise. + * sched.c: Likewise. + * stupid.c: Likewise. + * config/1750a/1750a.c: Likewise. + * config/a29k/a29k.c: Likewise. + * config/arc/arc.c: Likewise. + * config/arm/arm.c: Likewise. + * config/arm/thumb.c: Likewise. + * config/c4x/c4x.c: Likewise. + * config/clipper/clipper.c: Likewise. + * config/convex/convex.c: Likewise. + * config/fx80/fx80.c: Likewise. + * config/i860/i860.c: Likewise. + * config/m68k/m68k.c: Likewise. + * config/m88k/m88k.c: Likewise. + * config/mips/mips.c: Likewise. + * config/pdp11/pdp11.c: Likewise. + * config/pyr/pyr.c: Likewise. + * config/romp/romp.c: Likewise. + * config/sh/sh.c: Likewise. + * config/tahoe/tahoe.c: Likewise. + * config/vax/vax.c: Likewise. + * config/we32k/we32k.c: Likewise. + * config/sparc/sparc.c: Include "function.h". + (mem_min_alignment): Test current_function rather than + regno_pointer_align. + * config/pa/pa.c: Likewise. + (compute_frame_size): Delete declaration of + current_function_outgoing_args_size. + * config/arc/arc.h (current_function_varargs): Delete declaration. + * config/elxsi/elxsi.h (current_function_calls_alloca): Delete + declaration. + * config/i370/i370.h (current_function_outgoing_args_size): Delete + declaration. + * config/i386/i386.h (FINALIZE_PIC): Delete declaration of + current_function_uses_pic_offset_table. + * config/m68k/a-ux.h (FUNCTION_EXTRA_EPILOGUE): Delete declaration + of current_function_returns_pointer. + * config/m68k/altos3068.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m68k/linux.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m68k/m68kv4.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m68k/mot3300.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m68k/pbb.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m68k/tower-as.h (FUNCTION_EXTRA_EPILOGUE): Likewise. + * config/m88k/m88k.c: Include "function.h" + (call_used_regs, current_function_pretend_args_size, + current_function_outgoing_args_size, frame_pointer_needed): Delete + declarations. + * config/m88k/m88k.h (current_function_pretend_args_size): Delete + declaration. + * config/mips/mips.h (current_function_calls_alloca): Delete + declaration. + * config/mn10200/mn10200.h (current_function_needs_context, + rtx_equal_function_value_matters): Delete declarations. + * config/ns32k/ns32k (current_function_uses_pic_offset_table, + flag_pic): Delete declarations. + * config/pa/pa.h (current_function_pretend_args_size, + current_function_decl): Delete declarations. + * config/pa/som.h (current_function_varargs): Delete declaration. + * config/pdp11/pdp11.h (current_function_pretend_args_size): Delete + declaration. + * config/pyr/pyr.h (current_function_pretend_args_size, + current_function_args_size, current_function_calls_alloca): Delete + declarations. + * config/sh/sh.h (current_function_varargs): Delete declaration. + * config/sparc/sparc.h (current_function_outgoing_args_size, + current_function_calls_alloca, current_function_decl): Delete + declarations. + * config/spur/spur.h (current_function_pretend_args_size, + current_function_calls_alloca): Delete declarations. + * config/v850/v850.c (current_function_outgoing_args_size): Delete + declaration. + * config/vax/vms.h (current_function_name): Delete declaration. + * gcse.c: Include "function.h". + (current_function_name, current_function_calls_setjmp): Delete + declarations. + * haifa-sched.c: Include "function.h". + (forced_labels): Delete declaration. + * jump.c: Likewise. + * reg-stack.c: Likewise. + * reload1.c: Likewise. + * genemit.c (main): Make generated file include function.h. + * genoutput.c (output_prologue): Likewise. + + * builtins.c (saveregs_value, apply_args_value): Delete variables. + * emit-rtl.c (reg_rtx_no, first_label_num, first_insn, last_insn, + sequence_rtl_expr, cur_insn_uid, last_linenum, last_filename, + regno_pointer_flag, regno_pointer_flag_length, regno_pointer_align, + regno_reg_rtx, sequence_stack): Delete variables. Add accessor + macros for some of them. + (emit_filename, emit_lineno): Delete declarations. + (gen_reg_rtx): Use memset/memcpy instead of bzero/bcopy. Access + regno_pointer_* variables through current_function. + (gen_inline_header_rtx): Delete function. + (save_emit_status): Delete function. + (set_new_last_label_num): New function. + (clear_emit_caches): New function. + (restore_emit_status): Just clear last_labelnum and call + clear_emit_caches. + (get_last_insn_anywhere): Variable sequence_stack is now accessed + through macro seq_stack. + (add_insn_after): Likewise. + (add_insn_before): Likewise. + (remove_insn): Likewise. + (pop_topmost_sequence): Likewise. + (in_sequence_p): Likewise. + (start_sequence_for_rtl_expr): Likewise. + (start_sequence): Likewise, and likewise for + sequence_rtl_expr/seq_rtl_expr. + (push_topmost_sequence): Likewise. + (end_sequence): Likewise. + (init_virtual_regs): Now takes a "struct emit_status *" argument. + All callers changed. Store into that pointer instead of globals. + (init_emit): Allocate emit elt of current_function. + Changes for sequence_rtl_expr/sequence_stack renaming. + Call clear_emit_caches instead of doing it in-line. + Access regno_pointer_* variables through current_function. + (init_emit_once) Don't clear sequence_stack. + + * expr.c (pending_stack_adjust, inhibit_defer_pop, pending_chain): + Delete variables. + (arg_pointer_save_area): Delete declaration. + (finish_expr_for_function): Renamed from init_queue; no longer static. + (init_expr): Don't call init_queue. + (save_expr_status, restore_expr_status): Delete functions. + (expand_expr): Changes to reflect new layout of struct function. + Don't access current_function_check_memory_usage when current_function + is 0. + * expr.h (forced_labels, save_expr_regs, saveregs_value, + apply_args_value, current_function_calls_alloca, inhibit_defer_pop, + current_function_outgoing_args_size, current_function_arg_offset_rtx, + current_function_uses_const_pool, function_call_count, + current_function_uses_pic_offset_table, nonlocal_labels, + current_function_internal_arg_pointer, nonlocal_goto_stack_level, + current_function_check_memory_usage, nonlocal_goto_handler_slots, + pending_stack_adjust, target_temp_slot_level, temp_slot_level): Delete + declarations. + (finish_expr_for_function): Declare. + * flags.h (current_function_has_nonlocal_label, + current_function_has_nonlocal_goto, current_function_is_thunk, + current_function_has_computed_jump): Delete declarations. + * flow.c (forced_labels): Delete declaration. + * function.c (current_function_pops_args, + current_function_returns_struct, current_function_returns_pcc_struct, + current_function_needs_context, current_function_calls_setjmp, + current_function_calls_longjmp, current_function_has_nonlocal_label, + current_function_has_nonlocal_goto, current_function_is_thunk, + current_function_has_computed_jump, current_function_calls_alloca, + current_function_contains_functions, current_function_returns_pointer, + current_function_epilogue_delay_list, current_function_args_size, + current_function_pretend_args_size, current_function_arg_offset_rtx, + current_function_outgoing_args_size, current_function_varargs, + current_function_stdarg, current_function_args_info, cleanup_label, + current_function_name, current_function_uses_const_pool, + current_function_instrument_entry_exit, current_function_return_rtx, + current_function_uses_pic_offset_table, nonlocal_labels, + current_function_internal_arg_pointer, current_function_cannot_inline, + current_function_check_memory_usage, function_call_count, + nonlocal_goto_handler_slots, nonlocal_goto_handler_labels, + nonlocal_goto_stack_level, return_label, save_expr_regs, + stack_slot_list, rtl_expr_chain, tail_recursion_label, temp_slots, + tail_recursion_reentry, arg_pointer_save_area, frame_offset, + context_display, trampoline_list, parm_birth_insn, invalid_stack_slot, + last_parm_insn, max_parm_reg, parm_reg_stack_loc, sequence_rtl_expr, + temp_slot_level, var_temp_slot_level, target_temp_slot_level): + Delete variables. + (push_function_context_to): Don't save them. Don't call + save_storage_status, save_emit_status or save_expr_status. + (pop_function_context_from): Don't restore them. Don't call + restore_storage_status or restore_expr_status. + (get_func_frame_size): New function. + (get_frame_size): Use it. + (assign_outer_stack_local): Reflect some member name changes in struct + function. + (put_reg_into_stack): Likewise. + (assign_stack_temp_for_type): sequence_rtl_expr was renamed to + seq_rtl_expr. + (fixup_var_refs): Likewise. + (fix_lexical_addr): Likewise. + (trampoline_address): Likewise. + (prepare_function_start): Clear field inlinable of current_function. + (init_function_for_compilation): New function. + (expand_dummy_function_end): New function. + (expand_function_end): Call finish_expr_for_function. + * function.h (struct emit_status): New; fields moved here from struct + function and from global variables. Add accessor macros for some of + the fields. + (struct expr_status): Likewise. + (REGNO_POINTER_ALIGN, REGNO_POINTER_FLAG): Moved here from regs.h. + (struct function): Add fields expr and emit, inlinable, inl_emit, + original_arg_vector, original_decl_initial, inl_last_parm_insn, + inl_max_label_num. Add many comments. + Add accessor macros for all elts of struct function that no longer + have a global variable. + (cleanup_label, return_label, frame_offset, tail_recursion_label, + tail_recursion_reentry, arg_pointer_save_area, rtl_expr_chain, + stack_slot_list): Delete declarations. + (get_func_frame_size): Declare. + (save_expr_status, restore_expr_status, save_emit_status, + save_storage_status, restore_storage_status): Delete declarations. + (init_virtual_regs): Declare. + * output.h (current_function_pops_args, + current_function_returns_struct, current_function_returns_pcc_struct, + current_function_needs_context, current_function_calls_setjmp, + current_function_calls_longjmp, current_function_calls_alloca, + current_function_has_nonlocal_label, current_function_varargs, + current_function_has_computed_jump, current_function_returns_pointer, + current_function_contains_functions, current_function_args_size, + current_function_pretend_args_size, current_function_stdarg, + current_function_outgoing_args_size, current_function_args_info, + current_function_name, current_function_return_rtx, + current_function_epilogue_delay_list, + current_function_uses_const_pool, current_function_cannot_inline): + Delete declarations. + * regs.h (reg_rtx_no, regno_pointer_flag, regno_pointer_flag_length, + regno_reg_rtx): Delete declaration. + (REGNO_POINTER_FLAG): Delete macro. + * stmt.c (expand_goto): Changes to reflect that some fields in struct + function were renamed. + * stor-layout.c (save_storage_status, restore_storage_status): Delete + functions. + * toplev.c: Include "function.h". + (current_function_decl): Delete declaration. + (compile_file): Call init_dummy_function_start and + expand_dummy_function_end around some initializations that need to + emit rtl. + (rest_of_compilation): Use DECL_SAVED_INSNS properly. + Call init_function_for_compilation. + * unroll.c: Include "function.h" + (unroll_loop): Access regno_pointer_* variables through + current_function. + + * tree.h (struct tree_decl): Add elt f to saved_insns member. + (DECL_SAVED_INSNS): use it. + (expand_dummy_function_end): Declare. + (init_function_for_compilation): Declare. + * calls.c (calls_function_1): Change use of DECL_SAVED_INSNS now + that it's no longer an INLINE_HEADER. + (expand_call): Likewise. + * integrate.c (finish_inline): Delete function. + (max_parm_reg, parm_reg_stack_loc): Delete declarations. + (initialize_for_inline): Delete min_labelno, max_labelno and max_reg + args. Don't generate an INLINE_HEADER rtx, just return the arg + vector. All callers changed. + (save_for_inline_copying): Create a duplicate struct emit_status to + hold the emit state for compiling the current function. Use this and + the other new fields in struct function that are for integration + instead of an INLINE_HEADER. + Use memcpy instead of bcopy. + Store the current struct function in DECL_SAVED_INSNS of fndecl. + (save_for_inline_nocopy): Similar changes, except no new emit_status + is needed here. + (expand_inline_function): Get information from function structure, + not from an inline header rtx. + (output_inline_function): Lose code to extract the necessary + information from an inline header; simply put back the function + structure into current_function. Clear its inlinable elt. + * rtl.def (INLINE_HEADER): Delete. + * rtl.h: Delete all accessors for an INLINE_HEADER. + (gen_inline_header_rtx): Delete declaration. + (regno_reg_rtx, regno_pointer_align, nonlocal_goto_handler_labels): + Delete declarations. + (REGNO_POINTER_ALIGN): Delete. + (clear_emit_caches): Declare. + (set_new_last_label_num): Declare. + Mon Aug 9 01:52:24 1999 Jason Merrill <jason@yorick.cygnus.com> * print-tree.c (print_node): Print base for OFFSET_TYPEs. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1a57586..5f01370 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1327,7 +1327,7 @@ $(srcdir)/c-gperf.h: c-parse.gperf $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \ - c-lex.h flags.h output.h toplev.h defaults.h + c-lex.h flags.h function.h output.h toplev.h defaults.h c-typeck.o : c-typeck.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \ flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h c-lang.o : c-lang.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \ @@ -1344,7 +1344,7 @@ c-iterate.o: c-iterate.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-tree.h \ c-common.h flags.h toplev.h $(EXPR_H) mbchar.o: mbchar.c $(CONFIG_H) system.h mbchar.h graph.o: graph.c $(CONFIG_H) system.h toplev.h flags.h output.h $(RTL_H) \ - hard-reg-set.h $(BASIC_BLOCK_H) + function.h hard-reg-set.h $(BASIC_BLOCK_H) sbitmap.o: sbitmap.c $(CONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H) COLLECT2_OBJS = collect2.o tlink.o hash.o intl.o underscore.o version.o @@ -1445,7 +1445,7 @@ stor-layout.o : stor-layout.c $(CONFIG_H) system.h $(TREE_H) flags.h \ function.h $(EXPR_H) $(RTL_H) toplev.h fold-const.o : fold-const.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h \ $(RTL_H) -toplev.o : toplev.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) \ +toplev.o : toplev.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) function.h \ flags.h input.h insn-attr.h xcoffout.h defaults.h output.h \ insn-codes.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h dwarfout.h \ dwarf2out.h sdbout.h dbxout.h $(EXPR_H) $(BASIC_BLOCK_H) \ @@ -1513,80 +1513,82 @@ integrate.o : integrate.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ intl.h function.h output.h $(RECOG_H) except.h toplev.h jump.o : jump.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h $(REGS_H) \ - insn-config.h insn-flags.h $(RECOG_H) $(EXPR_H) real.h except.h \ + insn-config.h insn-flags.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \ toplev.h insn-attr.h stupid.o : stupid.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h \ - $(BASIC_BLOCK_H) insn-config.h reload.h flags.h toplev.h + $(BASIC_BLOCK_H) insn-config.h reload.h flags.h function.h toplev.h cse.o : cse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h flags.h \ - real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h output.h \ + real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h output.h function.h \ $(srcdir)/../include/splay-tree.h gcse.o : gcse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h \ flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) \ - output.h toplev.h + function.h output.h toplev.h resource.o : resource.c $(CONFIG_H) $(RTL_H) hard-reg-set.h system.h \ - $(BASIC_BLOCK_H) $(REGS_H) flags.h output.h resource.h toplev.h + $(BASIC_BLOCK_H) $(REGS_H) flags.h output.h resource.h function.h toplev.h lcm.o : lcm.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h flags.h \ real.h insn-config.h $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) profile.o : profile.c $(CONFIG_H) system.h $(RTL_H) flags.h insn-flags.h \ - gcov-io.h $(TREE_H) output.h $(REGS_H) toplev.h insn-config.h + gcov-io.h $(TREE_H) output.h $(REGS_H) toplev.h function.h insn-config.h loop.o : loop.c $(CONFIG_H) system.h $(RTL_H) flags.h loop.h insn-config.h \ insn-flags.h $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \ - toplev.h varray.h -unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ + function.h toplev.h varray.h +unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h function.h \ integrate.h $(REGS_H) $(RECOG_H) flags.h $(EXPR_H) loop.h toplev.h varray.h flow.o : flow.c $(CONFIG_H) system.h $(RTL_H) flags.h insn-config.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h recog.h \ insn-flags.h function.h -combine.o : combine.c $(CONFIG_H) system.h $(RTL_H) flags.h \ +combine.o : combine.c $(CONFIG_H) system.h $(RTL_H) flags.h function.h \ insn-config.h insn-flags.h insn-codes.h insn-attr.h $(REGS_H) $(EXPR_H) \ $(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h regclass.o : regclass.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h flags.h \ - $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h real.h toplev.h \ - output.h + $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h real.h \ + toplev.h function.h output.h local-alloc.o : local-alloc.c $(CONFIG_H) system.h $(RTL_H) flags.h \ - $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h $(RECOG_H) output.h \ - insn-attr.h toplev.h + $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h $(RECOG_H) \ + output.h function.h insn-attr.h toplev.h bitmap.o : bitmap.c $(CONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H) \ $(REGS_H) -global.o : global.c $(CONFIG_H) system.h $(RTL_H) flags.h reload.h \ +global.o : global.c $(CONFIG_H) system.h $(RTL_H) flags.h reload.h function.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h output.h toplev.h varray.o : varray.c $(CONFIG_H) system.h varray.h $(RTL_H) $(TREE_H) bitmap.h reload.o : reload.c $(CONFIG_H) system.h $(RTL_H) flags.h output.h $(EXPR_H) \ reload.h $(RECOG_H) hard-reg-set.h insn-config.h insn-codes.h $(REGS_H) \ - real.h toplev.h + function.h real.h toplev.h reload1.o : reload1.c $(CONFIG_H) system.h $(RTL_H) real.h flags.h $(EXPR_H) \ reload.h $(REGS_H) hard-reg-set.h insn-config.h insn-flags.h insn-codes.h \ - $(BASIC_BLOCK_H) $(RECOG_H) output.h toplev.h + $(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h caller-save.o : caller-save.c $(CONFIG_H) system.h $(RTL_H) flags.h \ - $(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) \ + $(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) function.h \ $(RECOG_H) reload.h $(EXPR_H) toplev.h reorg.o : reorg.c $(CONFIG_H) system.h $(RTL_H) conditions.h hard-reg-set.h \ $(BASIC_BLOCK_H) $(REGS_H) insn-config.h insn-attr.h insn-flags.h \ - $(RECOG_H) flags.h output.h $(EXPR_H) toplev.h + $(RECOG_H) function.h flags.h output.h $(EXPR_H) toplev.h alias.o : alias.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h \ $(REGS_H) toplev.h output.h $(EXPR_H) regmove.o : regmove.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ - $(RECOG_H) output.h reload.h $(REGS_H) hard-reg-set.h flags.h \ + $(RECOG_H) output.h reload.h $(REGS_H) hard-reg-set.h flags.h function.h \ $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h $(SCHED_PREFIX)sched.o : $(SCHED_PREFIX)sched.c $(CONFIG_H) system.h $(RTL_H) \ - $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h \ + $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ insn-attr.h toplev.h recog.h final.o : final.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h intl.h \ - $(REGS_H) $(RECOG_H) conditions.h insn-config.h insn-attr.h except.h real.h \ - output.h hard-reg-set.h insn-flags.h insn-codes.h gstab.h xcoffout.h \ - defaults.h toplev.h reload.h dwarfout.h dwarf2out.h sdbout.h dbxout.h -recog.o : recog.c $(CONFIG_H) system.h $(RTL_H) \ + $(REGS_H) $(RECOG_H) conditions.h insn-config.h insn-attr.h function.h \ + real.h output.h hard-reg-set.h insn-flags.h insn-codes.h gstab.h except.h \ + xcoffout.h defaults.h toplev.h reload.h dwarfout.h dwarf2out.h sdbout.h \ + dbxout.h +recog.o : recog.c $(CONFIG_H) system.h $(RTL_H) function.h \ $(REGS_H) $(RECOG_H) hard-reg-set.h flags.h insn-config.h insn-attr.h \ insn-flags.h insn-codes.h real.h toplev.h reg-stack.o : reg-stack.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) recog.h \ - $(REGS_H) hard-reg-set.h flags.h insn-config.h insn-flags.h toplev.h + $(REGS_H) hard-reg-set.h flags.h insn-config.h insn-flags.h toplev.h \ + function.h dyn-string.o: dyn-string.c dyn-string.h $(CONFIG_H) system.h $(out_object_file): $(out_file) $(CONFIG_H) $(TREE_H) \ $(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \ - insn-flags.h output.h insn-attr.h insn-codes.h system.h toplev.h + insn-flags.h output.h insn-attr.h insn-codes.h system.h toplev.h function.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(out_file) # Build auxiliary files that support ecoff format. @@ -1658,7 +1660,7 @@ s-codes : $(md_file) gencodes $(srcdir)/move-if-change touch s-codes insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \ - insn-config.h insn-flags.h insn-codes.h system.h reload.h recog.h + insn-config.h insn-flags.h insn-codes.h system.h reload.h recog.h function.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c insn-emit.c: s-emit ; @true @@ -1725,7 +1727,7 @@ s-attrtab : $(md_file) genattrtab $(srcdir)/move-if-change insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h conditions.h \ hard-reg-set.h insn-config.h insn-flags.h insn-attr.h output.h $(RECOG_H) \ - insn-codes.h system.h + function.h insn-codes.h system.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-output.c insn-output.c: s-output ; @true diff --git a/gcc/alias.c b/gcc/alias.c index 6c2e886..d24b0b6 100644 --- a/gcc/alias.c +++ b/gcc/alias.c @@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" #include "rtl.h" +#include "function.h" #include "expr.h" #include "regs.h" #include "hard-reg-set.h" diff --git a/gcc/builtins.c b/gcc/builtins.c index 9f2b816..8e69652 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -52,14 +52,6 @@ Boston, MA 02111-1307, USA. */ #define OUTGOING_REGNO(IN) (IN) #endif -/* Nonzero means __builtin_saveregs has already been done in this function. - The value is the pseudoreg containing the value __builtin_saveregs - returned. */ -rtx saveregs_value; - -/* Similarly for __builtin_apply_args. */ -rtx apply_args_value; - static int get_pointer_alignment PROTO((tree, unsigned)); static tree c_strlen PROTO((tree)); static rtx get_memory_rtx PROTO((tree)); diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 1060f40..97fdd8a 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "tree.h" #include "flags.h" +#include "function.h" #include "output.h" #include "c-tree.h" #include "c-lex.h" diff --git a/gcc/caller-save.c b/gcc/caller-save.c index 7c390a5..4edabfa 100644 --- a/gcc/caller-save.c +++ b/gcc/caller-save.c @@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. */ #include "recog.h" #include "basic-block.h" #include "reload.h" +#include "function.h" #include "expr.h" #include "toplev.h" diff --git a/gcc/calls.c b/gcc/calls.c index d0153a3..b646be8 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA. */ #include "tree.h" #include "flags.h" #include "expr.h" +#include "function.h" #include "regs.h" #include "insn-flags.h" #include "toplev.h" @@ -218,8 +219,7 @@ calls_function_1 (exp, which) if ((DECL_BUILT_IN (fndecl) && DECL_FUNCTION_CODE (fndecl) == BUILT_IN_ALLOCA) || (DECL_SAVED_INSNS (fndecl) - && (FUNCTION_FLAGS (DECL_SAVED_INSNS (fndecl)) - & FUNCTION_FLAGS_CALLS_ALLOCA))) + && DECL_SAVED_INSNS (fndecl)->calls_alloca)) return 1; } @@ -1649,7 +1649,7 @@ expand_call (exp, target, ignore) && fndecl != current_function_decl && DECL_INLINE (fndecl) && DECL_SAVED_INSNS (fndecl) - && RTX_INTEGRATED_P (DECL_SAVED_INSNS (fndecl))) + && DECL_SAVED_INSNS (fndecl)->inlinable) is_integrable = 1; else if (! TREE_ADDRESSABLE (fndecl)) { @@ -1786,11 +1786,11 @@ expand_call (exp, target, ignore) rtx insn, seq; /* Look for a call in the inline function code. - If OUTGOING_ARGS_SIZE (DECL_SAVED_INSNS (fndecl)) is + If DECL_SAVED_INSNS (fndecl)->outgoing_args_size is nonzero then there is a call and it is not necessary to scan the insns. */ - if (OUTGOING_ARGS_SIZE (DECL_SAVED_INSNS (fndecl)) == 0) + if (DECL_SAVED_INSNS (fndecl)->outgoing_args_size == 0) for (insn = first_insn; insn; insn = NEXT_INSN (insn)) if (GET_CODE (insn) == CALL_INSN) break; @@ -1814,7 +1814,7 @@ expand_call (exp, target, ignore) value of reg_parm_stack_space is wrong, but gives correct results on all supported machines. */ - int adjust = (OUTGOING_ARGS_SIZE (DECL_SAVED_INSNS (fndecl)) + int adjust = (DECL_SAVED_INSNS (fndecl)->outgoing_args_size + reg_parm_stack_space); start_sequence (); diff --git a/gcc/combine.c b/gcc/combine.c index c922c86..9df5ae5 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -82,6 +82,7 @@ Boston, MA 02111-1307, USA. */ #include "hard-reg-set.h" #include "basic-block.h" #include "insn-config.h" +#include "function.h" /* Include expr.h after insn-config.h so we get HAVE_conditional_move. */ #include "expr.h" #include "insn-flags.h" diff --git a/gcc/config/1750a/1750a.c b/gcc/config/1750a/1750a.c index ff9ae37..789eedb 100644 --- a/gcc/config/1750a/1750a.c +++ b/gcc/config/1750a/1750a.c @@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */ #include <string.h> #include "rtl.h" #include "tree.h" +#include "function.h" #include "expr.h" #define HAVE_cc0 #include "conditions.h" diff --git a/gcc/config/a29k/a29k.c b/gcc/config/a29k/a29k.c index d4483a4..31b1117 100644 --- a/gcc/config/a29k/a29k.c +++ b/gcc/config/a29k/a29k.c @@ -33,6 +33,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-attr.h" #include "flags.h" #include "recog.h" +#include "function.h" #include "expr.h" #include "obstack.h" #include "tree.h" diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 94ed0ba..39b6cef 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -33,6 +33,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "insn-attr.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "recog.h" diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h index 9df6edc..6eee038 100644 --- a/gcc/config/arc/arc.h +++ b/gcc/config/arc/arc.h @@ -699,7 +699,6 @@ extern enum reg_class arc_regno_reg_class[]; varargs function we want to treat the last named arg (which is `__builtin_va_alist') as unnamed. This macro is only used in this file. */ -extern int current_function_varargs; #define PASS_IN_REG_P(CUM, MODE, TYPE, NAMED) \ ((!current_function_varargs || (NAMED)) \ && (CUM) < MAX_ARC_PARM_REGS \ diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 38c7c58..a5013f9 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "reload.h" #include "tree.h" +#include "function.h" #include "expr.h" #include "toplev.h" #include "recog.h" diff --git a/gcc/config/arm/thumb.c b/gcc/config/arm/thumb.c index fa09524..62c4e6a 100644 --- a/gcc/config/arm/thumb.c +++ b/gcc/config/arm/thumb.c @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-attr.h" #include "flags.h" #include "tree.h" +#include "function.h" #include "expr.h" #include "insn-config.h" #include "recog.h" diff --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c index 0071fd5..35bd196 100644 --- a/gcc/config/c4x/c4x.c +++ b/gcc/config/c4x/c4x.c @@ -37,6 +37,7 @@ #include "insn-flags.h" #include "output.h" #include "tree.h" +#include "function.h" #include "expr.h" #include "flags.h" #include "loop.h" diff --git a/gcc/config/clipper/clipper.c b/gcc/config/clipper/clipper.c index 29fd8e6..b9279ac 100644 --- a/gcc/config/clipper/clipper.c +++ b/gcc/config/clipper/clipper.c @@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-attr.h" #include "tree.h" #include "c-tree.h" +#include "function.h" #include "expr.h" #include "flags.h" #include "machmode.h" diff --git a/gcc/config/convex/convex.c b/gcc/config/convex/convex.c index cd2eb55..1a588e0 100644 --- a/gcc/config/convex/convex.c +++ b/gcc/config/convex/convex.c @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-flags.h" #include "insn-attr.h" #include "output.h" +#include "function.h" #include "expr.h" /* Tables used in convex.h */ diff --git a/gcc/config/elxsi/elxsi.h b/gcc/config/elxsi/elxsi.h index 4bacabdab..b38af88 100644 --- a/gcc/config/elxsi/elxsi.h +++ b/gcc/config/elxsi/elxsi.h @@ -440,10 +440,9 @@ enum reg_class { NO_REGS, GENERAL_REGS, ALL_REGS, LIM_REG_CLASSES }; { register int regno; \ register int cnt = 0; \ extern char call_used_regs[]; \ - extern int current_function_calls_alloca; \ /* this conditional is ONLY here because there is a BUG; \ - EXIT_IGNORE_STACK is ignored itself when the first part of \ - the condition is true! (at least in version 1.35) */ \ + EXIT_IGNORE_STACK is ignored itself when the first part of \ + the condition is true! (at least in version 1.35) */ \ /* the 8*10 is for 64 bits of .r5 - .r14 */ \ if (current_function_calls_alloca || (SIZE)>=(256-8*10)) { \ /* use .r4 as a temporary! Ok for now.... */ \ diff --git a/gcc/config/fx80/fx80.c b/gcc/config/fx80/fx80.c index 4e8f420..48658e2 100644 --- a/gcc/config/fx80/fx80.c +++ b/gcc/config/fx80/fx80.c @@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-config.h" #include "conditions.h" #include "insn-flags.h" +#include "function.h" #include "output.h" #include "insn-attr.h" diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h index dcfd463..88656d1 100644 --- a/gcc/config/i370/i370.h +++ b/gcc/config/i370/i370.h @@ -43,10 +43,6 @@ extern char *mvs_function_name; extern int mvs_function_name_length; -/* The amount of space used for outgoing arguments. */ - -extern int current_function_outgoing_args_size; - /* Compile using char instructions (mvc, nc, oc, xc). On 4341 use this since these are more than twice as fast as load-op-store. On 3090 don't use this since load-op-store is much faster. */ diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index a5c387a..3b6385a 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -1859,8 +1859,6 @@ while (0) #define FINALIZE_PIC \ do \ { \ - extern int current_function_uses_pic_offset_table; \ - \ current_function_uses_pic_offset_table |= profile_flag | profile_block_flag; \ } \ while (0) diff --git a/gcc/config/i860/i860.c b/gcc/config/i860/i860.c index 08e2db7..966c572 100644 --- a/gcc/config/i860/i860.c +++ b/gcc/config/i860/i860.c @@ -39,6 +39,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "recog.h" #include "insn-attr.h" +#include "function.h" #include "expr.h" static rtx find_addr_reg (); diff --git a/gcc/config/m68k/a-ux.h b/gcc/config/m68k/a-ux.h index 69ecb53..229b6ab 100644 --- a/gcc/config/m68k/a-ux.h +++ b/gcc/config/m68k/a-ux.h @@ -150,9 +150,8 @@ crt2.o%s " #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ { \ - extern int current_function_returns_pointer; \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ asm_fprintf (FILE, "\t%s %Ra0,%Rd0\n", ASM_MOV_INSN); \ } diff --git a/gcc/config/m68k/altos3068.h b/gcc/config/m68k/altos3068.h index 5903a12..d68efb4 100644 --- a/gcc/config/m68k/altos3068.h +++ b/gcc/config/m68k/altos3068.h @@ -126,10 +126,9 @@ Boston, MA 02111-1307, USA. */ /* Return pointer values in both d0 and a0. */ #undef FUNCTION_EXTRA_EPILOGUE -#define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ -{ \ - extern int current_function_returns_pointer; \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode))\ - fprintf (FILE, "\tmovel d0,a0\n"); \ +#define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ +{ \ + if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + fprintf (FILE, "\tmovel d0,a0\n"); \ } diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index a1a4fff..d100f5c 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -282,11 +282,10 @@ Boston, MA 02111-1307, USA. */ callers that have neglected to properly declare the callee can still find the correct return value. */ -extern int current_function_returns_pointer; #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ do { \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ asm_fprintf (FILE, "\tmove.l %Ra0,%Rd0\n"); \ } while (0); diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c index 9480309..659c705 100644 --- a/gcc/config/m68k/m68k.c +++ b/gcc/config/m68k/m68k.c @@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "tree.h" #include "rtl.h" +#include "function.h" #include "regs.h" #include "hard-reg-set.h" #include "real.h" diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h index 9f2744d..6c229b6 100644 --- a/gcc/config/m68k/m68kv4.h +++ b/gcc/config/m68k/m68kv4.h @@ -179,11 +179,10 @@ while (0) neglected to properly declare the callee can still find the correct return value. */ -extern int current_function_returns_pointer; #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ do { \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ asm_fprintf (FILE, "\tmov.l %Ra0,%Rd0\n"); \ } while (0); diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h index e6eadd1..1a4ca6d 100644 --- a/gcc/config/m68k/mot3300.h +++ b/gcc/config/m68k/mot3300.h @@ -145,10 +145,9 @@ Boston, MA 02111-1307, USA. */ #undef FUNCTION_EXTRA_EPILOGUE #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ - { extern int current_function_returns_pointer; \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ - asm_fprintf (FILE, "\tmov.l %Ra0,%Rd0\n"); } +{ if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + asm_fprintf (FILE, "\tmov.l %Ra0,%Rd0\n"); } #undef FUNCTION_PROFILER #define FUNCTION_PROFILER(FILE, LABEL_NO) \ diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h index 41319c2..9197ac3 100644 --- a/gcc/config/m68k/pbb.h +++ b/gcc/config/m68k/pbb.h @@ -109,9 +109,8 @@ Boston, MA 02111-1307, USA. */ #undef FUNCTION_EXTRA_EPILOGUE #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ - { extern int current_function_returns_pointer; \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ +{ if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ asm_fprintf (FILE, "\tmovl %Rd0,%Ra0\n"); } #define ASM_RETURN_CASE_JUMP \ diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h index 7b5771a..aeb5478 100644 --- a/gcc/config/m68k/tower-as.h +++ b/gcc/config/m68k/tower-as.h @@ -185,10 +185,9 @@ Boston, MA 02111-1307, USA. */ #undef FUNCTION_EXTRA_EPILOGUE #define FUNCTION_EXTRA_EPILOGUE(FILE, SIZE) \ - { extern int current_function_returns_pointer; \ - if ((current_function_returns_pointer) && \ - ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ - asm_fprintf (FILE, "\tmov.l %Rd0,%Ra0\n"); } +{ if (current_function_returns_pointer \ + && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ + asm_fprintf (FILE, "\tmov.l %Rd0,%Ra0\n"); } /* This is how to output an insn to push a register on the stack. It need not be very fast code. */ diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c index 5d54fdd..b845216 100644 --- a/gcc/config/m88k/m88k.c +++ b/gcc/config/m88k/m88k.c @@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "insn-attr.h" #include "tree.h" +#include "function.h" #include "c-tree.h" #include "expr.h" #include "flags.h" @@ -1759,11 +1760,6 @@ static int variable_args_p; static int epilogue_marked; static int prologue_marked; -extern char call_used_regs[]; -extern int current_function_pretend_args_size; -extern int current_function_outgoing_args_size; -extern int frame_pointer_needed; - #define FIRST_OCS_PRESERVE_REGISTER 14 #define LAST_OCS_PRESERVE_REGISTER 30 diff --git a/gcc/config/m88k/m88k.h b/gcc/config/m88k/m88k.h index 0ea0ef6..9c377c4 100644 --- a/gcc/config/m88k/m88k.h +++ b/gcc/config/m88k/m88k.h @@ -155,7 +155,6 @@ extern enum m88k_instruction classify_integer (); extern int target_flags; /* -m compiler switches */ extern int frame_pointer_needed; /* current function has a FP */ -extern int current_function_pretend_args_size; /* args size without ... */ extern int flag_delayed_branch; /* -fdelayed-branch */ extern int flag_pic; /* -fpic */ extern char * reg_names[]; @@ -198,13 +197,13 @@ extern char * reg_names[]; Redefined in sysv4.h, and luna.h. */ #define VERSION_INFO1 "m88k, " #ifndef VERSION_INFO2 -#define VERSION_INFO2 "$Revision: 1.14 $" +#define VERSION_INFO2 "$Revision: 1.15 $" #endif #ifndef VERSION_STRING #define VERSION_STRING version_string #ifdef __STDC__ -#define TM_RCS_ID "@(#)" __FILE__ " $Revision: 1.14 $ " __DATE__ +#define TM_RCS_ID "@(#)" __FILE__ " $Revision: 1.15 $ " __DATE__ #else #define TM_RCS_ID "$What: <@(#) m88k.h,v 1.1.1.2.2.2> $" #endif /* __STDC__ */ diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 72b02eb..4c61676 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -41,8 +41,8 @@ Boston, MA 02111-1307, USA. */ #include "insn-codes.h" #include "recog.h" #include "toplev.h" - #include "tree.h" +#include "function.h" #include "expr.h" #include "flags.h" #include "reload.h" diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 7886ff1..4592c29 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */ extern char *asm_file_name; extern char call_used_regs[]; -extern int current_function_calls_alloca; extern char *language_string; extern int may_call_alloca; extern char **save_argv; diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h index c044c16..c1e8760 100644 --- a/gcc/config/mn10200/mn10200.h +++ b/gcc/config/mn10200/mn10200.h @@ -1069,9 +1069,7 @@ extern void notice_update_cc (); extern int call_address_operand (); extern enum reg_class secondary_reload_class (); extern char *emit_a_shift (); -extern int current_function_needs_context; extern char *output_tst (); extern int extendpsi_operand (); -extern int rtx_equal_function_value_matters; extern struct rtx_def *zero_dreg; extern struct rtx_def *zero_areg; diff --git a/gcc/config/ns32k/ns32k.h b/gcc/config/ns32k/ns32k.h index d409ac2..5e0268c 100644 --- a/gcc/config/ns32k/ns32k.h +++ b/gcc/config/ns32k/ns32k.h @@ -711,7 +711,6 @@ enum reg_class int used_regs_buf[8], *bufp = used_regs_buf; \ int used_fregs_buf[17], *fbufp = used_fregs_buf; \ extern char call_used_regs[]; \ - extern int current_function_uses_pic_offset_table, flag_pic; \ MAIN_FUNCTION_PROLOGUE; \ for (regno = R0_REGNUM; regno < F0_REGNUM; regno++) \ if (regs_ever_live[regno] \ @@ -836,7 +835,6 @@ enum reg_class int used_regs_buf[8], *bufp = used_regs_buf; \ int used_fregs_buf[17], *fbufp = used_fregs_buf; \ extern char call_used_regs[]; \ - extern int current_function_uses_pic_offset_table, flag_pic; \ if (flag_pic && current_function_uses_pic_offset_table) \ fprintf (FILE, "\tlprd sb,tos\n"); \ *fbufp++ = -2; \ @@ -898,7 +896,6 @@ enum reg_class { \ int regno; \ int offset = -4; \ - extern int current_function_uses_pic_offset_table, flag_pic; \ for (regno = 0; regno < L1_REGNUM; regno++) \ if (regs_ever_live[regno] && ! call_used_regs[regno]) \ offset += 4; \ @@ -1196,7 +1193,6 @@ __transfer_from_trampoline () \ #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \ { register rtx xfooy, xfoo0, xfoo1; \ unsigned xfoo2; \ - extern int current_function_uses_pic_offset_table, flag_pic; \ xfooy = X; \ if (flag_pic && ! current_function_uses_pic_offset_table \ && global_symbolic_reference_mentioned_p (X, 1)) \ @@ -1240,7 +1236,6 @@ __transfer_from_trampoline () \ when generating PIC code. It is given that flag_pic is on and that X satisfies CONSTANT_P or is a CONST_DOUBLE. */ -extern int current_function_uses_pic_offset_table, flag_pic; #define LEGITIMATE_PIC_OPERAND_P(X) \ (((! current_function_uses_pic_offset_table \ && symbolic_reference_mentioned_p (X))? \ diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index 12b28c6..cdf1a4b 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA. */ #include "tree.h" #include "reload.h" #include "c-tree.h" +#include "function.h" #include "expr.h" #include "obstack.h" #include "toplev.h" @@ -2599,7 +2600,6 @@ compute_frame_size (size, fregs_live) int size; int *fregs_live; { - extern int current_function_outgoing_args_size; int i, fsize; /* Space for frame pointer + filler. If any frame is allocated diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 31d04ea..c27fbf0 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -1121,7 +1121,6 @@ extern enum cmp_type hppa_branch_type; No definition is equivalent to always zero. */ extern int may_call_alloca; -extern int current_function_pretend_args_size; #define EXIT_IGNORE_STACK \ (get_frame_size () != 0 \ @@ -1138,11 +1137,6 @@ extern int current_function_pretend_args_size; of alloca; we also take advantage of it to omit stack adjustments before returning. */ -/* This declaration is needed due to traditional/ANSI - incompatibilities which cannot be #ifdefed away - because they occur inside of macros. Sigh. */ -extern union tree_node *current_function_decl; - #define FUNCTION_EPILOGUE(FILE, SIZE) \ output_function_epilogue (FILE, SIZE) diff --git a/gcc/config/pa/som.h b/gcc/config/pa/som.h index 291faee..6f3d779 100644 --- a/gcc/config/pa/som.h +++ b/gcc/config/pa/som.h @@ -136,7 +136,7 @@ do { \ tree parm; \ int i; \ if (TREE_PUBLIC (DECL) || TARGET_GAS) \ - { extern int current_function_varargs; \ + { \ if (TREE_PUBLIC (DECL)) \ { \ fputs ("\t.EXPORT ", FILE); \ diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c index 2202d4b..ebe76e3 100644 --- a/gcc/config/pdp11/pdp11.c +++ b/gcc/config/pdp11/pdp11.c @@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-config.h" #include "conditions.h" #include "insn-flags.h" +#include "function.h" #include "output.h" #include "insn-attr.h" #include "flags.h" diff --git a/gcc/config/pdp11/pdp11.h b/gcc/config/pdp11/pdp11.h index 0822782..746a8e4 100644 --- a/gcc/config/pdp11/pdp11.h +++ b/gcc/config/pdp11/pdp11.h @@ -684,7 +684,6 @@ maybe ac0 ? - as option someday! */ No definition is equivalent to always zero. */ extern int may_call_alloca; -extern int current_function_pretend_args_size; #define EXIT_IGNORE_STACK 1 diff --git a/gcc/config/pyr/pyr.c b/gcc/config/pyr/pyr.c index 9a2e3bc..eaf0d4b 100644 --- a/gcc/config/pyr/pyr.c +++ b/gcc/config/pyr/pyr.c @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "insn-attr.h" #include "tree.h" +#include "function.h" /* * Do FUNCTION_ARG. diff --git a/gcc/config/pyr/pyr.h b/gcc/config/pyr/pyr.h index f40d030..e439502 100644 --- a/gcc/config/pyr/pyr.h +++ b/gcc/config/pyr/pyr.h @@ -783,9 +783,6 @@ extern void* pyr_function_arg (); /* This should return non-zero when we really set up a frame pointer. Otherwise, GCC is directed to preserve sp by returning zero. */ -extern int current_function_pretend_args_size; -extern int current_function_args_size; -extern int current_function_calls_alloca; #define EXIT_IGNORE_STACK \ (get_frame_size () + current_function_pretend_args_size \ + current_function_args_size != 0 \ diff --git a/gcc/config/romp/romp.c b/gcc/config/romp/romp.c index 0f64a9e..0b1a2a3 100644 --- a/gcc/config/romp/romp.c +++ b/gcc/config/romp/romp.c @@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA. */ #include "expr.h" #include "obstack.h" #include "tree.h" +#include "function.h" #define min(A,B) ((A) < (B) ? (A) : (B)) #define max(A,B) ((A) > (B) ? (A) : (B)) diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 12d093c..b6799d9 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "insn-flags.h" #include "expr.h" +#include "function.h" #include "regs.h" #include "hard-reg-set.h" #include "output.h" diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h index 23731ab..949e2e7 100644 --- a/gcc/config/sh/sh.h +++ b/gcc/config/sh/sh.h @@ -1039,8 +1039,6 @@ struct sh_args { NPARM_REGS words is at least partially passed in a register unless its data type forbids. */ -extern int current_function_varargs; - #define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) \ ((PASS_IN_REG_P ((CUM), (MODE), (TYPE)) \ && ((NAMED) \ diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index 1d3bbc7..067680b 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "insn-attr.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "recog.h" #include "toplev.h" @@ -2674,7 +2675,7 @@ mem_min_alignment (mem, desired) /* Check if the compiler has recorded some information about the alignment of the base REG. If reload has completed, we already matched with proper alignments. */ - if (((regno_pointer_align != NULL + if (((current_function != 0 && REGNO_POINTER_ALIGN (regno) >= desired) || reload_completed) && ((INTVAL (offset) & (desired - 1)) == 0)) diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index c322378..7fafc4d 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -2009,9 +2009,6 @@ LFLGRET"ID":\n\ functions that have frame pointers. No definition is equivalent to always zero. */ -extern int current_function_calls_alloca; -extern int current_function_outgoing_args_size; - #define EXIT_IGNORE_STACK \ (get_frame_size () != 0 \ || current_function_calls_alloca || current_function_outgoing_args_size) @@ -2026,11 +2023,6 @@ extern int current_function_outgoing_args_size; of alloca; we also take advantage of it to omit stack adjustments before returning. */ -/* This declaration is needed due to traditional/ANSI - incompatibilities which cannot be #ifdefed away - because they occur inside of macros. Sigh. */ -extern union tree_node *current_function_decl; - #define FUNCTION_EPILOGUE(FILE, SIZE) \ (TARGET_FLAT ? sparc_flat_output_function_epilogue (FILE, (int)SIZE) \ : output_function_epilogue (FILE, (int)SIZE, \ diff --git a/gcc/config/spur/spur.h b/gcc/config/spur/spur.h index e6d058a..3ce499e 100644 --- a/gcc/config/spur/spur.h +++ b/gcc/config/spur/spur.h @@ -484,7 +484,6 @@ enum reg_class { NO_REGS, GENERAL_REGS, FP_REGS, ALL_REGS, LIM_REG_CLASSES }; #define FUNCTION_PROLOGUE(FILE, SIZE) \ { \ extern char call_used_regs[]; \ - extern int current_function_pretend_args_size; \ int fsize = ((SIZE) + 7) & ~7; \ int nregs, i, fp_used = 0; \ for (i = 32, nregs = 0; i < FIRST_PSEUDO_REGISTER; i++) \ @@ -534,9 +533,6 @@ enum reg_class { NO_REGS, GENERAL_REGS, FP_REGS, ALL_REGS, LIM_REG_CLASSES }; functions that have frame pointers. No definition is equivalent to always zero. */ -extern int current_function_calls_alloca; -extern int current_function_pretend_args_size; - #define EXIT_IGNORE_STACK \ (get_frame_size () != 0 \ || current_function_calls_alloca || current_function_pretend_args_size) @@ -554,8 +550,6 @@ extern int current_function_pretend_args_size; #define FUNCTION_EPILOGUE(FILE, SIZE) \ { \ extern char call_used_regs[]; \ - extern int current_function_calls_alloca; \ - extern int current_function_pretend_args_size; \ int fsize = ((SIZE) + 7) & ~7; \ int nregs, i, fp_used = 0; \ for (i = 32, nregs = 0; i < FIRST_PSEUDO_REGISTER; i++) \ diff --git a/gcc/config/tahoe/tahoe.c b/gcc/config/tahoe/tahoe.c index 9dd189b..53f77d6 100644 --- a/gcc/config/tahoe/tahoe.c +++ b/gcc/config/tahoe/tahoe.c @@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-config.h" #include "conditions.h" #include "insn-flags.h" +#include "function.h" #include "output.h" #include "insn-attr.h" diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c index 15867ac..7222bbb 100644 --- a/gcc/config/v850/v850.c +++ b/gcc/config/v850/v850.c @@ -1508,8 +1508,6 @@ compute_frame_size (size, p_reg_saved) int size; long *p_reg_saved; { - extern int current_function_outgoing_args_size; - return (size + compute_register_save_size (p_reg_saved) + current_function_outgoing_args_size); diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c index bac442a..4035d6a 100644 --- a/gcc/config/vax/vax.c +++ b/gcc/config/vax/vax.c @@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-config.h" #include "conditions.h" #include "insn-flags.h" +#include "function.h" #include "output.h" #include "insn-attr.h" #ifdef VMS_TARGET diff --git a/gcc/config/vax/vms.h b/gcc/config/vax/vms.h index 35c1665..a430279 100644 --- a/gcc/config/vax/vms.h +++ b/gcc/config/vax/vms.h @@ -94,8 +94,7 @@ Boston, MA 02111-1307, USA. */ * setting of -4 will end up adding them right back again, but don't bother. */ #define MAYBE_VMS_FUNCTION_PROLOGUE(FILE) \ -{ extern char *current_function_name; \ - char *p = current_function_name; \ +{ char *p = current_function_name; \ int is_main = strcmp ("main", p) == 0; \ while (!is_main && *p != '\0') \ { \ diff --git a/gcc/config/we32k/we32k.c b/gcc/config/we32k/we32k.c index 0c02686..e1b58f9 100644 --- a/gcc/config/we32k/we32k.c +++ b/gcc/config/we32k/we32k.c @@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA. */ #include "config.h" #include <stdio.h> #include "rtl.h" +#include "function.h" #include "real.h" diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 17848cd..43a7486 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,20 @@ +1999-08-09 Bernd Schmidt <bernds@cygnus.co.uk> + + * Makefile.in: Update dependencies. + * class.c (finish_struct_1): Don't initialize DECL_SAVED_INSNS with + NULL_RTX. + * decl.c: Include "function.h" + (cleanup_label, return_label): Delete declarations. + (store_parm_decls): Don't initialize DECL_SAVED_INSNS with NULL_RTX. + (finish_function): Rename last_parm_insn variable to + fn_last_parm_insn. Don't compare DECL_SAVED_INSNS to NULL_RTX. + * decl2.c: Include "function.h". + (rtl_expr_chain): Delete declaration. + * method.c: Include "function.h" + * tree.c (build_vbase_pointer_fields): Don't initialize + DECL_SAVED_INSNS with NULL_RTX. + * typeck.c: Include "function.h" + 1999-08-09 Jason Merrill <jason@yorick.cygnus.com> * semantics.c (begin_function_try_block, finish_function_try_block, diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 63f8580..c8be4d6 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -257,16 +257,17 @@ lex.o : lex.c $(CONFIG_H) $(CXX_TREE_H) \ decl.o : decl.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ lex.h decl.h $(srcdir)/../stack.h $(srcdir)/../output.h \ $(srcdir)/../except.h $(srcdir)/../system.h $(srcdir)/../toplev.h \ - $(srcdir)/../hash.h + $(srcdir)/../hash.h $(srcdir)/../function.h decl2.o : decl2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ - lex.h decl.h $(EXPR_H) $(srcdir)/../except.h \ + lex.h decl.h $(EXPR_H) $(srcdir)/../except.h $(srcdir)/../function.h \ $(srcdir)/../output.h $(srcdir)/../except.h $(srcdir)/../system.h \ $(srcdir)/../toplev.h $(srcdir)/../dwarf2out.h $(srcdir)/../dwarfout.h \ $(srcdir)/../../include/splay-tree.h $(srcdir)/../varray.h typeck2.o : typeck2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ $(srcdir)/../system.h $(srcdir)/../toplev.h typeck.o : typeck.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \ - $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h + $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h \ + $(srcdir)/../function.h class.o : class.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ $(srcdir)/../system.h $(srcdir)/../toplev.h \ $(srcdir)/../../include/splay-tree.h @@ -275,9 +276,10 @@ call.o : call.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ friend.o : friend.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \ $(srcdir)/../system.h $(srcdir)/../toplev.h init.o : init.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \ - $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h + $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h \ + $(srcdir)/../function.h method.o : method.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h \ - $(srcdir)/../toplev.h + $(srcdir)/../toplev.h $(srcdir)/../function.h cvt.o : cvt.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h decl.h \ $(srcdir)/../flags.h $(srcdir)/../toplev.h $(srcdir)/../convert.h search.o : search.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../stack.h \ diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 28ef03f..a33c889 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -3404,7 +3404,7 @@ finish_struct_1 (t) if the insn `r' member and the size `i' member are different sizes, as on the alpha, the larger of the two will end up with garbage in it. */ - DECL_SAVED_INSNS (x) = NULL_RTX; + DECL_SAVED_INSNS (x) = 0; DECL_FIELD_SIZE (x) = 0; check_for_override (x, t); @@ -3503,7 +3503,7 @@ finish_struct_1 (t) if (type == error_mark_node) continue; - DECL_SAVED_INSNS (x) = NULL_RTX; + DECL_SAVED_INSNS (x) = 0; DECL_FIELD_SIZE (x) = 0; /* When this goes into scope, it will be a non-local reference. */ @@ -3871,7 +3871,7 @@ finish_struct_1 (t) DECL_FIELD_CONTEXT (vfield) = t; DECL_CLASS_CONTEXT (vfield) = t; DECL_FCONTEXT (vfield) = t; - DECL_SAVED_INSNS (vfield) = NULL_RTX; + DECL_SAVED_INSNS (vfield) = 0; DECL_FIELD_SIZE (vfield) = 0; DECL_ALIGN (vfield) = TYPE_ALIGN (ptr_type_node); #if 0 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c1b3b3b..4f03693 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "tree.h" #include "rtl.h" +#include "function.h" #include "flags.h" #include "cp-tree.h" #include "decl.h" @@ -315,8 +316,6 @@ static rtx last_parm_cleanup_insn; tree ctor_label; -extern rtx cleanup_label, return_label; - /* If original DECL_RESULT of current function was a register, but due to being an addressable named return value, would up on the stack, this variable holds the named return value's @@ -13509,7 +13508,7 @@ store_parm_decls () declare_function_name (); /* Initialize the RTL code for the function. */ - DECL_SAVED_INSNS (fndecl) = NULL_RTX; + DECL_SAVED_INSNS (fndecl) = 0; if (! processing_template_decl) expand_function_start (fndecl, parms_have_cleanups); @@ -13639,7 +13638,7 @@ finish_function (lineno, flags, nested) { register tree fndecl = current_function_decl; tree fntype, ctype = NULL_TREE; - rtx last_parm_insn, insns; + rtx fn_last_parm_insn, insns; /* Label to use if this function is supposed to return a value. */ tree no_return_label = NULL_TREE; tree decls = NULL_TREE; @@ -13875,13 +13874,13 @@ finish_function (lineno, flags, nested) insns = get_insns (); end_sequence (); - last_parm_insn = get_first_nonparm_insn (); - if (last_parm_insn == NULL_RTX) - last_parm_insn = get_last_insn (); + fn_last_parm_insn = get_first_nonparm_insn (); + if (fn_last_parm_insn == NULL_RTX) + fn_last_parm_insn = get_last_insn (); else - last_parm_insn = previous_insn (last_parm_insn); + fn_last_parm_insn = previous_insn (fn_last_parm_insn); - emit_insns_after (insns, last_parm_insn); + emit_insns_after (insns, fn_last_parm_insn); if (! ok_to_optimize_dtor) expand_end_cond (); @@ -14183,7 +14182,7 @@ finish_function (lineno, flags, nested) if (! nested) permanent_allocation (1); - if (DECL_SAVED_INSNS (fndecl) == NULL_RTX) + if (DECL_SAVED_INSNS (fndecl) == 0) { tree t; diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 04d6f22..a044f45 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA. */ #include "lex.h" #include "output.h" #include "except.h" +#include "function.h" #include "expr.h" #include "defaults.h" #include "toplev.h" diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 4163b1b..90e9d90 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "tree.h" #include "rtl.h" +#include "function.h" #include "cp-tree.h" #include "flags.h" #include "output.h" @@ -504,7 +505,7 @@ sort_base_init (t, rbase_ptr, vbase_ptr) Note that emit_base_init does *not* initialize virtual base classes. That is done specially, elsewhere. */ -extern tree base_init_expr, rtl_expr_chain; +extern tree base_init_expr; void emit_base_init (t, immediately) diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 39f6dce..3cc4df2 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA. */ #include "obstack.h" #include "rtl.h" #include "expr.h" +#include "function.h" #include "output.h" #include "hard-reg-set.h" #include "flags.h" diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 8838ef7..b26548f 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1010,7 +1010,7 @@ build_vbase_pointer_fields (rec) DECL_FIELD_CONTEXT (decl) = rec; DECL_CLASS_CONTEXT (decl) = rec; DECL_FCONTEXT (decl) = basetype; - DECL_SAVED_INSNS (decl) = NULL_RTX; + DECL_SAVED_INSNS (decl) = 0; DECL_FIELD_SIZE (decl) = 0; DECL_ALIGN (decl) = TYPE_ALIGN (ptr_type_node); TREE_CHAIN (decl) = vbase_decls; diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index cb894fd..0301786 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "output.h" #include "expr.h" +#include "function.h" #include "toplev.h" #include "defaults.h" @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "real.h" #include "insn-config.h" #include "recog.h" +#include "function.h" #include "expr.h" #include "toplev.h" #include "output.h" diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 7d20d75..cf05529 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -57,20 +57,12 @@ enum machine_mode word_mode; /* Mode whose width is BITS_PER_WORD. */ enum machine_mode double_mode; /* Mode whose width is DOUBLE_TYPE_SIZE. */ enum machine_mode ptr_mode; /* Mode whose width is POINTER_SIZE. */ -/* This is reset to LAST_VIRTUAL_REGISTER + 1 at the start of each function. - After rtl generation, it is 1 plus the largest register number used. */ - -int reg_rtx_no = LAST_VIRTUAL_REGISTER + 1; /* This is *not* reset after each function. It gives each CODE_LABEL in the entire compilation a unique label number. */ static int label_num = 1; -/* Lowest label number in current function. */ - -static int first_label_num; - /* Highest label number in current function. Zero means use the value of label_num instead. This is nonzero only when belatedly compiling an inline function. */ @@ -162,58 +154,6 @@ rtx return_address_pointer_rtx; /* (REG:Pmode RETURN_ADDRESS_POINTER_REGNUM) */ struct rtx_def const_int_rtx[MAX_SAVED_CONST_INT * 2 + 1]; -/* The ends of the doubly-linked chain of rtl for the current function. - Both are reset to null at the start of rtl generation for the function. - - start_sequence saves both of these on `sequence_stack' along with - `sequence_rtl_expr' and then starts a new, nested sequence of insns. */ - -static rtx first_insn = NULL; -static rtx last_insn = NULL; - -/* RTL_EXPR within which the current sequence will be placed. Use to - prevent reuse of any temporaries within the sequence until after the - RTL_EXPR is emitted. */ - -tree sequence_rtl_expr = NULL; - -/* INSN_UID for next insn emitted. - Reset to 1 for each function compiled. */ - -static int cur_insn_uid = 1; - -/* Line number and source file of the last line-number NOTE emitted. - This is used to avoid generating duplicates. */ - -static int last_linenum = 0; -static char *last_filename = 0; - -/* A vector indexed by pseudo reg number. The allocated length - of this vector is regno_pointer_flag_length. Since this - vector is needed during the expansion phase when the total - number of registers in the function is not yet known, - it is copied and made bigger when necessary. */ - -char *regno_pointer_flag; -int regno_pointer_flag_length; - -/* Indexed by pseudo register number, if nonzero gives the known alignment - for that pseudo (if regno_pointer_flag is set). - Allocated in parallel with regno_pointer_flag. */ -char *regno_pointer_align; - -/* Indexed by pseudo register number, gives the rtx for that pseudo. - Allocated in parallel with regno_pointer_flag. */ - -rtx *regno_reg_rtx; - -/* Stack of pending (incomplete) sequences saved by `start_sequence'. - Each element describes one pending sequence. - The main insn-chain is saved in the last element of the chain, - unless the chain is empty. */ - -struct sequence_stack *sequence_stack; - /* start_sequence and gen_sequence can make a lot of rtx expressions which are shortly thrown away. We use two mechanisms to prevent this waste: @@ -237,12 +177,14 @@ static rtx sequence_result[SEQUENCE_RESULT_SIZE]; /* During RTL generation, we also keep a list of free INSN rtl codes. */ static rtx free_insn; -extern int rtx_equal_function_value_matters; +#define first_insn (current_function->emit->x_first_insn) +#define last_insn (current_function->emit->x_last_insn) +#define cur_insn_uid (current_function->emit->x_cur_insn_uid) +#define last_linenum (current_function->emit->x_last_linenum) +#define last_filename (current_function->emit->x_last_filename) +#define first_label_num (current_function->emit->x_first_label_num) -/* Filename and line number of last line-number note, - whether we actually emitted it or not. */ -extern char *emit_filename; -extern int emit_lineno; +extern int rtx_equal_function_value_matters; static rtx make_jump_insn_raw PROTO((rtx)); static rtx make_call_insn_raw PROTO((rtx)); @@ -544,6 +486,7 @@ rtx gen_reg_rtx (mode) enum machine_mode mode; { + struct function *f = current_function; register rtx val; /* Don't let anything called after initial flow analysis create new @@ -575,28 +518,26 @@ gen_reg_rtx (mode) /* Make sure regno_pointer_flag and regno_reg_rtx are large enough to have an element for this pseudo reg number. */ - if (reg_rtx_no == regno_pointer_flag_length) + if (reg_rtx_no == f->emit->regno_pointer_flag_length) { + int old_size = f->emit->regno_pointer_flag_length; rtx *new1; - char *new = - (char *) savealloc (regno_pointer_flag_length * 2); - bcopy (regno_pointer_flag, new, regno_pointer_flag_length); - bzero (&new[regno_pointer_flag_length], regno_pointer_flag_length); - regno_pointer_flag = new; - - new = (char *) savealloc (regno_pointer_flag_length * 2); - bcopy (regno_pointer_align, new, regno_pointer_flag_length); - bzero (&new[regno_pointer_flag_length], regno_pointer_flag_length); - regno_pointer_align = new; - - new1 = (rtx *) savealloc (regno_pointer_flag_length * 2 * sizeof (rtx)); - bcopy ((char *) regno_reg_rtx, (char *) new1, - regno_pointer_flag_length * sizeof (rtx)); - bzero ((char *) &new1[regno_pointer_flag_length], - regno_pointer_flag_length * sizeof (rtx)); + char *new = (char *) savealloc (old_size * 2); + memcpy (new, f->emit->regno_pointer_flag, old_size); + memset (new + old_size, 0, old_size); + f->emit->regno_pointer_flag = new; + + new = (char *) savealloc (old_size * 2); + memcpy (new, f->emit->regno_pointer_align, old_size); + memset (new + old_size, 0, old_size); + f->emit->regno_pointer_align = new; + + new1 = (rtx *) savealloc (old_size * 2 * sizeof (rtx)); + memcpy (new1, regno_reg_rtx, old_size * sizeof (rtx)); + memset (new1 + old_size, 0, old_size * sizeof (rtx)); regno_reg_rtx = new1; - regno_pointer_flag_length *= 2; + f->emit->regno_pointer_flag_length = old_size * 2; } val = gen_rtx_raw_REG (mode, reg_rtx_no); @@ -1617,44 +1558,6 @@ gen_label_rtx () /* For procedure integration. */ -/* Return a newly created INLINE_HEADER rtx. Should allocate this - from a permanent obstack when the opportunity arises. */ - -rtx -gen_inline_header_rtx (first_insn, first_parm_insn, first_labelno, - last_labelno, max_parm_regnum, max_regnum, args_size, - pops_args, stack_slots, forced_labels, function_flags, - outgoing_args_size, original_arg_vector, - original_decl_initial, regno_rtx, regno_flag, - regno_align, parm_reg_stack_loc) - rtx first_insn, first_parm_insn; - int first_labelno, last_labelno, max_parm_regnum, max_regnum, args_size; - int pops_args; - rtx stack_slots; - rtx forced_labels; - int function_flags; - int outgoing_args_size; - rtvec original_arg_vector; - rtx original_decl_initial; - rtvec regno_rtx; - char *regno_flag; - char *regno_align; - rtvec parm_reg_stack_loc; -{ - rtx header = gen_rtx_INLINE_HEADER (VOIDmode, - cur_insn_uid++, NULL_RTX, - first_insn, first_parm_insn, - first_labelno, last_labelno, - max_parm_regnum, max_regnum, args_size, - pops_args, stack_slots, forced_labels, - function_flags, outgoing_args_size, - original_arg_vector, - original_decl_initial, - regno_rtx, regno_flag, regno_align, - parm_reg_stack_loc); - return header; -} - /* Install new pointers to the first and last insns in the chain. Also, set cur_insn_uid to one higher than the last in use. Used for an inline-procedure after copying the insn chain. */ @@ -1686,29 +1589,18 @@ set_new_first_and_last_label_num (first, last) first_label_num = first; last_label_num = last; } - -/* Save all variables describing the current status into the structure *P. - This is used before starting a nested function. */ + +/* Set the last label number found in the current function. + This is used when belatedly compiling an inline function. */ void -save_emit_status (p) - struct function *p; +set_new_last_label_num (last) + int last; { - p->reg_rtx_no = reg_rtx_no; - p->first_label_num = first_label_num; - p->first_insn = first_insn; - p->last_insn = last_insn; - p->sequence_rtl_expr = sequence_rtl_expr; - p->sequence_stack = sequence_stack; - p->cur_insn_uid = cur_insn_uid; - p->last_linenum = last_linenum; - p->last_filename = last_filename; - p->regno_pointer_flag = regno_pointer_flag; - p->regno_pointer_align = regno_pointer_align; - p->regno_pointer_flag_length = regno_pointer_flag_length; - p->regno_reg_rtx = regno_reg_rtx; + base_label_num = label_num; + last_label_num = last; } - + /* Restore all variables describing the current status from the structure *P. This is used after a nested function. */ @@ -1716,30 +1608,8 @@ void restore_emit_status (p) struct function *p; { - int i; - - reg_rtx_no = p->reg_rtx_no; - first_label_num = p->first_label_num; last_label_num = 0; - first_insn = p->first_insn; - last_insn = p->last_insn; - sequence_rtl_expr = p->sequence_rtl_expr; - sequence_stack = p->sequence_stack; - cur_insn_uid = p->cur_insn_uid; - last_linenum = p->last_linenum; - last_filename = p->last_filename; - regno_pointer_flag = p->regno_pointer_flag; - regno_pointer_align = p->regno_pointer_align; - regno_pointer_flag_length = p->regno_pointer_flag_length; - regno_reg_rtx = p->regno_reg_rtx; - - /* Clear our cache of rtx expressions for start_sequence and - gen_sequence. */ - sequence_element_free_list = 0; - for (i = 0; i < SEQUENCE_RESULT_SIZE; i++) - sequence_result[i] = 0; - - free_insn = 0; + clear_emit_caches (); } /* Go through all the RTL insn bodies and copy any invalid shared structure. @@ -2033,7 +1903,7 @@ get_last_insn_anywhere () struct sequence_stack *stack; if (last_insn) return last_insn; - for (stack = sequence_stack; stack; stack = stack->next) + for (stack = seq_stack; stack; stack = stack->next) if (stack->last != 0) return stack->last; return 0; @@ -2498,7 +2368,7 @@ add_insn_after (insn, after) last_insn = insn; else { - struct sequence_stack *stack = sequence_stack; + struct sequence_stack *stack = seq_stack; /* Scan all pending sequences too. */ for (; stack; stack = stack->next) if (after == stack->last) @@ -2549,7 +2419,7 @@ add_insn_before (insn, before) first_insn = insn; else { - struct sequence_stack *stack = sequence_stack; + struct sequence_stack *stack = seq_stack; /* Scan all pending sequences too. */ for (; stack; stack = stack->next) if (before == stack->first) @@ -2588,7 +2458,7 @@ remove_insn (insn) first_insn = next; else { - struct sequence_stack *stack = sequence_stack; + struct sequence_stack *stack = seq_stack; /* Scan all pending sequences too. */ for (; stack; stack = stack->next) if (insn == stack->first) @@ -2611,7 +2481,7 @@ remove_insn (insn) last_insn = prev; else { - struct sequence_stack *stack = sequence_stack; + struct sequence_stack *stack = seq_stack; /* Scan all pending sequences too. */ for (; stack; stack = stack->next) if (insn == stack->last) @@ -3335,12 +3205,12 @@ start_sequence () else tem = (struct sequence_stack *) permalloc (sizeof (struct sequence_stack)); - tem->next = sequence_stack; + tem->next = seq_stack; tem->first = first_insn; tem->last = last_insn; - tem->sequence_rtl_expr = sequence_rtl_expr; + tem->sequence_rtl_expr = seq_rtl_expr; - sequence_stack = tem; + seq_stack = tem; first_insn = 0; last_insn = 0; @@ -3356,7 +3226,7 @@ start_sequence_for_rtl_expr (t) { start_sequence (); - sequence_rtl_expr = t; + seq_rtl_expr = t; } /* Set up the insn chain starting with FIRST as the current sequence, @@ -3387,12 +3257,12 @@ push_topmost_sequence () start_sequence (); - for (stack = sequence_stack; stack; stack = stack->next) + for (stack = seq_stack; stack; stack = stack->next) top = stack; first_insn = top->first; last_insn = top->last; - sequence_rtl_expr = top->sequence_rtl_expr; + seq_rtl_expr = top->sequence_rtl_expr; } /* After emitting to the outer-level insn chain, update the outer-level @@ -3403,12 +3273,12 @@ pop_topmost_sequence () { struct sequence_stack *stack, *top = NULL; - for (stack = sequence_stack; stack; stack = stack->next) + for (stack = seq_stack; stack; stack = stack->next) top = stack; top->first = first_insn; top->last = last_insn; - /* ??? Why don't we save sequence_rtl_expr here? */ + /* ??? Why don't we save seq_rtl_expr here? */ end_sequence (); } @@ -3429,12 +3299,12 @@ pop_topmost_sequence () void end_sequence () { - struct sequence_stack *tem = sequence_stack; + struct sequence_stack *tem = seq_stack; first_insn = tem->first; last_insn = tem->last; - sequence_rtl_expr = tem->sequence_rtl_expr; - sequence_stack = tem->next; + seq_rtl_expr = tem->sequence_rtl_expr; + seq_stack = tem->next; tem->next = sequence_element_free_list; sequence_element_free_list = tem; @@ -3445,7 +3315,7 @@ end_sequence () int in_sequence_p () { - return sequence_stack != 0; + return seq_stack != 0; } /* Generate a SEQUENCE rtx containing the insns already emitted @@ -3506,13 +3376,27 @@ gen_sequence () /* Put the various virtual registers into REGNO_REG_RTX. */ void -init_virtual_regs () +init_virtual_regs (es) + struct emit_status *es; { - regno_reg_rtx[VIRTUAL_INCOMING_ARGS_REGNUM] = virtual_incoming_args_rtx; - regno_reg_rtx[VIRTUAL_STACK_VARS_REGNUM] = virtual_stack_vars_rtx; - regno_reg_rtx[VIRTUAL_STACK_DYNAMIC_REGNUM] = virtual_stack_dynamic_rtx; - regno_reg_rtx[VIRTUAL_OUTGOING_ARGS_REGNUM] = virtual_outgoing_args_rtx; - regno_reg_rtx[VIRTUAL_CFA_REGNUM] = virtual_cfa_rtx; + rtx *ptr = es->x_regno_reg_rtx; + ptr[VIRTUAL_INCOMING_ARGS_REGNUM] = virtual_incoming_args_rtx; + ptr[VIRTUAL_STACK_VARS_REGNUM] = virtual_stack_vars_rtx; + ptr[VIRTUAL_STACK_DYNAMIC_REGNUM] = virtual_stack_dynamic_rtx; + ptr[VIRTUAL_OUTGOING_ARGS_REGNUM] = virtual_outgoing_args_rtx; + ptr[VIRTUAL_CFA_REGNUM] = virtual_cfa_rtx; +} + +void +clear_emit_caches () +{ + int i; + + /* Clear the start_sequence/gen_sequence cache. */ + sequence_element_free_list = 0; + for (i = 0; i < SEQUENCE_RESULT_SIZE; i++) + sequence_result[i] = 0; + free_insn = 0; } /* Initialize data structures and variables in this file @@ -3521,43 +3405,41 @@ init_virtual_regs () void init_emit () { - int i; + struct function *f = current_function; + f->emit = (struct emit_status *) xmalloc (sizeof (struct emit_status)); first_insn = NULL; last_insn = NULL; - sequence_rtl_expr = NULL; + seq_rtl_expr = NULL; cur_insn_uid = 1; reg_rtx_no = LAST_VIRTUAL_REGISTER + 1; last_linenum = 0; last_filename = 0; first_label_num = label_num; last_label_num = 0; - sequence_stack = NULL; + seq_stack = NULL; - /* Clear the start_sequence/gen_sequence cache. */ - sequence_element_free_list = 0; - for (i = 0; i < SEQUENCE_RESULT_SIZE; i++) - sequence_result[i] = 0; - free_insn = 0; + clear_emit_caches (); /* Init the tables that describe all the pseudo regs. */ - regno_pointer_flag_length = LAST_VIRTUAL_REGISTER + 101; + f->emit->regno_pointer_flag_length = LAST_VIRTUAL_REGISTER + 101; - regno_pointer_flag - = (char *) savealloc (regno_pointer_flag_length); - bzero (regno_pointer_flag, regno_pointer_flag_length); + f->emit->regno_pointer_flag + = (char *) savealloc (f->emit->regno_pointer_flag_length); + bzero (f->emit->regno_pointer_flag, f->emit->regno_pointer_flag_length); - regno_pointer_align - = (char *) savealloc (regno_pointer_flag_length); - bzero (regno_pointer_align, regno_pointer_flag_length); + f->emit->regno_pointer_align + = (char *) savealloc (f->emit->regno_pointer_flag_length); + bzero (f->emit->regno_pointer_align, f->emit->regno_pointer_flag_length); regno_reg_rtx - = (rtx *) savealloc (regno_pointer_flag_length * sizeof (rtx)); - bzero ((char *) regno_reg_rtx, regno_pointer_flag_length * sizeof (rtx)); + = (rtx *) savealloc (f->emit->regno_pointer_flag_length * sizeof (rtx)); + bzero ((char *) regno_reg_rtx, + f->emit->regno_pointer_flag_length * sizeof (rtx)); /* Put copies of all the virtual register rtx into regno_reg_rtx. */ - init_virtual_regs (); + init_virtual_regs (f->emit); /* Indicate that the virtual registers and stack locations are all pointers. */ @@ -3608,8 +3490,6 @@ init_emit_once (line_numbers) no_line_numbers = ! line_numbers; - sequence_stack = NULL; - /* Compute the word and byte modes. */ byte_mode = VOIDmode; diff --git a/gcc/explow.c b/gcc/explow.c index ab04951..b79aa9b 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */ #include "rtl.h" #include "tree.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "hard-reg-set.h" #include "insn-config.h" @@ -83,35 +83,11 @@ int cse_not_expected; Nowadays this is never zero. */ int do_preexpand_calls = 1; -/* Number of units that we should eventually pop off the stack. - These are the arguments to function calls that have already returned. */ -int pending_stack_adjust; - -/* Under some ABIs, it is the caller's responsibility to pop arguments - pushed for function calls. A naive implementation would simply pop - the arguments immediately after each call. However, if several - function calls are made in a row, it is typically cheaper to pop - all the arguments after all of the calls are complete since a - single pop instruction can be used. Therefore, GCC attempts to - defer popping the arguments until absolutely necessary. (For - example, at the end of a conditional, the arguments must be popped, - since code outside the conditional won't know whether or not the - arguments need to be popped.) - - When INHIBIT_DEFER_POP is non-zero, however, the compiler does not - attempt to defer pops. Instead, the stack is popped immediately - after each call. Rather then setting this variable directly, use - NO_DEFER_POP and OK_DEFER_POP. */ -int inhibit_defer_pop; - /* Don't check memory usage, since code is being emitted to check a memory usage. Used when current_function_check_memory_usage is true, to avoid infinite recursion. */ static int in_check_memory_usage; -/* Postincrements that still need to be expanded. */ -static rtx pending_chain; - /* This structure is used by move_by_pieces to describe the move to be performed. */ struct move_by_pieces @@ -147,12 +123,10 @@ struct clear_by_pieces }; extern struct obstack permanent_obstack; -extern rtx arg_pointer_save_area; static rtx get_push_address PROTO ((int)); static rtx enqueue_insn PROTO((rtx, rtx)); -static void init_queue PROTO((void)); static int move_by_pieces_ninsns PROTO((unsigned int, int)); static void move_by_pieces_1 PROTO((rtx (*) (rtx, ...), enum machine_mode, struct move_by_pieces *)); @@ -302,8 +276,10 @@ init_expr_once () void init_expr () { - init_queue (); + current_function->expr + = (struct expr_status *) xmalloc (sizeof (struct expr_status)); + pending_chain = 0; pending_stack_adjust = 0; inhibit_defer_pop = 0; saveregs_value = 0; @@ -311,41 +287,12 @@ init_expr () forced_labels = 0; } -/* Save all variables describing the current status into the structure *P. - This is used before starting a nested function. */ - +/* Small sanity check that the queue is empty at the end of a function. */ void -save_expr_status (p) - struct function *p; +finish_expr_for_function () { - p->pending_chain = pending_chain; - p->pending_stack_adjust = pending_stack_adjust; - p->inhibit_defer_pop = inhibit_defer_pop; - p->saveregs_value = saveregs_value; - p->apply_args_value = apply_args_value; - p->forced_labels = forced_labels; - - pending_chain = NULL_RTX; - pending_stack_adjust = 0; - inhibit_defer_pop = 0; - saveregs_value = 0; - apply_args_value = 0; - forced_labels = 0; -} - -/* Restore all variables describing the current status from the structure *P. - This is used after a nested function. */ - -void -restore_expr_status (p) - struct function *p; -{ - pending_chain = p->pending_chain; - pending_stack_adjust = p->pending_stack_adjust; - inhibit_defer_pop = p->inhibit_defer_pop; - saveregs_value = p->saveregs_value; - apply_args_value = p->apply_args_value; - forced_labels = p->forced_labels; + if (pending_chain) + abort (); } /* Manage the queue of increment instructions to be output @@ -507,13 +454,6 @@ emit_queue () pending_chain = QUEUED_NEXT (p); } } - -static void -init_queue () -{ - if (pending_chain) - abort (); -} /* Copy data from FROM to TO, where the machine modes are not the same. Both modes may be integer, or both may be floating. @@ -5687,9 +5627,9 @@ expand_expr (exp, target, tmode, modifier) push_obstacks (p->function_obstack, p->function_maybepermanent_obstack); - p->forced_labels = gen_rtx_EXPR_LIST (VOIDmode, - label_rtx (exp), - p->forced_labels); + p->expr->x_forced_labels + = gen_rtx_EXPR_LIST (VOIDmode, label_rtx (exp), + p->expr->x_forced_labels); pop_obstacks (); } else @@ -5737,7 +5677,8 @@ expand_expr (exp, target, tmode, modifier) memory protection). Aggregates are not checked here; they're handled elsewhere. */ - if (current_function_check_memory_usage && code == VAR_DECL + if (current_function && current_function_check_memory_usage + && code == VAR_DECL && GET_CODE (DECL_RTL (exp)) == MEM && ! AGGREGATE_TYPE_P (TREE_TYPE (exp))) { @@ -6254,7 +6195,8 @@ expand_expr (exp, target, tmode, modifier) op0 = expand_expr (exp1, NULL_RTX, VOIDmode, EXPAND_SUM); op0 = memory_address (mode, op0); - if (current_function_check_memory_usage && !AGGREGATE_TYPE_P (TREE_TYPE (exp))) + if (current_function && current_function_check_memory_usage + && ! AGGREGATE_TYPE_P (TREE_TYPE (exp))) { enum memory_use_mode memory_usage; memory_usage = get_memory_usage_from_modifier (modifier); @@ -6542,7 +6484,8 @@ expand_expr (exp, target, tmode, modifier) } /* Check the access. */ - if (current_function_check_memory_usage && GET_CODE (op0) == MEM) + if (current_function && current_function_check_memory_usage + && GET_CODE (op0) == MEM) { enum memory_use_mode memory_usage; memory_usage = get_memory_usage_from_modifier (modifier); @@ -68,58 +68,6 @@ enum memory_use_mode {MEMORY_USE_BAD = 0, MEMORY_USE_RO = 1, MEMORY_USE_WO = 2, MEMORY_USE_RW = 3, MEMORY_USE_TW = 6, MEMORY_USE_DONT = 99}; -/* List of labels that must never be deleted. */ -extern rtx forced_labels; - -/* List (chain of EXPR_LISTs) of pseudo-regs of SAVE_EXPRs. - So we can mark them all live at the end of the function, if stupid. */ -extern rtx save_expr_regs; - -/* Nonzero means __builtin_saveregs has already been done in this function. - The value is the pseudoreg containing the value __builtin_saveregs - returned. */ -extern rtx saveregs_value; - -/* Similarly for __builtin_apply_args. */ -extern rtx apply_args_value; - -extern int current_function_calls_alloca; -extern int current_function_outgoing_args_size; - -/* This is the offset from the arg pointer to the place where the first - anonymous arg can be found, if there is one. */ -extern rtx current_function_arg_offset_rtx; - -/* This is nonzero if the current function uses the constant pool. */ -extern int current_function_uses_const_pool; - -/* This is nonzero if the current function uses pic_offset_table_rtx. */ -extern int current_function_uses_pic_offset_table; - -/* The arg pointer hard register, or the pseudo into which it was copied. */ -extern rtx current_function_internal_arg_pointer; - -/* This is nonzero if memory access checking be enabled in the current - function. */ -extern int current_function_check_memory_usage; - -/* Under some ABIs, it is the caller's responsibility to pop arguments - pushed for function calls. A naive implementation would simply pop - the arguments immediately after each call. However, if several - function calls are made in a row, it is typically cheaper to pop - all the arguments after all of the calls are complete since a - single pop instruction can be used. Therefore, GCC attempts to - defer popping the arguments until absolutely necessary. (For - example, at the end of a conditional, the arguments must be popped, - since code outside the conditional won't know whether or not the - arguments need to be popped.) - - When INHIBIT_DEFER_POP is non-zero, however, the compiler does not - attempt to defer pops. Instead, the stack is popped immediately - after each call. Rather then setting this variable directly, use - NO_DEFER_POP and OK_DEFER_POP. */ -extern int inhibit_defer_pop; - /* Prevent the compiler from deferring stack pops. See inhibit_defer_pop for more information. */ #define NO_DEFER_POP (inhibit_defer_pop += 1) @@ -127,45 +75,6 @@ extern int inhibit_defer_pop; /* Allow the compiler to defer stack pops. See inhibit_defer_pop for more information. */ #define OK_DEFER_POP (inhibit_defer_pop -= 1) - -/* Number of function calls seen so far in current function. */ - -extern int function_call_count; - -/* List (chain of EXPR_LIST) of stack slots that hold the current handlers - for nonlocal gotos. There is one for every nonlocal label in the function; - this list matches the one in nonlocal_labels. - Zero when function does not have nonlocal labels. */ - -extern rtx nonlocal_goto_handler_slots; - -/* RTX for stack slot that holds the stack pointer value to restore - for a nonlocal goto. - Zero when function does not have nonlocal labels. */ - -extern rtx nonlocal_goto_stack_level; - -/* List (chain of TREE_LIST) of LABEL_DECLs for all nonlocal labels - (labels to which there can be nonlocal gotos from nested functions) - in this function. */ - -#ifdef TREE_CODE /* Don't lose if tree.h not included. */ -extern tree nonlocal_labels; -#endif - -/* Number of units that we should eventually pop off the stack. - These are the arguments to function calls that have already returned. */ -extern int pending_stack_adjust; - -/* When temporaries are created by TARGET_EXPRs, they are created at - this level of temp_slot_level, so that they can remain allocated - until no longer needed. CLEANUP_POINT_EXPRs define the lifetime - of TARGET_EXPRs. */ -extern int target_temp_slot_level; - -/* Current level for normal temporaries. */ - -extern int temp_slot_level; #ifdef TREE_CODE /* Don't lose if tree.h not included. */ /* Structure to record the size of a sequence of arguments @@ -756,6 +665,9 @@ extern void init_expr_once PROTO((void)); /* This is run at the start of compiling a function. */ extern void init_expr PROTO((void)); +/* This is run at the end of compiling a function. */ +extern void finish_expr_for_function PROTO((void)); + /* Use protect_from_queue to convert a QUEUED expression into something that you can put immediately into an instruction. */ extern rtx protect_from_queue PROTO((rtx, int)); diff --git a/gcc/final.c b/gcc/final.c index a608041..a6dc137 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -62,6 +62,7 @@ Boston, MA 02111-1307, USA. */ #include "defaults.h" #include "output.h" #include "except.h" +#include "function.h" #include "toplev.h" #include "reload.h" #include "intl.h" diff --git a/gcc/flags.h b/gcc/flags.h index a3cc073..6f2f93f 100644 --- a/gcc/flags.h +++ b/gcc/flags.h @@ -485,23 +485,6 @@ extern int frame_pointer_needed; extern int can_reach_end; -/* Nonzero if function being compiled receives nonlocal gotos - from nested functions. */ - -extern int current_function_has_nonlocal_label; - -/* Nonzero if function being compiled has nonlocal gotos to parent - function. */ - -extern int current_function_has_nonlocal_goto; - -/* Nonzero if this function has a computed goto. - - It is computed during find_basic_blocks or during stupid life - analysis. */ - -extern int current_function_has_computed_jump; - /* Nonzero if GCC must add code to check memory access (used by Checker). */ extern int flag_check_memory_usage; @@ -510,9 +493,6 @@ extern int flag_check_memory_usage; flag_check_memory_usage). */ extern int flag_prefix_function_name; -/* Nonzero if the current function is a thunk, so we should try to cut - corners where we can. */ -extern int current_function_is_thunk; /* Value of the -G xx switch, and whether it was passed or not. */ extern int g_switch_value; @@ -154,9 +154,6 @@ Boston, MA 02111-1307, USA. */ extern struct obstack *function_obstack; -/* List of labels that must never be deleted. */ -extern rtx forced_labels; - /* Number of basic blocks in the current function. */ int n_basic_blocks; diff --git a/gcc/function.c b/gcc/function.c index e25d676..c30c0d1 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -94,266 +94,22 @@ Boston, MA 02111-1307, USA. */ #define NEED_SEPARATE_AP #endif -/* Number of bytes of args popped by function being compiled on its return. - Zero if no bytes are to be popped. - May affect compilation of return insn or of function epilogue. */ - -int current_function_pops_args; - -/* Nonzero if function being compiled needs to be given an address - where the value should be stored. */ - -int current_function_returns_struct; - -/* Nonzero if function being compiled needs to - return the address of where it has put a structure value. */ - -int current_function_returns_pcc_struct; - -/* Nonzero if function being compiled needs to be passed a static chain. */ - -int current_function_needs_context; - -/* Nonzero if function being compiled can call setjmp. */ - -int current_function_calls_setjmp; - -/* Nonzero if function being compiled can call longjmp. */ - -int current_function_calls_longjmp; - -/* Nonzero if function being compiled receives nonlocal gotos - from nested functions. */ - -int current_function_has_nonlocal_label; - -/* Nonzero if function being compiled has nonlocal gotos to parent - function. */ - -int current_function_has_nonlocal_goto; - -/* Nonzero if function being compiled contains nested functions. */ - -int current_function_contains_functions; - /* Nonzero if function being compiled doesn't contain any calls (ignoring the prologue and epilogue). This is set prior to local register allocation and is valid for the remaining compiler passes. */ - int current_function_is_leaf; /* Nonzero if function being compiled doesn't modify the stack pointer (ignoring the prologue and epilogue). This is only valid after life_analysis has run. */ - int current_function_sp_is_unchanging; /* Nonzero if the function being compiled is a leaf function which only uses leaf registers. This is valid after reload (specifically after sched2) and is useful only if the port defines LEAF_REGISTERS. */ - int current_function_uses_only_leaf_regs; -/* Nonzero if the function being compiled issues a computed jump. */ - -int current_function_has_computed_jump; - -/* Nonzero if the current function is a thunk (a lightweight function that - just adjusts one of its arguments and forwards to another function), so - we should try to cut corners where we can. */ -int current_function_is_thunk; - -/* Nonzero if function being compiled can call alloca, - either as a subroutine or builtin. */ - -int current_function_calls_alloca; - -/* Nonzero if the current function returns a pointer type */ - -int current_function_returns_pointer; - -/* If some insns can be deferred to the delay slots of the epilogue, the - delay list for them is recorded here. */ - -rtx current_function_epilogue_delay_list; - -/* If function's args have a fixed size, this is that size, in bytes. - Otherwise, it is -1. - May affect compilation of return insn or of function epilogue. */ - -int current_function_args_size; - -/* # bytes the prologue should push and pretend that the caller pushed them. - The prologue must do this, but only if parms can be passed in registers. */ - -int current_function_pretend_args_size; - -/* # of bytes of outgoing arguments. If ACCUMULATE_OUTGOING_ARGS is - defined, the needed space is pushed by the prologue. */ - -int current_function_outgoing_args_size; - -/* This is the offset from the arg pointer to the place where the first - anonymous arg can be found, if there is one. */ - -rtx current_function_arg_offset_rtx; - -/* Nonzero if current function uses varargs.h or equivalent. - Zero for functions that use stdarg.h. */ - -int current_function_varargs; - -/* Nonzero if current function uses stdarg.h or equivalent. - Zero for functions that use varargs.h. */ - -int current_function_stdarg; - -/* Quantities of various kinds of registers - used for the current function's args. */ - -CUMULATIVE_ARGS current_function_args_info; - -/* Name of function now being compiled. */ - -char *current_function_name; - -/* If non-zero, an RTL expression for the location at which the current - function returns its result. If the current function returns its - result in a register, current_function_return_rtx will always be - the hard register containing the result. */ - -rtx current_function_return_rtx; - -/* Nonzero if the current function uses the constant pool. */ - -int current_function_uses_const_pool; - -/* Nonzero if the current function uses pic_offset_table_rtx. */ -int current_function_uses_pic_offset_table; - -/* The arg pointer hard register, or the pseudo into which it was copied. */ -rtx current_function_internal_arg_pointer; - -/* Language-specific reason why the current function cannot be made inline. */ -char *current_function_cannot_inline; - -/* Nonzero if instrumentation calls for function entry and exit should be - generated. */ -int current_function_instrument_entry_exit; - -/* Nonzero if memory access checking be enabled in the current function. */ -int current_function_check_memory_usage; - -/* The FUNCTION_DECL for an inline function currently being expanded. */ -tree inline_function_decl; - -/* Number of function calls seen so far in current function. */ - -int function_call_count; - -/* List (chain of TREE_LIST) of LABEL_DECLs for all nonlocal labels - (labels to which there can be nonlocal gotos from nested functions) - in this function. */ - -tree nonlocal_labels; - -/* List (chain of EXPR_LIST) of stack slots that hold the current handlers - for nonlocal gotos. There is one for every nonlocal label in the function; - this list matches the one in nonlocal_labels. - Zero when function does not have nonlocal labels. */ - -rtx nonlocal_goto_handler_slots; - -/* List (chain of EXPR_LIST) of labels heading the current handlers for - nonlocal gotos. */ - -rtx nonlocal_goto_handler_labels; - -/* RTX for stack slot that holds the stack pointer value to restore - for a nonlocal goto. - Zero when function does not have nonlocal labels. */ - -rtx nonlocal_goto_stack_level; - -/* Label that will go on parm cleanup code, if any. - Jumping to this label runs cleanup code for parameters, if - such code must be run. Following this code is the logical return label. */ - -rtx cleanup_label; - -/* Label that will go on function epilogue. - Jumping to this label serves as a "return" instruction - on machines which require execution of the epilogue on all returns. */ - -rtx return_label; - -/* List (chain of EXPR_LISTs) of pseudo-regs of SAVE_EXPRs. - So we can mark them all live at the end of the function, if nonopt. */ -rtx save_expr_regs; - -/* List (chain of EXPR_LISTs) of all stack slots in this function. - Made for the sake of unshare_all_rtl. */ -rtx stack_slot_list; - -/* Chain of all RTL_EXPRs that have insns in them. */ -tree rtl_expr_chain; - -/* Label to jump back to for tail recursion, or 0 if we have - not yet needed one for this function. */ -rtx tail_recursion_label; - -/* Place after which to insert the tail_recursion_label if we need one. */ -rtx tail_recursion_reentry; - -/* Location at which to save the argument pointer if it will need to be - referenced. There are two cases where this is done: if nonlocal gotos - exist, or if vars stored at an offset from the argument pointer will be - needed by inner routines. */ - -rtx arg_pointer_save_area; - -/* Offset to end of allocated area of stack frame. - If stack grows down, this is the address of the last stack slot allocated. - If stack grows up, this is the address for the next slot. */ -HOST_WIDE_INT frame_offset; - -/* List (chain of TREE_LISTs) of static chains for containing functions. - Each link has a FUNCTION_DECL in the TREE_PURPOSE and a reg rtx - in an RTL_EXPR in the TREE_VALUE. */ -static tree context_display; - -/* List (chain of TREE_LISTs) of trampolines for nested functions. - The trampoline sets up the static chain and jumps to the function. - We supply the trampoline's address when the function's address is requested. - - Each link has a FUNCTION_DECL in the TREE_PURPOSE and a reg rtx - in an RTL_EXPR in the TREE_VALUE. */ -static tree trampoline_list; - -/* Insn after which register parms and SAVE_EXPRs are born, if nonopt. */ -static rtx parm_birth_insn; - -#if 0 -/* Nonzero if a stack slot has been generated whose address is not - actually valid. It means that the generated rtl must all be scanned - to detect and correct the invalid addresses where they occur. */ -static int invalid_stack_slot; -#endif - -/* Last insn of those whose job was to put parms into their nominal homes. */ -static rtx last_parm_insn; - -/* 1 + last pseudo register number possibly used for loading a copy - of a parameter of this function. */ -int max_parm_reg; - -/* Vector indexed by REGNO, containing location on stack in which - to put the parm which is nominally in pseudo register REGNO, - if we discover that that parm must go in the stack. The highest - element in this vector is one less than MAX_PARM_REG, above. */ -rtx *parm_reg_stack_loc; - /* Nonzero once virtual register instantiation has been done. assign_stack_local uses frame_pointer_rtx when this is nonzero. */ static int virtuals_instantiated; @@ -369,7 +125,9 @@ void (*restore_machine_status) PROTO((struct function *)); integrate.c */ extern int rtx_equal_function_value_matters; -extern tree sequence_rtl_expr; + +/* The FUNCTION_DECL for an inline function currently being expanded. */ +tree inline_function_decl; /* The currently compiled function. */ struct function *current_function = 0; @@ -440,24 +198,6 @@ struct temp_slot info is for combine_temp_slots. */ HOST_WIDE_INT full_size; }; - -/* List of all temporaries allocated, both available and in use. */ - -struct temp_slot *temp_slots; - -/* Current nesting level for temporaries. */ - -int temp_slot_level; - -/* Current nesting level for variables in a block. */ - -int var_temp_slot_level; - -/* When temporaries are created by TARGET_EXPRs, they are created at - this level of temp_slot_level, so that they can remain allocated - until no longer needed. CLEANUP_POINT_EXPRs define the lifetime - of TARGET_EXPRs. */ -int target_temp_slot_level; /* This structure is used to record MEMs or pseudos used to replace VAR, any SUBREGs of VAR, and any MEMs containing VAR as an address. We need to @@ -569,67 +309,10 @@ push_function_context_to (context) p->next = outer_function_chain; outer_function_chain = p; - - p->name = current_function_name; p->decl = current_function_decl; - p->pops_args = current_function_pops_args; - p->returns_struct = current_function_returns_struct; - p->returns_pcc_struct = current_function_returns_pcc_struct; - p->returns_pointer = current_function_returns_pointer; - p->needs_context = current_function_needs_context; - p->calls_setjmp = current_function_calls_setjmp; - p->calls_longjmp = current_function_calls_longjmp; - p->calls_alloca = current_function_calls_alloca; - p->has_nonlocal_label = current_function_has_nonlocal_label; - p->has_nonlocal_goto = current_function_has_nonlocal_goto; - p->contains_functions = current_function_contains_functions; - p->has_computed_jump = current_function_has_computed_jump; - p->is_thunk = current_function_is_thunk; - p->args_size = current_function_args_size; - p->pretend_args_size = current_function_pretend_args_size; - p->arg_offset_rtx = current_function_arg_offset_rtx; - p->varargs = current_function_varargs; - p->stdarg = current_function_stdarg; - p->uses_const_pool = current_function_uses_const_pool; - p->uses_pic_offset_table = current_function_uses_pic_offset_table; - p->internal_arg_pointer = current_function_internal_arg_pointer; - p->cannot_inline = current_function_cannot_inline; - p->max_parm_reg = max_parm_reg; - p->parm_reg_stack_loc = parm_reg_stack_loc; - p->outgoing_args_size = current_function_outgoing_args_size; - p->return_rtx = current_function_return_rtx; - p->nonlocal_goto_handler_slots = nonlocal_goto_handler_slots; - p->nonlocal_goto_handler_labels = nonlocal_goto_handler_labels; - p->nonlocal_goto_stack_level = nonlocal_goto_stack_level; - p->nonlocal_labels = nonlocal_labels; - p->cleanup_label = cleanup_label; - p->return_label = return_label; - p->save_expr_regs = save_expr_regs; - p->stack_slot_list = stack_slot_list; - p->parm_birth_insn = parm_birth_insn; - p->frame_offset = frame_offset; - p->tail_recursion_label = tail_recursion_label; - p->tail_recursion_reentry = tail_recursion_reentry; - p->arg_pointer_save_area = arg_pointer_save_area; - p->rtl_expr_chain = rtl_expr_chain; - p->last_parm_insn = last_parm_insn; - p->context_display = context_display; - p->trampoline_list = trampoline_list; - p->function_call_count = function_call_count; - p->temp_slots = temp_slots; - p->temp_slot_level = temp_slot_level; - p->target_temp_slot_level = target_temp_slot_level; - p->var_temp_slot_level = var_temp_slot_level; p->fixup_var_refs_queue = 0; - p->epilogue_delay_list = current_function_epilogue_delay_list; - p->args_info = current_function_args_info; - p->check_memory_usage = current_function_check_memory_usage; - p->instrument_entry_exit = current_function_instrument_entry_exit; save_tree_status (p, context); - save_storage_status (p); - save_emit_status (p); - save_expr_status (p); save_varasm_status (p, context); if (save_machine_status) (*save_machine_status) (p); @@ -657,66 +340,11 @@ pop_function_context_from (context) outer_function_chain = p->next; current_function_contains_functions - = p->contains_functions || p->inline_obstacks - || context == current_function_decl; - current_function_has_computed_jump = p->has_computed_jump; - current_function_name = p->name; + |= p->inline_obstacks || context == current_function_decl; current_function_decl = p->decl; - current_function_pops_args = p->pops_args; - current_function_returns_struct = p->returns_struct; - current_function_returns_pcc_struct = p->returns_pcc_struct; - current_function_returns_pointer = p->returns_pointer; - current_function_needs_context = p->needs_context; - current_function_calls_setjmp = p->calls_setjmp; - current_function_calls_longjmp = p->calls_longjmp; - current_function_calls_alloca = p->calls_alloca; - current_function_has_nonlocal_label = p->has_nonlocal_label; - current_function_has_nonlocal_goto = p->has_nonlocal_goto; - current_function_is_thunk = p->is_thunk; - current_function_args_size = p->args_size; - current_function_pretend_args_size = p->pretend_args_size; - current_function_arg_offset_rtx = p->arg_offset_rtx; - current_function_varargs = p->varargs; - current_function_stdarg = p->stdarg; - current_function_uses_const_pool = p->uses_const_pool; - current_function_uses_pic_offset_table = p->uses_pic_offset_table; - current_function_internal_arg_pointer = p->internal_arg_pointer; - current_function_cannot_inline = p->cannot_inline; - max_parm_reg = p->max_parm_reg; - parm_reg_stack_loc = p->parm_reg_stack_loc; - current_function_outgoing_args_size = p->outgoing_args_size; - current_function_return_rtx = p->return_rtx; - nonlocal_goto_handler_slots = p->nonlocal_goto_handler_slots; - nonlocal_goto_handler_labels = p->nonlocal_goto_handler_labels; - nonlocal_goto_stack_level = p->nonlocal_goto_stack_level; - nonlocal_labels = p->nonlocal_labels; - cleanup_label = p->cleanup_label; - return_label = p->return_label; - save_expr_regs = p->save_expr_regs; - stack_slot_list = p->stack_slot_list; - parm_birth_insn = p->parm_birth_insn; - frame_offset = p->frame_offset; - tail_recursion_label = p->tail_recursion_label; - tail_recursion_reentry = p->tail_recursion_reentry; - arg_pointer_save_area = p->arg_pointer_save_area; - rtl_expr_chain = p->rtl_expr_chain; - last_parm_insn = p->last_parm_insn; - context_display = p->context_display; - trampoline_list = p->trampoline_list; - function_call_count = p->function_call_count; - temp_slots = p->temp_slots; - temp_slot_level = p->temp_slot_level; - target_temp_slot_level = p->target_temp_slot_level; - var_temp_slot_level = p->var_temp_slot_level; - current_function_epilogue_delay_list = p->epilogue_delay_list; reg_renumber = 0; - current_function_args_info = p->args_info; - current_function_check_memory_usage = p->check_memory_usage; - current_function_instrument_entry_exit = p->instrument_entry_exit; restore_tree_status (p, context); - restore_storage_status (p); - restore_expr_status (p); restore_emit_status (p); restore_varasm_status (p); @@ -741,20 +369,31 @@ void pop_function_context () /* Allocate fixed slots in the stack frame of the current function. */ -/* Return size needed for stack frame based on slots so far allocated. +/* Return size needed for stack frame based on slots so far allocated in + function F. This size counts from zero. It is not rounded to PREFERRED_STACK_BOUNDARY; the caller may have to do that. */ HOST_WIDE_INT -get_frame_size () +get_func_frame_size (f) + struct function *f; { #ifdef FRAME_GROWS_DOWNWARD - return -frame_offset; + return -f->x_frame_offset; #else - return frame_offset; + return f->x_frame_offset; #endif } +/* Return size needed for stack frame based on slots so far allocated. + This size counts from zero. It is not rounded to PREFERRED_STACK_BOUNDARY; + the caller may have to do that. */ +HOST_WIDE_INT +get_frame_size () +{ + return get_func_frame_size (current_function); +} + /* Allocate a stack slot of SIZE bytes and return a MEM rtx for it with machine mode MODE. @@ -885,14 +524,14 @@ assign_outer_stack_local (mode, size, align, function) alignment = align / BITS_PER_UNIT; #ifdef FRAME_GROWS_DOWNWARD - function->frame_offset -= size; + function->x_frame_offset -= size; #endif /* Round frame offset to that alignment. */ #ifdef FRAME_GROWS_DOWNWARD - function->frame_offset = FLOOR_ROUND (function->frame_offset, alignment); + function->x_frame_offset = FLOOR_ROUND (function->x_frame_offset, alignment); #else - function->frame_offset = CEIL_ROUND (function->frame_offset, alignment); + function->x_frame_offset = CEIL_ROUND (function->x_frame_offset, alignment); #endif /* On a big-endian machine, if we are allocating more space than we will use, @@ -901,15 +540,15 @@ assign_outer_stack_local (mode, size, align, function) bigend_correction = size - GET_MODE_SIZE (mode); addr = plus_constant (virtual_stack_vars_rtx, - function->frame_offset + bigend_correction); + function->x_frame_offset + bigend_correction); #ifndef FRAME_GROWS_DOWNWARD - function->frame_offset += size; + function->x_frame_offset += size; #endif x = gen_rtx_MEM (mode, addr); - function->stack_slot_list - = gen_rtx_EXPR_LIST (VOIDmode, x, function->stack_slot_list); + function->x_stack_slot_list + = gen_rtx_EXPR_LIST (VOIDmode, x, function->x_stack_slot_list); pop_obstacks (); @@ -1079,7 +718,7 @@ assign_stack_temp_for_type (mode, size, keep, type) p->in_use = 1; p->addr_taken = 0; - p->rtl_expr = sequence_rtl_expr; + p->rtl_expr = seq_rtl_expr; if (keep == 2) { @@ -1693,8 +1332,8 @@ put_reg_into_stack (function, reg, type, promoted_mode, decl_mode, volatile_p, if (function) { - if (regno < function->max_parm_reg) - new = function->parm_reg_stack_loc[regno]; + if (regno < function->x_max_parm_reg) + new = function->x_parm_reg_stack_loc[regno]; if (new == 0) new = assign_outer_stack_local (decl_mode, GET_MODE_SIZE (decl_mode), 0, function); @@ -1758,7 +1397,7 @@ fixup_var_refs (var, promoted_mode, unsignedp, ht) { tree pending; rtx first_insn = get_insns (); - struct sequence_stack *stack = sequence_stack; + struct sequence_stack *stack = seq_stack; tree rtl_exps = rtl_expr_chain; /* Must scan all insns for stack-refs that exceed the limit. */ @@ -5584,11 +5223,11 @@ fix_lexical_addr (addr, var) #ifdef NEED_SEPARATE_AP rtx addr; - if (fp->arg_pointer_save_area == 0) - fp->arg_pointer_save_area + if (fp->x_arg_pointer_save_area == 0) + fp->x_arg_pointer_save_area = assign_outer_stack_local (Pmode, GET_MODE_SIZE (Pmode), 0, fp); - addr = fix_lexical_addr (XEXP (fp->arg_pointer_save_area, 0), var); + addr = fix_lexical_addr (XEXP (fp->x_arg_pointer_save_area, 0), var); addr = memory_address (Pmode, addr); base = copy_to_reg (gen_rtx_MEM (Pmode, addr)); @@ -5641,7 +5280,7 @@ trampoline_address (function) round_trampoline_addr (XEXP (RTL_EXPR_RTL (TREE_VALUE (link)), 0)); for (fp = outer_function_chain; fp; fp = fp->next) - for (link = fp->trampoline_list; link; link = TREE_CHAIN (link)) + for (link = fp->x_trampoline_list; link; link = TREE_CHAIN (link)) if (TREE_PURPOSE (link) == function) { tramp = fix_lexical_addr (XEXP (RTL_EXPR_RTL (TREE_VALUE (link)), 0), @@ -5687,7 +5326,8 @@ trampoline_address (function) fp->function_maybepermanent_obstack); rtlexp = make_node (RTL_EXPR); RTL_EXPR_RTL (rtlexp) = tramp; - fp->trampoline_list = tree_cons (function, rtlexp, fp->trampoline_list); + fp->x_trampoline_list = tree_cons (function, rtlexp, + fp->x_trampoline_list); pop_obstacks (); } else @@ -5949,6 +5589,8 @@ prepare_function_start () current_function_uses_pic_offset_table = 0; current_function_cannot_inline = 0; + current_function->inlinable = 0; + /* We have not yet needed to make a label to jump to for tail-recursion. */ tail_recursion_label = 0; @@ -6054,7 +5696,14 @@ init_function_start (subr, filename, line) current_function_returns_pointer = POINTER_TYPE_P (TREE_TYPE (DECL_RESULT (subr))); +} +/* Make sure all values used by the optimization passes have sane + defaults. */ +void +init_function_for_compilation () +{ + reg_renumber = 0; /* No prologue/epilogue insns yet. */ prologue = epilogue = 0; } @@ -6343,6 +5992,19 @@ expand_function_start (subr, parms_have_cleanups) force_next_line_note (); } +/* Undo the effects of init_dummy_function_start. */ +void +expand_dummy_function_end () +{ + /* End any sequences that failed to be closed due to syntax errors. */ + while (in_sequence_p ()) + end_sequence (); + + /* Outside function body, can't compute type's actual size + until next function's body starts. */ + current_function = 0; +} + /* Generate RTL for the end of the current function. FILENAME and LINE are the current position in the source file. @@ -6362,6 +6024,8 @@ expand_function_end (filename, line, end_bindings) static rtx initial_trampoline; #endif + finish_expr_for_function (); + #ifdef NON_SAVING_SETJMP /* Don't put any variables in registers if we call setjmp on a machine that fails to restore the registers. */ diff --git a/gcc/function.h b/gcc/function.h index 3d3943a..49cbe59 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -59,6 +59,117 @@ struct simple_obstack_stack struct simple_obstack_stack *next; }; +struct emit_status +{ + /* This is reset to LAST_VIRTUAL_REGISTER + 1 at the start of each function. + After rtl generation, it is 1 plus the largest register number used. */ + int x_reg_rtx_no; + + /* Lowest label number in current function. */ + int x_first_label_num; + + /* The ends of the doubly-linked chain of rtl for the current function. + Both are reset to null at the start of rtl generation for the function. + + start_sequence saves both of these on `sequence_stack' along with + `sequence_rtl_expr' and then starts a new, nested sequence of insns. */ + rtx x_first_insn; + rtx x_last_insn; + + /* RTL_EXPR within which the current sequence will be placed. Use to + prevent reuse of any temporaries within the sequence until after the + RTL_EXPR is emitted. */ + tree sequence_rtl_expr; + + /* Stack of pending (incomplete) sequences saved by `start_sequence'. + Each element describes one pending sequence. + The main insn-chain is saved in the last element of the chain, + unless the chain is empty. */ + struct sequence_stack *sequence_stack; + + /* INSN_UID for next insn emitted. + Reset to 1 for each function compiled. */ + int x_cur_insn_uid; + + /* Line number and source file of the last line-number NOTE emitted. + This is used to avoid generating duplicates. */ + int x_last_linenum; + char *x_last_filename; + + /* A vector indexed by pseudo reg number. The allocated length + of this vector is regno_pointer_flag_length. Since this + vector is needed during the expansion phase when the total + number of registers in the function is not yet known, + it is copied and made bigger when necessary. */ + char *regno_pointer_flag; + int regno_pointer_flag_length; + + /* Indexed by pseudo register number, if nonzero gives the known alignment + for that pseudo (if regno_pointer_flag is set). + Allocated in parallel with regno_pointer_flag. */ + char *regno_pointer_align; + + /* Indexed by pseudo register number, gives the rtx for that pseudo. + Allocated in parallel with regno_pointer_flag. */ + rtx *x_regno_reg_rtx; +}; + +/* For backward compatibility... eventually these should all go away. */ +#define reg_rtx_no (current_function->emit->x_reg_rtx_no) +#define seq_rtl_expr (current_function->emit->sequence_rtl_expr) +#define regno_reg_rtx (current_function->emit->x_regno_reg_rtx) +#define seq_stack (current_function->emit->sequence_stack) + +#define REGNO_POINTER_ALIGN(REGNO) \ + (current_function->emit->regno_pointer_align[REGNO]) +#define REGNO_POINTER_FLAG(REGNO) \ + (current_function->emit->regno_pointer_flag[REGNO]) + +struct expr_status +{ + /* Number of units that we should eventually pop off the stack. + These are the arguments to function calls that have already returned. */ + int x_pending_stack_adjust; + + /* Under some ABIs, it is the caller's responsibility to pop arguments + pushed for function calls. A naive implementation would simply pop + the arguments immediately after each call. However, if several + function calls are made in a row, it is typically cheaper to pop + all the arguments after all of the calls are complete since a + single pop instruction can be used. Therefore, GCC attempts to + defer popping the arguments until absolutely necessary. (For + example, at the end of a conditional, the arguments must be popped, + since code outside the conditional won't know whether or not the + arguments need to be popped.) + + When INHIBIT_DEFER_POP is non-zero, however, the compiler does not + attempt to defer pops. Instead, the stack is popped immediately + after each call. Rather then setting this variable directly, use + NO_DEFER_POP and OK_DEFER_POP. */ + int x_inhibit_defer_pop; + + /* Nonzero means __builtin_saveregs has already been done in this function. + The value is the pseudoreg containing the value __builtin_saveregs + returned. */ + rtx x_saveregs_value; + + /* Similarly for __builtin_apply_args. */ + rtx x_apply_args_value; + + /* List of labels that must never be deleted. */ + rtx x_forced_labels; + + /* Postincrements that still need to be expanded. */ + rtx x_pending_chain; +}; + +#define pending_stack_adjust (current_function->expr->x_pending_stack_adjust) +#define inhibit_defer_pop (current_function->expr->x_inhibit_defer_pop) +#define saveregs_value (current_function->expr->x_saveregs_value) +#define apply_args_value (current_function->expr->x_apply_args_value) +#define forced_labels (current_function->expr->x_forced_labels) +#define pending_chain (current_function->expr->x_pending_chain) + /* This structure can save all the important global and static variables describing the status of the current function. */ @@ -69,93 +180,227 @@ struct function struct eh_status *eh; struct stmt_status *stmt; + struct expr_status *expr; + struct emit_status *emit; /* For function.c. */ + + /* Name of this function. */ char *name; + /* Points to the FUNCTION_DECL of this function. */ tree decl; + + /* Number of bytes of args popped by function being compiled on its return. + Zero if no bytes are to be popped. + May affect compilation of return insn or of function epilogue. */ int pops_args; + + /* Nonzero if function being compiled needs to be given an address + where the value should be stored. */ int returns_struct; + + /* Nonzero if function being compiled needs to + return the address of where it has put a structure value. */ int returns_pcc_struct; + + /* Nonzero if the current function returns a pointer type. */ int returns_pointer; + + /* Nonzero if function being compiled needs to be passed a static chain. */ int needs_context; + + /* Nonzero if function being compiled can call setjmp. */ int calls_setjmp; + + /* Nonzero if function being compiled can call longjmp. */ int calls_longjmp; + + /* Nonzero if function being compiled can call alloca, + either as a subroutine or builtin. */ int calls_alloca; + + /* Nonzero if function being compiled receives nonlocal gotos + from nested functions. */ + int has_nonlocal_label; + + /* Nonzero if function being compiled has nonlocal gotos to parent + function. */ int has_nonlocal_goto; + + /* Nonzero if function being compiled contains nested functions. */ int contains_functions; + + /* Nonzero if the function being compiled issues a computed jump. */ int has_computed_jump; + + /* Nonzero if the current function is a thunk (a lightweight function that + just adjusts one of its arguments and forwards to another function), so + we should try to cut corners where we can. */ int is_thunk; - rtx nonlocal_goto_handler_slots; - rtx nonlocal_goto_handler_labels; - rtx nonlocal_goto_stack_level; - tree nonlocal_labels; + + /* If function's args have a fixed size, this is that size, in bytes. + Otherwise, it is -1. + May affect compilation of return insn or of function epilogue. */ int args_size; + + /* # bytes the prologue should push and pretend that the caller pushed them. + The prologue must do this, but only if parms can be passed in + registers. */ int pretend_args_size; + + /* # of bytes of outgoing arguments. If ACCUMULATE_OUTGOING_ARGS is + defined, the needed space is pushed by the prologue. */ + int outgoing_args_size; + + /* This is the offset from the arg pointer to the place where the first + anonymous arg can be found, if there is one. */ rtx arg_offset_rtx; + + /* Nonzero if current function uses varargs.h or equivalent. + Zero for functions that use stdarg.h. */ int varargs; + + /* Nonzero if current function uses stdarg.h or equivalent. + Zero for functions that use varargs.h. */ int stdarg; - int max_parm_reg; - rtx *parm_reg_stack_loc; - int outgoing_args_size; + + /* Quantities of various kinds of registers + used for the current function's args. */ + CUMULATIVE_ARGS args_info; + + /* If non-zero, an RTL expression for the location at which the current + function returns its result. If the current function returns its + result in a register, current_function_return_rtx will always be + the hard register containing the result. */ rtx return_rtx; - rtx cleanup_label; - rtx return_label; - rtx save_expr_regs; - rtx stack_slot_list; - rtx parm_birth_insn; - HOST_WIDE_INT frame_offset; - rtx tail_recursion_label; - rtx tail_recursion_reentry; + + /* The arg pointer hard register, or the pseudo into which it was copied. */ rtx internal_arg_pointer; + + /* Language-specific reason why the current function cannot be made + inline. */ char *cannot_inline; - rtx arg_pointer_save_area; - tree rtl_expr_chain; - rtx last_parm_insn; - tree context_display; - tree trampoline_list; - int function_call_count; - struct temp_slot *temp_slots; - int temp_slot_level; - int target_temp_slot_level; - int var_temp_slot_level; + + /* Nonzero if instrumentation calls for function entry and exit should be + generated. */ int instrument_entry_exit; - /* This slot is initialized as 0 and is added to - during the nested function. */ - struct var_refs_queue *fixup_var_refs_queue; - CUMULATIVE_ARGS args_info; - /* For expr.c. */ - rtx pending_chain; - int pending_stack_adjust; - int inhibit_defer_pop; - rtx saveregs_value; - rtx apply_args_value; - rtx forced_labels; + /* Nonzero if memory access checking be enabled in the current function. */ int check_memory_usage; - /* For emit-rtl.c. */ - int reg_rtx_no; - int first_label_num; - rtx first_insn; - rtx last_insn; - tree sequence_rtl_expr; - struct sequence_stack *sequence_stack; - int cur_insn_uid; - int last_linenum; - char *last_filename; - char *regno_pointer_flag; - char *regno_pointer_align; - int regno_pointer_flag_length; - rtx *regno_reg_rtx; - - /* For stor-layout.c. */ - tree permanent_type_chain; - tree temporary_type_chain; - tree permanent_type_end; - tree temporary_type_end; - tree pending_sizes; - int immediate_size_expand; + /* Number of function calls seen so far in current function. */ + int x_function_call_count; + + /* List (chain of TREE_LIST) of LABEL_DECLs for all nonlocal labels + (labels to which there can be nonlocal gotos from nested functions) + in this function. */ + tree x_nonlocal_labels; + + /* List (chain of EXPR_LIST) of stack slots that hold the current handlers + for nonlocal gotos. There is one for every nonlocal label in the + function; this list matches the one in nonlocal_labels. + Zero when function does not have nonlocal labels. */ + rtx x_nonlocal_goto_handler_slots; + + /* List (chain of EXPR_LIST) of labels heading the current handlers for + nonlocal gotos. */ + rtx x_nonlocal_goto_handler_labels; + + /* RTX for stack slot that holds the stack pointer value to restore + for a nonlocal goto. + Zero when function does not have nonlocal labels. */ + rtx x_nonlocal_goto_stack_level; + + /* Label that will go on parm cleanup code, if any. + Jumping to this label runs cleanup code for parameters, if + such code must be run. Following this code is the logical return + label. */ + rtx x_cleanup_label; + + /* Label that will go on function epilogue. + Jumping to this label serves as a "return" instruction + on machines which require execution of the epilogue on all returns. */ + rtx x_return_label; + + /* List (chain of EXPR_LISTs) of pseudo-regs of SAVE_EXPRs. + So we can mark them all live at the end of the function, if nonopt. */ + rtx x_save_expr_regs; + + /* List (chain of EXPR_LISTs) of all stack slots in this function. + Made for the sake of unshare_all_rtl. */ + rtx x_stack_slot_list; + + /* Chain of all RTL_EXPRs that have insns in them. */ + tree x_rtl_expr_chain; + + /* Label to jump back to for tail recursion, or 0 if we have + not yet needed one for this function. */ + rtx x_tail_recursion_label; + + /* Place after which to insert the tail_recursion_label if we need one. */ + rtx x_tail_recursion_reentry; + + /* Location at which to save the argument pointer if it will need to be + referenced. There are two cases where this is done: if nonlocal gotos + exist, or if vars stored at an offset from the argument pointer will be + needed by inner routines. */ + rtx x_arg_pointer_save_area; + + /* Offset to end of allocated area of stack frame. + If stack grows down, this is the address of the last stack slot allocated. + If stack grows up, this is the address for the next slot. */ + HOST_WIDE_INT x_frame_offset; + + /* List (chain of TREE_LISTs) of static chains for containing functions. + Each link has a FUNCTION_DECL in the TREE_PURPOSE and a reg rtx + in an RTL_EXPR in the TREE_VALUE. */ + tree x_context_display; + + /* List (chain of TREE_LISTs) of trampolines for nested functions. + The trampoline sets up the static chain and jumps to the function. + We supply the trampoline's address when the function's address is + requested. + + Each link has a FUNCTION_DECL in the TREE_PURPOSE and a reg rtx + in an RTL_EXPR in the TREE_VALUE. */ + tree x_trampoline_list; + + /* Insn after which register parms and SAVE_EXPRs are born, if nonopt. */ + rtx x_parm_birth_insn; + + /* Last insn of those whose job was to put parms into their nominal + homes. */ + rtx x_last_parm_insn; + + /* 1 + last pseudo register number possibly used for loading a copy + of a parameter of this function. */ + int x_max_parm_reg; + + /* Vector indexed by REGNO, containing location on stack in which + to put the parm which is nominally in pseudo register REGNO, + if we discover that that parm must go in the stack. The highest + element in this vector is one less than MAX_PARM_REG, above. */ + rtx *x_parm_reg_stack_loc; + + /* List of all temporaries allocated, both available and in use. */ + struct temp_slot *x_temp_slots; + + /* Current nesting level for temporaries. */ + int x_temp_slot_level; + + /* Current nesting level for variables in a block. */ + int x_var_temp_slot_level; + + /* When temporaries are created by TARGET_EXPRs, they are created at + this level of temp_slot_level, so that they can remain allocated + until no longer needed. CLEANUP_POINT_EXPRs define the lifetime + of TARGET_EXPRs. */ + int x_target_temp_slot_level; + + /* This slot is initialized as 0 and is added to + during the nested function. */ + struct var_refs_queue *fixup_var_refs_queue; /* For tree.c. */ int all_types_permanent; @@ -172,15 +417,33 @@ struct function struct obstack *rtl_obstack; struct simple_obstack_stack *inline_obstacks; - /* For integrate.c. */ + /* For integrate.c. We duplicate some of the fields so that + save_for_inline_copying can keep two versions. */ + int inlinable; + struct emit_status *inl_emit; + /* This is in fact an rtvec. */ + void *original_arg_vector; + tree original_decl_initial; + /* Last insn of those whose job was to put parms into their nominal + homes. */ + rtx inl_last_parm_insn; + /* Highest label number in current function. */ + int inl_max_label_num; + + /* Nonzero if the current function uses the constant pool. */ int uses_const_pool; /* For md files. */ + + /* Nonzero if the current function uses pic_offset_table_rtx. */ int uses_pic_offset_table; /* tm.h can use this to store whatever it likes. */ struct machine_function *machine; /* For reorg. */ + + /* If some insns can be deferred to the delay slots of the epilogue, the + delay list for them is recorded here. */ rtx epilogue_delay_list; /* For varasm. */ @@ -194,47 +457,65 @@ struct function extern struct function *current_function; extern struct function *all_functions; +/* For backward compatibility... eventually these should all go away. */ +#define current_function_name (current_function->name) +#define current_function_pops_args (current_function->pops_args) +#define current_function_returns_struct (current_function->returns_struct) +#define current_function_returns_pcc_struct (current_function->returns_pcc_struct) +#define current_function_returns_pointer (current_function->returns_pointer) +#define current_function_needs_context (current_function->needs_context) +#define current_function_calls_setjmp (current_function->calls_setjmp) +#define current_function_calls_alloca (current_function->calls_alloca) +#define current_function_calls_longjmp (current_function->calls_longjmp) +#define current_function_has_computed_jump (current_function->has_computed_jump) +#define current_function_contains_functions (current_function->contains_functions) +#define current_function_is_thunk (current_function->is_thunk) +#define current_function_args_info (current_function->args_info) +#define current_function_args_size (current_function->args_size) +#define current_function_pretend_args_size (current_function->pretend_args_size) +#define current_function_outgoing_args_size (current_function->outgoing_args_size) +#define current_function_arg_offset_rtx (current_function->arg_offset_rtx) +#define current_function_varargs (current_function->varargs) +#define current_function_stdarg (current_function->stdarg) +#define current_function_internal_arg_pointer (current_function->internal_arg_pointer) +#define current_function_return_rtx (current_function->return_rtx) +#define current_function_instrument_entry_exit (current_function->instrument_entry_exit) +#define current_function_check_memory_usage (current_function->check_memory_usage) +#define current_function_uses_pic_offset_table (current_function->uses_pic_offset_table) +#define current_function_uses_const_pool (current_function->uses_const_pool) +#define current_function_cannot_inline (current_function->cannot_inline) +#define current_function_epilogue_delay_list (current_function->epilogue_delay_list) +#define current_function_has_nonlocal_label (current_function->has_nonlocal_label) +#define current_function_has_nonlocal_goto (current_function->has_nonlocal_goto) + +#define max_parm_reg (current_function->x_max_parm_reg) +#define parm_reg_stack_loc (current_function->x_parm_reg_stack_loc) +#define cleanup_label (current_function->x_cleanup_label) +#define return_label (current_function->x_return_label) +#define save_expr_regs (current_function->x_save_expr_regs) +#define stack_slot_list (current_function->x_stack_slot_list) +#define parm_birth_insn (current_function->x_parm_birth_insn) +#define frame_offset (current_function->x_frame_offset) +#define tail_recursion_label (current_function->x_tail_recursion_label) +#define tail_recursion_reentry (current_function->x_tail_recursion_reentry) +#define arg_pointer_save_area (current_function->x_arg_pointer_save_area) +#define rtl_expr_chain (current_function->x_rtl_expr_chain) +#define last_parm_insn (current_function->x_last_parm_insn) +#define context_display (current_function->x_context_display) +#define trampoline_list (current_function->x_trampoline_list) +#define function_call_count (current_function->x_function_call_count) +#define temp_slots (current_function->x_temp_slots) +#define temp_slot_level (current_function->x_temp_slot_level) +#define target_temp_slot_level (current_function->x_target_temp_slot_level) +#define var_temp_slot_level (current_function->x_var_temp_slot_level) +#define nonlocal_labels (current_function->x_nonlocal_labels) +#define nonlocal_goto_handler_slots (current_function->x_nonlocal_goto_handler_slots) +#define nonlocal_goto_handler_labels (current_function->x_nonlocal_goto_handler_labels) +#define nonlocal_goto_stack_level (current_function->x_nonlocal_goto_stack_level) + /* The FUNCTION_DECL for an inline function currently being expanded. */ extern tree inline_function_decl; -/* Label that will go on parm cleanup code, if any. - Jumping to this label runs cleanup code for parameters, if - such code must be run. Following this code is the logical return label. */ - -extern rtx cleanup_label; - -/* Label that will go on function epilogue. - Jumping to this label serves as a "return" instruction - on machines which require execution of the epilogue on all returns. */ - -extern rtx return_label; - -/* Offset to end of allocated area of stack frame. - If stack grows down, this is the address of the last stack slot allocated. - If stack grows up, this is the address for the next slot. */ -extern HOST_WIDE_INT frame_offset; - -/* Label to jump back to for tail recursion, or 0 if we have - not yet needed one for this function. */ -extern rtx tail_recursion_label; - -/* Place after which to insert the tail_recursion_label if we need one. */ -extern rtx tail_recursion_reentry; - -/* Location at which to save the argument pointer if it will need to be - referenced. There are two cases where this is done: if nonlocal gotos - exist, or if vars whose is an offset from the argument pointer will be - needed by inner routines. */ - -extern rtx arg_pointer_save_area; - -/* Chain of all RTL_EXPRs that have insns in them. */ -extern tree rtl_expr_chain; - -/* List (chain of EXPR_LISTs) of all stack slots in this function. - Made for the sake of unshare_all_rtl. */ -extern rtx stack_slot_list; - /* Given a function decl for a containing function, return the `struct function' for it. */ struct function *find_function_data PROTO((tree)); @@ -251,6 +532,8 @@ extern tree *identify_blocks PROTO((tree, rtx)); This size counts from zero. It is not rounded to STACK_BOUNDARY; the caller may have to do that. */ extern HOST_WIDE_INT get_frame_size PROTO((void)); +/* Likewise, but for a different than the current function. */ +extern HOST_WIDE_INT get_func_frame_size PROTO((struct function *)); /* These variables hold pointers to functions to save and restore machine-specific data, @@ -263,15 +546,12 @@ extern void save_tree_status PROTO((struct function *, tree)); extern void restore_tree_status PROTO((struct function *, tree)); extern void save_varasm_status PROTO((struct function *, tree)); extern void restore_varasm_status PROTO((struct function *)); -extern void save_expr_status PROTO((struct function *)); -extern void restore_expr_status PROTO((struct function *)); -extern void save_emit_status PROTO((struct function *)); extern void restore_emit_status PROTO((struct function *)); -extern void save_storage_status PROTO((struct function *)); -extern void restore_storage_status PROTO((struct function *)); extern rtx get_first_block_beg PROTO((void)); +extern void init_virtual_regs PROTO((struct emit_status *)); + #ifdef rtx #undef rtx #endif @@ -152,6 +152,7 @@ Boston, MA 02111-1307, USA. */ #include "recog.h" #include "basic-block.h" #include "output.h" +#include "function.h" #include "expr.h" #include "obstack.h" @@ -479,9 +480,6 @@ static int gcse_create_count; static int const_prop_count; /* Number of copys propagated. */ static int copy_prop_count; - -extern char *current_function_name; -extern int current_function_calls_setjmp; /* These variables are used by classic GCSE. Normally they'd be defined a bit later, but `rd_gen' needs to diff --git a/gcc/genemit.c b/gcc/genemit.c index c7daa1d..7744145 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -770,6 +770,7 @@ from the machine description file `md'. */\n\n"); printf ("#include \"config.h\"\n"); printf ("#include \"system.h\"\n"); printf ("#include \"rtl.h\"\n"); + printf ("#include \"function.h\"\n"); printf ("#include \"expr.h\"\n"); printf ("#include \"real.h\"\n"); printf ("#include \"flags.h\"\n"); diff --git a/gcc/genoutput.c b/gcc/genoutput.c index 2956ec6..8326383 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -215,6 +215,7 @@ from the machine description file `md'. */\n\n"); printf ("#include \"system.h\"\n"); printf ("#include \"flags.h\"\n"); printf ("#include \"rtl.h\"\n"); + printf ("#include \"function.h\"\n"); printf ("#include \"regs.h\"\n"); printf ("#include \"hard-reg-set.h\"\n"); printf ("#include \"real.h\"\n"); diff --git a/gcc/global.c b/gcc/global.c index 3a98f59..0c5b050 100644 --- a/gcc/global.c +++ b/gcc/global.c @@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "insn-config.h" #include "reload.h" #include "output.h" diff --git a/gcc/graph.c b/gcc/graph.c index f586314..3086e40 100644 --- a/gcc/graph.c +++ b/gcc/graph.c @@ -25,6 +25,7 @@ #include "rtl.h" #include "flags.h" #include "output.h" +#include "function.h" #include "hard-reg-set.h" #include "basic-block.h" #include "toplev.h" diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 60b340f..1341338 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -161,6 +161,7 @@ #include "rtl.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "hard-reg-set.h" #include "flags.h" #include "insn-config.h" @@ -494,9 +495,6 @@ static int *out_edges; #define IN_EDGES(block) (in_edges[block]) #define OUT_EDGES(block) (out_edges[block]) -/* List of labels which cannot be deleted, needed for control - flow graph construction. */ -extern rtx forced_labels; static int is_cfg_nonregular PROTO ((void)); diff --git a/gcc/integrate.c b/gcc/integrate.c index 33a96c4..9049ac0 100644 --- a/gcc/integrate.c +++ b/gcc/integrate.c @@ -60,8 +60,7 @@ extern struct obstack *function_maybepermanent_obstack; : (8 * (8 + list_length (DECL_ARGUMENTS (DECL))))) #endif -static rtx initialize_for_inline PROTO((tree, int, int, int, int)); -static void finish_inline PROTO((tree, rtx)); +static rtvec initialize_for_inline PROTO((tree, int)); static void adjust_copied_decl_tree PROTO((tree)); static tree copy_decl_list PROTO((tree)); static tree copy_decl_tree PROTO((tree)); @@ -256,10 +255,6 @@ static rtx *insn_map; Only reg numbers less than max_parm_reg are mapped here. */ static tree *parmdecl_map; -/* Keep track of first pseudo-register beyond those that are parms. */ -extern int max_parm_reg; -extern rtx *parm_reg_stack_loc; - /* When an insn is being copied by copy_for_inline, this is nonzero if we have copied an ASM_OPERANDS. In that case, it is the original input-operand vector. */ @@ -289,36 +284,15 @@ save_for_inline_eh_labelmap (label) /* Subroutine for `save_for_inline{copying,nocopy}'. Performs initialization needed to save FNDECL's insns and info for future inline expansion. */ -static rtx -initialize_for_inline (fndecl, min_labelno, max_labelno, max_reg, copy) +static rtvec +initialize_for_inline (fndecl, copy) tree fndecl; - int min_labelno; - int max_labelno; - int max_reg; int copy; { - int function_flags, i; + int i; rtvec arg_vector; tree parms; - /* Compute the values of any flags we must restore when inlining this. */ - - function_flags - = (current_function_calls_alloca * FUNCTION_FLAGS_CALLS_ALLOCA - + current_function_calls_setjmp * FUNCTION_FLAGS_CALLS_SETJMP - + current_function_calls_longjmp * FUNCTION_FLAGS_CALLS_LONGJMP - + current_function_returns_struct * FUNCTION_FLAGS_RETURNS_STRUCT - + (current_function_returns_pcc_struct - * FUNCTION_FLAGS_RETURNS_PCC_STRUCT) - + current_function_needs_context * FUNCTION_FLAGS_NEEDS_CONTEXT - + (current_function_has_nonlocal_label - * FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) - + current_function_returns_pointer * FUNCTION_FLAGS_RETURNS_POINTER - + current_function_uses_const_pool * FUNCTION_FLAGS_USES_CONST_POOL - + (current_function_uses_pic_offset_table - * FUNCTION_FLAGS_USES_PIC_OFFSET_TABLE) - + current_function_has_computed_jump * FUNCTION_FLAGS_HAS_COMPUTED_JUMP); - /* Clear out PARMDECL_MAP. It was allocated in the caller's frame. */ bzero ((char *) parmdecl_map, max_parm_reg * sizeof (tree)); arg_vector = rtvec_alloc (list_length (DECL_ARGUMENTS (fndecl))); @@ -393,54 +367,7 @@ initialize_for_inline (fndecl, min_labelno, max_labelno, max_reg, copy) } } - /* Assume we start out in the insns that set up the parameters. */ - in_nonparm_insns = 0; - - /* The list of DECL_SAVED_INSNS, starts off with a header which - contains the following information: - - the first insn of the function (not including the insns that copy - parameters into registers). - the first parameter insn of the function, - the first label used by that function, - the last label used by that function, - the highest register number used for parameters, - the total number of registers used, - the size of the incoming stack area for parameters, - the number of bytes popped on return, - the stack slot list, - the labels that are forced to exist, - some flags that are used to restore compiler globals, - the value of current_function_outgoing_args_size, - the original argument vector, - the original DECL_INITIAL, - and pointers to the table of pseudo regs, pointer flags, and alignment. */ - - return gen_inline_header_rtx (NULL_RTX, NULL_RTX, min_labelno, max_labelno, - max_parm_reg, max_reg, - current_function_args_size, - current_function_pops_args, - stack_slot_list, forced_labels, function_flags, - current_function_outgoing_args_size, - arg_vector, (rtx) DECL_INITIAL (fndecl), - (rtvec) regno_reg_rtx, regno_pointer_flag, - regno_pointer_align, - (rtvec) parm_reg_stack_loc); -} - -/* Subroutine for `save_for_inline{copying,nocopy}'. Finishes up the - things that must be done to make FNDECL expandable as an inline function. - HEAD contains the chain of insns to which FNDECL will expand. */ - -static void -finish_inline (fndecl, head) - tree fndecl; - rtx head; -{ - FIRST_FUNCTION_INSN (head) = get_first_nonparm_insn (); - FIRST_PARM_INSN (head) = get_insns (); - DECL_SAVED_INSNS (fndecl) = head; - DECL_FRAME_SIZE (fndecl) = get_frame_size (); + return arg_vector; } /* Adjust the BLOCK_END_NOTE pointers in a given copied DECL tree so that @@ -487,8 +414,8 @@ void save_for_inline_copying (fndecl) tree fndecl; { - rtx first_insn, last_insn, insn; - rtx head, copy; + rtvec argvec; + rtx new_first_insn, new_last_insn, insn; int max_labelno, min_labelno, i, len; int max_reg; int max_uid; @@ -496,6 +423,8 @@ save_for_inline_copying (fndecl) char *new, *new1; rtx *new_parm_reg_stack_loc; rtx *new2; + struct emit_status *es + = (struct emit_status *) xmalloc (sizeof (struct emit_status)); /* Make and emit a return-label if we have not already done so. Do this before recording the bounds on label numbers. */ @@ -506,6 +435,8 @@ save_for_inline_copying (fndecl) emit_label (return_label); } + *es = *current_function->emit; + /* Get some bounds on the labels and registers used. */ max_labelno = max_label_num (); @@ -520,7 +451,7 @@ save_for_inline_copying (fndecl) parmdecl_map = (tree *) alloca (max_parm_reg * sizeof (tree)); - head = initialize_for_inline (fndecl, min_labelno, max_labelno, max_reg, 1); + argvec = initialize_for_inline (fndecl, 1); if (current_function_uses_const_pool) { @@ -544,7 +475,7 @@ save_for_inline_copying (fndecl) clear_const_double_mem (); } - max_uid = INSN_UID (head); + max_uid = get_max_uid (); /* We have now allocated all that needs to be allocated permanently on the rtx obstack. Set our high-water mark, so that we @@ -565,29 +496,29 @@ save_for_inline_copying (fndecl) insn = get_insns (); if (GET_CODE (insn) != NOTE) abort (); - first_insn = rtx_alloc (NOTE); - NOTE_SOURCE_FILE (first_insn) = NOTE_SOURCE_FILE (insn); - NOTE_LINE_NUMBER (first_insn) = NOTE_LINE_NUMBER (insn); - INSN_UID (first_insn) = INSN_UID (insn); - PREV_INSN (first_insn) = NULL; - NEXT_INSN (first_insn) = NULL; - last_insn = first_insn; + new_first_insn = rtx_alloc (NOTE); + NOTE_SOURCE_FILE (new_first_insn) = NOTE_SOURCE_FILE (insn); + NOTE_LINE_NUMBER (new_first_insn) = NOTE_LINE_NUMBER (insn); + INSN_UID (new_first_insn) = INSN_UID (insn); + PREV_INSN (new_first_insn) = NULL; + NEXT_INSN (new_first_insn) = NULL; + new_last_insn = new_first_insn; /* Each pseudo-reg in the old insn chain must have a unique rtx in the copy. Make these new rtx's now, and install them in regno_reg_rtx, so they will be the official pseudo-reg rtx's for the rest of compilation. */ - reg_map = (rtx *) savealloc (regno_pointer_flag_length * sizeof (rtx)); + reg_map = (rtx *) savealloc (es->regno_pointer_flag_length * sizeof (rtx)); len = sizeof (struct rtx_def) + (GET_RTX_LENGTH (REG) - 1) * sizeof (rtunion); for (i = max_reg - 1; i > LAST_VIRTUAL_REGISTER; i--) reg_map[i] = (rtx)obstack_copy (function_maybepermanent_obstack, regno_reg_rtx[i], len); - regno_reg_rtx = reg_map; + es->x_regno_reg_rtx = reg_map; /* Put copies of all the virtual register rtx into the new regno_reg_rtx. */ - init_virtual_regs (); + init_virtual_regs (es); /* Likewise each label rtx must have a unique rtx as its copy. */ @@ -663,6 +594,7 @@ save_for_inline_copying (fndecl) for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn)) { + rtx copy; orig_asm_operands_vector = 0; if (insn == first_nonparm_insn) @@ -732,9 +664,9 @@ save_for_inline_copying (fndecl) } INSN_UID (copy) = INSN_UID (insn); insn_map[INSN_UID (insn)] = copy; - NEXT_INSN (last_insn) = copy; - PREV_INSN (copy) = last_insn; - last_insn = copy; + NEXT_INSN (new_last_insn) = copy; + PREV_INSN (copy) = new_last_insn; + new_last_insn = copy; } adjust_copied_decl_tree (DECL_INITIAL (fndecl)); @@ -746,23 +678,28 @@ save_for_inline_copying (fndecl) REG_NOTES (insn_map[INSN_UID (insn)]) = copy_for_inline (REG_NOTES (insn)); - NEXT_INSN (last_insn) = NULL; - - finish_inline (fndecl, head); + NEXT_INSN (new_last_insn) = NULL; /* Make new versions of the register tables. */ - new = (char *) savealloc (regno_pointer_flag_length); - bcopy (regno_pointer_flag, new, regno_pointer_flag_length); - new1 = (char *) savealloc (regno_pointer_flag_length); - bcopy (regno_pointer_align, new1, regno_pointer_flag_length); - - regno_pointer_flag = new; - regno_pointer_align = new1; - - set_new_first_and_last_insn (first_insn, last_insn); - - if (label_map) - free (label_map); + new = (char *) savealloc (es->regno_pointer_flag_length); + memcpy (new, es->regno_pointer_flag, es->regno_pointer_flag_length); + new1 = (char *) savealloc (es->regno_pointer_flag_length); + memcpy (new1, es->regno_pointer_align, es->regno_pointer_flag_length); + es->regno_pointer_flag = new; + es->regno_pointer_align = new1; + + free (label_map); + + current_function->inl_max_label_num = max_label_num (); + current_function->inl_last_parm_insn = current_function->x_last_parm_insn; + current_function->original_arg_vector = argvec; + current_function->original_decl_initial = DECL_INITIAL (fndecl); + /* Use the copy we made for compiling the function now, and + use the original values for inlining. */ + current_function->inl_emit = current_function->emit; + current_function->emit = es; + set_new_first_and_last_insn (new_first_insn, new_last_insn); + DECL_SAVED_INSNS (fndecl) = current_function; } /* Copy NODE (as with copy_node). NODE must be a DECL. Set the @@ -885,7 +822,7 @@ save_for_inline_nocopy (fndecl) tree fndecl; { rtx insn; - rtx head; + rtvec argvec; rtx first_nonparm_insn; /* Set up PARMDECL_MAP which maps pseudo-reg number to its PARM_DECL. @@ -904,8 +841,7 @@ save_for_inline_nocopy (fndecl) emit_label (return_label); } - head = initialize_for_inline (fndecl, get_first_label_num (), - max_label_num (), max_reg_num (), 0); + argvec = initialize_for_inline (fndecl, 0); /* If there are insns that copy parms from the stack into pseudo registers, those insns are not copied. `expand_inline_function' must @@ -957,7 +893,12 @@ save_for_inline_nocopy (fndecl) preserve_data (); - finish_inline (fndecl, head); + current_function->inl_emit = current_function->emit; + current_function->inl_max_label_num = max_label_num (); + current_function->inl_last_parm_insn = current_function->x_last_parm_insn; + current_function->original_arg_vector = argvec; + current_function->original_decl_initial = DECL_INITIAL (fndecl); + DECL_SAVED_INSNS (fndecl) = current_function; } /* Given PX, a pointer into an insn, search for references to the constant @@ -1385,17 +1326,19 @@ expand_inline_function (fndecl, parms, target, ignore, type, tree type; rtx structure_value_addr; { + struct function *inl_f = DECL_SAVED_INSNS (fndecl); tree formal, actual, block; - rtx header = DECL_SAVED_INSNS (fndecl); - rtx insns = FIRST_FUNCTION_INSN (header); - rtx parm_insns = FIRST_PARM_INSN (header); + rtx parm_insns = inl_f->inl_emit->x_first_insn; + rtx insns = (inl_f->inl_last_parm_insn + ? NEXT_INSN (inl_f->inl_last_parm_insn) + : parm_insns); tree *arg_trees; rtx *arg_vals; rtx insn; int max_regno; register int i; - int min_labelno = FIRST_LABELNO (header); - int max_labelno = LAST_LABELNO (header); + int min_labelno = inl_f->inl_emit->x_first_label_num; + int max_labelno = inl_f->inl_max_label_num; int nargs; rtx local_return_label = 0; rtx loc; @@ -1405,15 +1348,16 @@ expand_inline_function (fndecl, parms, target, ignore, type, #ifdef HAVE_cc0 rtx cc0_insn = 0; #endif - rtvec arg_vector = ORIGINAL_ARG_VECTOR (header); + rtvec arg_vector = (rtvec) inl_f->original_arg_vector; rtx static_chain_value = 0; + int inl_max_uid; /* The pointer used to track the true location of the memory used for MAP->LABEL_MAP. */ rtx *real_label_map = 0; /* Allow for equivalences of the pseudos we make for virtual fp and ap. */ - max_regno = MAX_REGNUM (header) + 3; + max_regno = inl_f->inl_emit->x_reg_rtx_no + 3; if (max_regno < FIRST_PSEUDO_REGISTER) abort (); @@ -1556,10 +1500,11 @@ expand_inline_function (fndecl, parms, target, ignore, type, = (rtx *) xmalloc ((max_labelno) * sizeof (rtx)); map->label_map = real_label_map; - map->insn_map = (rtx *) alloca (INSN_UID (header) * sizeof (rtx)); - bzero ((char *) map->insn_map, INSN_UID (header) * sizeof (rtx)); + inl_max_uid = (inl_f->inl_emit->x_cur_insn_uid + 1); + map->insn_map = (rtx *) alloca (inl_max_uid * sizeof (rtx)); + bzero ((char *) map->insn_map, inl_max_uid * sizeof (rtx)); map->min_insnno = 0; - map->max_insnno = INSN_UID (header); + map->max_insnno = inl_max_uid; map->integrating = 1; @@ -1591,21 +1536,21 @@ expand_inline_function (fndecl, parms, target, ignore, type, if (map->insns_at_start == 0) map->insns_at_start = emit_note (NULL_PTR, NOTE_INSN_DELETED); - map->regno_pointer_flag = INLINE_REGNO_POINTER_FLAG (header); - map->regno_pointer_align = INLINE_REGNO_POINTER_ALIGN (header); + map->regno_pointer_flag = inl_f->inl_emit->regno_pointer_flag; + map->regno_pointer_align = inl_f->inl_emit->regno_pointer_align; /* Update the outgoing argument size to allow for those in the inlined function. */ - if (OUTGOING_ARGS_SIZE (header) > current_function_outgoing_args_size) - current_function_outgoing_args_size = OUTGOING_ARGS_SIZE (header); + if (inl_f->outgoing_args_size > current_function_outgoing_args_size) + current_function_outgoing_args_size = inl_f->outgoing_args_size; /* If the inline function needs to make PIC references, that means that this function's PIC offset table must be used. */ - if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_PIC_OFFSET_TABLE) + if (inl_f->uses_pic_offset_table) current_function_uses_pic_offset_table = 1; /* If this function needs a context, set it up. */ - if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT) + if (inl_f->needs_context) static_chain_value = lookup_static_chain (fndecl); if (GET_CODE (parm_insns) == NOTE @@ -1871,7 +1816,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, stack pointer around the call. This saves stack space, but also is required if this inline is being done between two pushes. */ - if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_ALLOCA) + if (inl_f->calls_alloca) emit_stack_save (SAVE_BLOCK, &stack_save, NULL_RTX); /* Now copy the insns one by one. Do this in two passes, first the insns and @@ -2134,7 +2079,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, emit_label (local_return_label); /* Restore the stack pointer if we saved it above. */ - if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_ALLOCA) + if (inl_f->calls_alloca) emit_stack_restore (SAVE_BLOCK, stack_save, NULL_RTX); /* Make copies of the decls of the symbols in the inline function, so that @@ -2144,7 +2089,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, inline_function_decl = fndecl; integrate_parm_decls (DECL_ARGUMENTS (fndecl), map, arg_vector); - integrate_decl_tree ((tree) ORIGINAL_DECL_INITIAL (header), 0, map); + integrate_decl_tree (inl_f->original_decl_initial, 0, map); inline_function_decl = 0; /* End the scope containing the copied formal parameter variables @@ -2363,7 +2308,7 @@ copy_rtx_and_substitute (orig, map) if (regno == VIRTUAL_STACK_VARS_REGNUM) { rtx loc, seq; - int size = DECL_FRAME_SIZE (map->fndecl); + int size = get_func_frame_size (DECL_SAVED_INSNS (map->fndecl)); #ifdef FRAME_GROWS_DOWNWARD /* In this case, virtual_stack_vars_rtx points to one byte @@ -2401,7 +2346,7 @@ copy_rtx_and_substitute (orig, map) /* Do the same for a block to contain any arguments referenced in memory. */ rtx loc, seq; - int size = FUNCTION_ARGS_SIZE (DECL_SAVED_INSNS (map->fndecl)); + int size = DECL_SAVED_INSNS (map->fndecl)->args_size; start_sequence (); loc = assign_stack_temp (BLKmode, size, 1); @@ -3374,81 +3319,19 @@ void output_inline_function (fndecl) tree fndecl; { - rtx head; + struct function *f = DECL_SAVED_INSNS (fndecl); rtx last; /* Things we allocate from here on are part of this function, not permanent. */ temporary_allocation (); - - head = DECL_SAVED_INSNS (fndecl); + current_function = f; current_function_decl = fndecl; - - /* This call is only used to initialize global variables. */ - init_function_start (fndecl, "lossage", 1); - - /* Redo parameter determinations in case the FUNCTION_... - macros took machine-specific actions that need to be redone. */ - assign_parms (fndecl, 1); - - /* Set stack frame size. */ - assign_stack_local (BLKmode, DECL_FRAME_SIZE (fndecl), 0); - - /* The first is a bit of a lie (the array may be larger), but doesn't - matter too much and it isn't worth saving the actual bound. */ - reg_rtx_no = regno_pointer_flag_length = MAX_REGNUM (head); - regno_reg_rtx = (rtx *) INLINE_REGNO_REG_RTX (head); - regno_pointer_flag = INLINE_REGNO_POINTER_FLAG (head); - regno_pointer_align = INLINE_REGNO_POINTER_ALIGN (head); - max_parm_reg = MAX_PARMREG (head); - parm_reg_stack_loc = (rtx *) PARMREG_STACK_LOC (head); - - stack_slot_list = STACK_SLOT_LIST (head); - forced_labels = FORCED_LABELS (head); - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_HAS_COMPUTED_JUMP) - current_function_has_computed_jump = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_CALLS_ALLOCA) - current_function_calls_alloca = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_CALLS_SETJMP) - current_function_calls_setjmp = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_CALLS_LONGJMP) - current_function_calls_longjmp = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_RETURNS_STRUCT) - current_function_returns_struct = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_RETURNS_PCC_STRUCT) - current_function_returns_pcc_struct = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_NEEDS_CONTEXT) - current_function_needs_context = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) - current_function_has_nonlocal_label = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_RETURNS_POINTER) - current_function_returns_pointer = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_USES_CONST_POOL) - current_function_uses_const_pool = 1; - - if (FUNCTION_FLAGS (head) & FUNCTION_FLAGS_USES_PIC_OFFSET_TABLE) - current_function_uses_pic_offset_table = 1; - - current_function_outgoing_args_size = OUTGOING_ARGS_SIZE (head); - current_function_pops_args = POPS_ARGS (head); - - /* This is the only thing the expand_function_end call that uses to be here - actually does and that call can cause problems. */ - immediate_size_expand--; + clear_emit_caches (); /* Find last insn and rebuild the constant pool. */ - for (last = FIRST_PARM_INSN (head); - NEXT_INSN (last); last = NEXT_INSN (last)) + init_const_rtx_hash_table (); + for (last = get_insns (); NEXT_INSN (last); last = NEXT_INSN (last)) { if (GET_RTX_CLASS (GET_CODE (last)) == 'i') { @@ -3457,8 +3340,7 @@ output_inline_function (fndecl) } } - set_new_first_and_last_insn (FIRST_PARM_INSN (head), last); - set_new_first_and_last_label_num (FIRST_LABELNO (head), LAST_LABELNO (head)); + set_new_last_label_num (f->inl_max_label_num); /* We must have already output DWARF debugging information for the original (abstract) inline function declaration/definition, so @@ -3475,10 +3357,12 @@ output_inline_function (fndecl) DECL_DEFER_OUTPUT (fndecl) = 0; /* We can't inline this anymore. */ + f->inlinable = 0; DECL_INLINE (fndecl) = 0; /* Compile this function all the way down to assembly code. */ rest_of_compilation (fndecl); + current_function = 0; current_function_decl = 0; } @@ -61,6 +61,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-flags.h" #include "insn-attr.h" #include "recog.h" +#include "function.h" #include "expr.h" #include "real.h" #include "except.h" @@ -89,10 +90,6 @@ Boston, MA 02111-1307, USA. */ static rtx *jump_chain; -/* List of labels referred to from initializers. - These can never be deleted. */ -rtx forced_labels; - /* Maximum index in jump_chain. */ static int max_jump_chain; diff --git a/gcc/local-alloc.c b/gcc/local-alloc.c index d1df595..9dccdaa 100644 --- a/gcc/local-alloc.c +++ b/gcc/local-alloc.c @@ -65,6 +65,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "hard-reg-set.h" #include "insn-config.h" #include "insn-attr.h" @@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "rtl.h" #include "obstack.h" +#include "function.h" #include "expr.h" #include "insn-config.h" #include "insn-flags.h" diff --git a/gcc/optabs.c b/gcc/optabs.c index 2b9091b..3765133 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "insn-flags.h" #include "insn-codes.h" +#include "function.h" #include "expr.h" #include "recog.h" #include "reload.h" diff --git a/gcc/output.h b/gcc/output.h index 8531085..1e88be5 100644 --- a/gcc/output.h +++ b/gcc/output.h @@ -341,48 +341,23 @@ extern int which_alternative; extern rtx final_sequence; #endif -/* Number of bytes of args popped by function being compiled on its return. - Zero if no bytes are to be popped. - May affect compilation of return insn or of function epilogue. */ - -extern int current_function_pops_args; - -/* Nonzero if function being compiled needs to be given an address - where the value should be stored. */ - -extern int current_function_returns_struct; - -/* Nonzero if function being compiled needs to - return the address of where it has put a structure value. */ - -extern int current_function_returns_pcc_struct; - -/* Nonzero if function being compiled needs to be passed a static chain. */ - -extern int current_function_needs_context; - -/* Nonzero if function being compiled can call setjmp. */ - -extern int current_function_calls_setjmp; - -/* Nonzero if function being compiled can call longjmp. */ - -extern int current_function_calls_longjmp; - -/* Nonzero if function being compiled can call alloca, - either as a subroutine or builtin. */ - -extern int current_function_calls_alloca; +/* Nonzero means generate position-independent code. + This is not fully implemented yet. */ -/* Nonzero if function being compiled receives nonlocal gotos - from nested functions. */ +extern int flag_pic; -extern int current_function_has_nonlocal_label; +/* The line number of the beginning of the current function. + sdbout.c needs this so that it can output relative linenumbers. */ -/* Nonzero if function being compiled contains nested functions. */ +#ifdef SDB_DEBUGGING_INFO /* Avoid undef sym in certain broken linkers. */ +extern int sdb_begin_function_line; +#endif -extern int current_function_contains_functions; +/* File in which assembler code is being written. */ +#ifdef BUFSIZ +extern FILE *asm_out_file; +#endif /* Nonzero if function being compiled doesn't contain any calls (ignoring the prologue and epilogue). This is set prior to local register allocation and is valid for the remaining @@ -402,90 +377,6 @@ extern int current_function_sp_is_unchanging; extern int current_function_uses_only_leaf_regs; -/* Nonzero if the function being compiled issues a computed jump. */ - -extern int current_function_has_computed_jump; - -/* Nonzero if the current function returns a pointer type */ - -extern int current_function_returns_pointer; - -/* If function's args have a fixed size, this is that size, in bytes. - Otherwise, it is -1. - May affect compilation of return insn or of function epilogue. */ - -extern int current_function_args_size; - -/* # bytes the prologue should push and pretend that the caller pushed them. - The prologue must do this, but only if parms can be passed in registers. */ - -extern int current_function_pretend_args_size; - -/* # of bytes of outgoing arguments required to be pushed by the prologue. - If this is non-zero, it means that ACCUMULATE_OUTGOING_ARGS was defined - and no stack adjusts will be done on function calls. */ - -extern int current_function_outgoing_args_size; - -/* Nonzero if current function uses varargs.h or equivalent. - Zero for functions that use stdarg.h. */ - -extern int current_function_varargs; - -/* Nonzero if current function uses stdarg.h or equivalent. - Zero for functions that use varargs.h. */ - -extern int current_function_stdarg; - -/* Quantities of various kinds of registers - used for the current function's args. */ - -extern CUMULATIVE_ARGS current_function_args_info; - -/* Name of function now being compiled. */ - -extern char *current_function_name; - -#ifdef RTX_CODE -/* If non-zero, an RTL expression for that location at which the current - function returns its result. Usually equal to - DECL_RTL (DECL_RESULT (current_function_decl)). */ - -extern rtx current_function_return_rtx; - -/* If some insns can be deferred to the delay slots of the epilogue, the - delay list for them is recorded here. */ - -extern rtx current_function_epilogue_delay_list; -#endif - -/* Nonzero means generate position-independent code. - This is not fully implemented yet. */ - -extern int flag_pic; - -/* This is nonzero if the current function uses pic_offset_table_rtx. */ -extern int current_function_uses_pic_offset_table; - -/* This is nonzero if the current function uses the constant pool. */ -extern int current_function_uses_const_pool; - -/* Language-specific reason why the current function cannot be made inline. */ -extern char *current_function_cannot_inline; - -/* The line number of the beginning of the current function. - sdbout.c needs this so that it can output relative linenumbers. */ - -#ifdef SDB_DEBUGGING_INFO /* Avoid undef sym in certain broken linkers. */ -extern int sdb_begin_function_line; -#endif - -/* File in which assembler code is being written. */ - -#ifdef BUFSIZ -extern FILE *asm_out_file; -#endif - /* Default file in which to dump debug output. */ #ifdef BUFSIZ diff --git a/gcc/profile.c b/gcc/profile.c index 17923c5..f39ea9c 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -44,12 +44,13 @@ Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" #include "rtl.h" +#include "tree.h" #include "flags.h" #include "insn-flags.h" #include "insn-config.h" #include "output.h" #include "regs.h" -#include "tree.h" +#include "function.h" #include "output.h" #include "gcov-io.h" #include "toplev.h" diff --git a/gcc/recog.c b/gcc/recog.c index b20f80b..6904852 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA. */ #include "recog.h" #include "regs.h" #include "hard-reg-set.h" +#include "function.h" #include "flags.h" #include "real.h" #include "toplev.h" diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index dd4a87e..766d7dc 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -154,6 +154,7 @@ Boston, MA 02111-1307, USA. */ #include "system.h" #include "tree.h" #include "rtl.h" +#include "function.h" #include "insn-config.h" #include "regs.h" #include "hard-reg-set.h" @@ -249,8 +250,6 @@ BLOCK_NUM(insn) return tmp; } -extern rtx forced_labels; - /* Forward declarations */ static void mark_regs_pat PROTO((rtx, HARD_REG_SET *)); diff --git a/gcc/regclass.c b/gcc/regclass.c index 4e16288..fc3de1c 100644 --- a/gcc/regclass.c +++ b/gcc/regclass.c @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "flags.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "insn-config.h" #include "recog.h" #include "reload.h" diff --git a/gcc/regmove.c b/gcc/regmove.c index 81a3520..8742c22 100644 --- a/gcc/regmove.c +++ b/gcc/regmove.c @@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA. */ #include "regs.h" #include "hard-reg-set.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "insn-flags.h" #include "basic-block.h" @@ -166,28 +166,10 @@ extern enum machine_mode reg_raw_mode[FIRST_PSEUDO_REGISTER]; #define REGNO_LAST_NOTE_UID(N) (VARRAY_REG (reg_n_info, N)->last_note_uid) -/* This is reset to LAST_VIRTUAL_REGISTER + 1 at the start of each function. - After rtl generation, it is 1 plus the largest register number used. */ - -extern int reg_rtx_no; - -/* Vector indexed by regno; contains 1 for a register is considered a pointer. - Reloading, etc. will use a pointer register rather than a non-pointer - as the base register in an address, when there is a choice of two regs. */ - -extern char *regno_pointer_flag; -#define REGNO_POINTER_FLAG(REGNO) regno_pointer_flag[REGNO] -extern int regno_pointer_flag_length; - /* List made of EXPR_LIST rtx's which gives pairs of pseudo registers that have to go in the same hard reg. */ extern rtx regs_may_share; -/* Vector mapping pseudo regno into the REG rtx for that register. - This is computed by reg_scan. */ - -extern rtx *regno_reg_rtx; - /* Flag set by local-alloc or global-alloc if they decide to allocate something in a call-clobbered register. */ diff --git a/gcc/reload.c b/gcc/reload.c index d8b4136..3fecafd 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -99,6 +99,7 @@ a register with any other reload. */ #include "flags.h" #include "real.h" #include "output.h" +#include "function.h" #include "expr.h" #include "toplev.h" diff --git a/gcc/reload1.c b/gcc/reload1.c index bfdcade..e3c3a7f 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "insn-flags.h" #include "insn-codes.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "regs.h" #include "basic-block.h" @@ -279,9 +280,6 @@ char *reload_firstobj; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -/* List of labels that must never be deleted. */ -extern rtx forced_labels; - /* List of insn_chain instructions, one for every insn that reload needs to examine. */ struct insn_chain *reload_insn_chain; diff --git a/gcc/reorg.c b/gcc/reorg.c index 09b6dd8..4320335 100644 --- a/gcc/reorg.c +++ b/gcc/reorg.c @@ -124,6 +124,7 @@ Boston, MA 02111-1307, USA. */ #include "toplev.h" #include "rtl.h" #include "expr.h" +#include "function.h" #include "insn-config.h" #include "conditions.h" #include "hard-reg-set.h" diff --git a/gcc/resource.c b/gcc/resource.c index ddf7df5..8bbcff0 100644 --- a/gcc/resource.c +++ b/gcc/resource.c @@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA. */ #include "hard-reg-set.h" #include "system.h" #include "basic-block.h" +#include "function.h" #include "regs.h" #include "flags.h" #include "output.h" diff --git a/gcc/rtl.def b/gcc/rtl.def index 7b8c845..0a5e7de 100644 --- a/gcc/rtl.def +++ b/gcc/rtl.def @@ -392,12 +392,6 @@ DEF_RTL_EXPR(CODE_LABEL, "code_label", "iuuis00", 'x') -3 means end of a contour; output N_RBRAC. */ DEF_RTL_EXPR(NOTE, "note", "iuusn", 'x') -/* INLINE_HEADER is use by inline function machinery. The information - it contains helps to build the mapping function between the rtx's of - the function to be inlined and the current function being expanded. */ - -DEF_RTL_EXPR(INLINE_HEADER, "inline_header", "iuuuiiiiiieeiiEeEssE", 'x') - /* ---------------------------------------------------------------------- Top level constituents of INSN, JUMP_INSN and CALL_INSN. ---------------------------------------------------------------------- */ @@ -660,68 +660,6 @@ extern char *note_insn_name[]; /* 1 means a SYMBOL_REF has been the library function in emit_library_call. */ #define SYMBOL_REF_USED(RTX) ((RTX)->used) -/* For an INLINE_HEADER rtx, FIRST_FUNCTION_INSN is the first insn - of the function that is not involved in copying parameters to - pseudo-registers. FIRST_PARM_INSN is the very first insn of - the function, including the parameter copying. - We keep this around in case we must splice - this function into the assembly code at the end of the file. - FIRST_LABELNO is the first label number used by the function (inclusive). - LAST_LABELNO is the last label used by the function (exclusive). - MAX_REGNUM is the largest pseudo-register used by that function. - FUNCTION_ARGS_SIZE is the size of the argument block in the stack. - POPS_ARGS is the number of bytes of input arguments popped by the function - STACK_SLOT_LIST is the list of stack slots. - FORCED_LABELS is the list of labels whose address was taken. - FUNCTION_FLAGS are where single-bit flags are saved. - OUTGOING_ARGS_SIZE is the size of the largest outgoing stack parameter list. - ORIGINAL_ARG_VECTOR is a vector of the original DECL_RTX values - for the function arguments. - ORIGINAL_DECL_INITIAL is a pointer to the original DECL_INITIAL for the - function. - INLINE_REGNO_REG_RTX, INLINE_REGNO_POINTER_FLAG, and - INLINE_REGNO_POINTER_ALIGN are pointers to the corresponding arrays. - - We want this to lay down like an INSN. The PREV_INSN field - is always NULL. The NEXT_INSN field always points to the - first function insn of the function being squirreled away. */ - -#define FIRST_FUNCTION_INSN(RTX) ((RTX)->fld[2].rtx) -#define FIRST_PARM_INSN(RTX) ((RTX)->fld[3].rtx) -#define FIRST_LABELNO(RTX) ((RTX)->fld[4].rtint) -#define LAST_LABELNO(RTX) ((RTX)->fld[5].rtint) -#define MAX_PARMREG(RTX) ((RTX)->fld[6].rtint) -#define MAX_REGNUM(RTX) ((RTX)->fld[7].rtint) -#define FUNCTION_ARGS_SIZE(RTX) ((RTX)->fld[8].rtint) -#define POPS_ARGS(RTX) ((RTX)->fld[9].rtint) -#define STACK_SLOT_LIST(RTX) ((RTX)->fld[10].rtx) -#define FORCED_LABELS(RTX) ((RTX)->fld[11].rtx) -#define FUNCTION_FLAGS(RTX) ((RTX)->fld[12].rtint) -#define OUTGOING_ARGS_SIZE(RTX) ((RTX)->fld[13].rtint) -#define ORIGINAL_ARG_VECTOR(RTX) ((RTX)->fld[14].rtvec) -#define ORIGINAL_DECL_INITIAL(RTX) ((RTX)->fld[15].rtx) -#define INLINE_REGNO_REG_RTX(RTX) ((RTX)->fld[16].rtvec) -#define INLINE_REGNO_POINTER_FLAG(RTX) ((RTX)->fld[17].rtstr) -#define INLINE_REGNO_POINTER_ALIGN(RTX) ((RTX)->fld[18].rtstr) -#define PARMREG_STACK_LOC(RTX) ((RTX)->fld[19].rtvec) - -/* In FUNCTION_FLAGS we save some variables computed when emitting the code - for the function and which must be `or'ed into the current flag values when - insns from that function are being inlined. */ - -/* These ought to be an enum, but non-ANSI compilers don't like that. */ -#define FUNCTION_FLAGS_CALLS_ALLOCA 01 -#define FUNCTION_FLAGS_CALLS_SETJMP 02 -#define FUNCTION_FLAGS_RETURNS_STRUCT 04 -#define FUNCTION_FLAGS_RETURNS_PCC_STRUCT 010 -#define FUNCTION_FLAGS_NEEDS_CONTEXT 020 -#define FUNCTION_FLAGS_HAS_NONLOCAL_LABEL 040 -#define FUNCTION_FLAGS_RETURNS_POINTER 0100 -#define FUNCTION_FLAGS_USES_CONST_POOL 0200 -#define FUNCTION_FLAGS_CALLS_LONGJMP 0400 -#define FUNCTION_FLAGS_USES_PIC_OFFSET_TABLE 01000 -#define FUNCTION_FLAGS_HAS_COMPUTED_JUMP 02000 - /* Define a macro to look for REG_INC notes, but save time on machines where they never exist. */ @@ -935,10 +873,6 @@ extern rtvec gen_rtvec_v PROTO((int, rtx *)); extern rtvec gen_rtvec_vv PROTO((int, rtunion *)); extern rtx gen_reg_rtx PROTO((enum machine_mode)); extern rtx gen_label_rtx PROTO((void)); -extern rtx gen_inline_header_rtx PROTO((rtx, rtx, int, int, int, int, - int, int, rtx, rtx, int, int, - rtvec, rtx, - rtvec, char *, char *, rtvec)); extern rtx gen_lowpart_common PROTO((enum machine_mode, rtx)); extern rtx gen_lowpart PROTO((enum machine_mode, rtx)); extern rtx gen_lowpart_if_possible PROTO((enum machine_mode, rtx)); @@ -1309,15 +1243,6 @@ extern int cse_not_expected; generate any new pseudo registers. */ extern int no_new_pseudos; -/* Indexed by pseudo register number, gives the rtx for that pseudo. - Allocated in parallel with regno_pointer_flag. */ -extern rtx *regno_reg_rtx; - -/* Vector indexed by regno; contain the alignment in bytes and type - pointed to for a register that contains a pointer, if known. */ -extern char *regno_pointer_align; -#define REGNO_POINTER_ALIGN(REGNO) regno_pointer_align[REGNO] - /* Translates rtx code to tree code, for those codes needed by REAL_ARITHMETIC. The function returns an int because the caller may not know what `enum tree_code' means. */ @@ -1385,6 +1310,7 @@ extern void reorder_insns PROTO ((rtx, rtx, rtx)); extern int get_max_uid PROTO ((void)); extern int in_sequence_p PROTO ((void)); extern void force_next_line_note PROTO ((void)); +extern void clear_emit_caches PROTO ((void)); extern void init_emit PROTO ((void)); extern void init_emit_once PROTO ((int)); extern void push_topmost_sequence PROTO ((void)); @@ -1393,6 +1319,7 @@ extern int subreg_realpart_p PROTO ((rtx)); extern void reverse_comparison PROTO ((rtx)); extern void set_new_first_and_last_insn PROTO ((rtx, rtx)); extern void set_new_first_and_last_label_num PROTO ((int, int)); +extern void set_new_last_label_num PROTO ((int)); extern void unshare_all_rtl PROTO ((rtx)); extern void set_last_insn PROTO ((rtx)); extern void link_cc0_insns PROTO ((rtx)); @@ -1403,7 +1330,6 @@ extern void remove_insn PROTO ((rtx)); extern void reorder_insns_with_line_notes PROTO ((rtx, rtx, rtx)); extern void emit_insn_after_with_line_notes PROTO ((rtx, rtx, rtx)); extern enum rtx_code classify_insn PROTO ((rtx)); -extern void init_virtual_regs PROTO ((void)); extern rtx emit PROTO ((rtx)); /* Query and clear/ restore no_line_numbers. This is used by the switch / case handling in stmt.c to give proper line numbers in @@ -1471,10 +1397,6 @@ extern void expand_null_return PROTO((void)); extern void emit_jump PROTO ((rtx)); extern int preserve_subexpressions_p PROTO ((void)); -/* List (chain of EXPR_LIST) of labels heading the current handlers for - nonlocal gotos. */ -extern rtx nonlocal_goto_handler_labels; - /* In expr.c */ extern void init_expr_once PROTO ((void)); extern void move_by_pieces PROTO ((rtx, rtx, int, int)); diff --git a/gcc/sched.c b/gcc/sched.c index c0eb5dc..20ca1e7 100644 --- a/gcc/sched.c +++ b/gcc/sched.c @@ -123,6 +123,7 @@ Boston, MA 02111-1307, USA. */ #include "rtl.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "hard-reg-set.h" #include "flags.h" #include "insn-config.h" @@ -625,8 +625,8 @@ expand_goto (label) tree link; /* Find the corresponding handler slot for this label. */ - handler_slot = p->nonlocal_goto_handler_slots; - for (link = p->nonlocal_labels; TREE_VALUE (link) != label; + handler_slot = p->x_nonlocal_goto_handler_slots; + for (link = p->x_nonlocal_labels; TREE_VALUE (link) != label; link = TREE_CHAIN (link)) handler_slot = XEXP (handler_slot, 1); handler_slot = XEXP (handler_slot, 0); @@ -643,7 +643,7 @@ expand_goto (label) if (HAVE_nonlocal_goto) emit_insn (gen_nonlocal_goto (lookup_static_chain (label), copy_rtx (handler_slot), - copy_rtx (p->nonlocal_goto_stack_level), + copy_rtx (p->x_nonlocal_goto_stack_level), label_ref)); else #endif @@ -669,7 +669,7 @@ expand_goto (label) hard_frame_pointer_rtx)); /* Restore the stack pointer. Note this uses fp just restored. */ - addr = p->nonlocal_goto_stack_level; + addr = p->x_nonlocal_goto_stack_level; if (addr) addr = replace_rtx (copy_rtx (addr), virtual_stack_vars_rtx, diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index c72e752..fe9fb90 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1386,29 +1386,3 @@ get_best_mode (bitsize, bitpos, align, largest_mode, volatilep) return mode; } - -/* Save all variables describing the current status into the structure *P. - This is used before starting a nested function. */ - -void -save_storage_status (p) - struct function *p ATTRIBUTE_UNUSED; -{ -#if 0 /* Need not save, since always 0 and non0 (resp.) within a function. */ - p->pending_sizes = pending_sizes; - p->immediate_size_expand = immediate_size_expand; -#endif /* 0 */ -} - -/* Restore all variables describing the current status from the structure *P. - This is used after a nested function. */ - -void -restore_storage_status (p) - struct function *p ATTRIBUTE_UNUSED; -{ -#if 0 - pending_sizes = p->pending_sizes; - immediate_size_expand = p->immediate_size_expand; -#endif /* 0 */ -} diff --git a/gcc/stupid.c b/gcc/stupid.c index b2cd170..e111802 100644 --- a/gcc/stupid.c +++ b/gcc/stupid.c @@ -49,6 +49,7 @@ Boston, MA 02111-1307, USA. */ #include "hard-reg-set.h" #include "basic-block.h" #include "regs.h" +#include "function.h" #include "insn-config.h" #include "reload.h" #include "flags.h" diff --git a/gcc/toplev.c b/gcc/toplev.c index 068a122..5c7041e 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -49,6 +49,7 @@ Boston, MA 02111-1307, USA. */ #include "defaults.h" #include "output.h" #include "except.h" +#include "function.h" #include "toplev.h" #include "expr.h" #include "basic-block.h" @@ -266,10 +267,6 @@ struct file_stack *input_file_stack; /* Incremented on each change to input_file_stack. */ int input_file_stack_tick; -/* FUNCTION_DECL for function now being parsed or compiled. */ - -extern tree current_function_decl; - /* Name to use as base of names for dump output files. */ const char *dump_base_name; @@ -2952,14 +2949,18 @@ compile_file (name) init_decl_processing (); init_optabs (); init_stmt (); - init_expmed (); - init_expr_once (); init_loop (); init_reload (); init_alias_once (); + /* The following initialization functions need to generate rtl, so + provide a dummy function context for them. */ + init_dummy_function_start (); + init_expmed (); + init_expr_once (); if (flag_caller_saves) init_caller_save (); + expand_dummy_function_end (); /* If auxiliary info generation is desired, open the output file. This goes in the same directory as the source file--unlike @@ -3730,7 +3731,7 @@ rest_of_compilation (decl) } #endif TIMEVAR (integration_time, save_for_inline_nocopy (decl)); - RTX_INTEGRATED_P (DECL_SAVED_INSNS (decl)) = inlinable; + DECL_SAVED_INSNS (decl)->inlinable = inlinable; goto exit_rest_of_compilation; } @@ -3765,7 +3766,7 @@ rest_of_compilation (decl) saved_block_tree = DECL_INITIAL (decl); saved_arguments = DECL_ARGUMENTS (decl); TIMEVAR (integration_time, save_for_inline_copying (decl)); - RTX_INTEGRATED_P (DECL_SAVED_INSNS (decl)) = inlinable; + DECL_SAVED_INSNS (decl)->inlinable = inlinable; } /* If specified extern inline but we aren't inlining it, we are @@ -3775,6 +3776,9 @@ rest_of_compilation (decl) goto exit_rest_of_compilation; } + /* Initialize some variables used by the optimizers. */ + init_function_for_compilation (); + if (! DECL_DEFER_OUTPUT (decl)) TREE_ASM_WRITTEN (decl) = 1; @@ -3846,9 +3850,8 @@ rest_of_compilation (decl) goto exit_rest_of_compilation; /* Dump rtl code after jump, if we are doing that. */ - - if (jump_opt_dump) - dump_rtl (".jump", decl, print_rtl, insns); + if (jump_opt_dump) + dump_rtl (".jump", decl, print_rtl, insns); /* Perform common subexpression elimination. Nonzero value from `cse_main' means that jumps were simplified @@ -1095,7 +1095,7 @@ struct tree_type where the data was actually passed. */ #define DECL_INCOMING_RTL(NODE) (DECL_CHECK (NODE)->decl.saved_insns.r) /* For FUNCTION_DECL, if it is inline, holds the saved insn chain. */ -#define DECL_SAVED_INSNS(NODE) (DECL_CHECK (NODE)->decl.saved_insns.r) +#define DECL_SAVED_INSNS(NODE) (DECL_CHECK (NODE)->decl.saved_insns.f) /* For FUNCTION_DECL, if it is inline, holds the size of the stack frame, as an integer. */ #define DECL_FRAME_SIZE(NODE) (DECL_CHECK (NODE)->decl.frame_size.i) @@ -1363,6 +1363,7 @@ struct tree_decl /* For FUNCTION_DECLs: points to insn that constitutes its definition on the permanent obstack. For FIELD_DECL, this is DECL_FIELD_SIZE. */ union { + struct function *f; struct rtx_def *r; HOST_WIDE_INT i; } saved_insns; @@ -2202,6 +2203,8 @@ extern void setjmp_protect PROTO ((tree)); extern void expand_main_function PROTO ((void)); extern void mark_varargs PROTO ((void)); extern void init_dummy_function_start PROTO ((void)); +extern void expand_dummy_function_end PROTO ((void)); +extern void init_function_for_compilation PROTO ((void)); extern void init_function_start PROTO ((tree, char *, int)); extern void assign_parms PROTO ((tree, int)); extern void put_var_into_stack PROTO ((tree)); diff --git a/gcc/unroll.c b/gcc/unroll.c index d6dbcf0..c2297f9 100644 --- a/gcc/unroll.c +++ b/gcc/unroll.c @@ -154,6 +154,7 @@ enum unroll_types { UNROLL_COMPLETELY, UNROLL_MODULO, UNROLL_NAIVE }; #include "regs.h" #include "recog.h" #include "flags.h" +#include "function.h" #include "expr.h" #include "loop.h" #include "toplev.h" @@ -1180,8 +1181,8 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before, } /* Use our current register alignment and pointer flags. */ - map->regno_pointer_flag = regno_pointer_flag; - map->regno_pointer_align = regno_pointer_align; + map->regno_pointer_flag = current_function->emit->regno_pointer_flag; + map->regno_pointer_align = current_function->emit->regno_pointer_align; /* If the loop is being partially unrolled, and the iteration variables are being split, and are being renamed for the split, then must fix up |