Skip to content

R
riscv-gcc-1
Commit 02ee605c by Richard Henderson Committed by Richard Henderson
Options

builtins.c (get_builtin_sync_mode): New. 

        * builtins.c (get_builtin_sync_mode): New.
        (expand_builtin_sync_operation): Pass in mode argument.
        (expand_builtin_compare_and_swap): Likewise.
        (expand_builtin_lock_test_and_set): Likewise.
        (expand_builtin_lock_release): Likewise.
        (expand_builtin): Update to match.

From-SVN: r104741
parent 7d866c52
Showing with 65 additions and 30 deletions
gcc/ChangeLog
2005-09-28 Richard Henderson <rth@redhat.com>
* builtins.c (get_builtin_sync_mode): New.
(expand_builtin_sync_operation): Pass in mode argument.
(expand_builtin_compare_and_swap): Likewise.
(expand_builtin_lock_test_and_set): Likewise.
(expand_builtin_lock_release): Likewise.
(expand_builtin): Update to match.
2005-09-28 Nick Clifton <nickc@redhat.com> 2005-09-28 Nick Clifton <nickc@redhat.com>
* config/v850/v850.h (GO_IF_LEGITIMATE_ADDRESS): Tidy up * config/v850/v850.h (GO_IF_LEGITIMATE_ADDRESS): Tidy up
......
gcc/builtins.c
...@@ -5388,6 +5388,20 @@ expand_builtin_fork_or_exec (tree fn, tree arglist, rtx target, int ignore) ...@@ -5388,6 +5388,20 @@ expand_builtin_fork_or_exec (tree fn, tree arglist, rtx target, int ignore)
} }
/* Reconstitute a mode for a __sync intrinsic operation. Since the type of
the pointer in these functions is void*, the tree optimizers may remove
casts. The mode computed in expand_builtin isn't reliable either, due
to __sync_bool_compare_and_swap.
FCODE_DIFF should be fcode - base, where base is the FOO_1 code for the
group of builtins. This gives us log2 of the mode size. */
static inline enum machine_mode
get_builtin_sync_mode (int fcode_diff)
{
return mode_for_size (BITS_PER_UNIT << fcode_diff, MODE_INT, 1);
}
/* Expand the __sync_xxx_and_fetch and __sync_fetch_and_xxx intrinsics. /* Expand the __sync_xxx_and_fetch and __sync_fetch_and_xxx intrinsics.
ARGLIST is the operands list to the function. CODE is the rtx code ARGLIST is the operands list to the function. CODE is the rtx code
that corresponds to the arithmetic or logical operation from the name; that corresponds to the arithmetic or logical operation from the name;
...@@ -5397,15 +5411,14 @@ expand_builtin_fork_or_exec (tree fn, tree arglist, rtx target, int ignore) ...@@ -5397,15 +5411,14 @@ expand_builtin_fork_or_exec (tree fn, tree arglist, rtx target, int ignore)
the result of the operation at all. */ the result of the operation at all. */
static rtx static rtx
expand_builtin_sync_operation (tree arglist, enum rtx_code code, bool after, expand_builtin_sync_operation (enum machine_mode mode, tree arglist,
enum rtx_code code, bool after,
rtx target, bool ignore) rtx target, bool ignore)
{ {
enum machine_mode mode;
rtx addr, val, mem; rtx addr, val, mem;
/* Expand the operands. */ /* Expand the operands. */
addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM);
mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (TREE_VALUE (arglist))));
arglist = TREE_CHAIN (arglist); arglist = TREE_CHAIN (arglist);
val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL);
...@@ -5428,14 +5441,13 @@ expand_builtin_sync_operation (tree arglist, enum rtx_code code, bool after, ...@@ -5428,14 +5441,13 @@ expand_builtin_sync_operation (tree arglist, enum rtx_code code, bool after,
results; this is NOT optional if IS_BOOL is true. */ results; this is NOT optional if IS_BOOL is true. */
static rtx static rtx
expand_builtin_compare_and_swap (tree arglist, bool is_bool, rtx target) expand_builtin_compare_and_swap (enum machine_mode mode, tree arglist,
bool is_bool, rtx target)
{ {
enum machine_mode mode;
rtx addr, old_val, new_val, mem; rtx addr, old_val, new_val, mem;
/* Expand the operands. */ /* Expand the operands. */
addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM);
mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (TREE_VALUE (arglist))));
arglist = TREE_CHAIN (arglist); arglist = TREE_CHAIN (arglist);
old_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); old_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL);
...@@ -5462,14 +5474,13 @@ expand_builtin_compare_and_swap (tree arglist, bool is_bool, rtx target) ...@@ -5462,14 +5474,13 @@ expand_builtin_compare_and_swap (tree arglist, bool is_bool, rtx target)
place for us to store the results. */ place for us to store the results. */
static rtx static rtx
expand_builtin_lock_test_and_set (tree arglist, rtx target) expand_builtin_lock_test_and_set (enum machine_mode mode, tree arglist,
rtx target)
{ {
enum machine_mode mode;
rtx addr, val, mem; rtx addr, val, mem;
/* Expand the operands. */ /* Expand the operands. */
addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL);
mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (TREE_VALUE (arglist))));
arglist = TREE_CHAIN (arglist); arglist = TREE_CHAIN (arglist);
val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL);
...@@ -5509,16 +5520,14 @@ expand_builtin_synchronize (void) ...@@ -5509,16 +5520,14 @@ expand_builtin_synchronize (void)
to the function. */ to the function. */
static void static void
expand_builtin_lock_release (tree arglist) expand_builtin_lock_release (enum machine_mode mode, tree arglist)
{ {
enum machine_mode mode;
enum insn_code icode; enum insn_code icode;
rtx addr, val, mem, insn; rtx addr, mem, insn;
rtx val = const0_rtx;
/* Expand the operands. */ /* Expand the operands. */
addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL);
mode = TYPE_MODE (TREE_TYPE (TREE_TYPE (TREE_VALUE (arglist))));
val = const0_rtx;
/* Note that we explicitly do not want any alias information for this /* Note that we explicitly do not want any alias information for this
memory, so that we kill all other live memories. Otherwise we don't memory, so that we kill all other live memories. Otherwise we don't
...@@ -6207,7 +6216,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6207,7 +6216,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_ADD_2: case BUILT_IN_FETCH_AND_ADD_2:
case BUILT_IN_FETCH_AND_ADD_4: case BUILT_IN_FETCH_AND_ADD_4:
case BUILT_IN_FETCH_AND_ADD_8: case BUILT_IN_FETCH_AND_ADD_8:
target = expand_builtin_sync_operation (arglist, PLUS, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_ADD_1);
target = expand_builtin_sync_operation (mode, arglist, PLUS,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6217,7 +6227,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6217,7 +6227,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_SUB_2: case BUILT_IN_FETCH_AND_SUB_2:
case BUILT_IN_FETCH_AND_SUB_4: case BUILT_IN_FETCH_AND_SUB_4:
case BUILT_IN_FETCH_AND_SUB_8: case BUILT_IN_FETCH_AND_SUB_8:
target = expand_builtin_sync_operation (arglist, MINUS, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_SUB_1);
target = expand_builtin_sync_operation (mode, arglist, MINUS,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6227,7 +6238,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6227,7 +6238,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_OR_2: case BUILT_IN_FETCH_AND_OR_2:
case BUILT_IN_FETCH_AND_OR_4: case BUILT_IN_FETCH_AND_OR_4:
case BUILT_IN_FETCH_AND_OR_8: case BUILT_IN_FETCH_AND_OR_8:
target = expand_builtin_sync_operation (arglist, IOR, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_OR_1);
target = expand_builtin_sync_operation (mode, arglist, IOR,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6237,7 +6249,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6237,7 +6249,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_AND_2: case BUILT_IN_FETCH_AND_AND_2:
case BUILT_IN_FETCH_AND_AND_4: case BUILT_IN_FETCH_AND_AND_4:
case BUILT_IN_FETCH_AND_AND_8: case BUILT_IN_FETCH_AND_AND_8:
target = expand_builtin_sync_operation (arglist, AND, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_AND_1);
target = expand_builtin_sync_operation (mode, arglist, AND,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6247,7 +6260,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6247,7 +6260,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_XOR_2: case BUILT_IN_FETCH_AND_XOR_2:
case BUILT_IN_FETCH_AND_XOR_4: case BUILT_IN_FETCH_AND_XOR_4:
case BUILT_IN_FETCH_AND_XOR_8: case BUILT_IN_FETCH_AND_XOR_8:
target = expand_builtin_sync_operation (arglist, XOR, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_XOR_1);
target = expand_builtin_sync_operation (mode, arglist, XOR,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6257,7 +6271,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6257,7 +6271,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_FETCH_AND_NAND_2: case BUILT_IN_FETCH_AND_NAND_2:
case BUILT_IN_FETCH_AND_NAND_4: case BUILT_IN_FETCH_AND_NAND_4:
case BUILT_IN_FETCH_AND_NAND_8: case BUILT_IN_FETCH_AND_NAND_8:
target = expand_builtin_sync_operation (arglist, NOT, mode = get_builtin_sync_mode (fcode - BUILT_IN_FETCH_AND_NAND_1);
target = expand_builtin_sync_operation (mode, arglist, NOT,
false, target, ignore); false, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6267,7 +6282,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6267,7 +6282,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_ADD_AND_FETCH_2: case BUILT_IN_ADD_AND_FETCH_2:
case BUILT_IN_ADD_AND_FETCH_4: case BUILT_IN_ADD_AND_FETCH_4:
case BUILT_IN_ADD_AND_FETCH_8: case BUILT_IN_ADD_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, PLUS, mode = get_builtin_sync_mode (fcode - BUILT_IN_ADD_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, PLUS,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6277,7 +6293,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6277,7 +6293,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_SUB_AND_FETCH_2: case BUILT_IN_SUB_AND_FETCH_2:
case BUILT_IN_SUB_AND_FETCH_4: case BUILT_IN_SUB_AND_FETCH_4:
case BUILT_IN_SUB_AND_FETCH_8: case BUILT_IN_SUB_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, MINUS, mode = get_builtin_sync_mode (fcode - BUILT_IN_SUB_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, MINUS,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6287,7 +6304,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6287,7 +6304,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_OR_AND_FETCH_2: case BUILT_IN_OR_AND_FETCH_2:
case BUILT_IN_OR_AND_FETCH_4: case BUILT_IN_OR_AND_FETCH_4:
case BUILT_IN_OR_AND_FETCH_8: case BUILT_IN_OR_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, IOR, mode = get_builtin_sync_mode (fcode - BUILT_IN_OR_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, IOR,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6297,7 +6315,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6297,7 +6315,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_AND_AND_FETCH_2: case BUILT_IN_AND_AND_FETCH_2:
case BUILT_IN_AND_AND_FETCH_4: case BUILT_IN_AND_AND_FETCH_4:
case BUILT_IN_AND_AND_FETCH_8: case BUILT_IN_AND_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, AND, mode = get_builtin_sync_mode (fcode - BUILT_IN_AND_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, AND,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6307,7 +6326,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6307,7 +6326,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_XOR_AND_FETCH_2: case BUILT_IN_XOR_AND_FETCH_2:
case BUILT_IN_XOR_AND_FETCH_4: case BUILT_IN_XOR_AND_FETCH_4:
case BUILT_IN_XOR_AND_FETCH_8: case BUILT_IN_XOR_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, XOR, mode = get_builtin_sync_mode (fcode - BUILT_IN_XOR_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, XOR,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6317,7 +6337,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6317,7 +6337,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_NAND_AND_FETCH_2: case BUILT_IN_NAND_AND_FETCH_2:
case BUILT_IN_NAND_AND_FETCH_4: case BUILT_IN_NAND_AND_FETCH_4:
case BUILT_IN_NAND_AND_FETCH_8: case BUILT_IN_NAND_AND_FETCH_8:
target = expand_builtin_sync_operation (arglist, NOT, mode = get_builtin_sync_mode (fcode - BUILT_IN_NAND_AND_FETCH_1);
target = expand_builtin_sync_operation (mode, arglist, NOT,
true, target, ignore); true, target, ignore);
if (target) if (target)
return target; return target;
...@@ -6331,7 +6352,9 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6331,7 +6352,9 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
mode = TYPE_MODE (boolean_type_node); mode = TYPE_MODE (boolean_type_node);
if (!target || !register_operand (target, mode)) if (!target || !register_operand (target, mode))
target = gen_reg_rtx (mode); target = gen_reg_rtx (mode);
target = expand_builtin_compare_and_swap (arglist, true, target);
mode = get_builtin_sync_mode (fcode - BUILT_IN_BOOL_COMPARE_AND_SWAP_1);
target = expand_builtin_compare_and_swap (mode, arglist, true, target);
if (target) if (target)
return target; return target;
break; break;
...@@ -6340,7 +6363,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6340,7 +6363,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_VAL_COMPARE_AND_SWAP_2: case BUILT_IN_VAL_COMPARE_AND_SWAP_2:
case BUILT_IN_VAL_COMPARE_AND_SWAP_4: case BUILT_IN_VAL_COMPARE_AND_SWAP_4:
case BUILT_IN_VAL_COMPARE_AND_SWAP_8: case BUILT_IN_VAL_COMPARE_AND_SWAP_8:
target = expand_builtin_compare_and_swap (arglist, false, target); mode = get_builtin_sync_mode (fcode - BUILT_IN_VAL_COMPARE_AND_SWAP_1);
target = expand_builtin_compare_and_swap (mode, arglist, false, target);
if (target) if (target)
return target; return target;
break; break;
...@@ -6349,7 +6373,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6349,7 +6373,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_LOCK_TEST_AND_SET_2: case BUILT_IN_LOCK_TEST_AND_SET_2:
case BUILT_IN_LOCK_TEST_AND_SET_4: case BUILT_IN_LOCK_TEST_AND_SET_4:
case BUILT_IN_LOCK_TEST_AND_SET_8: case BUILT_IN_LOCK_TEST_AND_SET_8:
target = expand_builtin_lock_test_and_set (arglist, target); mode = get_builtin_sync_mode (fcode - BUILT_IN_LOCK_TEST_AND_SET_1);
target = expand_builtin_lock_test_and_set (mode, arglist, target);
if (target) if (target)
return target; return target;
break; break;
...@@ -6358,7 +6383,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode, ...@@ -6358,7 +6383,8 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
case BUILT_IN_LOCK_RELEASE_2: case BUILT_IN_LOCK_RELEASE_2:
case BUILT_IN_LOCK_RELEASE_4: case BUILT_IN_LOCK_RELEASE_4:
case BUILT_IN_LOCK_RELEASE_8: case BUILT_IN_LOCK_RELEASE_8:
expand_builtin_lock_release (arglist); mode = get_builtin_sync_mode (fcode - BUILT_IN_LOCK_RELEASE_1);
expand_builtin_lock_release (mode, arglist);
return const0_rtx; return const0_rtx;
case BUILT_IN_SYNCHRONIZE: case BUILT_IN_SYNCHRONIZE:
......
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