diff options
author | Richard Sandiford <richard.sandiford@linaro.org> | 2017-12-21 06:58:16 +0000 |
---|---|---|
committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2017-12-21 06:58:16 +0000 |
commit | f075bd950c5ad3e2baeb3d8f82fe962efc8e4f7a (patch) | |
tree | 8b895dc76d9b5a9544b28dcb10c3ac925ccea4dd /gcc/config | |
parent | 7ee216163faf80d2a55f1c08abb971b7da34a793 (diff) | |
download | gcc-f075bd950c5ad3e2baeb3d8f82fe962efc8e4f7a.zip gcc-f075bd950c5ad3e2baeb3d8f82fe962efc8e4f7a.tar.gz gcc-f075bd950c5ad3e2baeb3d8f82fe962efc8e4f7a.tar.bz2 |
poly_int: frame allocations
This patch converts the frame allocation code (mostly in function.c)
to use poly_int64 rather than HOST_WIDE_INT for frame offsets and
sizes.
2017-12-21 Richard Sandiford <richard.sandiford@linaro.org>
Alan Hayward <alan.hayward@arm.com>
David Sherwood <david.sherwood@arm.com>
gcc/
* function.h (frame_space): Change start and length from HOST_WIDE_INT
to poly_int64.
(get_frame_size): Return the size as a poly_int64 rather than a
HOST_WIDE_INT.
(frame_offset_overflow): Take the offset as a poly_int64 rather
than a HOST_WIDE_INT.
(assign_stack_local_1, assign_stack_local, assign_stack_temp_for_type)
(assign_stack_temp): Likewise for the size.
* function.c (get_frame_size): Return a poly_int64 rather than
a HOST_WIDE_INT.
(frame_offset_overflow): Take the offset as a poly_int64 rather
than a HOST_WIDE_INT.
(try_fit_stack_local): Take the start, length and size as poly_int64s
rather than HOST_WIDE_INTs. Return the offset as a poly_int64_pod
rather than a HOST_WIDE_INT.
(add_frame_space): Take the start and end as poly_int64s rather than
HOST_WIDE_INTs.
(assign_stack_local_1, assign_stack_local, assign_stack_temp_for_type)
(assign_stack_temp): Likewise for the size.
(temp_slot): Change size, base_offset and full_size from HOST_WIDE_INT
to poly_int64.
(find_temp_slot_from_address): Handle polynomial offsets.
(combine_temp_slots): Likewise.
* emit-rtl.h (rtl_data::x_frame_offset): Change from HOST_WIDE_INT
to poly_int64.
* cfgexpand.c (alloc_stack_frame_space): Return the offset as a
poly_int64 rather than a HOST_WIDE_INT.
(expand_one_stack_var_at): Take the offset as a poly_int64 rather
than a HOST_WIDE_INT.
(expand_stack_vars, expand_one_stack_var_1, expand_used_vars): Handle
polynomial frame offsets.
* config/m32r/m32r-protos.h (m32r_compute_frame_size): Take the size
as a poly_int64 rather than an int.
* config/m32r/m32r.c (m32r_compute_frame_size): Likewise.
* config/v850/v850-protos.h (compute_frame_size): Likewise.
* config/v850/v850.c (compute_frame_size): Likewise.
* config/xtensa/xtensa-protos.h (compute_frame_size): Likewise.
* config/xtensa/xtensa.c (compute_frame_size): Likewise.
* config/pa/pa-protos.h (pa_compute_frame_size): Likewise.
* config/pa/pa.c (pa_compute_frame_size): Likewise.
* explow.h (get_dynamic_stack_base): Take the offset as a poly_int64
rather than a HOST_WIDE_INT.
* explow.c (get_dynamic_stack_base): Likewise.
* final.c (final_start_function): Use the constant lower bound
of the frame size for -Wframe-larger-than.
* ira.c (do_reload): Adjust for new get_frame_size return type.
* lra.c (lra): Likewise.
* reload1.c (reload): Likewise.
* config/avr/avr.c (avr_asm_function_end_prologue): Likewise.
* config/pa/pa.h (EXIT_IGNORE_STACK): Likewise.
* rtlanal.c (get_initial_register_offset): Return the offset as
a poly_int64 rather than a HOST_WIDE_INT.
Co-Authored-By: Alan Hayward <alan.hayward@arm.com>
Co-Authored-By: David Sherwood <david.sherwood@arm.com>
From-SVN: r255917
Diffstat (limited to 'gcc/config')
-rw-r--r-- | gcc/config/avr/avr.c | 2 | ||||
-rw-r--r-- | gcc/config/m32r/m32r-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/m32r/m32r.c | 2 | ||||
-rw-r--r-- | gcc/config/pa/pa-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/pa/pa.c | 2 | ||||
-rw-r--r-- | gcc/config/pa/pa.h | 2 | ||||
-rw-r--r-- | gcc/config/v850/v850-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/v850/v850.c | 2 | ||||
-rw-r--r-- | gcc/config/xtensa/xtensa-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/xtensa/xtensa.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index ff6672f..e2db38d 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -2044,7 +2044,7 @@ avr_asm_function_end_prologue (FILE *file) avr_outgoing_args_size()); fprintf (file, "/* frame size = " HOST_WIDE_INT_PRINT_DEC " */\n", - get_frame_size()); + (HOST_WIDE_INT) get_frame_size()); if (!cfun->machine->gasisr.yes) { diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index 30dbc1d..83192da 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -22,7 +22,7 @@ extern void m32r_init (void); extern void m32r_init_expanders (void); -extern unsigned m32r_compute_frame_size (int); +extern unsigned m32r_compute_frame_size (poly_int64); extern void m32r_expand_prologue (void); extern void m32r_expand_epilogue (void); extern int direct_return (void); diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index dbc1bae..7f98dd5 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -1555,7 +1555,7 @@ static struct m32r_frame_info zero_frame_info; SIZE is the size needed for local variables. */ unsigned int -m32r_compute_frame_size (int size) /* # of var. bytes allocated. */ +m32r_compute_frame_size (poly_int64 size) /* # of var. bytes allocated. */ { unsigned int regno; unsigned int total_size, var_size, args_size, pretend_size, extra_size; diff --git a/gcc/config/pa/pa-protos.h b/gcc/config/pa/pa-protos.h index cbf25af..7c38c60 100644 --- a/gcc/config/pa/pa-protos.h +++ b/gcc/config/pa/pa-protos.h @@ -85,7 +85,7 @@ extern int pa_shadd_constant_p (int); extern int pa_zdepi_cint_p (unsigned HOST_WIDE_INT); extern void pa_output_ascii (FILE *, const char *, int); -extern HOST_WIDE_INT pa_compute_frame_size (HOST_WIDE_INT, int *); +extern HOST_WIDE_INT pa_compute_frame_size (poly_int64, int *); extern void pa_expand_prologue (void); extern void pa_expand_epilogue (void); extern bool pa_can_use_return_insn (void); diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index 415d23e..15f22fc 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -3771,7 +3771,7 @@ set_reg_plus_d (int reg, int base, HOST_WIDE_INT disp, int note) } HOST_WIDE_INT -pa_compute_frame_size (HOST_WIDE_INT size, int *fregs_live) +pa_compute_frame_size (poly_int64 size, int *fregs_live) { int freg_saved = 0; int i, j; diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 7bd1f11..044f65e 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -691,7 +691,7 @@ void hppa_profile_hook (int label_no); extern int may_call_alloca; #define EXIT_IGNORE_STACK \ - (get_frame_size () != 0 \ + (maybe_ne (get_frame_size (), 0) \ || cfun->calls_alloca || crtl->outgoing_args_size) /* Length in units of the trampoline for entering a nested function. */ diff --git a/gcc/config/v850/v850-protos.h b/gcc/config/v850/v850-protos.h index 7cd4f8b..b59ca77 100644 --- a/gcc/config/v850/v850-protos.h +++ b/gcc/config/v850/v850-protos.h @@ -26,7 +26,7 @@ extern void expand_prologue (void); extern void expand_epilogue (void); extern int v850_handle_pragma (int (*)(void), void (*)(int), char *); extern int compute_register_save_size (long *); -extern int compute_frame_size (int, long *); +extern int compute_frame_size (poly_int64, long *); extern void v850_init_expanders (void); #ifdef RTX_CODE diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c index ab096ea..4f602f4 100644 --- a/gcc/config/v850/v850.c +++ b/gcc/config/v850/v850.c @@ -1574,7 +1574,7 @@ compute_register_save_size (long * p_reg_saved) -------------------------- ---- ------------------ V */ int -compute_frame_size (int size, long * p_reg_saved) +compute_frame_size (poly_int64 size, long * p_reg_saved) { return (size + compute_register_save_size (p_reg_saved) diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h index dac5657..3764340 100644 --- a/gcc/config/xtensa/xtensa-protos.h +++ b/gcc/config/xtensa/xtensa-protos.h @@ -67,7 +67,7 @@ extern rtx xtensa_return_addr (int, rtx); extern void xtensa_setup_frame_addresses (void); extern int xtensa_dbx_register_number (int); -extern long compute_frame_size (int); +extern long compute_frame_size (poly_int64); extern bool xtensa_use_return_instruction_p (void); extern void xtensa_expand_prologue (void); extern void xtensa_expand_epilogue (void); diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c index 665fe95..18b349c 100644 --- a/gcc/config/xtensa/xtensa.c +++ b/gcc/config/xtensa/xtensa.c @@ -2698,7 +2698,7 @@ xtensa_call_save_reg(int regno) #define XTENSA_STACK_ALIGN(LOC) (((LOC) + STACK_BYTES-1) & ~(STACK_BYTES-1)) long -compute_frame_size (int size) +compute_frame_size (poly_int64 size) { int regno; |