From e35f75d35c66f66f4b2e04a2474406876255bcce Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Thu, 8 Aug 2019 22:18:56 +0200 Subject: [PATCH] rs6000: Rename DFP iterator and attr to DDTD and q This is more in line with the other iterators we have, and a bit easier to read and write. * config/rs6000/dfp.md (D64_D128): Rename to ... (DDTD): ... this, throughout. (dfp_suffix): Rename to ... (q): ... this, throughout. From-SVN: r274218 --- gcc/ChangeLog | 7 +++ gcc/config/rs6000/dfp.md | 130 +++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 67 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f9ebc668e62..f440b86f6b7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-08-08 Segher Boessenkool + + * config/rs6000/dfp.md (D64_D128): Rename to ... + (DDTD): ... this, throughout. + (dfp_suffix): Rename to ... + (q): ... this, throughout. + 2019-08-08 Segher Boessenkool * config/rs6000/dfp.md (D64_D128): Move earlier in the file. diff --git a/gcc/config/rs6000/dfp.md b/gcc/config/rs6000/dfp.md index 61ede5d2445..659b3c9a39b 100644 --- a/gcc/config/rs6000/dfp.md +++ b/gcc/config/rs6000/dfp.md @@ -29,10 +29,9 @@ ]) ; Either of the two decimal modes. -(define_mode_iterator D64_D128 [DD TD]) +(define_mode_iterator DDTD [DD TD]) -(define_mode_attr dfp_suffix [(DD "") - (TD "q")]) +(define_mode_attr q [(DD "") (TD "q")]) (define_insn "movsd_store" @@ -157,43 +156,43 @@ (set_attr "length" "8")]) (define_insn "add3" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (plus:D64_D128 (match_operand:D64_D128 1 "gpc_reg_operand" "%d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (plus:DDTD (match_operand:DDTD 1 "gpc_reg_operand" "%d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")))] "TARGET_DFP" - "dadd %0,%1,%2" + "dadd %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "sub3" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (minus:D64_D128 (match_operand:D64_D128 1 "gpc_reg_operand" "d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (minus:DDTD (match_operand:DDTD 1 "gpc_reg_operand" "d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")))] "TARGET_DFP" - "dsub %0,%1,%2" + "dsub %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "mul3" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (mult:D64_D128 (match_operand:D64_D128 1 "gpc_reg_operand" "%d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (mult:DDTD (match_operand:DDTD 1 "gpc_reg_operand" "%d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")))] "TARGET_DFP" - "dmul %0,%1,%2" + "dmul %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "div3" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (div:D64_D128 (match_operand:D64_D128 1 "gpc_reg_operand" "d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (div:DDTD (match_operand:DDTD 1 "gpc_reg_operand" "d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")))] "TARGET_DFP" - "ddiv %0,%1,%2" + "ddiv %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "*cmp_internal1" [(set (match_operand:CCFP 0 "cc_reg_operand" "=y") - (compare:CCFP (match_operand:D64_D128 1 "gpc_reg_operand" "d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")))] + (compare:CCFP (match_operand:DDTD 1 "gpc_reg_operand" "d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")))] "TARGET_DFP" - "dcmpu %0,%1,%2" + "dcmpu %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "floatdidd2" @@ -214,10 +213,10 @@ ;; This is the first stage of converting it to an integer type. (define_insn "ftrunc2" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (fix:D64_D128 (match_operand:D64_D128 1 "gpc_reg_operand" "d")))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (fix:DDTD (match_operand:DDTD 1 "gpc_reg_operand" "d")))] "TARGET_DFP" - "drintn. 0,%0,%1,1" + "drintn. 0,%0,%1,1" [(set_attr "type" "dfp")]) ;; Convert a decimal64/128 whose value is an integer to an actual integer. @@ -225,9 +224,9 @@ (define_insn "fixdi2" [(set (match_operand:DI 0 "gpc_reg_operand" "=d") - (fix:DI (match_operand:D64_D128 1 "gpc_reg_operand" "d")))] + (fix:DI (match_operand:DDTD 1 "gpc_reg_operand" "d")))] "TARGET_DFP" - "dctfix %0,%1" + "dctfix %0,%1" [(set_attr "type" "dfp")]) ;; Decimal builtin support @@ -244,64 +243,61 @@ (define_code_iterator DFP_TEST [eq lt gt unordered]) (define_insn "dfp_ddedpd_" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (unspec:D64_D128 [(match_operand:QI 1 "const_0_to_3_operand" "i") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")] - UNSPEC_DDEDPD))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (unspec:DDTD [(match_operand:QI 1 "const_0_to_3_operand" "i") + (match_operand:DDTD 2 "gpc_reg_operand" "d")] + UNSPEC_DDEDPD))] "TARGET_DFP" - "ddedpd %1,%0,%2" + "ddedpd %1,%0,%2" [(set_attr "type" "dfp")]) (define_insn "dfp_denbcd_" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (unspec:D64_D128 [(match_operand:QI 1 "const_0_to_1_operand" "i") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")] - UNSPEC_DENBCD))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (unspec:DDTD [(match_operand:QI 1 "const_0_to_1_operand" "i") + (match_operand:DDTD 2 "gpc_reg_operand" "d")] + UNSPEC_DENBCD))] "TARGET_DFP" - "denbcd %1,%0,%2" + "denbcd %1,%0,%2" [(set_attr "type" "dfp")]) (define_insn "dfp_dxex_" [(set (match_operand:DI 0 "gpc_reg_operand" "=d") - (unspec:DI [(match_operand:D64_D128 1 "gpc_reg_operand" "d")] + (unspec:DI [(match_operand:DDTD 1 "gpc_reg_operand" "d")] UNSPEC_DXEX))] "TARGET_DFP" - "dxex %0,%1" + "dxex %0,%1" [(set_attr "type" "dfp")]) (define_insn "dfp_diex_" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (unspec:D64_D128 [(match_operand:DI 1 "gpc_reg_operand" "d") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")] - UNSPEC_DXEX))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (unspec:DDTD [(match_operand:DI 1 "gpc_reg_operand" "d") + (match_operand:DDTD 2 "gpc_reg_operand" "d")] + UNSPEC_DXEX))] "TARGET_DFP" - "diex %0,%1,%2" + "diex %0,%1,%2" [(set_attr "type" "dfp")]) (define_expand "dfptstsfi__" [(set (match_dup 3) - (compare:CCFP - (unspec:D64_D128 - [(match_operand:SI 1 "const_int_operand") - (match_operand:D64_D128 2 "gpc_reg_operand")] - UNSPEC_DTSTSFI) - (match_dup 4))) + (compare:CCFP (unspec:DDTD [(match_operand:SI 1 "const_int_operand") + (match_operand:DDTD 2 "gpc_reg_operand")] + UNSPEC_DTSTSFI) + (const_int 0))) (set (match_operand:SI 0 "register_operand") - (DFP_TEST:SI (match_dup 3) + (DFP_TEST:SI (match_dup 3) (const_int 0))) ] "TARGET_P9_MISC" { operands[3] = gen_reg_rtx (CCFPmode); - operands[4] = const0_rtx; }) (define_insn "*dfp_sgnfcnc_" [(set (match_operand:CCFP 0 "" "=y") - (compare:CCFP - (unspec:D64_D128 [(match_operand:SI 1 "const_int_operand" "n") - (match_operand:D64_D128 2 "gpc_reg_operand" "d")] - UNSPEC_DTSTSFI) + (compare:CCFP + (unspec:DDTD [(match_operand:SI 1 "const_int_operand" "n") + (match_operand:DDTD 2 "gpc_reg_operand" "d")] + UNSPEC_DTSTSFI) (match_operand:SI 3 "zero_constant" "j")))] "TARGET_P9_MISC" { @@ -310,24 +306,24 @@ immediate operand values greater than 63. */ if (!(IN_RANGE (INTVAL (operands[1]), 0, 63))) operands[1] = GEN_INT (63); - return "dtstsfi %0,%1,%2"; + return "dtstsfi %0,%1,%2"; } [(set_attr "type" "fp")]) (define_insn "dfp_dscli_" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (unspec:D64_D128 [(match_operand:D64_D128 1 "gpc_reg_operand" "d") - (match_operand:QI 2 "immediate_operand" "i")] - UNSPEC_DSCLI))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (unspec:DDTD [(match_operand:DDTD 1 "gpc_reg_operand" "d") + (match_operand:QI 2 "immediate_operand" "i")] + UNSPEC_DSCLI))] "TARGET_DFP" - "dscli %0,%1,%2" + "dscli %0,%1,%2" [(set_attr "type" "dfp")]) (define_insn "dfp_dscri_" - [(set (match_operand:D64_D128 0 "gpc_reg_operand" "=d") - (unspec:D64_D128 [(match_operand:D64_D128 1 "gpc_reg_operand" "d") - (match_operand:QI 2 "immediate_operand" "i")] - UNSPEC_DSCRI))] + [(set (match_operand:DDTD 0 "gpc_reg_operand" "=d") + (unspec:DDTD [(match_operand:DDTD 1 "gpc_reg_operand" "d") + (match_operand:QI 2 "immediate_operand" "i")] + UNSPEC_DSCRI))] "TARGET_DFP" - "dscri %0,%1,%2" + "dscri %0,%1,%2" [(set_attr "type" "dfp")]) -- 2.30.2