Skip to content

Commit

Permalink
i386: Move struct ix86_frame to machine_function
Browse files Browse the repository at this point in the history 
Make ix86_frame available to i386 code generation.

	* config/i386/i386.c (ix86_frame): Moved to ...
	* config/i386/i386.h (ix86_frame): Here.
	(machine_function): Add frame.
	* config/i386/i386.c (ix86_compute_frame_layout): Repace the
	frame argument with &cfun->machine->frame.
	(ix86_can_use_return_insn_p): Don't pass &frame to
	ix86_compute_frame_layout.  Copy frame from cfun->machine->frame.
	(ix86_can_eliminate): Likewise.
	(ix86_expand_prologue): Likewise.
	(ix86_expand_epilogue): Likewise.
	(ix86_expand_split_stack_prologue): Likewise.
  • Loading branch information
@hjl-tools
hjl-tools committed Dec 18, 2017
1 parent 91073e5 commit 9005ade
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 56 deletions.
68 changes: 13 additions & 55 deletions gcc/config/i386/i386.c
View file
Expand Up @@ -2444,53 +2444,6 @@ struct GTY(()) stack_local_entry {
struct stack_local_entry *next;
};

/* Structure describing stack frame layout.
Stack grows downward:

[arguments]
<- ARG_POINTER
saved pc

saved static chain if ix86_static_chain_on_stack

saved frame pointer if frame_pointer_needed
<- HARD_FRAME_POINTER
[saved regs]
<- regs_save_offset
[padding0]

[saved SSE regs]
<- sse_regs_save_offset
[padding1] |
| <- FRAME_POINTER
[va_arg registers] |
|
[frame] |
|
[padding2] | = to_allocate
<- STACK_POINTER
*/
struct ix86_frame
{
int nsseregs;
int nregs;
int va_arg_size;
int red_zone_size;
int outgoing_arguments_size;

/* The offsets relative to ARG_POINTER. */
HOST_WIDE_INT frame_pointer_offset;
HOST_WIDE_INT hard_frame_pointer_offset;
HOST_WIDE_INT stack_pointer_offset;
HOST_WIDE_INT hfp_save_offset;
HOST_WIDE_INT reg_save_offset;
HOST_WIDE_INT sse_reg_save_offset;

/* When save_regs_using_mov is set, emit prologue using
move instead of push instructions. */
bool save_regs_using_mov;
};

/* Which cpu are we scheduling for. */
enum attr_cpu ix86_schedule;

Expand Down Expand Up @@ -2582,7 +2535,7 @@ static unsigned int ix86_function_arg_boundary (machine_mode,
const_tree);
static rtx ix86_static_chain (const_tree, bool);
static int ix86_function_regparm (const_tree, const_tree);
static void ix86_compute_frame_layout (struct ix86_frame *);
static void ix86_compute_frame_layout (void);
static bool ix86_expand_vector_init_one_nonzero (bool, machine_mode,
rtx, rtx, int);
static void ix86_add_new_builtins (HOST_WIDE_INT, HOST_WIDE_INT);
Expand Down Expand Up @@ -11903,7 +11856,8 @@ ix86_can_use_return_insn_p (void)
if (crtl->args.pops_args && crtl->args.size >= 32768)
return 0;

