aboutsummaryrefslogtreecommitdiff
path: root/gcc/config
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/config')
-rw-r--r--gcc/config/alpha/alpha.c57
-rw-r--r--gcc/config/arc/arc.c6
-rw-r--r--gcc/config/clipper/clipper.c12
-rw-r--r--gcc/config/i386/i386.c2
-rw-r--r--gcc/config/i960/i960.c5
-rw-r--r--gcc/config/ia64/ia64.c4
-rw-r--r--gcc/config/m32r/m32r.c2
-rw-r--r--gcc/config/m88k/m88k.c10
-rw-r--r--gcc/config/mips/mips.c4
-rw-r--r--gcc/config/mn10300/mn10300.c4
-rw-r--r--gcc/config/pa/pa.c2
-rw-r--r--gcc/config/rs6000/rs6000.c60
-rw-r--r--gcc/config/sh/sh.c12
-rw-r--r--gcc/config/sparc/sparc.c6
-rw-r--r--gcc/config/v850/v850.c2
15 files changed, 96 insertions, 92 deletions
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index ec70eb1..1f62d0d 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -1102,7 +1102,7 @@ get_aligned_mem (ref, paligned_mem, pbitnum)
/* Sadly, we cannot use alias sets here because we may overlap other
data in a different alias set. */
- MEM_ALIAS_SET (*paligned_mem) = 0;
+ set_mem_alias_set (*paligned_mem, 0);
*pbitnum = GEN_INT ((offset & 3) * 8);
}
@@ -1229,7 +1229,6 @@ alpha_set_memflags_1 (x, in_struct_p, volatile_p, unchanging_p)
are the only thing we would be able to differentiate anyway,
there does not seem to be any point in convoluting the early
out of the alias check. */
- /* MEM_ALIAS_SET (x) = alias_set; */
break;
default:
@@ -2519,7 +2518,7 @@ alpha_expand_unaligned_load (tgt, mem, size, ofs, sign)
gen_rtx_AND (DImode,
plus_constant (XEXP (mem, 0), ofs),
GEN_INT (-8)));
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
emit_move_insn (meml, tmp);
tmp = change_address (mem, DImode,
@@ -2527,7 +2526,7 @@ alpha_expand_unaligned_load (tgt, mem, size, ofs, sign)
plus_constant (XEXP (mem, 0),
ofs + size - 1),
GEN_INT (-8)));
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
emit_move_insn (memh, tmp);
if (sign && size == 2)
@@ -2600,14 +2599,14 @@ alpha_expand_unaligned_store (dst, src, size, ofs)
gen_rtx_AND (DImode,
plus_constant (XEXP (dst, 0), ofs),
GEN_INT (-8)));
- MEM_ALIAS_SET (meml) = 0;
+ set_mem_alias_set (meml, 0);
memh = change_address (dst, DImode,
gen_rtx_AND (DImode,
plus_constant (XEXP (dst, 0),
ofs+size-1),
GEN_INT (-8)));
- MEM_ALIAS_SET (memh) = 0;
+ set_mem_alias_set (memh, 0);
emit_move_insn (dsth, memh);
emit_move_insn (dstl, meml);
@@ -2705,7 +2704,7 @@ alpha_expand_unaligned_load_words (out_regs, smem, words, ofs)
gen_rtx_AND (DImode,
plus_constant (XEXP(smem,0), 8*i),
im8));
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
emit_move_insn (data_regs[i], tmp);
}
@@ -2713,7 +2712,7 @@ alpha_expand_unaligned_load_words (out_regs, smem, words, ofs)
gen_rtx_AND (DImode,
plus_constant (XEXP(smem,0), 8*words - 1),
im8));
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
emit_move_insn (data_regs[words], tmp);
/* Extract the half-word fragments. Unfortunately DEC decided to make
@@ -2779,13 +2778,13 @@ alpha_expand_unaligned_store_words (data_regs, dmem, words, ofs)
plus_constant (XEXP(dmem,0),
words*8 - 1),
im8));
- MEM_ALIAS_SET (st_addr_2) = 0;
+ set_mem_alias_set (st_addr_2, 0);
st_addr_1 = change_address (dmem, DImode,
gen_rtx_AND (DImode,
XEXP (dmem, 0),
im8));
- MEM_ALIAS_SET (st_addr_1) = 0;
+ set_mem_alias_set (st_addr_1, 0);
/* Load up the destination end bits. */
emit_move_insn (st_tmp_2, st_addr_2);
@@ -2828,7 +2827,7 @@ alpha_expand_unaligned_store_words (data_regs, dmem, words, ofs)
gen_rtx_AND (DImode,
plus_constant(XEXP (dmem,0), i*8),
im8));
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
emit_move_insn (tmp, data_regs ? ins_tmps[i-1] : const0_rtx);
}
emit_move_insn (st_addr_1, st_tmp_1);
@@ -3253,7 +3252,7 @@ alpha_expand_block_clear (operands)
HOST_WIDE_INT mask;
mem = adjust_address (orig_dst, mode, ofs - inv_alignofs);
- MEM_ALIAS_SET (mem) = 0;
+ set_mem_alias_set (mem, 0);
mask = ~(~(HOST_WIDE_INT)0 << (inv_alignofs * 8));
if (bytes < alignofs)
@@ -3333,13 +3332,13 @@ alpha_expand_block_clear (operands)
words = bytes / 8;
for (i = 0; i < words; ++i)
{
- rtx mem;
- mem = change_address (orig_dst, DImode,
- gen_rtx_AND (DImode,
- plus_constant (XEXP (orig_dst, 0),
- ofs + i*8),
- GEN_INT (-8)));
- MEM_ALIAS_SET (mem) = 0;
+ rtx mem
+ = change_address (orig_dst, DImode,
+ gen_rtx_AND (DImode,
+ plus_constant (XEXP (orig_dst, 0),
+ ofs + i*8),
+ GEN_INT (-8)));
+ set_mem_alias_set (mem, 0);
emit_move_insn (mem, const0_rtx);
}
@@ -3398,7 +3397,7 @@ alpha_expand_block_clear (operands)
HOST_WIDE_INT mask;
mem = adjust_address (orig_dst, DImode, ofs);
- MEM_ALIAS_SET (mem) = 0;
+ set_mem_alias_set (mem, 0);
mask = ~(HOST_WIDE_INT)0 << (bytes * 8);
@@ -3414,7 +3413,7 @@ alpha_expand_block_clear (operands)
HOST_WIDE_INT mask;
mem = adjust_address (orig_dst, SImode, ofs);
- MEM_ALIAS_SET (mem) = 0;
+ set_mem_alias_set (mem, 0);
mask = ~(HOST_WIDE_INT)0 << (bytes * 8);
@@ -4741,7 +4740,7 @@ alpha_expand_prologue ()
if (TARGET_OPEN_VMS && vms_is_stack_procedure)
{
mem = gen_rtx_MEM (DImode, stack_pointer_rtx);
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (mem, gen_rtx_REG (DImode, REG_PV)));
}
@@ -4749,7 +4748,7 @@ alpha_expand_prologue ()
if (imask & (1L << REG_RA))
{
mem = gen_rtx_MEM (DImode, plus_constant (sa_reg, reg_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (mem, gen_rtx_REG (DImode, REG_RA)));
imask &= ~(1L << REG_RA);
reg_offset += 8;
@@ -4760,7 +4759,7 @@ alpha_expand_prologue ()
if (imask & (1L << i))
{
mem = gen_rtx_MEM (DImode, plus_constant (sa_reg, reg_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (mem, gen_rtx_REG (DImode, i)));
reg_offset += 8;
}
@@ -4769,7 +4768,7 @@ alpha_expand_prologue ()
if (fmask & (1L << i))
{
mem = gen_rtx_MEM (DFmode, plus_constant (sa_reg, reg_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (mem, gen_rtx_REG (DFmode, i+32)));
reg_offset += 8;
}
@@ -5104,7 +5103,7 @@ alpha_expand_epilogue ()
mem = gen_rtx_MEM (DImode, plus_constant (sa_reg, reg_offset));
if (! eh_ofs)
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (gen_rtx_REG (DImode, REG_RA), mem));
reg_offset += 8;
@@ -5118,7 +5117,7 @@ alpha_expand_epilogue ()
else
{
mem = gen_rtx_MEM (DImode, plus_constant(sa_reg, reg_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (gen_rtx_REG (DImode, i), mem));
}
reg_offset += 8;
@@ -5128,7 +5127,7 @@ alpha_expand_epilogue ()
if (fmask & (1L << i))
{
mem = gen_rtx_MEM (DFmode, plus_constant(sa_reg, reg_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (gen_rtx_REG (DFmode, i+32), mem));
reg_offset += 8;
}
@@ -5186,7 +5185,7 @@ alpha_expand_epilogue ()
{
emit_insn (gen_blockage ());
mem = gen_rtx_MEM (DImode, plus_constant (sa_reg, fp_offset));
- MEM_ALIAS_SET (mem) = alpha_sr_alias_set;
+ set_mem_alias_set (mem, alpha_sr_alias_set);
FRP (emit_move_insn (hard_frame_pointer_rtx, mem));
}
else if (TARGET_OPEN_VMS)
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 7e309f8..0fe070b 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -1,6 +1,6 @@
/* Subroutines used for code generation on the Argonaut ARC cpu.
- Copyright (C) 1994, 1995, 1997, 1998, 1999,
- 2000 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -797,7 +797,7 @@ arc_setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
plus_constant (arg_pointer_rtx,
FIRST_PARM_OFFSET (0)
+ align_slop * UNITS_PER_WORD));
- MEM_ALIAS_SET (regblock) = get_varargs_alias_set ();
+ set_mem_alias_set (regblock, get_varargs_alias_set ());
move_block_from_reg (first_reg_offset, regblock,
MAX_ARC_PARM_REGS - first_reg_offset,
((MAX_ARC_PARM_REGS - first_reg_offset)
diff --git a/gcc/config/clipper/clipper.c b/gcc/config/clipper/clipper.c
index 76320ff..1e3118e 100644
--- a/gcc/config/clipper/clipper.c
+++ b/gcc/config/clipper/clipper.c
@@ -1,6 +1,6 @@
/* Subroutines for insn-output.c for Clipper
- Copyright (C) 1987, 1988, 1991, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1987, 1988, 1991, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
Contributed by Holger Teutsch (holger@hotbso.rhein-main.de)
This file is part of GNU CC.
@@ -402,21 +402,21 @@ clipper_builtin_saveregs ()
/* Store int regs */
mem = gen_rtx_MEM (SImode, r0_addr);
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (SImode, 0));
mem = gen_rtx_MEM (SImode, r1_addr);
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (SImode, 1));
/* Store float regs */
mem = gen_rtx_MEM (DFmode, f0_addr);
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (DFmode, 16));
mem = gen_rtx_MEM (DFmode, f1_addr);
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (DFmode, 17));
if (current_function_check_memory_usage)
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 585238f..81cfcd7 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3421,7 +3421,7 @@ legitimize_pic_address (orig, reg)
new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new);
new = gen_rtx_MEM (Pmode, new);
RTX_UNCHANGING_P (new) = 1;
- MEM_ALIAS_SET (new) = ix86_GOT_alias_set ();
+ set_mem_alias_set (new, ix86_GOT_alias_set ());
if (reg == 0)
reg = gen_reg_rtx (Pmode);
diff --git a/gcc/config/i960/i960.c b/gcc/config/i960/i960.c
index 7cdb5aa..12b1548 100644
--- a/gcc/config/i960/i960.c
+++ b/gcc/config/i960/i960.c
@@ -2581,9 +2581,8 @@ i960_setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
/* ??? Note that we unnecessarily store one extra register for stdarg
fns. We could optimize this, but it's kept as for now. */
regblock = gen_rtx_MEM (BLKmode,
- plus_constant (arg_pointer_rtx,
- first_reg * 4));
- MEM_ALIAS_SET (regblock) = get_varargs_alias_set ();
+ plus_constant (arg_pointer_rtx, first_reg * 4));
+ set_mem_alias_set (regblock, get_varargs_alias_set ());
move_block_from_reg (first_reg, regblock,
NPARM_REGS - first_reg,
(NPARM_REGS - first_reg) * UNITS_PER_WORD);
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 394c910..9d1d506 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -1702,7 +1702,7 @@ spill_restore_mem (reg, cfa_off)
&& frame_pointer_needed)
{
mem = gen_rtx_MEM (GET_MODE (reg), hard_frame_pointer_rtx);
- MEM_ALIAS_SET (mem) = get_varargs_alias_set ();
+ set_mem_alias_set (mem, get_varargs_alias_set ());
return mem;
}
else
@@ -1751,7 +1751,7 @@ spill_restore_mem (reg, cfa_off)
/* ??? Not all of the spills are for varargs, but some of them are.
The rest of the spills belong in an alias set of their own. But
it doesn't actually hurt to include them here. */
- MEM_ALIAS_SET (mem) = get_varargs_alias_set ();
+ set_mem_alias_set (mem, get_varargs_alias_set ());
spill_fill_data.prev_addr[iter] = &XEXP (mem, 0);
spill_fill_data.prev_off[iter] = cfa_off;
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 006e7be..a37ed65 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -1400,7 +1400,7 @@ m32r_setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
regblock = gen_rtx_MEM (BLKmode,
plus_constant (arg_pointer_rtx,
FIRST_PARM_OFFSET (0)));
- MEM_ALIAS_SET (regblock) = get_varargs_alias_set ();
+ set_mem_alias_set (regblock, get_varargs_alias_set ());
move_block_from_reg (first_reg_offset, regblock,
size, size * UNITS_PER_WORD);
diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index 63e4644..9ac0349 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -2612,15 +2612,13 @@ m88k_builtin_saveregs ()
variable_args_p = 1;
fixed = 0;
- if (CONSTANT_P (current_function_arg_offset_rtx))
- {
- fixed = (XINT (current_function_arg_offset_rtx, 0)
- + argadj) / UNITS_PER_WORD;
- }
+ if (GET_CODE (current_function_arg_offset_rtx) == CONST_INT)
+ fixed = ((INTVAL (current_function_arg_offset_rtx) + argadj)
+ / UNITS_PER_WORD);
/* Allocate the register space, and store it as the __va_reg member. */
addr = assign_stack_local (BLKmode, 8 * UNITS_PER_WORD, -1);
- MEM_ALIAS_SET (addr) = get_varargs_alias_set ();
+ set_mem_alias_set (addr, get_varargs_alias_set ());
RTX_UNCHANGING_P (addr) = 1;
RTX_UNCHANGING_P (XEXP (addr, 0)) = 1;
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 4436f7d..dd2e3e3 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4515,7 +4515,7 @@ mips_va_arg (valist, type)
if (indirect)
{
r = gen_rtx_MEM (Pmode, addr_rtx);
- MEM_ALIAS_SET (r) = get_varargs_alias_set ();
+ set_mem_alias_set (r, get_varargs_alias_set ());
emit_move_insn (addr_rtx, r);
}
else
@@ -4656,7 +4656,7 @@ mips_va_arg (valist, type)
if (indirect)
{
r = gen_rtx_MEM (Pmode, addr_rtx);
- MEM_ALIAS_SET (r) = get_varargs_alias_set ();
+ set_mem_alias_set (r, get_varargs_alias_set ());
emit_move_insn (addr_rtx, r);
}
else
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index decbe6d..7ea66d8 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -869,12 +869,12 @@ mn10300_builtin_saveregs ()
offset = current_function_arg_offset_rtx;
mem = gen_rtx_MEM (SImode, current_function_internal_arg_pointer);
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (SImode, 0));
mem = gen_rtx_MEM (SImode,
plus_constant (current_function_internal_arg_pointer, 4));
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (SImode, 1));
return copy_to_reg (expand_binop (Pmode, add_optab,
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index aec2e42..c1fa4fe 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -4799,7 +4799,7 @@ hppa_builtin_saveregs ()
dest = gen_rtx_MEM (BLKmode,
plus_constant (current_function_internal_arg_pointer,
-16));
- MEM_ALIAS_SET (dest) = get_varargs_alias_set ();
+ set_mem_alias_set (dest, get_varargs_alias_set ());
move_block_from_reg (23, dest, 4, 4 * UNITS_PER_WORD);
/* move_block_from_reg will emit code to store the argument registers
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index a01bf6f..73aa3d5 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1861,9 +1861,10 @@ rs6000_emit_move (dest, source, mode)
get_pool_constant (XEXP (operands[1], 0)),
get_pool_mode (XEXP (operands[1], 0))))
{
- operands[1] = gen_rtx_MEM (mode,
- create_TOC_reference (XEXP (operands[1], 0)));
- MEM_ALIAS_SET (operands[1]) = get_TOC_alias_set ();
+ operands[1]
+ = gen_rtx_MEM (mode,
+ create_TOC_reference (XEXP (operands[1], 0)));
+ set_mem_alias_set (operands[1], get_TOC_alias_set ());
RTX_UNCHANGING_P (operands[1]) = 1;
}
}
@@ -2355,7 +2356,7 @@ setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
mem = gen_rtx_MEM (BLKmode,
plus_constant (save_area,
first_reg_offset * reg_size)),
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
move_block_from_reg
(GP_ARG_MIN_REG + first_reg_offset, mem,
@@ -2387,7 +2388,7 @@ setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
while (fregno <= FP_ARG_V4_MAX_REG)
{
mem = gen_rtx_MEM (DFmode, plus_constant (save_area, off));
- MEM_ALIAS_SET (mem) = set;
+ set_mem_alias_set (mem, set);
emit_move_insn (mem, gen_rtx_REG (DFmode, fregno));
fregno++;
off += 8;
@@ -2692,7 +2693,7 @@ rs6000_va_arg (valist, type)
if (indirect_p)
{
r = gen_rtx_MEM (Pmode, addr_rtx);
- MEM_ALIAS_SET (r) = get_varargs_alias_set ();
+ set_mem_alias_set (r, get_varargs_alias_set ());
emit_move_insn (addr_rtx, r);
}
@@ -5673,7 +5674,7 @@ rs6000_emit_eh_toc_restore (stacksize)
rtx loop_exit = gen_label_rtx ();
mem = gen_rtx_MEM (Pmode, hard_frame_pointer_rtx);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (bottom_of_stack, mem);
top_of_stack = expand_binop (Pmode, add_optab,
@@ -5707,7 +5708,7 @@ rs6000_emit_eh_toc_restore (stacksize)
loop_exit);
mem = gen_rtx_MEM (Pmode, bottom_of_stack);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (bottom_of_stack, mem);
mem = gen_rtx_MEM (Pmode,
@@ -5723,15 +5724,15 @@ rs6000_emit_eh_toc_restore (stacksize)
}
#endif /* TARGET_AIX */
-/* This ties together stack memory
- (MEM with an alias set of rs6000_sr_alias_set)
- and the change to the stack pointer. */
+/* This ties together stack memory (MEM with an alias set of
+ rs6000_sr_alias_set) and the change to the stack pointer. */
+
static void
rs6000_emit_stack_tie ()
{
- rtx mem;
- mem = gen_rtx_MEM (BLKmode, gen_rtx_REG (Pmode, STACK_POINTER_REGNUM));
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ rtx mem = gen_rtx_MEM (BLKmode, gen_rtx_REG (Pmode, STACK_POINTER_REGNUM));
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_insn (gen_stack_tie (mem));
}
@@ -5972,7 +5973,7 @@ rs6000_emit_prologue ()
+ sp_offset
+ 8*i));
mem = gen_rtx_MEM (DFmode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
insn = emit_move_insn (mem, reg);
rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
@@ -6004,7 +6005,7 @@ rs6000_emit_prologue ()
GEN_INT (info->fp_save_offset
+ sp_offset + 8*i));
mem = gen_rtx_MEM (DFmode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
RTVEC_ELT (p, i + 2) = gen_rtx_SET (VOIDmode, mem, reg);
}
@@ -6030,7 +6031,7 @@ rs6000_emit_prologue ()
+ sp_offset
+ reg_size * i));
mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
RTVEC_ELT (p, i) = gen_rtx_SET (VOIDmode, mem, reg);
}
@@ -6057,7 +6058,7 @@ rs6000_emit_prologue ()
+ sp_offset
+ reg_size * i));
mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
insn = emit_move_insn (mem, reg);
rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
@@ -6084,7 +6085,7 @@ rs6000_emit_prologue ()
info->ehrd_offset + sp_offset
+ reg_size * (int) i);
mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
insn = emit_move_insn (mem, reg);
rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
@@ -6113,7 +6114,8 @@ rs6000_emit_prologue ()
rtx addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
GEN_INT (info->cr_save_offset + sp_offset));
rtx mem = gen_rtx_MEM (SImode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
/* If r12 was used to hold the original sp, copy cr into r0 now
that it's free. */
@@ -6304,7 +6306,8 @@ rs6000_emit_epilogue (sibcall)
rtx addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
GEN_INT (info->lr_save_offset + sp_offset));
rtx mem = gen_rtx_MEM (Pmode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (gen_rtx_REG (Pmode, 0), mem);
}
@@ -6315,7 +6318,8 @@ rs6000_emit_epilogue (sibcall)
rtx addr = gen_rtx_PLUS (Pmode, frame_reg_rtx,
GEN_INT (info->cr_save_offset + sp_offset));
rtx mem = gen_rtx_MEM (SImode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (gen_rtx_REG (SImode, 12), mem);
}
@@ -6342,7 +6346,7 @@ rs6000_emit_epilogue (sibcall)
info->ehrd_offset + sp_offset
+ reg_size * (int) i);
mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (gen_rtx_REG (reg_mode, regno), mem);
}
@@ -6361,7 +6365,8 @@ rs6000_emit_epilogue (sibcall)
+ sp_offset
+ reg_size * i));
rtx mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
RTVEC_ELT (p, i) =
gen_rtx_SET (VOIDmode,
@@ -6385,7 +6390,8 @@ rs6000_emit_epilogue (sibcall)
+ sp_offset
+ reg_size * i));
rtx mem = gen_rtx_MEM (reg_mode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (gen_rtx_REG (reg_mode,
info->first_gp_reg_save + i),
@@ -6404,7 +6410,7 @@ rs6000_emit_epilogue (sibcall)
+ sp_offset
+ 8*i));
mem = gen_rtx_MEM (DFmode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
emit_move_insn (gen_rtx_REG (DFmode,
info->first_fp_reg_save + i),
@@ -6526,7 +6532,7 @@ rs6000_emit_epilogue (sibcall)
addr = gen_rtx_PLUS (Pmode, sp_reg_rtx,
GEN_INT (info->fp_save_offset + 8*i));
mem = gen_rtx_MEM (DFmode, addr);
- MEM_ALIAS_SET (mem) = rs6000_sr_alias_set;
+ set_mem_alias_set (mem, rs6000_sr_alias_set);
RTVEC_ELT (p, i+3) =
gen_rtx_SET (VOIDmode,
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index b6885a7..18e6379 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -4224,7 +4224,8 @@ sh_builtin_saveregs ()
/* Number of SFmode float regs to save. */
int n_floatregs = MAX (0, NPARM_REGS (SFmode) - first_floatreg);
rtx regbuf, fpregs;
- int bufsize, regno, alias_set;
+ int bufsize, regno;
+ HOST_WIDE_INT alias_set;
/* Allocate block of memory for the regs. */
/* ??? If n_intregs + n_floatregs == 0, should we allocate at least 1 byte?
@@ -4233,7 +4234,7 @@ sh_builtin_saveregs ()
regbuf = assign_stack_local (BLKmode, bufsize, 0);
alias_set = get_varargs_alias_set ();
- MEM_ALIAS_SET (regbuf) = alias_set;
+ set_mem_alias_set (regbuf, alias_set);
/* Save int args.
This is optimized to only save the regs that are necessary. Explicitly
@@ -4264,7 +4265,7 @@ sh_builtin_saveregs ()
emit_insn (gen_addsi3 (fpregs, fpregs,
GEN_INT (-2 * UNITS_PER_WORD)));
mem = gen_rtx_MEM (DFmode, fpregs);
- MEM_ALIAS_SET (mem) = alias_set;
+ set_mem_alias_set (mem, alias_set);
emit_move_insn (mem,
gen_rtx (REG, DFmode, BASE_ARG_REG (DFmode) + regno));
}
@@ -4273,7 +4274,7 @@ sh_builtin_saveregs ()
{
emit_insn (gen_addsi3 (fpregs, fpregs, GEN_INT (- UNITS_PER_WORD)));
mem = gen_rtx_MEM (SFmode, fpregs);
- MEM_ALIAS_SET (mem) = alias_set;
+ set_mem_alias_set (mem, alias_set);
emit_move_insn (mem,
gen_rtx (REG, SFmode, BASE_ARG_REG (SFmode) + regno
- (TARGET_LITTLE_ENDIAN != 0)));
@@ -4283,9 +4284,10 @@ sh_builtin_saveregs ()
for (regno = NPARM_REGS (SFmode) - 1; regno >= first_floatreg; regno--)
{
rtx mem;
+
emit_insn (gen_addsi3 (fpregs, fpregs, GEN_INT (- UNITS_PER_WORD)));
mem = gen_rtx_MEM (SFmode, fpregs);
- MEM_ALIAS_SET (mem) = alias_set;
+ set_mem_alias_set (mem, alias_set);
emit_move_insn (mem,
gen_rtx_REG (SFmode, BASE_ARG_REG (SFmode) + regno));
}
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 197242d1..e7413ee 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4929,10 +4929,10 @@ sparc_va_arg (valist, type)
addr_rtx = force_reg (Pmode, addr_rtx);
addr_rtx = gen_rtx_MEM (BLKmode, addr_rtx);
- MEM_ALIAS_SET (addr_rtx) = get_varargs_alias_set ();
+ set_mem_alias_set (addr_rtx, get_varargs_alias_set ());
tmp = shallow_copy_rtx (tmp);
PUT_MODE (tmp, BLKmode);
- MEM_ALIAS_SET (tmp) = 0;
+ set_mem_alias_set (tmp, 0);
dest_addr = emit_block_move (tmp, addr_rtx, GEN_INT (rsize),
BITS_PER_WORD);
@@ -4946,7 +4946,7 @@ sparc_va_arg (valist, type)
{
addr_rtx = force_reg (Pmode, addr_rtx);
addr_rtx = gen_rtx_MEM (Pmode, addr_rtx);
- MEM_ALIAS_SET (addr_rtx) = get_varargs_alias_set ();
+ set_mem_alias_set (addr_rtx, get_varargs_alias_set ());
}
return addr_rtx;
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 2cbd115..e742eeb 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -2791,7 +2791,7 @@ v850_va_arg (valist, type)
{
addr_rtx = force_reg (Pmode, addr_rtx);
addr_rtx = gen_rtx_MEM (Pmode, addr_rtx);
- MEM_ALIAS_SET (addr_rtx) = get_varargs_alias_set ();
+ set_mem_alias_set (addr_rtx, get_varargs_alias_set ());
}
return addr_rtx;