From 048b1c951bd2510e004535964f001e7d6ddcf459 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 20 Mar 2002 22:47:07 +0100 Subject: [PATCH] re PR c/5972 (produces wrong assembly code when -march=pentiumpro and optimization (e.g. -O2)is on) PR c/5972 * config/i386/i386.md (movdicc_c_rex64, movsicc_noc, movhicc_noc, movsfcc_1, movdfcc_1): Add %O2. * config/i386/i386.c (print_operand): Handle %ON. Print . before float condition codes in Sun as cmov syntax. * config/i386/sol2.h (CMOV_SUN_AS_SYNTAX): Define for Sun as. * config.gcc (i[34567]86-*-solaris2*): Remove comment which is no longer true. From-SVN: r51086 --- gcc/ChangeLog | 13 ++++++++++++- gcc/config.gcc | 1 - gcc/config/i386/i386.c | 27 +++++++++++++++++++++++++++ gcc/config/i386/i386.md | 20 ++++++++++---------- gcc/config/i386/sol2.h | 2 ++ 5 files changed, 51 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f441576f18bf..1e3bb435d8d2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2002-03-20 Jakub Jelinek + + PR c/5972 + * config/i386/i386.md (movdicc_c_rex64, movsicc_noc, movhicc_noc, + movsfcc_1, movdfcc_1): Add %O2. + * config/i386/i386.c (print_operand): Handle %ON. + Print . before float condition codes in Sun as cmov syntax. + * config/i386/sol2.h (CMOV_SUN_AS_SYNTAX): Define for Sun as. + * config.gcc (i[34567]86-*-solaris2*): Remove comment which is + no longer true. + 2002-03-20 Philip Blundell * config/arm/arm.c (arm_output_epilogue): Don't generate separate @@ -8,7 +19,7 @@ * config/xtensa/xtensa.md: Remove unused type attributes. (adddi_carry, subddi_carry): Change type attribute to "multi". -2002-03-19 Dale Johannesen +2002-03-19 Dale Johannesen PR optimization/5999, middle-end/5731 * expr.c (expand_expr) [RDIV_EXPR]: Only convert real divisions into diff --git a/gcc/config.gcc b/gcc/config.gcc index 4b59903f66b1..8337baf2c84c 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1333,7 +1333,6 @@ i[34567]86-*-solaris2*) xm_defines="POSIX SMALL_ARG_MAX" tm_file="${tm_file} i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sol2.h" if test x$gas = xyes; then - # Only needed if gas does not support -s tm_file="i386/sol2gas.h ${tm_file}" fi tmake_file="i386/t-sol2 t-svr4" diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 2d0649944d6e..17a10c8f47e0 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -5640,6 +5640,8 @@ print_reg (x, code, file) C -- print opcode suffix for set/cmov insn. c -- like C, but print reversed condition F,f -- likewise, but for floating-point. + O -- if CMOV_SUN_AS_SYNTAX, expand to "w.", "l." or "q.", otherwise + nothing R -- print the prefix for register names. z -- print the opcode suffix for the size of the current operand. * -- print a star (in certain assembler syntax) @@ -5837,10 +5839,31 @@ print_operand (file, x, code) break; } return; + case 'O': +#ifdef CMOV_SUN_AS_SYNTAX + if (ASSEMBLER_DIALECT == ASM_ATT) + { + switch (GET_MODE (x)) + { + case HImode: putc ('w', file); break; + case SImode: + case SFmode: putc ('l', file); break; + case DImode: + case DFmode: putc ('q', file); break; + default: abort (); + } + putc ('.', file); + } +#endif + return; case 'C': put_condition_code (GET_CODE (x), GET_MODE (XEXP (x, 0)), 0, 0, file); return; case 'F': +#ifdef CMOV_SUN_AS_SYNTAX + if (ASSEMBLER_DIALECT == ASM_ATT) + putc ('.', file); +#endif put_condition_code (GET_CODE (x), GET_MODE (XEXP (x, 0)), 0, 1, file); return; @@ -5856,6 +5879,10 @@ print_operand (file, x, code) put_condition_code (GET_CODE (x), GET_MODE (XEXP (x, 0)), 1, 0, file); return; case 'f': +#ifdef CMOV_SUN_AS_SYNTAX + if (ASSEMBLER_DIALECT == ASM_ATT) + putc ('.', file); +#endif put_condition_code (GET_CODE (x), GET_MODE (XEXP (x, 0)), 1, 1, file); return; case '+': diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 41d864977fd0..079dfc03e09c 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -15896,8 +15896,8 @@ "TARGET_64BIT && TARGET_CMOVE && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)" "@ - cmov%C1\t{%2, %0|%0, %2} - cmov%c1\t{%3, %0|%0, %3}" + cmov%O2%C1\t{%2, %0|%0, %2} + cmov%O2%c1\t{%3, %0|%0, %3}" [(set_attr "type" "icmov") (set_attr "mode" "DI")]) @@ -15938,8 +15938,8 @@ "TARGET_CMOVE && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)" "@ - cmov%C1\t{%2, %0|%0, %2} - cmov%c1\t{%3, %0|%0, %3}" + cmov%O2%C1\t{%2, %0|%0, %2} + cmov%O2%c1\t{%3, %0|%0, %3}" [(set_attr "type" "icmov") (set_attr "mode" "SI")]) @@ -15960,8 +15960,8 @@ "TARGET_CMOVE && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)" "@ - cmov%C1\t{%2, %0|%0, %2} - cmov%c1\t{%3, %0|%0, %3}" + cmov%O2%C1\t{%2, %0|%0, %2} + cmov%O2%c1\t{%3, %0|%0, %3}" [(set_attr "type" "icmov") (set_attr "mode" "HI")]) @@ -15984,8 +15984,8 @@ "@ fcmov%F1\t{%2, %0|%0, %2} fcmov%f1\t{%3, %0|%0, %3} - cmov%C1\t{%2, %0|%0, %2} - cmov%c1\t{%3, %0|%0, %3}" + cmov%O2%C1\t{%2, %0|%0, %2} + cmov%O2%c1\t{%3, %0|%0, %3}" [(set_attr "type" "fcmov,fcmov,icmov,icmov") (set_attr "mode" "SF,SF,SI,SI")]) @@ -16024,8 +16024,8 @@ "@ fcmov%F1\t{%2, %0|%0, %2} fcmov%f1\t{%3, %0|%0, %3} - cmov%C1\t{%2, %0|%0, %2} - cmov%c1\t{%3, %0|%0, %3}" + cmov%O2%C1\t{%2, %0|%0, %2} + cmov%O2%c1\t{%3, %0|%0, %3}" [(set_attr "type" "fcmov,fcmov,icmov,icmov") (set_attr "mode" "DF")]) diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h index 6fb2eb598f0b..79c9ea8327f3 100644 --- a/gcc/config/i386/sol2.h +++ b/gcc/config/i386/sol2.h @@ -39,6 +39,8 @@ Boston, MA 02111-1307, USA. */ #define ASM_SPEC \ "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s" +#define CMOV_SUN_AS_SYNTAX 1 + #else /* GAS_REJECTS_MINUS_S */ /* Same as above, except for -s, unsupported by GNU as. */ -- 2.43.5