ix86_compute_frame_layout (&frame);
ix86_compute_frame_layout ();
frame = cfun->machine->frame;
return (frame.stack_pointer_offset == UNITS_PER_WORD
&& (frame.nregs + frame.nsseregs) == 0);
}
Expand Down Expand Up @@ -12389,8 +12343,8 @@ ix86_can_eliminate (const int from, const int to)
HOST_WIDE_INT
ix86_initial_elimination_offset (int from, int to)
{
struct ix86_frame frame;
ix86_compute_frame_layout (&frame);
ix86_compute_frame_layout ();
struct ix86_frame frame = cfun->machine->frame;

if (from == ARG_POINTER_REGNUM && to == HARD_FRAME_POINTER_REGNUM)
return frame.hard_frame_pointer_offset;
Expand Down Expand Up @@ -12429,8 +12383,9 @@ ix86_builtin_setjmp_frame_value (void)
/* Fill structure ix86_frame about frame of currently computed function. */

static void
ix86_compute_frame_layout (struct ix86_frame *frame)
ix86_compute_frame_layout (void)
{
struct ix86_frame *frame = &cfun->machine->frame;
unsigned HOST_WIDE_INT stack_alignment_needed;
HOST_WIDE_INT offset;
unsigned HOST_WIDE_INT preferred_alignment;
Expand Down Expand Up @@ -13737,7 +13692,8 @@ ix86_expand_prologue (void)
m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET;
m->fs.sp_valid = true;

ix86_compute_frame_layout (&frame);
ix86_compute_frame_layout ();
frame = m->frame;

if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl))
{
Expand Down Expand Up @@ -14405,7 +14361,8 @@ ix86_expand_epilogue (int style)
bool using_drap;

ix86_finalize_stack_realign_flags ();
ix86_compute_frame_layout (&frame);
ix86_compute_frame_layout ();
frame = m->frame;

m->fs.sp_valid = (!frame_pointer_needed
|| (crtl->sp_is_unchanging
Expand Down Expand Up @@ -14915,7 +14872,8 @@ ix86_expand_split_stack_prologue (void)
gcc_assert (flag_split_stack && reload_completed);

ix86_finalize_stack_realign_flags ();
ix86_compute_frame_layout (&frame);
ix86_compute_frame_layout ();
frame = cfun->machine->frame;
allocate = frame.stack_pointer_offset - INCOMING_FRAME_SP_OFFSET;

/* This is the label we will branch to if we have enough stack
Expand Down
53 changes: 52 additions & 1 deletion gcc/config/i386/i386.h
View file
Expand Up @@ -2451,9 +2451,56 @@ enum avx_u128_state

#define FASTCALL_PREFIX '@'

#ifndef USED_FOR_TARGET
/* Structure describing stack frame layout.
Stack grows downward:
[arguments]
<- ARG_POINTER
saved pc
saved static chain if ix86_static_chain_on_stack
saved frame pointer if frame_pointer_needed
<- HARD_FRAME_POINTER
[saved regs]
<- regs_save_offset
[padding0]
[saved SSE regs]
<- sse_regs_save_offset
[padding1] |
| <- FRAME_POINTER
[va_arg registers] |
|
[frame] |
|
[padding2] | = to_allocate
<- STACK_POINTER
*/
struct GTY(()) ix86_frame
{
int nsseregs;
int nregs;
int va_arg_size;
int red_zone_size;
int outgoing_arguments_size;

/* The offsets relative to ARG_POINTER. */
HOST_WIDE_INT frame_pointer_offset;
HOST_WIDE_INT hard_frame_pointer_offset;
HOST_WIDE_INT stack_pointer_offset;
HOST_WIDE_INT hfp_save_offset;
HOST_WIDE_INT reg_save_offset;
HOST_WIDE_INT sse_reg_save_offset;

/* When save_regs_using_mov is set, emit prologue using
move instead of push instructions. */
bool save_regs_using_mov;
};

/* Machine specific frame tracking during prologue/epilogue generation. */

#ifndef USED_FOR_TARGET
struct GTY(()) machine_frame_state
{
/* This pair tracks the currently active CFA as reg+offset. When reg
Expand Down Expand Up @@ -2512,6 +2559,9 @@ struct GTY(()) machine_function {
int varargs_fpr_size;
int optimize_mode_switching[MAX_386_ENTITIES];

/* Cached initial frame layout for the current function. */
struct ix86_frame frame;

/* Number of saved registers USE_FAST_PROLOGUE_EPILOGUE
has been computed for. */
int use_fast_prologue_epilogue_nregs;
Expand Down Expand Up @@ -2594,6 +2644,7 @@ struct GTY(()) machine_function {
#define ix86_current_function_calls_tls_descriptor \
(ix86_tls_descriptor_calls_expanded_in_cfun && df_regs_ever_live_p (SP_REG))
#define ix86_static_chain_on_stack (cfun->machine->static_chain_on_stack)
#define ix86_red_zone_size (cfun->machine->frame.red_zone_size)

/* Control behavior of x86_file_start. */
#define X86_FILE_START_VERSION_DIRECTIVE false
Expand Down

0 comments on commit 9005ade

Please sign in to comment.