From fdbfe4e5523f9fe55b7759b2d16b1ce2704fd3ac Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 20 Dec 2017 12:54:36 +0000 Subject: [PATCH] poly_int: operand_subword This patch makes operand_subword and operand_subword_force take polynomial offsets. This is a fairly old-school interface and these days should only be used when splitting multiword operations into word operations. It still doesn't hurt to support polynomial offsets and it helps make callers easier to write. 2017-12-20 Richard Sandiford Alan Hayward David Sherwood gcc/ * rtl.h (operand_subword, operand_subword_force): Take the offset as a poly_uint64 an unsigned int. * emit-rtl.c (operand_subword, operand_subword_force): Likewise. Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r255883 --- gcc/ChangeLog | 8 ++++++++ gcc/emit-rtl.c | 9 +++++---- gcc/rtl.h | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ad7ee7e6ca3..fa0a3ce3dec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-12-20 Richard Sandiford + Alan Hayward + David Sherwood + + * rtl.h (operand_subword, operand_subword_force): Take the offset + as a poly_uint64 an unsigned int. + * emit-rtl.c (operand_subword, operand_subword_force): Likewise. + 2017-12-20 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index f8d2f55e052..6f4dea325ca 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1705,7 +1705,8 @@ subreg_lowpart_p (const_rtx x) */ rtx -operand_subword (rtx op, unsigned int offset, int validate_address, machine_mode mode) +operand_subword (rtx op, poly_uint64 offset, int validate_address, + machine_mode mode) { if (mode == VOIDmode) mode = GET_MODE (op); @@ -1714,12 +1715,12 @@ operand_subword (rtx op, unsigned int offset, int validate_address, machine_mode /* If OP is narrower than a word, fail. */ if (mode != BLKmode - && (GET_MODE_SIZE (mode) < UNITS_PER_WORD)) + && maybe_lt (GET_MODE_SIZE (mode), UNITS_PER_WORD)) return 0; /* If we want a word outside OP, return zero. */ if (mode != BLKmode - && (offset + 1) * UNITS_PER_WORD > GET_MODE_SIZE (mode)) + && maybe_gt ((offset + 1) * UNITS_PER_WORD, GET_MODE_SIZE (mode))) return const0_rtx; /* Form a new MEM at the requested address. */ @@ -1753,7 +1754,7 @@ operand_subword (rtx op, unsigned int offset, int validate_address, machine_mode MODE is the mode of OP, in case it is CONST_INT. */ rtx -operand_subword_force (rtx op, unsigned int offset, machine_mode mode) +operand_subword_force (rtx op, poly_uint64 offset, machine_mode mode) { rtx result = operand_subword (op, offset, 1, mode); diff --git a/gcc/rtl.h b/gcc/rtl.h index df410789d2b..17fd9209e9a 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3043,10 +3043,10 @@ extern rtx gen_lowpart_if_possible (machine_mode, rtx); /* In emit-rtl.c */ extern rtx gen_highpart (machine_mode, rtx); extern rtx gen_highpart_mode (machine_mode, machine_mode, rtx); -extern rtx operand_subword (rtx, unsigned int, int, machine_mode); +extern rtx operand_subword (rtx, poly_uint64, int, machine_mode); /* In emit-rtl.c */ -extern rtx operand_subword_force (rtx, unsigned int, machine_mode); +extern rtx operand_subword_force (rtx, poly_uint64, machine_mode); extern int subreg_lowpart_p (const_rtx); extern poly_uint64 subreg_size_lowpart_offset (poly_uint64, poly_uint64); -- 2.30.2