OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86: Restore the frame pointer in word_mode 

We must restore the frame pointer in word_mode for eh_return epilogues
since the upper 32 bits of RBP register can have any values.

Tested on Linux/x32 and Linux/x86-64.

	PR target/94556
	* config/i386/i386.c (ix86_expand_epilogue): Restore the frame
	pointer in word_mode for eh_return epilogues.
This commit is contained in:
H.J. Lu 2020-04-13 04:23:05 -07:00
parent 04637536a6
commit efc1f3577f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2020-04-13 H.J. Lu <hongjiu.lu@intel.com>
PR target/94556
* config/i386/i386.c (ix86_expand_epilogue): Restore the frame
pointer in word_mode for eh_return epilogues.
2020-04-13 Jozef Lawrynowicz <jozef.l@mittosystems.com>
* config/msp430/msp430.c (msp430_print_operand): Don't add offsets to

11
gcc/config/i386/i386.c
View File

@ -9052,8 +9052,13 @@ ix86_expand_epilogue (int style)
t = plus_constant (Pmode, t, m->fs.fp_offset - UNITS_PER_WORD);
emit_insn (gen_rtx_SET (sa, t));
t = gen_frame_mem (Pmode, hard_frame_pointer_rtx);
insn = emit_move_insn (hard_frame_pointer_rtx, t);
/* NB: eh_return epilogues must restore the frame pointer
in word_mode since the upper 32 bits of RBP register
can have any values. */
t = gen_frame_mem (word_mode, hard_frame_pointer_rtx);
rtx frame_reg = gen_rtx_REG (word_mode,
HARD_FRAME_POINTER_REGNUM);
insn = emit_move_insn (frame_reg, t);
/* Note that we use SA as a temporary CFA, as the return
address is at the proper place relative to it. We
@ -9068,7 +9073,7 @@ ix86_expand_epilogue (int style)
add_reg_note (insn, REG_CFA_DEF_CFA,
plus_constant (Pmode, sa, UNITS_PER_WORD));
ix86_add_queued_cfa_restore_notes (insn);
add_reg_note (insn, REG_CFA_RESTORE, hard_frame_pointer_rtx);
add_reg_note (insn, REG_CFA_RESTORE, frame_reg);
RTX_FRAME_RELATED_P (insn) = 1;
m->fs.cfa_reg = sa;