Hello!
"Convert TLS location to DEFAULT_TLS_SEG_REG address space" patch [1]
allows to remove special handling of LEA addresses from
ix86_split_long_move. The address space is the property of MEM RTX,
not the address itself.
2017-09-19 Uros Bizjak <ubiz...@gmail.com>
* config/i386/i386.c (ix86_split_long_move): Do not handle
address used for LEA in a special way.
Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}.
Committed to mainline SVN.
[1] https://gcc.gnu.org/ml/gcc-patches/2017-08/msg01789.html
Uros.
Index: config/i386/i386.c
===================================================================
--- config/i386/i386.c (revision 252978)
+++ config/i386/i386.c (working copy)
@@ -26706,7 +26706,7 @@ ix86_split_long_move (rtx operands[])
Do an lea to the last part and use only one colliding move. */
else if (collisions > 1)
{
- rtx base, addr, tls_base = NULL_RTX;
+ rtx base, addr;
collisions = 1;
@@ -26723,44 +26723,13 @@ ix86_split_long_move (rtx operands[])
struct ix86_address parts;
int ok = ix86_decompose_address (addr, &parts);
gcc_assert (ok);
- if (parts.seg == DEFAULT_TLS_SEG_REG)
- {
- /* It is not valid to use %gs: or %fs: in
- lea though, so we need to remove it from the
- address used for lea and add it to each individual
- memory loads instead. */
- addr = copy_rtx (addr);
- rtx *x = &addr;
- while (GET_CODE (*x) == PLUS)
- {
- for (i = 0; i < 2; i++)
- {
- rtx u = XEXP (*x, i);
- if (GET_CODE (u) == ZERO_EXTEND)
- u = XEXP (u, 0);
- if (GET_CODE (u) == UNSPEC
- && XINT (u, 1) == UNSPEC_TP)
- {
- tls_base = XEXP (*x, i);
- *x = XEXP (*x, 1 - i);
- break;
- }
- }
- if (tls_base)
- break;
- x = &XEXP (*x, 0);
- }
- gcc_assert (tls_base);
- }
+ /* It is not valid to use %gs: or %fs: in lea. */
+ gcc_assert (parts.seg == ADDR_SPACE_GENERIC);
}
emit_insn (gen_rtx_SET (base, addr));
- if (tls_base)
- base = gen_rtx_PLUS (GET_MODE (base), base, tls_base);
part[1][0] = replace_equiv_address (part[1][0], base);
for (i = 1; i < nparts; i++)
{
- if (tls_base)
- base = copy_rtx (base);
tmp = plus_constant (Pmode, base, UNITS_PER_WORD * i);
part[1][i] = replace_equiv_address (part[1][i], tmp);
}
