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

sparc: Fix stack references in return delay slot. 

gcc/

	PR target/80968
	* config/sparc/sparc.c (sparc_expand_prologue): Emit frame
	blockage if function uses alloca.

gcc/testsuite/

	* gcc.target/sparc/sparc-ret-3.c: New test.

From-SVN: r248929
This commit is contained in:
David S. Miller 2017-06-06 18:42:52 +00:00 committed by David S. Miller
parent 4bbb73f6df
commit 3179bb54ce
4 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-06 David S. Miller <davem@davemloft.net>
PR target/80968
* config/sparc/sparc.c (sparc_expand_prologue): Emit frame
blockage if function uses alloca.
2017-06-05 Volker Reichelt <v.reichelt@netcologne.de>
* doc/invoke.texi (-Wduplicated-branches): Add to warning list.

3
gcc/config/sparc/sparc.c
View File

@ -5792,6 +5792,9 @@ sparc_expand_epilogue (bool for_eh)
{
HOST_WIDE_INT size = sparc_frame_size;
if (cfun->calls_alloca)
emit_insn (gen_frame_blockage ());
if (sparc_n_global_fp_regs > 0)
emit_save_or_restore_global_fp_regs (sparc_frame_base_reg,
sparc_frame_base_offset

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2017-06-06 David S. Miller <davem@davemloft.net>
* gcc.target/sparc/sparc-ret-3.c: New test.
2017-06-05 Janus Weil <janus@gcc.gnu.org>
Backport from trunk

53
gcc/testsuite/gcc.target/sparc/sparc-ret-3.c Normal file
View File

@ -0,0 +1,53 @@
/* PR target/80968 */
/* { dg-do compile } */
/* { dg-skip-if "no register windows" { *-*-* } { "-mflat" } { "" } } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-mcpu=ultrasparc -O" } */
/* Make sure references to the stack frame do not slip into the delay slot
of a return instruction. */
struct crypto_shash {
unsigned int descsize;
};
struct crypto_shash *tfm;
struct shash_desc {
struct crypto_shash *tfm;
unsigned int flags;
void *__ctx[] __attribute__((aligned(8)));
};
static inline unsigned int crypto_shash_descsize(struct crypto_shash *tfm)
{
return tfm->descsize;
}
static inline void *shash_desc_ctx(struct shash_desc *desc)
{
return desc->__ctx;
}
#define SHASH_DESC_ON_STACK(shash, ctx) \
char __##shash##_desc[sizeof(struct shash_desc) + \
crypto_shash_descsize(ctx)] __attribute__((aligned(8))); \
struct shash_desc *shash = (struct shash_desc *)__##shash##_desc
extern int crypto_shash_update(struct shash_desc *, const void *, unsigned int);
unsigned int bug(unsigned int crc, const void *address, unsigned int length)
{
SHASH_DESC_ON_STACK(shash, tfm);
unsigned int *ctx = (unsigned int *)shash_desc_ctx(shash);
int err;
shash->tfm = tfm;
shash->flags = 0;
*ctx = crc;
err = crypto_shash_update(shash, address, length);
return *ctx;
}
/* { dg-final { scan-assembler "ld\[ \t\]*\\\[%i5\\+8\\\], %i0\n\[^\n\]*return\[ \t\]*%i7\\+8" } } */