From: Kai Tietz <ktietz70@googlemail.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Richard Henderson <rth@redhat.com>
Subject: Re: [RFA patch i386]: Prepare x64 prologue using positive offsets for frame-pointer
Date: Mon, 05 Jul 2010 06:18:00 -0000 [thread overview]
Message-ID: <AANLkTinQW8cn9uoJO7omzuyLuz1IHgEptTEZFnZGRUoh@mail.gmail.com> (raw)
In-Reply-To: <AANLkTinxsx-sCIz4A8VADqbHO55LIrAjvO_2fnjqr6r-@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
2010/7/4 Kai Tietz <ktietz70@googlemail.com>:
> Hello,
>
> this patch prepares for x64 SEH, that frame-pointer points at end of
> stack-prologue. This is required for x64, because the SEH unwind
> information can't express negative offsets for stack.
>
> ChangeLog
>
> 2010-07-04 Kai Tietz
>
> * config/i386/i386.c (ix86_compute_frame_layout): Let frame's
> hard_frame_pointer_offset point to end of prologue.
> (ix86_expand_prologue): Handle x64 frame-pointer prologue.
> (ix86_expand_epilogue): Handle x64 frame-pointer epilogue.
>
> Tested for i686-pc-cygwin, x86_64-pc-mingw32. Ok for apply?
>
> Regards,
> Kai
This update patch avoids, that for profiling-built the x64
frame-layout gets used. It would lead to issues, caused by profiling
code, which assumes old stack-frame layout.
Regards,
Kai
--
| (\_/) This is Bunny. Copy and paste
| (='.'=) Bunny into your signature to help
| (")_(") him gain world domination
[-- Attachment #2: x64_pro.diff --]
[-- Type: application/octet-stream, Size: 7215 bytes --]
Index: gcc/gcc/config/i386/i386.c
===================================================================
--- gcc.orig/gcc/config/i386/i386.c 2010-07-03 10:58:48.000000000 +0200
+++ gcc/gcc/config/i386/i386.c 2010-07-05 08:12:20.043586300 +0200
@@ -8347,6 +8347,13 @@ ix86_compute_frame_layout (struct ix86_f
/* We've reached end of stack frame. */
frame->stack_pointer_offset = offset;
+ /* Adjust hard_frame_pointer for x64 abi, so that it points
+ to end of frame. */
+ if (TARGET_64BIT && DEFAULT_ABI == MS_ABI && frame_pointer_needed
+ && !profile_flag)
+ frame->hard_frame_pointer_offset = offset;
+
+
/* Size prologue needs to allocate. */
frame->to_allocate =
(size + frame->padding1 + frame->padding2
@@ -8720,6 +8727,8 @@ ix86_expand_prologue (void)
struct ix86_frame frame;
HOST_WIDE_INT allocate;
int gen_frame_pointer = frame_pointer_needed;
+ int be_x64frame = TARGET_64BIT && DEFAULT_ABI == MS_ABI
+ && frame_pointer_needed && !profile_flag;
ix86_finalize_stack_realign_flags ();
@@ -8851,11 +8860,14 @@ ix86_expand_prologue (void)
insn = emit_insn (gen_push (hard_frame_pointer_rtx));
RTX_FRAME_RELATED_P (insn) = 1;
- insn = emit_move_insn (hard_frame_pointer_rtx, stack_pointer_rtx);
- RTX_FRAME_RELATED_P (insn) = 1;
+ if (!be_x64frame)
+ {
+ insn = emit_move_insn (hard_frame_pointer_rtx, stack_pointer_rtx);
+ RTX_FRAME_RELATED_P (insn) = 1;
- if (ix86_cfa_state->reg == stack_pointer_rtx)
- ix86_cfa_state->reg = hard_frame_pointer_rtx;
+ if (ix86_cfa_state->reg == stack_pointer_rtx)
+ ix86_cfa_state->reg = hard_frame_pointer_rtx;
+ }
}
if (stack_realign_fp)
@@ -8884,7 +8896,7 @@ ix86_expand_prologue (void)
a red zone location */
if (!TARGET_64BIT_MS_ABI && TARGET_RED_ZONE && frame.save_regs_using_mov
&& (! TARGET_STACK_PROBE || allocate < CHECK_STACK_LIMIT))
- ix86_emit_save_regs_using_mov ((frame_pointer_needed
+ ix86_emit_save_regs_using_mov ((frame_pointer_needed && !be_x64frame
&& !crtl->stack_realign_needed)
? hard_frame_pointer_rtx
: stack_pointer_rtx,
@@ -8932,7 +8944,7 @@ ix86_expand_prologue (void)
if (eax_live)
{
- if (frame_pointer_needed)
+ if (frame_pointer_needed && !be_x64frame)
t = plus_constant (hard_frame_pointer_rtx,
allocate
- frame.to_allocate
@@ -8947,7 +8959,7 @@ ix86_expand_prologue (void)
&& !(!TARGET_64BIT_MS_ABI && TARGET_RED_ZONE
&& (! TARGET_STACK_PROBE || allocate < CHECK_STACK_LIMIT)))
{
- if (!frame_pointer_needed
+ if (!frame_pointer_needed || be_x64frame
|| !(frame.to_allocate + frame.padding0)
|| crtl->stack_realign_needed)
ix86_emit_save_regs_using_mov (stack_pointer_rtx,
@@ -8957,7 +8969,7 @@ ix86_expand_prologue (void)
ix86_emit_save_regs_using_mov (hard_frame_pointer_rtx,
-frame.nregs * UNITS_PER_WORD);
}
- if (!frame_pointer_needed
+ if (!frame_pointer_needed || be_x64frame
|| !(frame.to_allocate + frame.padding0)
|| crtl->stack_realign_needed)
ix86_emit_save_sse_regs_using_mov (stack_pointer_rtx,
@@ -9011,6 +9023,15 @@ ix86_expand_prologue (void)
if (crtl->profile && pic_reg_used)
emit_insn (gen_prologue_use (pic_offset_table_rtx));
+ if (be_x64frame)
+ {
+ insn = emit_move_insn (hard_frame_pointer_rtx, stack_pointer_rtx);
+ RTX_FRAME_RELATED_P (insn) = 1;
+
+ if (ix86_cfa_state->reg == stack_pointer_rtx)
+ ix86_cfa_state->reg = hard_frame_pointer_rtx;
+ }
+
if (crtl->drap_reg && !crtl->stack_realign_needed)
{
/* vDRAP is setup but after reload it turns out stack realign
@@ -9223,19 +9244,29 @@ ix86_expand_epilogue (int style)
HOST_WIDE_INT offset, red_offset;
struct machine_cfa_state cfa_state_save = *ix86_cfa_state;
bool using_drap;
+ int be_x64frame = TARGET_64BIT && DEFAULT_ABI == MS_ABI
+ && frame_pointer_needed && !profile_flag;
+
ix86_finalize_stack_realign_flags ();
/* When stack is realigned, SP must be valid. */
- sp_valid = (!frame_pointer_needed
+ sp_valid = (!frame_pointer_needed || be_x64frame
|| current_function_sp_is_unchanging
|| stack_realign_fp);
ix86_compute_frame_layout (&frame);
+ if (be_x64frame)
+ {
+ pro_epilogue_adjust_stack (stack_pointer_rtx,
+ hard_frame_pointer_rtx,
+ const0_rtx, style, 0);
+ }
+
/* See the comment about red zone and frame
pointer usage in ix86_expand_prologue. */
- if (frame_pointer_needed && frame.red_zone_size)
+ if (frame_pointer_needed && (frame.red_zone_size || be_x64frame))
emit_insn (gen_memory_blockage ());
using_drap = crtl->drap_reg && crtl->stack_realign_needed;
@@ -9286,7 +9317,8 @@ ix86_expand_epilogue (int style)
|| (frame_pointer_needed && TARGET_USE_LEAVE
&& cfun->machine->use_fast_prologue_epilogue
&& (frame.nregs + frame.nsseregs) == 1)
- || crtl->calls_eh_return)
+ || crtl->calls_eh_return
+ || be_x64frame)
{
/* Restore registers. We can use ebp or esp to address the memory
locations. If both are available, default to ebp, since offsets
@@ -9297,7 +9329,7 @@ ix86_expand_epilogue (int style)
If we are realigning stack with bp and sp, regs restore can't
be addressed by bp. sp must be used instead. */
- if (!frame_pointer_needed
+ if (!frame_pointer_needed || be_x64frame
|| (sp_valid && !(frame.to_allocate + frame.padding0))
|| stack_realign_fp)
{
@@ -9338,7 +9370,7 @@ ix86_expand_epilogue (int style)
/* Neither does regparm nested functions. */
gcc_assert (!ix86_static_chain_on_stack);
- if (frame_pointer_needed)
+ if (frame_pointer_needed && !be_x64frame)
{
tmp = gen_rtx_PLUS (Pmode, hard_frame_pointer_rtx, sa);
tmp = plus_constant (tmp, UNITS_PER_WORD);
@@ -9387,6 +9419,16 @@ ix86_expand_epilogue (int style)
}
}
}
+ else if (be_x64frame)
+ {
+ pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
+ GEN_INT (frame.to_allocate
+ + frame.nregs * UNITS_PER_WORD
+ + frame.nsseregs * 16
+ + frame.padding0),
+ style, 0);
+ ix86_emit_restore_reg_using_pop (hard_frame_pointer_rtx, red_offset);
+ }
else if (!frame_pointer_needed)
pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
GEN_INT (frame.to_allocate
@@ -9416,7 +9458,7 @@ ix86_expand_epilogue (int style)
won't be able to recover via lea $offset(%bp), %sp, because
there is a padding area between bp and sp for realign.
"add $to_allocate, %sp" must be used instead. */
- if (!sp_valid)
+ if (!sp_valid && !be_x64frame)
{
gcc_assert (frame_pointer_needed);
gcc_assert (!stack_realign_fp);
@@ -9447,7 +9489,7 @@ ix86_expand_epilogue (int style)
+ frame.padding0);
red_offset -= offset;
- if (frame_pointer_needed)
+ if (frame_pointer_needed && !be_x64frame)
{
/* Leave results in shorter dependency chains on CPUs that are
able to grok it fast. */
next prev parent reply other threads:[~2010-07-05 6:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-04 21:06 Kai Tietz
2010-07-05 6:18 ` Kai Tietz [this message]
2010-07-14 19:29 ` NightStrike
2010-07-18 10:42 ` Kai Tietz
2010-07-20 22:57 ` Richard Henderson
2010-07-21 7:43 ` Kai Tietz
2010-07-21 17:36 ` Richard Henderson
2010-07-21 18:06 ` Kai Tietz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinQW8cn9uoJO7omzuyLuz1IHgEptTEZFnZGRUoh@mail.gmail.com \
--to=ktietz70@googlemail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=rth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).