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

backport: re PR target/83111 ([sh] stack smashing detected in gen_udivsi3)

Browse Source 
gcc/
	Backport from mainline
	2017-11-23  Oleg Endo  <olegendo@gcc.gnu.org>

	PR target/83111
	* config/sh/sh.md (udivsi3, divsi3, sibcall_value_pcrel,
	sibcall_value_pcrel_fdpic): Use local variable instead of
	operands[3].
	(calli_tbr_rel): Add missing operand 2.
	(call_valuei_tbr_rel): Add missing operand 3.

From-SVN: r255097
This commit is contained in:
Oleg Endo 2017-11-23 14:08:12 +00:00
parent 254cf05059
commit 83d51b3e9c
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,3 +1,15 @@
2017-11-23 Oleg Endo <olegendo@gcc.gnu.org>
Backport from mainline
2017-11-23 Oleg Endo <olegendo@gcc.gnu.org>
PR target/83111
* config/sh/sh.md (udivsi3, divsi3, sibcall_value_pcrel,
sibcall_value_pcrel_fdpic): Use local variable instead of
operands[3].
(calli_tbr_rel): Add missing operand 2.
(call_valuei_tbr_rel): Add missing operand 3.
2017-11-22 Richard Biener <rguenther@suse.de>
Revert

51
gcc/config/sh/sh.md
View File

@ -2277,8 +2277,8 @@
""
{
rtx last;
rtx func_ptr = gen_reg_rtx (Pmode);
operands[3] = gen_reg_rtx (Pmode);
/* Emit the move of the address to a pseudo outside of the libcall. */
if (TARGET_DIVIDE_CALL_TABLE)
{
@ -2298,16 +2298,16 @@
emit_move_insn (operands[0], operands[2]);
DONE;
}
function_symbol (operands[3], "__udivsi3_i4i", SFUNC_GOT);
last = gen_udivsi3_i4_int (operands[0], operands[3]);
function_symbol (func_ptr, "__udivsi3_i4i", SFUNC_GOT);
last = gen_udivsi3_i4_int (operands[0], func_ptr);
}
else if (TARGET_DIVIDE_CALL_FP)
{
rtx lab = function_symbol (operands[3], "__udivsi3_i4", SFUNC_STATIC).lab;
rtx lab = function_symbol (func_ptr, "__udivsi3_i4", SFUNC_STATIC).lab;
if (TARGET_FPU_SINGLE)
last = gen_udivsi3_i4_single (operands[0], operands[3], lab);
last = gen_udivsi3_i4_single (operands[0], func_ptr, lab);
else
last = gen_udivsi3_i4 (operands[0], operands[3], lab);
last = gen_udivsi3_i4 (operands[0], func_ptr, lab);
}
else if (TARGET_SH2A)
{
@ -2318,8 +2318,8 @@
}
else
{
rtx lab = function_symbol (operands[3], "__udivsi3", SFUNC_STATIC).lab;
last = gen_udivsi3_i1 (operands[0], operands[3], lab);
rtx lab = function_symbol (func_ptr, "__udivsi3", SFUNC_STATIC).lab;
last = gen_udivsi3_i1 (operands[0], func_ptr, lab);
}
emit_move_insn (gen_rtx_REG (SImode, 4), operands[1]);
emit_move_insn (gen_rtx_REG (SImode, 5), operands[2]);
@ -2405,22 +2405,22 @@
""
{
rtx last;
rtx func_ptr = gen_reg_rtx (Pmode);
operands[3] = gen_reg_rtx (Pmode);
/* Emit the move of the address to a pseudo outside of the libcall. */
if (TARGET_DIVIDE_CALL_TABLE)
{
function_symbol (operands[3], sh_divsi3_libfunc, SFUNC_GOT);
last = gen_divsi3_i4_int (operands[0], operands[3]);
function_symbol (func_ptr, sh_divsi3_libfunc, SFUNC_GOT);
last = gen_divsi3_i4_int (operands[0], func_ptr);
}
else if (TARGET_DIVIDE_CALL_FP)
{
rtx lab = function_symbol (operands[3], sh_divsi3_libfunc,
rtx lab = function_symbol (func_ptr, sh_divsi3_libfunc,
SFUNC_STATIC).lab;
if (TARGET_FPU_SINGLE)
last = gen_divsi3_i4_single (operands[0], operands[3], lab);
last = gen_divsi3_i4_single (operands[0], func_ptr, lab);
else
last = gen_divsi3_i4 (operands[0], operands[3], lab);
last = gen_divsi3_i4 (operands[0], func_ptr, lab);
}
else if (TARGET_SH2A)
{
@ -2431,8 +2431,8 @@
}
else
{
function_symbol (operands[3], sh_divsi3_libfunc, SFUNC_GOT);
last = gen_divsi3_i1 (operands[0], operands[3]);
function_symbol (func_ptr, sh_divsi3_libfunc, SFUNC_GOT);
last = gen_divsi3_i1 (operands[0], func_ptr);
}
emit_move_insn (gen_rtx_REG (SImode, 4), operands[1]);
emit_move_insn (gen_rtx_REG (SImode, 5), operands[2]);
@ -6519,6 +6519,7 @@
[(call (mem (match_operand:SI 0 "symbol_ref_operand" ""))
(match_operand 1 "" ""))
(use (reg:SI FPSCR_MODES_REG))
(use (match_scratch 2))
(clobber (reg:SI PR_REG))]
"TARGET_SH2A && sh2a_is_function_vector_call (operands[0])"
{
@ -6629,6 +6630,7 @@
(call (mem:SI (match_operand:SI 1 "symbol_ref_operand" ""))
(match_operand 2 "" "")))
(use (reg:SI FPSCR_MODES_REG))
(use (match_scratch 3))
(clobber (reg:SI PR_REG))]
"TARGET_SH2A && sh2a_is_function_vector_call (operands[1])"
{
@ -7044,13 +7046,11 @@
[(const_int 0)]
{
rtx lab = PATTERN (gen_call_site ());
rtx call_insn;
rtx tmp = gen_rtx_REG (SImode, R1_REG);
operands[3] = gen_rtx_REG (SImode, R1_REG);
sh_expand_sym_label2reg (operands[3], operands[1], lab, true);
call_insn = emit_call_insn (gen_sibcall_valuei_pcrel (operands[0],
operands[3],
sh_expand_sym_label2reg (tmp, operands[1], lab, true);
rtx call_insn = emit_call_insn (gen_sibcall_valuei_pcrel (operands[0],
tmp,
operands[2],
copy_rtx (lab)));
SIBLING_CALL_P (call_insn) = 1;
@ -7078,12 +7078,11 @@
[(const_int 0)]
{
rtx lab = PATTERN (gen_call_site ());
rtx tmp = gen_rtx_REG (SImode, R1_REG);
operands[3] = gen_rtx_REG (SImode, R1_REG);
sh_expand_sym_label2reg (operands[3], operands[1], lab, true);
sh_expand_sym_label2reg (tmp, operands[1], lab, true);
rtx i = emit_call_insn (gen_sibcall_valuei_pcrel_fdpic (operands[0],
operands[3],
tmp,
operands[2],
copy_rtx (lab)));
SIBLING_CALL_P (i) = 1;