+2014-08-08 Kugan Vivekanandarajah <kuganv@linaro.org>
+
+ * calls.c (precompute_arguments): Use new SUBREG_PROMOTED_SET
+ instead of SUBREG_PROMOTED_UNSIGNED_SET.
+ (expand_call): Likewise.
+ * cfgexpand.c (expand_gimple_stmt_1): Use SUBREG_PROMOTED_SIGN
+ to get promoted mode.
+ * combine.c (record_promoted_value): Skip > 0 comparison with
+ SUBREG_PROMOTED_UNSIGNED_P as it now returns only 0 or 1.
+ * expr.c (convert_move): Use SUBREG_CHECK_PROMOTED_SIGN instead
+ of SUBREG_PROMOTED_UNSIGNED_P.
+ (convert_modes): Likewise.
+ (store_expr): Use SUBREG_PROMOTED_SIGN to get promoted mode.
+ Use SUBREG_CHECK_PROMOTED_SIGN instead of SUBREG_PROMOTED_UNSIGNED_P.
+ (expand_expr_real_1): Use new SUBREG_PROMOTED_SET instead of
+ SUBREG_PROMOTED_UNSIGNED_SET.
+ * function.c (assign_parm_setup_reg): Use new SUBREG_PROMOTED_SET
+ instead of SUBREG_PROMOTED_UNSIGNED_SET.
+ * ifcvt.c (noce_emit_cmove): Updated to use SUBREG_PROMOTED_GET and
+ SUBREG_PROMOTED_SET.
+ * internal-fn.c (ubsan_expand_si_overflow_mul_check): Use
+ SUBREG_PROMOTED_SET instead of SUBREG_PROMOTED_UNSIGNED_SET.
+ * optabs.c (widen_operand): Use SUBREG_CHECK_PROMOTED_SIGN instead
+ of SUBREG_PROMOTED_UNSIGNED_P.
+ * rtl.h (SUBREG_PROMOTED_UNSIGNED_SET): Remove.
+ (SUBREG_PROMOTED_SET): New define.
+ (SUBREG_PROMOTED_GET): Likewise.
+ (SUBREG_PROMOTED_SIGN): Likewise.
+ (SUBREG_PROMOTED_SIGNED_P): Likewise.
+ (SUBREG_CHECK_PROMOTED_SIGN): Likewise.
+ (SUBREG_PROMOTED_UNSIGNED_P): Updated.
+ * rtlanal.c (unsigned_reg_p): Use new SUBREG_PROMOTED_GET
+ instead of SUBREG_PROMOTED_UNSIGNED_GET.
+ (nonzero_bits1): Skip > 0 comparison with the results as
+ SUBREG_PROMOTED_UNSIGNED_P now returns only 0 or 1.
+ (num_sign_bit_copies1): Use SUBREG_PROMOTED_SIGNED_P instead
+ of !SUBREG_PROMOTED_UNSIGNED_P.
+ * simplify-rtx.c (simplify_unary_operation_1): Use new
+ SUBREG_PROMOTED_SIGNED_P instead of !SUBREG_PROMOTED_UNSIGNED_P.
+ (simplify_subreg): Use new SUBREG_PROMOTED_SIGNED_P,
+ SUBREG_PROMOTED_UNSIGNED_P and SUBREG_PROMOTED_SET instead of
+ SUBREG_PROMOTED_UNSIGNED_P and SUBREG_PROMOTED_UNSIGNED_SET.
+
2014-08-07 Jan Hubicka <hubicka@ucw.cz>
* ipa-devirt.c: Include gimple-pretty-print.h
args[i].initial_value
= gen_lowpart_SUBREG (mode, args[i].value);
SUBREG_PROMOTED_VAR_P (args[i].initial_value) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (args[i].initial_value,
- args[i].unsignedp);
+ SUBREG_PROMOTED_SET (args[i].initial_value, args[i].unsignedp);
}
}
}
target = gen_rtx_SUBREG (TYPE_MODE (type), target, offset);
SUBREG_PROMOTED_VAR_P (target) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (target, unsignedp);
+ SUBREG_PROMOTED_SET (target, unsignedp);
}
/* If size of args is variable or this was a constructor call for a stack
;
else if (promoted)
{
- int unsignedp = SUBREG_PROMOTED_UNSIGNED_P (target);
+ int unsignedp = SUBREG_PROMOTED_SIGN (target);
/* If TEMP is a VOIDmode constant, use convert_modes to make
sure that we properly convert it. */
if (CONSTANT_P (temp) && GET_MODE (temp) == VOIDmode)
rsp = ®_stat[regno];
if (rsp->last_set == insn)
{
- if (SUBREG_PROMOTED_UNSIGNED_P (subreg) > 0)
+ if (SUBREG_PROMOTED_UNSIGNED_P (subreg))
rsp->last_set_nonzero_bits &= GET_MODE_MASK (mode);
}
if (GET_CODE (from) == SUBREG && SUBREG_PROMOTED_VAR_P (from)
&& (GET_MODE_PRECISION (GET_MODE (SUBREG_REG (from)))
>= GET_MODE_PRECISION (to_mode))
- && SUBREG_PROMOTED_UNSIGNED_P (from) == unsignedp)
+ && SUBREG_CHECK_PROMOTED_SIGN (from, unsignedp))
from = gen_lowpart (to_mode, from), from_mode = to_mode;
gcc_assert (GET_CODE (to) != SUBREG || !SUBREG_PROMOTED_VAR_P (to));
if (GET_CODE (x) == SUBREG && SUBREG_PROMOTED_VAR_P (x)
&& GET_MODE_SIZE (GET_MODE (SUBREG_REG (x))) >= GET_MODE_SIZE (mode)
- && SUBREG_PROMOTED_UNSIGNED_P (x) == unsignedp)
+ && SUBREG_CHECK_PROMOTED_SIGN (x, unsignedp))
x = gen_lowpart (mode, SUBREG_REG (x));
if (GET_MODE (x) != VOIDmode)
&& GET_MODE_PRECISION (GET_MODE (target))
== TYPE_PRECISION (TREE_TYPE (exp)))
{
- if (TYPE_UNSIGNED (TREE_TYPE (exp))
- != SUBREG_PROMOTED_UNSIGNED_P (target))
+ if (!SUBREG_CHECK_PROMOTED_SIGN (target,
+ TYPE_UNSIGNED (TREE_TYPE (exp))))
{
/* Some types, e.g. Fortran's logical*4, won't have a signed
version, so use the mode instead. */
tree ntype
= (signed_or_unsigned_type_for
- (SUBREG_PROMOTED_UNSIGNED_P (target), TREE_TYPE (exp)));
+ (SUBREG_PROMOTED_SIGN (target), TREE_TYPE (exp)));
if (ntype == NULL)
ntype = lang_hooks.types.type_for_mode
(TYPE_MODE (TREE_TYPE (exp)),
- SUBREG_PROMOTED_UNSIGNED_P (target));
+ SUBREG_PROMOTED_SIGN (target));
exp = fold_convert_loc (loc, ntype, exp);
}
exp = fold_convert_loc (loc, lang_hooks.types.type_for_mode
(GET_MODE (SUBREG_REG (target)),
- SUBREG_PROMOTED_UNSIGNED_P (target)),
+ SUBREG_PROMOTED_SIGN (target)),
exp);
inner_target = SUBREG_REG (target);
if (CONSTANT_P (temp) && GET_MODE (temp) == VOIDmode)
{
temp = convert_modes (GET_MODE (target), TYPE_MODE (TREE_TYPE (exp)),
- temp, SUBREG_PROMOTED_UNSIGNED_P (target));
+ temp, SUBREG_PROMOTED_SIGN (target));
temp = convert_modes (GET_MODE (SUBREG_REG (target)),
GET_MODE (target), temp,
- SUBREG_PROMOTED_UNSIGNED_P (target));
+ SUBREG_PROMOTED_SIGN (target));
}
convert_move (SUBREG_REG (target), temp,
- SUBREG_PROMOTED_UNSIGNED_P (target));
+ SUBREG_PROMOTED_SIGN (target));
return NULL_RTX;
}
temp = gen_lowpart_SUBREG (mode, decl_rtl);
SUBREG_PROMOTED_VAR_P (temp) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (temp, unsignedp);
+ SUBREG_PROMOTED_SET (temp, unsignedp);
return temp;
}
/* The argument is already sign/zero extended, so note it
into the subreg. */
SUBREG_PROMOTED_VAR_P (tempreg) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (tempreg, unsignedp);
+ SUBREG_PROMOTED_SET (tempreg, unsignedp);
}
/* TREE_USED gets set erroneously during expand_assignment. */
|| byte_vtrue != byte_vfalse
|| (SUBREG_PROMOTED_VAR_P (vtrue)
!= SUBREG_PROMOTED_VAR_P (vfalse))
- || (SUBREG_PROMOTED_UNSIGNED_P (vtrue)
- != SUBREG_PROMOTED_UNSIGNED_P (vfalse)))
+ || (SUBREG_PROMOTED_GET (vtrue)
+ != SUBREG_PROMOTED_GET (vfalse)))
return NULL_RTX;
promoted_target = gen_reg_rtx (GET_MODE (reg_vtrue));
target = gen_rtx_SUBREG (GET_MODE (vtrue), promoted_target, byte_vtrue);
SUBREG_PROMOTED_VAR_P (target) = SUBREG_PROMOTED_VAR_P (vtrue);
- SUBREG_PROMOTED_UNSIGNED_SET (target, SUBREG_PROMOTED_UNSIGNED_P (vtrue));
+ SUBREG_PROMOTED_SET (target, SUBREG_PROMOTED_GET (vtrue));
emit_move_insn (x, target);
return x;
}
if (GET_CODE (lopart0) == SUBREG)
{
SUBREG_PROMOTED_VAR_P (lopart0) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (lopart0, 0);
+ SUBREG_PROMOTED_SET (lopart0, 0);
}
if (GET_CODE (lopart1) == SUBREG)
{
SUBREG_PROMOTED_VAR_P (lopart1) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET (lopart1, 0);
+ SUBREG_PROMOTED_SET (lopart1, 0);
}
tree halfstype = build_nonstandard_integer_type (hprec, 0);
ops.op0 = make_tree (halfstype, lopart0);
a promoted object differs from our extension. */
if (! no_extend
|| (GET_CODE (op) == SUBREG && SUBREG_PROMOTED_VAR_P (op)
- && SUBREG_PROMOTED_UNSIGNED_P (op) == unsignedp))
+ && SUBREG_CHECK_PROMOTED_SIGN (op, unsignedp)))
return convert_modes (mode, oldmode, op, unsignedp);
/* If MODE is no wider than a single word, we return a lowpart or paradoxical
#define SUBREG_PROMOTED_VAR_P(RTX) \
(RTL_FLAG_CHECK1 ("SUBREG_PROMOTED", (RTX), SUBREG)->in_struct)
-#define SUBREG_PROMOTED_UNSIGNED_SET(RTX, VAL) \
-do { \
- rtx const _rtx = RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_UNSIGNED_SET", \
- (RTX), SUBREG); \
- if ((VAL) < 0) \
- _rtx->volatil = 1; \
- else { \
- _rtx->volatil = 0; \
- _rtx->unchanging = (VAL); \
- } \
-} while (0)
-
/* Valid for subregs which are SUBREG_PROMOTED_VAR_P(). In that case
this gives the necessary extensions:
- 0 - signed
- 1 - normal unsigned
+ 0 - signed (SPR_SIGNED)
+ 1 - normal unsigned (SPR_UNSIGNED)
+ 2 - value is both sign and unsign extended for mode
+ (SPR_SIGNED_AND_UNSIGNED).
-1 - pointer unsigned, which most often can be handled like unsigned
extension, except for generating instructions where we need to
- emit special code (ptr_extend insns) on some architectures. */
+ emit special code (ptr_extend insns) on some architectures
+ (SPR_POINTER). */
+
+const int SRP_POINTER = -1;
+const int SRP_SIGNED = 0;
+const int SRP_UNSIGNED = 1;
+const int SRP_SIGNED_AND_UNSIGNED = 2;
+
+/* Sets promoted mode for SUBREG_PROMOTED_VAR_P(). */
+#define SUBREG_PROMOTED_SET(RTX, VAL) \
+do { \
+ rtx const _rtx = RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_SET", \
+ (RTX), SUBREG); \
+ switch (VAL) \
+ { \
+ case SRP_POINTER: \
+ _rtx->volatil = 0; \
+ _rtx->unchanging = 0; \
+ break; \
+ case SRP_SIGNED: \
+ _rtx->volatil = 0; \
+ _rtx->unchanging = 1; \
+ break; \
+ case SRP_UNSIGNED: \
+ _rtx->volatil = 1; \
+ _rtx->unchanging = 0; \
+ break; \
+ case SRP_SIGNED_AND_UNSIGNED: \
+ _rtx->volatil = 1; \
+ _rtx->unchanging = 1; \
+ break; \
+ } \
+} while (0)
+/* Gets the value stored in promoted mode for SUBREG_PROMOTED_VAR_P(),
+ including SRP_SIGNED_AND_UNSIGNED if promoted for
+ both signed and unsigned. */
+#define SUBREG_PROMOTED_GET(RTX) \
+ (2 * (RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_GET", (RTX), SUBREG)->volatil)\
+ + (RTX)->unchanging - 1)
+
+/* Returns sign of promoted mode for SUBREG_PROMOTED_VAR_P(). */
+#define SUBREG_PROMOTED_SIGN(RTX) \
+ ((RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_SIGN", (RTX), SUBREG)->volatil) ? 1\
+ : (RTX)->unchanging - 1)
+
+/* Predicate to check if RTX of SUBREG_PROMOTED_VAR_P() is promoted
+ for SIGNED type. */
+#define SUBREG_PROMOTED_SIGNED_P(RTX) \
+ (RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_SIGNED_P", (RTX), SUBREG)->unchanging)
+
+/* Predicate to check if RTX of SUBREG_PROMOTED_VAR_P() is promoted
+ for UNSIGNED type. */
#define SUBREG_PROMOTED_UNSIGNED_P(RTX) \
- ((RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_UNSIGNED_P", (RTX), SUBREG)->volatil) \
- ? -1 : (int) (RTX)->unchanging)
+ (RTL_FLAG_CHECK1 ("SUBREG_PROMOTED_UNSIGNED_P", (RTX), SUBREG)->volatil)
+
+/* Checks if RTX of SUBREG_PROMOTED_VAR_P() is promoted for given SIGN. */
+#define SUBREG_CHECK_PROMOTED_SIGN(RTX, SIGN) \
+((SIGN) == SRP_POINTER ? SUBREG_PROMOTED_GET (RTX) == SRP_POINTER \
+ : (SIGN) == SRP_SIGNED ? SUBREG_PROMOTED_SIGNED_P (RTX) \
+ : SUBREG_PROMOTED_UNSIGNED_P (RTX))
/* True if the subreg was generated by LRA for reload insns. Such
subregs are valid only during LRA. */
return true;
if (GET_CODE (op) == SUBREG
- && SUBREG_PROMOTED_UNSIGNED_P (op))
+ && SUBREG_PROMOTED_SIGN (op))
return true;
return false;
been zero-extended, we know that at least the high-order bits
are zero, though others might be too. */
- if (SUBREG_PROMOTED_VAR_P (x) && SUBREG_PROMOTED_UNSIGNED_P (x) > 0)
+ if (SUBREG_PROMOTED_VAR_P (x) && SUBREG_PROMOTED_UNSIGNED_P (x))
nonzero = GET_MODE_MASK (GET_MODE (x))
& cached_nonzero_bits (SUBREG_REG (x), GET_MODE (x),
known_x, known_mode, known_ret);
and we are looking at it in a wider mode, we know that at least the
high-order bits are known to be sign bit copies. */
- if (SUBREG_PROMOTED_VAR_P (x) && ! SUBREG_PROMOTED_UNSIGNED_P (x))
+ if (SUBREG_PROMOTED_VAR_P (x) && SUBREG_PROMOTED_SIGNED_P (x))
{
num0 = cached_num_sign_bit_copies (SUBREG_REG (x), mode,
known_x, known_mode, known_ret);
target mode is the same as the variable's promotion. */
if (GET_CODE (op) == SUBREG
&& SUBREG_PROMOTED_VAR_P (op)
- && ! SUBREG_PROMOTED_UNSIGNED_P (op)
+ && SUBREG_PROMOTED_SIGNED_P (op)
&& GET_MODE_SIZE (mode) <= GET_MODE_SIZE (GET_MODE (XEXP (op, 0))))
{
temp = rtl_hooks.gen_lowpart_no_emit (mode, op);
target mode is the same as the variable's promotion. */
if (GET_CODE (op) == SUBREG
&& SUBREG_PROMOTED_VAR_P (op)
- && SUBREG_PROMOTED_UNSIGNED_P (op) > 0
+ && SUBREG_PROMOTED_UNSIGNED_P (op)
&& GET_MODE_SIZE (mode) <= GET_MODE_SIZE (GET_MODE (XEXP (op, 0))))
{
temp = rtl_hooks.gen_lowpart_no_emit (mode, op);
{
newx = gen_rtx_SUBREG (outermode, SUBREG_REG (op), final_offset);
if (SUBREG_PROMOTED_VAR_P (op)
- && SUBREG_PROMOTED_UNSIGNED_P (op) >= 0
+ && SUBREG_PROMOTED_SIGN (op) >= 0
&& GET_MODE_CLASS (outermode) == MODE_INT
&& IN_RANGE (GET_MODE_SIZE (outermode),
GET_MODE_SIZE (innermode),
&& subreg_lowpart_p (newx))
{
SUBREG_PROMOTED_VAR_P (newx) = 1;
- SUBREG_PROMOTED_UNSIGNED_SET
- (newx, SUBREG_PROMOTED_UNSIGNED_P (op));
+ SUBREG_PROMOTED_SET (newx, SUBREG_PROMOTED_GET (op));
}
return newx;
}
projects / thirdparty / gcc.git / commitdiff
