From: Uros Bizjak <ubizjak@gmail.com>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Cc: Richard Henderson <rth@redhat.com>
Subject: [PATCH, i386]: Fix gcc.c-torture/compile/pr41634.c FAIL
Date: Tue, 10 Nov 2015 17:54:00 -0000 [thread overview]
Message-ID: <CAFULd4ZadbE1LO_TzDpi6D3qw3BKJ=YwXXVB9QT2OuhAHpEy+w@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
Hello!
Recent AS patches introduced the above compilation failure. We have to
treat movabs operands in a special way - without %rip and inside
square bracket for -masm=intel.
Also, the patch removes dead code while at it.
2015-11-10 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (ix86_print_operand): Remove dead code that
tried to avoid (%rip) for call operands.
2015-11-10 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (ix86_print_operand_address_as): Add no_rip
argument. Do not use RIP relative addressing when no_rip is set.
(ix86_print_operand): Update call to ix86_print_operand_address_as.
(ix86_print_operand_address): Ditto.
* config/i386/i386.md (*movabs<mode>_1): Use %P modifier for
absolute movabs operand 0. Add square braces for -masm=intel.
(*movabs<mode>_2): Ditto for operand 1.
Bootstrapped and regression tested on x86_64-linux-gnu {,-m32} and
committed to mainline SVN.
Uros.
[-- Attachment #2: p.diff.txt --]
[-- Type: text/plain, Size: 3153 bytes --]
Index: config/i386/i386.md
===================================================================
--- config/i386/i386.md (revision 230084)
+++ config/i386/i386.md (working copy)
@@ -2601,7 +2601,7 @@
switch (which_alternative)
{
case 0:
- return "movabs{<imodesuffix>}\t{%1, %0|%0, %1}";
+ return "movabs{<imodesuffix>}\t{%1, %P0|[%P0], %1}";
case 1:
return "mov{<imodesuffix>}\t{%1, %0|%0, %1}";
default:
@@ -2625,7 +2625,7 @@
switch (which_alternative)
{
case 0:
- return "movabs{<imodesuffix>}\t{%1, %0|%0, %1}";
+ return "movabs{<imodesuffix>}\t{%P1, %0|%0, [%P1]}";
case 1:
return "mov{<imodesuffix>}\t{%1, %0|%0, %1}";
default:
Index: config/i386/i386.c
===================================================================
--- config/i386/i386.c (revision 230084)
+++ config/i386/i386.c (working copy)
@@ -80,7 +80,7 @@ along with GCC; see the file COPYING3. If not see
static rtx legitimize_dllimport_symbol (rtx, bool);
static rtx legitimize_pe_coff_extern_decl (rtx, bool);
static rtx legitimize_pe_coff_symbol (rtx, bool);
-static void ix86_print_operand_address_as (FILE *file, rtx addr, addr_space_t);
+static void ix86_print_operand_address_as (FILE *, rtx, addr_space_t, bool);
#ifndef CHECK_STACK_LIMIT
#define CHECK_STACK_LIMIT (-1)
@@ -17131,13 +17131,6 @@ ix86_print_operand (FILE *file, rtx x, int code)
{
rtx addr = XEXP (x, 0);
- /* Avoid (%rip) for call operands. */
- if (code == 'P' && CONSTANT_ADDRESS_P (x) && !CONST_INT_P (x))
- {
- output_addr_const (file, addr);
- return;
- }
-
/* No `byte ptr' prefix for call instructions ... */
if (ASSEMBLER_DIALECT == ASM_INTEL && code != 'X' && code != 'P')
{
@@ -17187,7 +17180,8 @@ ix86_print_operand (FILE *file, rtx x, int code)
if (this_is_asm_operands && ! address_operand (addr, VOIDmode))
output_operand_lossage ("invalid constraints for operand");
else
- ix86_print_operand_address_as (file, addr, MEM_ADDR_SPACE (x));
+ ix86_print_operand_address_as
+ (file, addr, MEM_ADDR_SPACE (x), code == 'p' || code == 'P');
}
else if (CONST_DOUBLE_P (x) && GET_MODE (x) == SFmode)
@@ -17272,7 +17266,8 @@ ix86_print_operand_punct_valid_p (unsigned char co
/* Print a memory operand whose address is ADDR. */
static void
-ix86_print_operand_address_as (FILE *file, rtx addr, addr_space_t as)
+ix86_print_operand_address_as (FILE *file, rtx addr,
+ addr_space_t as, bool no_rip)
{
struct ix86_address parts;
rtx base, index, disp;
@@ -17346,7 +17341,7 @@ static void
}
/* Use one byte shorter RIP relative addressing for 64bit mode. */
- if (TARGET_64BIT && !base && !index)
+ if (TARGET_64BIT && !base && !index && !no_rip)
{
rtx symbol = disp;
@@ -17505,7 +17500,7 @@ static void
static void
ix86_print_operand_address (FILE *file, machine_mode /*mode*/, rtx addr)
{
- ix86_print_operand_address_as (file, addr, ADDR_SPACE_GENERIC);
+ ix86_print_operand_address_as (file, addr, ADDR_SPACE_GENERIC, false);
}
/* Implementation of TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA. */
next reply other threads:[~2015-11-10 17:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-10 17:54 Uros Bizjak [this message]
2015-11-10 18:00 ` Richard Henderson
2015-11-10 18:14 ` Uros Bizjak
2015-11-10 18:24 ` Uros Bizjak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFULd4ZadbE1LO_TzDpi6D3qw3BKJ=YwXXVB9QT2OuhAHpEy+w@mail.gmail.com' \
--to=ubizjak@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=rth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).