Skip to content

R
riscv-gcc-1
Commit 4d9ef6a9 by Kaveh R. Ghazi Committed by Kaveh Ghazi
Options

builtins.c (expand_builtin_mempcpy): Move tree handling code to fold_builtin_mempcpy. 

	* builtins.c (expand_builtin_mempcpy): Move tree handling code to
	fold_builtin_mempcpy.  Accept a type parameter.  Delete duplicate
	code.
	(expand_builtin_strcat): Accept a type parameter.
	(fold_builtin_mempcpy): Accept a type and endp parameter.

From-SVN: r88762
parent 559837f7
Showing with 48 additions and 66 deletions
gcc/ChangeLog
2004-10-08 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 2004-10-08 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* builtins.c (expand_builtin_mempcpy): Move tree handling code to
fold_builtin_mempcpy. Accept a type parameter. Delete duplicate
code.
(expand_builtin_strcat): Accept a type parameter.
(fold_builtin_mempcpy): Accept a type and endp parameter.
* builtins.c (expand_builtin_strncpy): Delete duplicate code. * builtins.c (expand_builtin_strncpy): Delete duplicate code.
Accept an `exp' instead of an `arglist'. Accept an `exp' instead of an `arglist'.
......
gcc/builtins.c
...@@ -107,12 +107,12 @@ static rtx expand_builtin_memcmp (tree, tree, rtx, enum machine_mode); ...@@ -107,12 +107,12 @@ static rtx expand_builtin_memcmp (tree, tree, rtx, enum machine_mode);
static rtx expand_builtin_strcmp (tree, rtx, enum machine_mode); static rtx expand_builtin_strcmp (tree, rtx, enum machine_mode);
static rtx expand_builtin_strncmp (tree, rtx, enum machine_mode); static rtx expand_builtin_strncmp (tree, rtx, enum machine_mode);
static rtx builtin_memcpy_read_str (void *, HOST_WIDE_INT, enum machine_mode); static rtx builtin_memcpy_read_str (void *, HOST_WIDE_INT, enum machine_mode);
static rtx expand_builtin_strcat (tree, rtx, enum machine_mode); static rtx expand_builtin_strcat (tree, tree, rtx, enum machine_mode);
static rtx expand_builtin_strncat (tree, rtx, enum machine_mode); static rtx expand_builtin_strncat (tree, rtx, enum machine_mode);
static rtx expand_builtin_strspn (tree, rtx, enum machine_mode); static rtx expand_builtin_strspn (tree, rtx, enum machine_mode);
static rtx expand_builtin_strcspn (tree, rtx, enum machine_mode); static rtx expand_builtin_strcspn (tree, rtx, enum machine_mode);
static rtx expand_builtin_memcpy (tree, rtx, enum machine_mode); static rtx expand_builtin_memcpy (tree, rtx, enum machine_mode);
static rtx expand_builtin_mempcpy (tree, rtx, enum machine_mode, int); static rtx expand_builtin_mempcpy (tree, tree, rtx, enum machine_mode, int);
static rtx expand_builtin_memmove (tree, tree, rtx, enum machine_mode); static rtx expand_builtin_memmove (tree, tree, rtx, enum machine_mode);
static rtx expand_builtin_bcopy (tree, tree); static rtx expand_builtin_bcopy (tree, tree);
static rtx expand_builtin_strcpy (tree, rtx, enum machine_mode); static rtx expand_builtin_strcpy (tree, rtx, enum machine_mode);
...@@ -162,7 +162,7 @@ static tree fold_builtin_ceil (tree); ...@@ -162,7 +162,7 @@ static tree fold_builtin_ceil (tree);
static tree fold_builtin_round (tree); static tree fold_builtin_round (tree);
static tree fold_builtin_bitop (tree); static tree fold_builtin_bitop (tree);
static tree fold_builtin_memcpy (tree); static tree fold_builtin_memcpy (tree);
static tree fold_builtin_mempcpy (tree); static tree fold_builtin_mempcpy (tree, tree, int);
static tree fold_builtin_memmove (tree, tree); static tree fold_builtin_memmove (tree, tree);
static tree fold_builtin_strchr (tree); static tree fold_builtin_strchr (tree);
static tree fold_builtin_memcmp (tree); static tree fold_builtin_memcmp (tree);
...@@ -2621,7 +2621,7 @@ expand_builtin_memcpy (tree exp, rtx target, enum machine_mode mode) ...@@ -2621,7 +2621,7 @@ expand_builtin_memcpy (tree exp, rtx target, enum machine_mode mode)
stpcpy. */ stpcpy. */
static rtx static rtx
expand_builtin_mempcpy (tree arglist, rtx target, enum machine_mode mode, expand_builtin_mempcpy (tree arglist, tree type, rtx target, enum machine_mode mode,
int endp) int endp)
{ {
if (!validate_arglist (arglist, if (!validate_arglist (arglist,
...@@ -2648,48 +2648,20 @@ expand_builtin_mempcpy (tree arglist, rtx target, enum machine_mode mode, ...@@ -2648,48 +2648,20 @@ expand_builtin_mempcpy (tree arglist, rtx target, enum machine_mode mode,
unsigned int dest_align unsigned int dest_align
= get_pointer_alignment (dest, BIGGEST_ALIGNMENT); = get_pointer_alignment (dest, BIGGEST_ALIGNMENT);
rtx dest_mem, src_mem, len_rtx; rtx dest_mem, src_mem, len_rtx;
tree result = fold_builtin_mempcpy (arglist, type, endp);
/* If DEST is not a pointer type, call the normal function. */ if (result)
if (dest_align == 0) return expand_expr (result, target, mode, EXPAND_NORMAL);
/* If either SRC or DEST is not a pointer type, don't do this
operation in-line. */
if (dest_align == 0 || src_align == 0)
return 0; return 0;
/* If SRC and DEST are the same (and not volatile), do nothing. */
if (operand_equal_p (src, dest, 0))
{
tree expr;
if (endp == 0)
{
/* Evaluate and ignore LEN in case it has side-effects. */
expand_expr (len, const0_rtx, VOIDmode, EXPAND_NORMAL);
return expand_expr (dest, target, mode, EXPAND_NORMAL);
}
if (endp == 2)
len = fold (build2 (MINUS_EXPR, TREE_TYPE (len), len,
integer_one_node));
len = fold_convert (TREE_TYPE (dest), len);
expr = fold (build2 (PLUS_EXPR, TREE_TYPE (dest), dest, len));
return expand_expr (expr, target, mode, EXPAND_NORMAL);
}
/* If LEN is not constant, call the normal function. */ /* If LEN is not constant, call the normal function. */
if (! host_integerp (len, 1)) if (! host_integerp (len, 1))
return 0; return 0;
/* If the LEN parameter is zero, return DEST. */
if (tree_low_cst (len, 1) == 0)
{
/* Evaluate and ignore SRC in case it has side-effects. */
expand_expr (src, const0_rtx, VOIDmode, EXPAND_NORMAL);
return expand_expr (dest, target, mode, EXPAND_NORMAL);
}
/* If either SRC is not a pointer type, don't do this
operation in-line. */
if (src_align == 0)
return 0;
len_rtx = expand_expr (len, NULL_RTX, VOIDmode, 0); len_rtx = expand_expr (len, NULL_RTX, VOIDmode, 0);
src_str = c_getstr (src); src_str = c_getstr (src);
...@@ -2779,7 +2751,7 @@ expand_builtin_memmove (tree arglist, tree type, rtx target, ...@@ -2779,7 +2751,7 @@ expand_builtin_memmove (tree arglist, tree type, rtx target,
it is ok to use memcpy as well. */ it is ok to use memcpy as well. */
if (integer_onep (len)) if (integer_onep (len))
{ {
rtx ret = expand_builtin_mempcpy (arglist, target, mode, rtx ret = expand_builtin_mempcpy (arglist, type, target, mode,
/*endp=*/0); /*endp=*/0);
if (ret) if (ret)
return ret; return ret;
...@@ -2950,7 +2922,8 @@ expand_builtin_stpcpy (tree exp, rtx target, enum machine_mode mode) ...@@ -2950,7 +2922,8 @@ expand_builtin_stpcpy (tree exp, rtx target, enum machine_mode mode)
narglist = build_tree_list (NULL_TREE, lenp1); narglist = build_tree_list (NULL_TREE, lenp1);
narglist = tree_cons (NULL_TREE, src, narglist); narglist = tree_cons (NULL_TREE, src, narglist);
narglist = tree_cons (NULL_TREE, dst, narglist); narglist = tree_cons (NULL_TREE, dst, narglist);
ret = expand_builtin_mempcpy (narglist, target, mode, /*endp=*/2); ret = expand_builtin_mempcpy (narglist, TREE_TYPE (exp),
target, mode, /*endp=*/2);
if (ret) if (ret)
return ret; return ret;
...@@ -3590,7 +3563,7 @@ expand_builtin_strncmp (tree exp, rtx target, enum machine_mode mode) ...@@ -3590,7 +3563,7 @@ expand_builtin_strncmp (tree exp, rtx target, enum machine_mode mode)
otherwise try to get the result in TARGET, if convenient. */ otherwise try to get the result in TARGET, if convenient. */
static rtx static rtx
expand_builtin_strcat (tree arglist, rtx target, enum machine_mode mode) expand_builtin_strcat (tree arglist, tree type, rtx target, enum machine_mode mode)
{ {
if (!validate_arglist (arglist, POINTER_TYPE, POINTER_TYPE, VOID_TYPE)) if (!validate_arglist (arglist, POINTER_TYPE, POINTER_TYPE, VOID_TYPE))
return 0; return 0;
...@@ -3640,7 +3613,7 @@ expand_builtin_strcat (tree arglist, rtx target, enum machine_mode mode) ...@@ -3640,7 +3613,7 @@ expand_builtin_strcat (tree arglist, rtx target, enum machine_mode mode)
pass in a target of zero, it should never actually be pass in a target of zero, it should never actually be
used. If this was successful return the original used. If this was successful return the original
dst, not the result of mempcpy. */ dst, not the result of mempcpy. */
if (expand_builtin_mempcpy (arglist, /*target=*/0, mode, /*endp=*/0)) if (expand_builtin_mempcpy (arglist, type, /*target=*/0, mode, /*endp=*/0))
return expand_expr (dst, target, mode, EXPAND_NORMAL); return expand_expr (dst, target, mode, EXPAND_NORMAL);
else else
return 0; return 0;
...@@ -5383,7 +5356,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -5383,7 +5356,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
break; break;
case BUILT_IN_STRCAT: case BUILT_IN_STRCAT:
target = expand_builtin_strcat (arglist, target, mode); target = expand_builtin_strcat (arglist, TREE_TYPE (exp), target, mode);
if (target) if (target)
return target; return target;
break; break;
...@@ -5439,7 +5412,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -5439,7 +5412,7 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
break; break;
case BUILT_IN_MEMPCPY: case BUILT_IN_MEMPCPY:
target = expand_builtin_mempcpy (arglist, target, mode, /*endp=*/ 1); target = expand_builtin_mempcpy (arglist, TREE_TYPE (exp), target, mode, /*endp=*/ 1);
if (target) if (target)
return target; return target;
break; break;
...@@ -6971,31 +6944,34 @@ fold_builtin_memcpy (tree exp) ...@@ -6971,31 +6944,34 @@ fold_builtin_memcpy (tree exp)
NULL_TREE if no simplification can be made. */ NULL_TREE if no simplification can be made. */
static tree static tree
fold_builtin_mempcpy (tree exp) fold_builtin_mempcpy (tree arglist, tree type, int endp)
{ {
tree arglist = TREE_OPERAND (exp, 1); if (validate_arglist (arglist,
tree dest, src, len; POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE))
{
if (!validate_arglist (arglist, tree dest = TREE_VALUE (arglist);
POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) tree src = TREE_VALUE (TREE_CHAIN (arglist));
return 0; tree len = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
dest = TREE_VALUE (arglist); /* If the LEN parameter is zero, return DEST. */
src = TREE_VALUE (TREE_CHAIN (arglist)); if (integer_zerop (len))
len = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); return omit_one_operand (type, dest, src);
/* If the LEN parameter is zero, return DEST. */ /* If SRC and DEST are the same (and not volatile), return DEST+LEN. */
if (integer_zerop (len)) if (operand_equal_p (src, dest, 0))
return omit_one_operand (TREE_TYPE (exp), dest, src); {
if (endp == 0)
return omit_one_operand (type, dest, len);
/* If SRC and DEST are the same (and not volatile), return DEST+LEN. */ if (endp == 2)
if (operand_equal_p (src, dest, 0)) len = fold (build2 (MINUS_EXPR, TREE_TYPE (len), len,
{ ssize_int (1)));
tree temp = fold_convert (TREE_TYPE (dest), len);
temp = fold (build2 (PLUS_EXPR, TREE_TYPE (dest), dest, temp)); len = fold_convert (TREE_TYPE (dest), len);
return fold_convert (TREE_TYPE (exp), temp); len = fold (build2 (PLUS_EXPR, TREE_TYPE (dest), dest, len));
return fold_convert (type, len);
}
} }
return 0; return 0;
} }
...@@ -7964,7 +7940,7 @@ fold_builtin_1 (tree exp, bool ignore) ...@@ -7964,7 +7940,7 @@ fold_builtin_1 (tree exp, bool ignore)
return fold_builtin_memcpy (exp); return fold_builtin_memcpy (exp);
case BUILT_IN_MEMPCPY: case BUILT_IN_MEMPCPY:
return fold_builtin_mempcpy (exp); return fold_builtin_mempcpy (arglist, type, /*endp=*/1);
case BUILT_IN_MEMMOVE: case BUILT_IN_MEMMOVE:
return fold_builtin_memmove (arglist, type); return fold_builtin_memmove (arglist, type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment