Hi,
this is the split out part from the "Fix not 8-byte aligned ldrd/strd on ARMv5
(PR 89544)"
which is sanitizing the middle-end interface to the back-end for strict
alignment,
and a couple of bug-fixes that are necessary to survive boot-strap.
It is intended to be applied after the PR 89544 fix.
I think it would be possible to change the default implementation of
STACK_SLOT_ALIGNMENT
to make all stack variables always naturally aligned instead of doing that only
in assign_parm_setup_stack, but would still like to avoid changing too many
things
that do not seem to have a problem. Since this would affect many targets, and
more
kinds of variables that may probably not have a strict alignment problem.
But I am ready to take your advice though.
Boot-strapped and reg-tested on x86_64-pc-linux-gnu and arm-linux-gnueabihf
Is it OK for trunk?
Thanks
Bernd.
2019-08-15 Bernd Edlinger <bernd.edlin...@hotmail.de>
Richard Biener <rguent...@suse.de>
* expr.c (expand_assignment): Handle misaligned DECLs.
(expand_expr_real_1): Handle FUNCTION_DECL as unaligned.
* function.c (assign_parm_adjust_stack_rtl): Check movmisalign optab
too.
(assign_parm_setup_stack): Allocate properly aligned stack slots.
* varasm.c (build_constant_desc): Align constants of misaligned types.
* config/arm/arm.md (movdi, movsi, movhi, movhf, movsf, movdf): Check
strict alignment restrictions on memory addresses.
* config/arm/neon.md (movti, mov<VSTRUCT>, mov<VH>): Likewise.
* config/arm/vec-common.md (mov<VALL>): Likewise.
Index: gcc/config/arm/arm.md
===================================================================
--- gcc/config/arm/arm.md (Revision 274531)
+++ gcc/config/arm/arm.md (Arbeitskopie)
@@ -5838,6 +5838,12 @@
(match_operand:DI 1 "general_operand"))]
"TARGET_EITHER"
"
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (DImode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (DImode));
if (can_create_pseudo_p ())
{
if (!REG_P (operands[0]))
@@ -6014,6 +6020,12 @@
{
rtx base, offset, tmp;
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (SImode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (SImode));
if (TARGET_32BIT || TARGET_HAVE_MOVT)
{
/* Everything except mem = const or mem = mem can be done easily. */
@@ -6503,6 +6515,12 @@
(match_operand:HI 1 "general_operand"))]
"TARGET_EITHER"
"
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (HImode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (HImode));
if (TARGET_ARM)
{
if (can_create_pseudo_p ())
@@ -6912,6 +6930,12 @@
(match_operand:HF 1 "general_operand"))]
"TARGET_EITHER"
"
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (HFmode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (HFmode));
if (TARGET_32BIT)
{
if (MEM_P (operands[0]))
@@ -6976,6 +7000,12 @@
(match_operand:SF 1 "general_operand"))]
"TARGET_EITHER"
"
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (SFmode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (SFmode));
if (TARGET_32BIT)
{
if (MEM_P (operands[0]))
@@ -7071,6 +7101,12 @@
(match_operand:DF 1 "general_operand"))]
"TARGET_EITHER"
"
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (DFmode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (DFmode));
if (TARGET_32BIT)
{
if (MEM_P (operands[0]))
Index: gcc/config/arm/neon.md
===================================================================
--- gcc/config/arm/neon.md (Revision 274531)
+++ gcc/config/arm/neon.md (Arbeitskopie)
@@ -127,6 +127,12 @@
(match_operand:TI 1 "general_operand"))]
"TARGET_NEON"
{
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (TImode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (TImode));
if (can_create_pseudo_p ())
{
if (!REG_P (operands[0]))
@@ -139,6 +145,12 @@
(match_operand:VSTRUCT 1 "general_operand"))]
"TARGET_NEON"
{
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
if (can_create_pseudo_p ())
{
if (!REG_P (operands[0]))
@@ -151,6 +163,12 @@
(match_operand:VH 1 "s_register_operand"))]
"TARGET_NEON"
{
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
if (can_create_pseudo_p ())
{
if (!REG_P (operands[0]))
Index: gcc/config/arm/vec-common.md
===================================================================
--- gcc/config/arm/vec-common.md (Revision 274531)
+++ gcc/config/arm/vec-common.md (Arbeitskopie)
@@ -26,6 +26,12 @@
"TARGET_NEON
|| (TARGET_REALLY_IWMMXT && VALID_IWMMXT_REG_MODE (<MODE>mode))"
{
+ gcc_checking_assert (!MEM_P (operands[0])
+ || MEM_ALIGN (operands[0])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
+ gcc_checking_assert (!MEM_P (operands[1])
+ || MEM_ALIGN (operands[1])
+ >= GET_MODE_ALIGNMENT (<MODE>mode));
if (can_create_pseudo_p ())
{
if (!REG_P (operands[0]))
Index: gcc/expr.c
===================================================================
--- gcc/expr.c (Revision 274531)
+++ gcc/expr.c (Arbeitskopie)
@@ -5002,9 +5002,10 @@ expand_assignment (tree to, tree from, bool nontem
/* Handle misaligned stores. */
mode = TYPE_MODE (TREE_TYPE (to));
if ((TREE_CODE (to) == MEM_REF
- || TREE_CODE (to) == TARGET_MEM_REF)
+ || TREE_CODE (to) == TARGET_MEM_REF
+ || DECL_P (to))
&& mode != BLKmode
- && !mem_ref_refers_to_non_mem_p (to)
+ && (DECL_P (to) || !mem_ref_refers_to_non_mem_p (to))
&& ((align = get_object_alignment (to))
< GET_MODE_ALIGNMENT (mode))
&& (((icode = optab_handler (movmisalign_optab, mode))
@@ -10796,6 +10797,14 @@ expand_expr_real_1 (tree exp, rtx target, machine_
MEM_VOLATILE_P (op0) = 1;
}
+ if (MEM_P (op0) && TREE_CODE (tem) == FUNCTION_DECL)
+ {
+ if (op0 == orig_op0)
+ op0 = copy_rtx (op0);
+
+ set_mem_align (op0, BITS_PER_UNIT);
+ }
+
/* In cases where an aligned union has an unaligned object
as a field, we might be extracting a BLKmode value from
an integer-mode (e.g., SImode) object. Handle this case
Index: gcc/function.c
===================================================================
--- gcc/function.c (Revision 274531)
+++ gcc/function.c (Arbeitskopie)
@@ -2812,8 +2827,10 @@ assign_parm_adjust_stack_rtl (struct assign_parm_d
stack slot, if we need one. */
if (stack_parm
&& ((GET_MODE_ALIGNMENT (data->nominal_mode) > MEM_ALIGN (stack_parm)
- && targetm.slow_unaligned_access (data->nominal_mode,
- MEM_ALIGN (stack_parm)))
+ && ((optab_handler (movmisalign_optab, data->nominal_mode)
+ != CODE_FOR_nothing)
+ || targetm.slow_unaligned_access (data->nominal_mode,
+ MEM_ALIGN (stack_parm))))
|| (data->nominal_type
&& TYPE_ALIGN (data->nominal_type) > MEM_ALIGN (stack_parm)
&& MEM_ALIGN (stack_parm) < PREFERRED_STACK_BOUNDARY)))
@@ -3466,11 +3483,20 @@ assign_parm_setup_stack (struct assign_parm_data_a
int align = STACK_SLOT_ALIGNMENT (data->passed_type,
GET_MODE (data->entry_parm),
TYPE_ALIGN (data->passed_type));
+ if (align < (int)GET_MODE_ALIGNMENT (GET_MODE (data->entry_parm))
+ && ((optab_handler (movmisalign_optab,
+ GET_MODE (data->entry_parm))
+ != CODE_FOR_nothing)
+ || targetm.slow_unaligned_access (GET_MODE (data->entry_parm),
+ align)))
+ align = GET_MODE_ALIGNMENT (GET_MODE (data->entry_parm));
data->stack_parm
= assign_stack_local (GET_MODE (data->entry_parm),
GET_MODE_SIZE (GET_MODE (data->entry_parm)),
align);
+ align = MEM_ALIGN (data->stack_parm);
set_mem_attributes (data->stack_parm, parm, 1);
+ set_mem_align (data->stack_parm, align);
}
dest = validize_mem (copy_rtx (data->stack_parm));
Index: gcc/varasm.c
===================================================================
--- gcc/varasm.c (Revision 274531)
+++ gcc/varasm.c (Arbeitskopie)
@@ -47,6 +47,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "expmed.h"
+#include "optabs.h"
#include "output.h"
#include "langhooks.h"
#include "debug.h"
@@ -3386,7 +3387,15 @@ build_constant_desc (tree exp)
if (TREE_CODE (exp) == STRING_CST)
SET_DECL_ALIGN (decl, targetm.constant_alignment (exp, DECL_ALIGN (decl)));
else
- align_variable (decl, 0);
+ {
+ align_variable (decl, 0);
+ if (DECL_ALIGN (decl) < GET_MODE_ALIGNMENT (DECL_MODE (decl))
+ && ((optab_handler (movmisalign_optab, DECL_MODE (decl))
+ != CODE_FOR_nothing)
+ || targetm.slow_unaligned_access (DECL_MODE (decl),
+ DECL_ALIGN (decl))))
+ SET_DECL_ALIGN (decl, GET_MODE_ALIGNMENT (DECL_MODE (decl)));
+ }
/* Now construct the SYMBOL_REF and the MEM. */
if (use_object_blocks_p ())
