OSDN Git Service

* builtins.c, c-pragma.h, c-typeck.c, cgraph.c, cgraphunit.c,
[pf3gnuchains/gcc-fork.git] / gcc / config / s390 / s390.md
index a74cf9e..c03f880 100644 (file)
@@ -1,5 +1,5 @@
 ;;- Machine description for GNU compiler -- S/390 / zSeries version.
-;;  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;;  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;  Free Software Foundation, Inc.
 ;;  Contributed by Hartmut Penner (hpenner@de.ibm.com) and
 ;;                 Ulrich Weigand (uweigand@de.ibm.com).
@@ -18,8 +18,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GCC; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
 
 ;;
 ;; Special constraints for s/390 machine description:
@@ -27,6 +27,9 @@
 ;;    a -- Any address register from 1 to 15.
 ;;    c -- Condition code register 33.
 ;;    d -- Any register from 0 to 15.
+;;    f -- Floating point registers.
+;;    t -- Access registers 36 and 37.
+;;    G -- Const double zero operand
 ;;    I -- An 8-bit constant (0..255).
 ;;    J -- A 12-bit constant (0..4095).
 ;;    K -- A 16-bit constant (-32768..32767).
 ;;         has a value different from its other parts.  If the letter x
 ;;         is specified instead of a part number, the constraint matches
 ;;         if there is any single part with non-default value.
+;;    O -- Multiple letter constraint followed by 1 parameter.
+;;         s:  Signed extended immediate value (-2G .. 2G-1).
+;;         p:  Positive extended immediate value (0 .. 4G-1).
+;;         n:  Negative extended immediate value (-4G .. -1).
+;;         These constraints do not accept any operand if the machine does
+;;         not provide the extended-immediate facility.
+;;    P -- Any integer constant that can be loaded without literal pool.
 ;;    Q -- Memory reference without index register and with short displacement.
 ;;    R -- Memory reference with index register and short displacement.
 ;;    S -- Memory reference without index register but with long displacement.
 ;;     %C: print opcode suffix for branch condition.
 ;;     %D: print opcode suffix for inverse branch condition.
 ;;     %J: print tls_load/tls_gdcall/tls_ldcall suffix
+;;     %G: print the size of the operand in bytes.
 ;;     %O: print only the displacement of a memory reference.
 ;;     %R: print only the base register of a memory reference.
 ;;     %S: print S-type memory reference (base+displacement).
 ;;     %N: print the second word of a DImode operand.
 ;;     %M: print the second word of a TImode operand.
-
+;;     %Y: print shift count operand.
+;;  
 ;;     %b: print integer X as if it's an unsigned byte.
-;;     %x: print integer X as if it's an unsigned word.
-;;     %h: print integer X as if it's a signed word.
-;;     %i: print the first nonzero HImode part of X
-;;     %j: print the first HImode part unequal to 0xffff of X
-
+;;     %x: print integer X as if it's an unsigned halfword.
+;;     %h: print integer X as if it's a signed halfword.
+;;     %i: print the first nonzero HImode part of X.
+;;     %j: print the first HImode part unequal to -1 of X.
+;;     %k: print the first nonzero SImode part of X.
+;;     %m: print the first SImode part unequal to -1 of X.
+;;     %o: print integer X as if it's an unsigned 32bit word.
 ;;
 ;; We have a special constraint for pattern matching.
 ;;
   [; Miscellaneous
    (UNSPEC_ROUND               1)
    (UNSPEC_CMPINT              2)
-   (UNSPEC_SETHIGH             10)
+   (UNSPEC_ICM                 10)
 
    ; GOT/PLT and lt-relative accesses
    (UNSPEC_LTREL_OFFSET                100)
    (UNSPEC_TLS_LOAD            512)
 
    ; String Functions
-   (UNSPEC_SRST                600)
+   (UNSPEC_SRST                        600)
+   (UNSPEC_MVST                        601)
+   
+   ; Stack Smashing Protector
+   (UNSPEC_SP_SET              700)
+   (UNSPEC_SP_TEST             701)
  ])
 
 ;;
 
    ; TLS support
    (UNSPECV_SET_TP             500)
+
+   ; Atomic Support
+   (UNSPECV_MB                 700)
+   (UNSPECV_CAS                        701)
+  ])
+
+;;
+;; Registers
+;;
+
+(define_constants
+  [
+   ; Sibling call register.
+   (SIBCALL_REGNUM              1)
+   ; Literal pool base register.
+   (BASE_REGNUM                        13)
+   ; Return address register.
+   (RETURN_REGNUM              14)
+   ; Condition code register.
+   (CC_REGNUM                  33)
+   ; Thread local storage pointer register. 
+   (TP_REGNUM                  36)
   ])
 
 
 ;; Instruction type attribute used for scheduling.
 
 (define_attr "type" "none,integer,load,lr,la,larl,lm,stm,
-                    cs,vs,store,idiv,
+                    cs,vs,store,sem,idiv,
                      imulhi,imulsi,imuldi,
-                    branch,jsr,fsimpd,fsimps,
-                    floadd,floads,fstored, fstores,
-                    fmuld,fmuls,fdivd,fdivs,
-                    ftoi,itof,fsqrtd,fsqrts,
-                     other"
+                    branch,jsr,fsimptf,fsimpdf,fsimpsf,
+                    floadtf,floaddf,floadsf,fstoredf,fstoresf,
+                    fmultf,fmuldf,fmulsf,fdivtf,fdivdf,fdivsf,
+                    ftoi,itof,fsqrttf,fsqrtdf,fsqrtsf,
+                     ftrunctf,ftruncdf,other"
   (cond [(eq_attr "op_type" "NN")  (const_string "other")
          (eq_attr "op_type" "SS")  (const_string "cs")]
     (const_string "integer")))
 ;;   reg: Instruction does not use the agen unit
 
 (define_attr "atype" "agen,reg"
-  (cond [(eq_attr "op_type" "E")   (const_string "reg")
-         (eq_attr "op_type" "RR")  (const_string "reg")
-         (eq_attr "op_type" "RX")  (const_string "agen")
-         (eq_attr "op_type" "RI")  (const_string "reg")
-         (eq_attr "op_type" "RRE") (const_string "reg")
-         (eq_attr "op_type" "RS")  (const_string "agen")
-         (eq_attr "op_type" "RSI") (const_string "agen")
-         (eq_attr "op_type" "S")   (const_string "agen")
-         (eq_attr "op_type" "SI")  (const_string "agen")
-         (eq_attr "op_type" "SS")  (const_string "agen")
-         (eq_attr "op_type" "SSE") (const_string "agen")
-         (eq_attr "op_type" "RXE") (const_string "agen")
-         (eq_attr "op_type" "RSE") (const_string "agen")
-         (eq_attr "op_type" "RIL") (const_string "agen")
-         (eq_attr "op_type" "RXY") (const_string "agen")
-         (eq_attr "op_type" "RSY") (const_string "agen")
-         (eq_attr "op_type" "SIY") (const_string "agen")]
-    (const_string "agen")))
+  (if_then_else (eq_attr "op_type" "E,RR,RI,RRE")  
+               (const_string "reg")
+               (const_string "agen")))
 
 ;; Length in bytes.
 
 (define_attr "length" ""
-  (cond [(eq_attr "op_type" "E")   (const_int 2)
-         (eq_attr "op_type" "RR")  (const_int 2)
-         (eq_attr "op_type" "RX")  (const_int 4)
-         (eq_attr "op_type" "RI")  (const_int 4)
-         (eq_attr "op_type" "RRE") (const_int 4)
-         (eq_attr "op_type" "RS")  (const_int 4)
-         (eq_attr "op_type" "RSI") (const_int 4)
-         (eq_attr "op_type" "S")   (const_int 4)
-         (eq_attr "op_type" "SI")  (const_int 4)
-         (eq_attr "op_type" "SS")  (const_int 6)
-         (eq_attr "op_type" "SSE") (const_int 6)
-         (eq_attr "op_type" "RXE") (const_int 6)
-         (eq_attr "op_type" "RSE") (const_int 6)
-         (eq_attr "op_type" "RIL") (const_int 6)
-         (eq_attr "op_type" "RXY") (const_int 6)
-         (eq_attr "op_type" "RSY") (const_int 6)
-         (eq_attr "op_type" "SIY") (const_int 6)]
+  (cond [(eq_attr "op_type" "E,RR")                  (const_int 2)
+         (eq_attr "op_type" "RX,RI,RRE,RS,RSI,S,SI")  (const_int 4)]
     (const_int 6)))
 
 
 ;; distinguish between g5 and g6, but there are differences between the two
 ;; CPUs could in theory be modeled.
 
-(define_attr "cpu" "g5,g6,z900,z990"
+(define_attr "cpu" "g5,g6,z900,z990,z9_109"
   (const (symbol_ref "s390_tune")))
 
 ;; Pipeline description for z900.  For lack of anything better,
 ;; Predicates
 (include "predicates.md")
 
+;; Other includes
+(include "tpf.md")
 
 ;; Macros
 
+;; This mode macro allows floating point patterns to be generated from the
+;; same template.
+(define_mode_macro FPR [TF DF SF])
+(define_mode_macro DSF [DF SF])
+
+;; These mode macros allow 31-bit and 64-bit TDSI patterns to be generated
+;; from the same template.
+(define_mode_macro TDSI [(TI "TARGET_64BIT") DI SI])
+
+;; These mode macros allow 31-bit and 64-bit GPR patterns to be generated
+;; from the same template.
+(define_mode_macro GPR [(DI "TARGET_64BIT") SI])
+(define_mode_macro DSI [DI SI])
+
+;; This mode macro allows :P to be used for patterns that operate on
+;; pointer-sized quantities.  Exactly one of the two alternatives will match.
+(define_mode_macro DP  [(TI "TARGET_64BIT") (DI "!TARGET_64BIT")])
+(define_mode_macro P [(DI "TARGET_64BIT") (SI "!TARGET_64BIT")])
+
 ;; This mode macro allows the QI and HI patterns to be defined from
 ;; the same template.
 (define_mode_macro HQI [HI QI])
 
+;; This mode macro allows the integer patterns to be defined from the
+;; same template.
+(define_mode_macro INT [(DI "TARGET_64BIT") SI HI QI])
 
-;; ICM mask required to load MODE value into the highest subreg
-;; of a SImode register.
-(define_mode_attr icm_hi [(HI "12") (QI "8")])
+;; This macro allows to unify all 'bCOND' expander patterns.
+(define_code_macro COMPARE [eq ne gt gtu lt ltu ge geu le leu unordered 
+                           ordered uneq unlt ungt unle unge ltgt])
+
+;; This macro allows to unify all 'sCOND' patterns.
+(define_code_macro SCOND [ltu gtu leu geu])
+
+;; This macro allows some 'ashift' and 'lshiftrt' pattern to be defined from
+;; the same template.
+(define_code_macro SHIFT [ashift lshiftrt])
+
+;; These macros allow to combine most atomic operations.
+(define_code_macro ATOMIC [and ior xor plus minus mult])
+(define_code_attr atomic [(and "and") (ior "ior") (xor "xor") 
+                         (plus "add") (minus "sub") (mult "nand")])
+
+
+;; In FPR templates, a string like "lt<de>br" will expand to "ltxbr" in TFmode,
+;; "ltdbr" in DFmode, and "ltebr" in SFmode.
+(define_mode_attr xde [(TF "x") (DF "d") (SF "e")])
+
+;; In FPR templates, a string like "m<dee>br" will expand to "mxbr" in TFmode,
+;; "mdbr" in DFmode, and "meebr" in SFmode.
+(define_mode_attr xdee [(TF "x") (DF "d") (SF "ee")])
+
+;; In FPR templates, "<RRe>" will expand to "RRE" in TFmode and "RR" otherwise.
+;; Likewise for "<RXe>".
+(define_mode_attr RRe [(TF "RRE") (DF "RR") (SF "RR")])
+(define_mode_attr RXe [(TF "RXE") (DF "RX") (SF "RX")])
+
+;; In FPR templates, "<Rf>" will expand to "f" in TFmode and "R" otherwise.
+;; This is used to disable the memory alternative in TFmode patterns.
+(define_mode_attr Rf [(TF "f") (DF "R") (SF "R")])
+
+;; In GPR and P templates, a constraint like "<d0>" will expand to "d" in DImode
+;; and "0" in SImode. This allows to combine instructions of which the 31bit
+;; version only operates on one register.
+(define_mode_attr d0 [(DI "d") (SI "0")])
+
+;; In combination with d0 this allows to combine instructions of which the 31bit
+;; version only operates on one register. The DImode version needs an additional
+;; register for the assembler output.
+(define_mode_attr 1 [(DI "%1,") (SI "")])
+  
+;; In SHIFT templates, a string like "s<lr>dl" will expand to "sldl" in 
+;; 'ashift' and "srdl" in 'lshiftrt'.
+(define_code_attr lr [(ashift "l") (lshiftrt "r")])
+
+;; In SHIFT templates, this attribute holds the correct standard name for the
+;; pattern itself and the corresponding function calls. 
+(define_code_attr shift [(ashift "ashl") (lshiftrt "lshr")])
+
+;; This attribute handles differences in the instruction 'type' and will result
+;; in "RRE" for DImode and "RR" for SImode.
+(define_mode_attr E [(DI "E") (SI "")])
+
+;; This attribute handles differences in the instruction 'type' and makes RX<Y>
+;; to result in "RXY" for DImode and "RX" for SImode.
+(define_mode_attr Y [(DI "Y") (SI "")])
+
+;; This attribute handles differences in the instruction 'type' and will result
+;; in "RSE" for TImode and "RS" for DImode.
+(define_mode_attr TE [(TI "E") (DI "")])
+
+;; In GPR templates, a string like "lc<g>r" will expand to "lcgr" in DImode
+;; and "lcr" in SImode.
+(define_mode_attr g [(DI "g") (SI "")])
+
+;; In GPR templates, a string like "sl<y>" will expand to "slg" in DImode
+;; and "sly" in SImode. This is useful because on 64bit the ..g instructions
+;; were enhanced with long displacements whereas 31bit instructions got a ..y
+;; variant for long displacements.
+(define_mode_attr y [(DI "g") (SI "y")])
+
+;; In DP templates, a string like "cds<g>" will expand to "cdsg" in TImode
+;; and "cds" in DImode.
+(define_mode_attr tg [(TI "g") (DI "")])
+
+;; In GPR templates, a string like "c<gf>dbr" will expand to "cgdbr" in DImode
+;; and "cfdbr" in SImode.
+(define_mode_attr gf [(DI "g") (SI "f")])
 
 ;; ICM mask required to load MODE value into the lowest subreg
 ;; of a SImode register.
 (define_mode_attr icm_lo [(HI "3") (QI "1")])
 
+;; In HQI templates, a string like "llg<hc>" will expand to "llgh" in
+;; HImode and "llgc" in QImode.
+(define_mode_attr hc [(HI "h") (QI "c")])
+
+;; In P templates, the mode <DBL> will expand to "TI" in DImode and "DI"
+;; in SImode.
+(define_mode_attr DBL [(DI "TI") (SI "DI")])
+
 ;; Maximum unsigned integer that fits in MODE.
 (define_mode_attr max_uint [(HI "65535") (QI "255")])
 
 ;;- Compare instructions.
 ;;
 
-(define_expand "cmpdi"
-  [(set (reg:CC 33)
-        (compare:CC (match_operand:DI 0 "register_operand" "")
-                    (match_operand:DI 1 "general_operand" "")))]
-  "TARGET_64BIT"
-{
-  s390_compare_op0 = operands[0];
-  s390_compare_op1 = operands[1];
-  DONE;
-})
-
-(define_expand "cmpsi"
-  [(set (reg:CC 33)
-        (compare:CC (match_operand:SI 0 "register_operand" "")
-                    (match_operand:SI 1 "general_operand" "")))]
+(define_expand "cmp<mode>"
+  [(set (reg:CC CC_REGNUM)
+        (compare:CC (match_operand:GPR 0 "register_operand" "")
+                    (match_operand:GPR 1 "general_operand" "")))]
   ""
 {
   s390_compare_op0 = operands[0];
   DONE;
 })
 
-(define_expand "cmpdf"
-  [(set (reg:CC 33)
-        (compare:CC (match_operand:DF 0 "register_operand" "")
-                    (match_operand:DF 1 "general_operand" "")))]
-  "TARGET_HARD_FLOAT"
-{
-  s390_compare_op0 = operands[0];
-  s390_compare_op1 = operands[1];
-  DONE;
-})
-
-(define_expand "cmpsf"
-  [(set (reg:CC 33)
-        (compare:CC (match_operand:SF 0 "register_operand" "")
-                    (match_operand:SF 1 "general_operand" "")))]
+(define_expand "cmp<mode>"
+  [(set (reg:CC CC_REGNUM)
+        (compare:CC (match_operand:FPR 0 "register_operand" "")
+                    (match_operand:FPR 1 "general_operand" "")))]
   "TARGET_HARD_FLOAT"
 {
   s390_compare_op0 = operands[0];
 ; Test-under-Mask instructions
 
 (define_insn "*tmqi_mem"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (and:QI (match_operand:QI 0 "memory_operand" "Q,S")
                          (match_operand:QI 1 "immediate_operand" "n,n"))
                  (match_operand:QI 2 "immediate_operand" "n,n")))]
-  "s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 0))"
+  "s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], false))"
   "@
    tm\t%S0,%b1
    tmy\t%S0,%b1"
   [(set_attr "op_type" "SI,SIY")])
 
 (define_insn "*tmdi_reg"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (and:DI (match_operand:DI 0 "nonimmediate_operand" "d,d,d,d")
                          (match_operand:DI 1 "immediate_operand"
                                             "N0HD0,N1HD0,N2HD0,N3HD0"))
                  (match_operand:DI 2 "immediate_operand" "n,n,n,n")))]
   "TARGET_64BIT
-   && s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 1))
+   && s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], true))
    && s390_single_part (operands[1], DImode, HImode, 0) >= 0"
   "@
    tmhh\t%0,%i1
   [(set_attr "op_type" "RI")])
 
 (define_insn "*tmsi_reg"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (and:SI (match_operand:SI 0 "nonimmediate_operand" "d,d")
                          (match_operand:SI 1 "immediate_operand" "N0HS0,N1HS0"))
                  (match_operand:SI 2 "immediate_operand" "n,n")))]
-  "s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 1))
+  "s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], true))
    && s390_single_part (operands[1], SImode, HImode, 0) >= 0"
   "@
    tmh\t%0,%i1
   [(set_attr "op_type" "RI")])
 
 (define_insn "*tm<mode>_full"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HQI 0 "register_operand" "d")
                  (match_operand:HQI 1 "immediate_operand" "n")))]
-  "s390_match_ccmode (insn, s390_tm_ccmode (constm1_rtx, operands[1], 1))"
+  "s390_match_ccmode (insn, s390_tm_ccmode (constm1_rtx, operands[1], true))"
   "tml\t%0,<max_uint>"
   [(set_attr "op_type" "RI")])
 
 
+;
 ; Load-and-Test instructions
+;
+
+; tst(di|si) instruction pattern(s).
 
 (define_insn "*tstdi_sign"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ashiftrt:DI (ashift:DI (subreg:DI (match_operand:SI 0 "register_operand" "d") 0)
                                         (const_int 32)) (const_int 32))
                  (match_operand:DI 1 "const0_operand" "")))
   "ltgfr\t%2,%0"
   [(set_attr "op_type" "RRE")])
 
+(define_insn "*tst<mode>_extimm"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 0 "nonimmediate_operand" "d,m")
+                 (match_operand:GPR 1 "const0_operand" "")))
+   (set (match_operand:GPR 2 "register_operand" "=d,d")
+        (match_dup 0))]
+  "s390_match_ccmode(insn, CCSmode) && TARGET_EXTIMM"
+  "@
+   lt<g>r\t%2,%0
+   lt<g>\t%2,%0"
+  [(set_attr "op_type" "RR<E>,RXY")])
+
+(define_insn "*tst<mode>_cconly_extimm"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 0 "nonimmediate_operand" "d,m")
+                 (match_operand:GPR 1 "const0_operand" "")))
+   (clobber (match_scratch:GPR 2 "=X,d"))]
+  "s390_match_ccmode(insn, CCSmode) && TARGET_EXTIMM"
+  "@
+   lt<g>r\t%0,%0
+   lt<g>\t%2,%0"
+  [(set_attr "op_type" "RR<E>,RXY")])
+
 (define_insn "*tstdi"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:DI 0 "register_operand" "d")
                  (match_operand:DI 1 "const0_operand" "")))
    (set (match_operand:DI 2 "register_operand" "=d")
         (match_dup 0))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT"
+  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT && !TARGET_EXTIMM"
   "ltgr\t%2,%0"
   [(set_attr "op_type" "RRE")])
 
-(define_insn "*tstdi_cconly"
-  [(set (reg 33)
-        (compare (match_operand:DI 0 "register_operand" "d")
-                 (match_operand:DI 1 "const0_operand" "")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT"
-  "ltgr\t%0,%0"
-  [(set_attr "op_type" "RRE")])
-
-(define_insn "*tstdi_cconly_31"
-  [(set (reg 33)
-        (compare (match_operand:DI 0 "register_operand" "d")
-                 (match_operand:DI 1 "const0_operand" "")))]
-  "s390_match_ccmode(insn, CCSmode) && !TARGET_64BIT"
-  "srda\t%0,0"
-  [(set_attr "op_type" "RS")
-   (set_attr "atype"   "reg")])
-
-
 (define_insn "*tstsi"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:SI 0 "nonimmediate_operand" "d,Q,S")
                  (match_operand:SI 1 "const0_operand" "")))
    (set (match_operand:SI 2 "register_operand" "=d,d,d")
         (match_dup 0))]
-  "s390_match_ccmode(insn, CCSmode)"
+  "s390_match_ccmode(insn, CCSmode) && !TARGET_EXTIMM"
   "@
    ltr\t%2,%0
    icm\t%2,15,%S0
   [(set_attr "op_type" "RR,RS,RSY")])
 
 (define_insn "*tstsi_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:SI 0 "nonimmediate_operand" "d,Q,S")
                  (match_operand:SI 1 "const0_operand" "")))
    (clobber (match_scratch:SI 2 "=X,d,d"))]
    icmy\t%2,15,%S0"
   [(set_attr "op_type" "RR,RS,RSY")])
 
-(define_insn "*tstsi_cconly2"
-  [(set (reg 33)
-        (compare (match_operand:SI 0 "register_operand" "d")
-                 (match_operand:SI 1 "const0_operand" "")))]
+(define_insn "*tstdi_cconly_31"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:DI 0 "register_operand" "d")
+                 (match_operand:DI 1 "const0_operand" "")))]
+  "s390_match_ccmode(insn, CCSmode) && !TARGET_64BIT"
+  "srda\t%0,0"
+  [(set_attr "op_type" "RS")
+   (set_attr "atype"   "reg")])
+
+(define_insn "*tst<mode>_cconly2"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 0 "register_operand" "d")
+                 (match_operand:GPR 1 "const0_operand" "")))]
   "s390_match_ccmode(insn, CCSmode)"
-  "ltr\t%0,%0"
-  [(set_attr "op_type" "RR")])
+  "lt<g>r\t%0,%0"
+  [(set_attr "op_type" "RR<E>")])
+
+; tst(hi|qi) instruction pattern(s).
 
 (define_insn "*tst<mode>CCT"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HQI 0 "nonimmediate_operand" "?Q,?S,d")
                  (match_operand:HQI 1 "const0_operand" "")))
    (set (match_operand:HQI 2 "register_operand" "=d,d,0")
   [(set_attr "op_type" "RS,RSY,RI")])
 
 (define_insn "*tsthiCCT_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HI 0 "nonimmediate_operand" "Q,S,d")
                  (match_operand:HI 1 "const0_operand" "")))
    (clobber (match_scratch:HI 2 "=d,d,X"))]
   [(set_attr "op_type" "RS,RSY,RI")])
 
 (define_insn "*tstqiCCT_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:QI 0 "nonimmediate_operand" "?Q,?S,d")
                  (match_operand:QI 1 "const0_operand" "")))]
   "s390_match_ccmode(insn, CCTmode)"
   [(set_attr "op_type" "SI,SIY,RI")])
 
 (define_insn "*tst<mode>"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HQI 0 "s_operand" "Q,S")
                  (match_operand:HQI 1 "const0_operand" "")))
    (set (match_operand:HQI 2 "register_operand" "=d,d")
   [(set_attr "op_type" "RS,RSY")])
 
 (define_insn "*tst<mode>_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HQI 0 "s_operand" "Q,S")
                  (match_operand:HQI 1 "const0_operand" "")))
    (clobber (match_scratch:HQI 2 "=d,d"))]
 ; Compare (equality) instructions
 
 (define_insn "*cmpdi_cct"
-  [(set (reg 33)
-        (compare (match_operand:DI 0 "nonimmediate_operand" "%d,d,d,Q")
-                 (match_operand:DI 1 "general_operand" "d,K,m,BQ")))]
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:DI 0 "nonimmediate_operand" "%d,d,d,d,Q")
+                 (match_operand:DI 1 "general_operand" "d,K,Os,m,BQ")))]
   "s390_match_ccmode (insn, CCTmode) && TARGET_64BIT"
   "@
    cgr\t%0,%1
    cghi\t%0,%h1
+   cgfi\t%0,%1
    cg\t%0,%1
    #"
-  [(set_attr "op_type" "RRE,RI,RXY,SS")])
+  [(set_attr "op_type" "RRE,RI,RIL,RXY,SS")])
 
 (define_insn "*cmpsi_cct"
-  [(set (reg 33)
-        (compare (match_operand:SI 0 "nonimmediate_operand" "%d,d,d,d,Q")
-                 (match_operand:SI 1 "general_operand" "d,K,R,T,BQ")))]
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:SI 0 "nonimmediate_operand" "%d,d,d,d,d,Q")
+                 (match_operand:SI 1 "general_operand" "d,K,Os,R,T,BQ")))]
   "s390_match_ccmode (insn, CCTmode)"
   "@
    cr\t%0,%1
    chi\t%0,%h1
+   cfi\t%0,%1
    c\t%0,%1
    cy\t%0,%1
    #"
-  [(set_attr "op_type" "RR,RI,RX,RXY,SS")])
+  [(set_attr "op_type" "RR,RI,RIL,RX,RXY,SS")])
 
 
 ; Compare (signed) instructions
 
 (define_insn "*cmpdi_ccs_sign"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (sign_extend:DI (match_operand:SI 1 "nonimmediate_operand" "d,m"))
                  (match_operand:DI 0 "register_operand" "d,d")))]
   "s390_match_ccmode(insn, CCSRmode) && TARGET_64BIT"
    cgf\t%0,%1"
   [(set_attr "op_type" "RRE,RXY")])
 
-(define_insn "*cmpdi_ccs"
-  [(set (reg 33)
-        (compare (match_operand:DI 0 "register_operand" "d,d,d")
-                 (match_operand:DI 1 "general_operand" "d,K,m")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT"
-  "@
-   cgr\t%0,%1
-   cghi\t%0,%h1
-   cg\t%0,%1"
-  [(set_attr "op_type" "RRE,RI,RXY")])
-
 (define_insn "*cmpsi_ccs_sign"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (sign_extend:SI (match_operand:HI 1 "memory_operand" "R,T"))
                  (match_operand:SI 0 "register_operand" "d,d")))]
   "s390_match_ccmode(insn, CCSRmode)"
    chy\t%0,%1"
   [(set_attr "op_type" "RX,RXY")])
 
-(define_insn "*cmpsi_ccs"
-  [(set (reg 33)
-        (compare (match_operand:SI 0 "register_operand" "d,d,d,d")
-                 (match_operand:SI 1 "general_operand" "d,K,R,T")))]
+(define_insn "*cmp<mode>_ccs"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 0 "register_operand" "d,d,d,d,d")
+                 (match_operand:GPR 1 "general_operand" "d,K,Os,R,T")))]
   "s390_match_ccmode(insn, CCSmode)"
   "@
-   cr\t%0,%1
-   chi\t%0,%h1
-   c\t%0,%1
-   cy\t%0,%1"
-  [(set_attr "op_type" "RR,RI,RX,RXY")])
+   c<g>r\t%0,%1
+   c<g>hi\t%0,%h1
+   c<g>fi\t%0,%1
+   c<g>\t%0,%1
+   c<y>\t%0,%1"
+  [(set_attr "op_type" "RR<E>,RI,RIL,RX<Y>,RXY")])
 
 
 ; Compare (unsigned) instructions
 
 (define_insn "*cmpdi_ccu_zero"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "d,m"))
                  (match_operand:DI 0 "register_operand" "d,d")))]
   "s390_match_ccmode (insn, CCURmode) && TARGET_64BIT"
   [(set_attr "op_type" "RRE,RXY")])
 
 (define_insn "*cmpdi_ccu"
-  [(set (reg 33)
-        (compare (match_operand:DI 0 "nonimmediate_operand" "d,d,Q,BQ")
-                 (match_operand:DI 1 "general_operand" "d,m,BQ,Q")))]
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:DI 0 "nonimmediate_operand" "d,d,d,Q,BQ")
+                 (match_operand:DI 1 "general_operand" "d,Op,m,BQ,Q")))]
   "s390_match_ccmode (insn, CCUmode) && TARGET_64BIT"
   "@
    clgr\t%0,%1
+   clgfi\t%0,%1
    clg\t%0,%1
    #
    #"
-  [(set_attr "op_type" "RRE,RXY,SS,SS")])
+  [(set_attr "op_type" "RRE,RIL,RXY,SS,SS")])
 
 (define_insn "*cmpsi_ccu"
-  [(set (reg 33)
-        (compare (match_operand:SI 0 "nonimmediate_operand" "d,d,d,Q,BQ")
-                 (match_operand:SI 1 "general_operand" "d,R,T,BQ,Q")))]
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:SI 0 "nonimmediate_operand" "d,d,d,d,Q,BQ")
+                 (match_operand:SI 1 "general_operand" "d,Os,R,T,BQ,Q")))]
   "s390_match_ccmode (insn, CCUmode)"
   "@
    clr\t%0,%1
+   clfi\t%0,%o1
    cl\t%0,%1
    cly\t%0,%1
    #
    #"
-  [(set_attr "op_type" "RR,RX,RXY,SS,SS")])
+  [(set_attr "op_type" "RR,RIL,RX,RXY,SS,SS")])
 
 (define_insn "*cmphi_ccu"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:HI 0 "nonimmediate_operand" "d,d,Q,BQ")
                  (match_operand:HI 1 "general_operand" "Q,S,BQ,Q")))]
   "s390_match_ccmode (insn, CCUmode)
   [(set_attr "op_type" "RS,RSY,SS,SS")])
 
 (define_insn "*cmpqi_ccu"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:QI 0 "nonimmediate_operand" "d,d,Q,S,Q,BQ")
                  (match_operand:QI 1 "general_operand" "Q,S,n,n,BQ,Q")))]
   "s390_match_ccmode (insn, CCUmode)
 ; Block compare (CLC) instruction patterns.
 
 (define_insn "*clc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand:BLK 0 "memory_operand" "Q")
                  (match_operand:BLK 1 "memory_operand" "Q")))
    (use (match_operand 2 "const_int_operand" "n"))]
   [(set_attr "op_type" "SS")])
 
 (define_split
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (match_operand 0 "memory_operand" "")
                  (match_operand 1 "memory_operand" "")))]
   "reload_completed
 })
 
 
-; DF instructions
-
-(define_insn "*cmpdf_ccs_0"
-  [(set (reg 33)
-        (compare (match_operand:DF 0 "register_operand" "f")
-                 (match_operand:DF 1 "const0_operand" "")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "ltdbr\t%0,%0"
-   [(set_attr "op_type" "RRE")
-    (set_attr "type"  "fsimpd")])
-
-(define_insn "*cmpdf_ccs_0_ibm"
-  [(set (reg 33)
-        (compare (match_operand:DF 0 "register_operand" "f")
-                 (match_operand:DF 1 "const0_operand" "")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "ltdr\t%0,%0"
-   [(set_attr "op_type" "RR")
-    (set_attr "type"  "fsimpd")])
-
-(define_insn "*cmpdf_ccs"
-  [(set (reg 33)
-        (compare (match_operand:DF 0 "register_operand" "f,f")
-                 (match_operand:DF 1 "general_operand" "f,R")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   cdbr\t%0,%1
-   cdb\t%0,%1"
-   [(set_attr "op_type" "RRE,RXE")
-    (set_attr "type"  "fsimpd")])
-
-(define_insn "*cmpdf_ccs_ibm"
-  [(set (reg 33)
-        (compare (match_operand:DF 0 "register_operand" "f,f")
-                 (match_operand:DF 1 "general_operand" "f,R")))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "@
-   cdr\t%0,%1
-   cd\t%0,%1"
-   [(set_attr "op_type" "RR,RX")
-    (set_attr "type"  "fsimpd")])
-
-
-; SF instructions
+; (DF|SF) instructions
 
-(define_insn "*cmpsf_ccs_0"
-  [(set (reg 33)
-        (compare (match_operand:SF 0 "register_operand" "f")
-                 (match_operand:SF 1 "const0_operand" "")))]
+(define_insn "*cmp<mode>_ccs_0"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:FPR 0 "register_operand" "f")
+                 (match_operand:FPR 1 "const0_operand" "")))]
   "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "ltebr\t%0,%0"
+  "lt<xde>br\t%0,%0"
    [(set_attr "op_type" "RRE")
-    (set_attr "type"  "fsimps")])
+    (set_attr "type"  "fsimp<mode>")])
 
-(define_insn "*cmpsf_ccs_0_ibm"
-  [(set (reg 33)
-        (compare (match_operand:SF 0 "register_operand" "f")
-                 (match_operand:SF 1 "const0_operand" "")))]
+(define_insn "*cmp<mode>_ccs_0_ibm"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:FPR 0 "register_operand" "f")
+                 (match_operand:FPR 1 "const0_operand" "")))]
   "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "lter\t%0,%0"
-   [(set_attr "op_type" "RR")
-    (set_attr "type"  "fsimps")])
-
-(define_insn "*cmpsf_ccs"
-  [(set (reg 33)
-        (compare (match_operand:SF 0 "register_operand" "f,f")
-                 (match_operand:SF 1 "general_operand" "f,R")))]
+  "lt<xde>r\t%0,%0"
+   [(set_attr "op_type" "<RRe>")
+    (set_attr "type"  "fsimp<mode>")])
+
+(define_insn "*cmp<mode>_ccs"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:FPR 0 "register_operand" "f,f")
+                 (match_operand:FPR 1 "general_operand" "f,<Rf>")))]
   "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   cebr\t%0,%1
-   ceb\t%0,%1"
+   c<xde>br\t%0,%1
+   c<xde>b\t%0,%1"
    [(set_attr "op_type" "RRE,RXE")
-    (set_attr "type"  "fsimps")])
+    (set_attr "type"  "fsimp<mode>")])
 
-(define_insn "*cmpsf_ccs"
-  [(set (reg 33)
-        (compare (match_operand:SF 0 "register_operand" "f,f")
-                 (match_operand:SF 1 "general_operand" "f,R")))]
+(define_insn "*cmp<mode>_ccs_ibm"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:FPR 0 "register_operand" "f,f")
+                 (match_operand:FPR 1 "general_operand" "f,<Rf>")))]
   "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
-   cer\t%0,%1
-   ce\t%0,%1"
-   [(set_attr "op_type" "RR,RX")
-    (set_attr "type"  "fsimps")])
+   c<xde>r\t%0,%1
+   c<xde>\t%0,%1"
+   [(set_attr "op_type" "<RRe>,<RXe>")
+    (set_attr "type"  "fsimp<mode>")])
 
 
 ;;
 
 (define_insn "movti"
   [(set (match_operand:TI 0 "nonimmediate_operand" "=d,QS,d,o,Q")
-        (match_operand:TI 1 "general_operand" "QS,d,dKm,d,Q"))]
+        (match_operand:TI 1 "general_operand" "QS,d,dPm,d,Q"))]
   "TARGET_64BIT"
   "@
    lmg\t%0,%N0,%S1
    [(set_attr "op_type" "RIL")
     (set_attr "type"    "larl")])
 
+(define_insn "*movdi_64extimm"
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+                            "=d,d,d,d,d,d,d,d,d,d,d,m,!*f,!*f,!*f,!R,!T,d,t,Q,t,?Q")
+        (match_operand:DI 1 "general_operand"
+                            "K,N0HD0,N1HD0,N2HD0,N3HD0,Os,N0SD0,N1SD0,L,d,m,d,*f,R,T,*f,*f,t,d,t,Q,?Q"))]
+  "TARGET_64BIT && TARGET_EXTIMM"
+  "@
+   lghi\t%0,%h1
+   llihh\t%0,%i1
+   llihl\t%0,%i1
+   llilh\t%0,%i1
+   llill\t%0,%i1
+   lgfi\t%0,%1
+   llihf\t%0,%k1
+   llilf\t%0,%k1
+   lay\t%0,%a1
+   lgr\t%0,%1
+   lg\t%0,%1
+   stg\t%1,%0
+   ldr\t%0,%1
+   ld\t%0,%1
+   ldy\t%0,%1
+   std\t%1,%0
+   stdy\t%1,%0
+   #
+   #
+   stam\t%1,%N1,%S0
+   lam\t%0,%N0,%S1
+   #"
+  [(set_attr "op_type" "RI,RI,RI,RI,RI,RIL,RIL,RIL,RXY,RRE,RXY,RXY,
+                        RR,RX,RXY,RX,RXY,*,*,RS,RS,SS")
+   (set_attr "type" "*,*,*,*,*,*,*,*,la,lr,load,store,
+                     floaddf,floaddf,floaddf,fstoredf,fstoredf,*,*,*,*,*")])
+
 (define_insn "*movdi_64"
   [(set (match_operand:DI 0 "nonimmediate_operand"
                             "=d,d,d,d,d,d,d,d,m,!*f,!*f,!*f,!R,!T,d,t,Q,t,?Q")
         (match_operand:DI 1 "general_operand"
                             "K,N0HD0,N1HD0,N2HD0,N3HD0,L,d,m,d,*f,R,T,*f,*f,t,d,t,Q,?Q"))]
-  "TARGET_64BIT"
+  "TARGET_64BIT && !TARGET_EXTIMM"
   "@
    lghi\t%0,%h1
    llihh\t%0,%i1
   [(set_attr "op_type" "RI,RI,RI,RI,RI,RXY,RRE,RXY,RXY,
                         RR,RX,RXY,RX,RXY,*,*,RS,RS,SS")
    (set_attr "type" "*,*,*,*,*,la,lr,load,store,
-                     floadd,floadd,floadd,fstored,fstored,*,*,*,*,*")])
+                     floaddf,floaddf,floaddf,fstoredf,fstoredf,*,*,*,*,*")])
 
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
    s390_split_access_reg (operands[0], &operands[3], &operands[4]);")
 
 (define_insn "*movdi_31"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=d,Q,d,o,!*f,!*f,!*f,!R,!T,Q")
-        (match_operand:DI 1 "general_operand" "Q,d,dKm,d,*f,R,T,*f,*f,Q"))]
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,Q,S,d,o,!*f,!*f,!*f,!R,!T,Q")
+        (match_operand:DI 1 "general_operand" "Q,S,d,d,dPm,d,*f,R,T,*f,*f,Q"))]
   "!TARGET_64BIT"
   "@
    lm\t%0,%N0,%S1
+   lmy\t%0,%N0,%S1
    stm\t%1,%N1,%S0
+   stmy\t%1,%N1,%S0
    #
    #
    ldr\t%0,%1
    std\t%1,%0
    stdy\t%1,%0
    #"
-  [(set_attr "op_type" "RS,RS,*,*,RR,RX,RXY,RX,RXY,SS")
-   (set_attr "type" "lm,stm,*,*,floadd,floadd,floadd,fstored,fstored,*")])
+  [(set_attr "op_type" "RS,RSY,RS,RSY,*,*,RR,RX,RXY,RX,RXY,SS")
+   (set_attr "type" "lm,lm,stm,stm,*,*,floaddf,floaddf,floaddf,fstoredf,fstoredf,*")])
 
 (define_split
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
   [(parallel
     [(set (match_operand:DI 0 "register_operand" "")
           (match_operand:QI 1 "address_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_64BIT
    && preferred_la_operand_p (operands[1], const0_rtx)"
   [(set (match_dup 0) (match_dup 1))]
     [(set (match_dup 0)
           (plus:DI (match_dup 0)
                    (match_operand:DI 2 "nonmemory_operand" "")))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_64BIT
    && !reg_overlap_mentioned_p (operands[0], operands[2])
    && preferred_la_operand_p (operands[1], operands[2])"
 
 (define_insn "*movsi_zarch"
   [(set (match_operand:SI 0 "nonimmediate_operand"
-                            "=d,d,d,d,d,d,d,R,T,!*f,!*f,!*f,!R,!T,d,t,Q,t,?Q")
+                           "=d,d,d,d,d,d,d,d,R,T,!*f,!*f,!*f,!R,!T,d,t,Q,t,?Q")
         (match_operand:SI 1 "general_operand"
-                            "K,N0HS0,N1HS0,L,d,R,T,d,d,*f,R,T,*f,*f,t,d,t,Q,?Q"))]
+                           "K,N0HS0,N1HS0,Os,L,d,R,T,d,d,*f,R,T,*f,*f,t,d,t,Q,?Q"))]
   "TARGET_ZARCH"
   "@
    lhi\t%0,%h1
    llilh\t%0,%i1
    llill\t%0,%i1
+   iilf\t%0,%o1
    lay\t%0,%a1
    lr\t%0,%1
    l\t%0,%1
    stam\t%1,%1,%S0
    lam\t%0,%0,%S1
    #"
-  [(set_attr "op_type" "RI,RI,RI,RXY,RR,RX,RXY,RX,RXY,
+  [(set_attr "op_type" "RI,RI,RI,RIL,RXY,RR,RX,RXY,RX,RXY,
                         RR,RX,RXY,RX,RXY,RRE,RRE,RS,RS,SS")
-   (set_attr "type" "*,*,*,la,lr,load,load,store,store,
-                     floads,floads,floads,fstores,fstores,*,*,*,*,*")])
+   (set_attr "type" "*,*,*,*,la,lr,load,load,store,store,
+                     floadsf,floadsf,floadsf,fstoresf,fstoresf,*,*,*,*,*")])
 
 (define_insn "*movsi_esa"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,R,!*f,!*f,!R,d,t,Q,t,?Q")
    lam\t%0,%0,%S1
    #"
   [(set_attr "op_type" "RI,RR,RX,RX,RR,RX,RX,RRE,RRE,RS,RS,SS")
-   (set_attr "type" "*,lr,load,store,floads,floads,fstores,*,*,*,*,*")])
+   (set_attr "type" "*,lr,load,store,floadsf,floadsf,fstoresf,*,*,*,*,*")])
 
 (define_peephole2
   [(set (match_operand:SI 0 "register_operand" "")
   [(parallel
     [(set (match_operand:SI 0 "register_operand" "")
           (match_operand:QI 1 "address_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "!TARGET_64BIT
    && preferred_la_operand_p (operands[1], const0_rtx)"
   [(set (match_dup 0) (match_dup 1))]
     [(set (match_dup 0)
           (plus:SI (match_dup 0)
                    (match_operand:SI 2 "nonmemory_operand" "")))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "!TARGET_64BIT
    && !reg_overlap_mentioned_p (operands[0], operands[2])
    && preferred_la_operand_p (operands[1], operands[2])"
   [(set (match_operand:SI 0 "register_operand" "=d")
         (and:SI (match_operand:QI 1 "address_operand" "p")
                 (const_int 2147483647)))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT"
   "#"
   "&& reload_completed"
 (define_insn "*movstricthi"
   [(set (strict_low_part (match_operand:HI 0 "register_operand" "+d,d"))
                          (match_operand:HI 1 "memory_operand" "Q,S"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   ""
   "@
    icm\t%0,3,%S1
    (set_attr "type" "lr,load,load,*")])
 
 ;
+; movtf instruction pattern(s).
+;
+
+(define_expand "movtf"
+  [(set (match_operand:TF 0 "nonimmediate_operand" "")
+        (match_operand:TF 1 "general_operand"       ""))]
+  ""
+  "")
+
+(define_insn "*movtf_64"
+  [(set (match_operand:TF 0 "nonimmediate_operand" "=f,f,f,o,d,QS,d,o,Q")
+        (match_operand:TF 1 "general_operand"       "G,f,o,f,QS,d,dm,d,Q"))]
+  "TARGET_64BIT"
+  "@
+   lzxr\t%0
+   lxr\t%0,%1
+   #
+   #
+   lmg\t%0,%N0,%S1
+   stmg\t%1,%N1,%S0
+   #
+   #
+   #"
+  [(set_attr "op_type" "RRE,RRE,*,*,RSY,RSY,*,*,*")
+   (set_attr "type"    "fsimptf,fsimptf,*,*,lm,stm,*,*,*")])
+
+(define_insn "*movtf_31"
+  [(set (match_operand:TF 0 "nonimmediate_operand" "=f,f,f,o,Q")
+        (match_operand:TF 1 "general_operand"       "G,f,o,f,Q"))]
+  "!TARGET_64BIT"
+  "@
+   lzxr\t%0
+   lxr\t%0,%1
+   #
+   #
+   #"
+  [(set_attr "op_type" "RRE,RRE,*,*,*")
+   (set_attr "type"    "fsimptf,fsimptf,*,*,*")])
+
+; TFmode in GPRs splitters
+
+(define_split
+  [(set (match_operand:TF 0 "nonimmediate_operand" "")
+        (match_operand:TF 1 "general_operand" ""))]
+  "TARGET_64BIT && reload_completed
+   && s390_split_ok_p (operands[0], operands[1], TFmode, 0)"
+  [(set (match_dup 2) (match_dup 4))
+   (set (match_dup 3) (match_dup 5))]
+{
+  operands[2] = operand_subword (operands[0], 0, 0, TFmode);
+  operands[3] = operand_subword (operands[0], 1, 0, TFmode);
+  operands[4] = operand_subword (operands[1], 0, 0, TFmode);
+  operands[5] = operand_subword (operands[1], 1, 0, TFmode);
+})
+
+(define_split
+  [(set (match_operand:TF 0 "nonimmediate_operand" "")
+        (match_operand:TF 1 "general_operand" ""))]
+  "TARGET_64BIT && reload_completed
+   && s390_split_ok_p (operands[0], operands[1], TFmode, 1)"
+  [(set (match_dup 2) (match_dup 4))
+   (set (match_dup 3) (match_dup 5))]
+{
+  operands[2] = operand_subword (operands[0], 1, 0, TFmode);
+  operands[3] = operand_subword (operands[0], 0, 0, TFmode);
+  operands[4] = operand_subword (operands[1], 1, 0, TFmode);
+  operands[5] = operand_subword (operands[1], 0, 0, TFmode);
+})
+
+(define_split
+  [(set (match_operand:TF 0 "register_operand" "")
+        (match_operand:TF 1 "memory_operand" ""))]
+  "TARGET_64BIT && reload_completed
+   && !FP_REG_P (operands[0])
+   && !s_operand (operands[1], VOIDmode)"
+  [(set (match_dup 0) (match_dup 1))]
+{
+  rtx addr = operand_subword (operands[0], 1, 0, DFmode);
+  s390_load_address (addr, XEXP (operands[1], 0));
+  operands[1] = replace_equiv_address (operands[1], addr);
+})
+
+; TFmode in FPRs splitters
+
+(define_split
+  [(set (match_operand:TF 0 "register_operand" "")
+        (match_operand:TF 1 "memory_operand" ""))]
+  "reload_completed && offsettable_memref_p (operands[1]) 
+   && FP_REG_P (operands[0])"
+  [(set (match_dup 2) (match_dup 4))
+   (set (match_dup 3) (match_dup 5))]
+{
+  operands[2] = simplify_gen_subreg (DFmode, operands[0], TFmode, 0);
+  operands[3] = simplify_gen_subreg (DFmode, operands[0], TFmode, 8);
+  operands[4] = adjust_address_nv (operands[1], DFmode, 0);
+  operands[5] = adjust_address_nv (operands[1], DFmode, 8);
+})
+
+(define_split
+  [(set (match_operand:TF 0 "memory_operand" "")
+        (match_operand:TF 1 "register_operand" ""))]
+  "reload_completed && offsettable_memref_p (operands[0])
+   && FP_REG_P (operands[1])"
+  [(set (match_dup 2) (match_dup 4))
+   (set (match_dup 3) (match_dup 5))]
+{
+  operands[2] = adjust_address_nv (operands[0], DFmode, 0);
+  operands[3] = adjust_address_nv (operands[0], DFmode, 8);
+  operands[4] = simplify_gen_subreg (DFmode, operands[1], TFmode, 0);
+  operands[5] = simplify_gen_subreg (DFmode, operands[1], TFmode, 8);
+})
+
+(define_expand "reload_outtf"
+  [(parallel [(match_operand:TF 0 "" "")
+              (match_operand:TF 1 "register_operand" "f")
+              (match_operand:SI 2 "register_operand" "=&a")])]
+  ""
+{
+  rtx addr = gen_lowpart (Pmode, operands[2]);
+
+  gcc_assert (MEM_P (operands[0]));
+  s390_load_address (addr, find_replacement (&XEXP (operands[0], 0)));
+  operands[0] = replace_equiv_address (operands[0], addr);
+  emit_move_insn (operands[0], operands[1]);
+  DONE;
+})
+
+(define_expand "reload_intf"
+  [(parallel [(match_operand:TF 0 "register_operand" "=f")
+              (match_operand:TF 1 "" "")
+              (match_operand:SI 2 "register_operand" "=&a")])]
+  ""
+{
+  rtx addr = gen_lowpart (Pmode, operands[2]);
+  gcc_assert (MEM_P (operands[1]));
+  s390_load_address (addr, find_replacement (&XEXP (operands[1], 0)));
+  operands[1] = replace_equiv_address (operands[1], addr);
+  emit_move_insn (operands[0], operands[1]);
+  DONE;
+})
+
+;
 ; movdf instruction pattern(s).
 ;
 
   "")
 
 (define_insn "*movdf_64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,R,T,d,d,m,?Q")
-        (match_operand:DF 1 "general_operand" "f,R,T,f,f,d,m,d,?Q"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,f,R,T,d,d,m,?Q")
+        (match_operand:DF 1 "general_operand" "G,f,R,T,f,f,d,m,d,?Q"))]
   "TARGET_64BIT"
   "@
+   lzdr\t%0
    ldr\t%0,%1
    ld\t%0,%1
    ldy\t%0,%1
    lg\t%0,%1
    stg\t%1,%0
    #"
-  [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RRE,RXY,RXY,SS")
-   (set_attr "type" "floadd,floadd,floadd,fstored,fstored,lr,load,store,*")])
+  [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RRE,RXY,RXY,SS")
+   (set_attr "type" "fsimpdf,floaddf,floaddf,floaddf,fstoredf,fstoredf,lr,load,store,*")])
 
 (define_insn "*movdf_31"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,R,T,d,Q,d,o,Q")
-        (match_operand:DF 1 "general_operand" "f,R,T,f,f,Q,d,dKm,d,Q"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,f,R,T,d,d,Q,S,d,o,Q")
+        (match_operand:DF 1 "general_operand" "G,f,R,T,f,f,Q,S,d,d,dPm,d,Q"))]
   "!TARGET_64BIT"
   "@
+   lzdr\t%0
    ldr\t%0,%1
    ld\t%0,%1
    ldy\t%0,%1
    std\t%1,%0
    stdy\t%1,%0
    lm\t%0,%N0,%S1
+   lmy\t%0,%N0,%S1
    stm\t%1,%N1,%S0
+   stmy\t%1,%N1,%S0
    #
    #
    #"
-  [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RS,RS,*,*,SS")
-   (set_attr "type" "floadd,floadd,floadd,fstored,fstored,lm,stm,*,*,*")])
+  [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RS,RSY,RS,RSY,*,*,SS")
+   (set_attr "type" "fsimpdf,floaddf,floaddf,floaddf,fstoredf,fstoredf,\
+                     lm,lm,stm,stm,*,*,*")])
 
 (define_split
   [(set (match_operand:DF 0 "nonimmediate_operand" "")
 ;
 
 (define_insn "movsf"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=f,f,f,R,T,d,d,d,R,T,?Q")
-        (match_operand:SF 1 "general_operand" "f,R,T,f,f,d,R,T,d,d,?Q"))]
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=f,f,f,f,R,T,d,d,d,R,T,?Q")
+        (match_operand:SF 1 "general_operand" "G,f,R,T,f,f,d,R,T,d,d,?Q"))]
   ""
   "@
+   lzer\t%0
    ler\t%0,%1
    le\t%0,%1
    ley\t%0,%1
    st\t%1,%0
    sty\t%1,%0
    #"
-  [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY,SS")
-   (set_attr "type" "floads,floads,floads,fstores,fstores,
+  [(set_attr "op_type" "RRE,RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY,SS")
+   (set_attr "type" "fsimpsf,floadsf,floadsf,floadsf,fstoresf,fstoresf,
                      lr,load,load,store,store,*")])
 
 ;
      (use (match_operand 5 "const_int_operand" ""))])]
   "s390_offset_p (operands[0], operands[3], operands[2])
    && s390_offset_p (operands[1], operands[4], operands[2])
+   && !s390_overlap_p (operands[0], operands[1], 
+                       INTVAL (operands[2]) + INTVAL (operands[5]))
    && INTVAL (operands[2]) + INTVAL (operands[5]) <= 256"
   [(parallel
     [(set (match_dup 6) (match_dup 7))
 ; strlenM instruction pattern(s).
 ;
 
-(define_expand "strlendi"
-  [(set (reg:QI 0) (match_operand:QI 2 "immediate_operand" ""))
+(define_expand "strlen<mode>"
+  [(set (reg:SI 0) (match_operand:SI 2 "immediate_operand" ""))
    (parallel
     [(set (match_dup 4)
-         (unspec:DI [(const_int 0)
+         (unspec:P [(const_int 0)
                      (match_operand:BLK 1 "memory_operand" "")
-                     (reg:QI 0)
+                     (reg:SI 0)
                      (match_operand 3 "immediate_operand" "")] UNSPEC_SRST))
-     (clobber (scratch:DI))
-     (clobber (reg:CC 33))])
+     (clobber (scratch:P))
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-          (minus:DI (match_dup 4) (match_dup 5)))
-     (clobber (reg:CC 33))])]
-  "TARGET_64BIT"
+    [(set (match_operand:P 0 "register_operand" "")
+          (minus:P (match_dup 4) (match_dup 5)))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
 {
-  operands[4] = gen_reg_rtx (DImode);
-  operands[5] = gen_reg_rtx (DImode);
+  operands[4] = gen_reg_rtx (Pmode);
+  operands[5] = gen_reg_rtx (Pmode);
   emit_move_insn (operands[5], force_operand (XEXP (operands[1], 0), NULL_RTX));
   operands[1] = replace_equiv_address (operands[1], operands[5]);
 })
 
-(define_insn "*strlendi"
-  [(set (match_operand:DI 0 "register_operand" "=a")
-       (unspec:DI [(match_operand:DI 2 "general_operand" "0")
-                   (mem:BLK (match_operand:DI 3 "register_operand" "1"))
-                   (reg:QI 0)
+(define_insn "*strlen<mode>"
+  [(set (match_operand:P 0 "register_operand" "=a")
+       (unspec:P [(match_operand:P 2 "general_operand" "0")
+                   (mem:BLK (match_operand:P 3 "register_operand" "1"))
+                   (reg:SI 0)
                    (match_operand 4 "immediate_operand" "")] UNSPEC_SRST))
-   (clobber (match_scratch:DI 1 "=a"))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
+   (clobber (match_scratch:P 1 "=a"))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
   "srst\t%0,%1\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
 
-(define_expand "strlensi"
-  [(set (reg:QI 0) (match_operand:QI 2 "immediate_operand" ""))
+;
+; cmpstrM instruction pattern(s).
+;
+
+(define_expand "cmpstrsi"
+  [(set (reg:SI 0) (const_int 0))
    (parallel
-    [(set (match_dup 4)
-         (unspec:SI [(const_int 0)
-                     (match_operand:BLK 1 "memory_operand" "")
-                     (reg:QI 0)
-                     (match_operand 3 "immediate_operand" "")] UNSPEC_SRST))
-     (clobber (scratch:SI))
-     (clobber (reg:CC 33))])
+    [(clobber (match_operand 3 "" ""))
+     (clobber (match_dup 4))
+     (set (reg:CCU CC_REGNUM)
+         (compare:CCU (match_operand:BLK 1 "memory_operand" "")
+                      (match_operand:BLK 2 "memory_operand" "")))
+     (use (reg:SI 0))])
    (parallel
-    [(set (match_operand:SI 0 "register_operand" "")
-          (minus:SI (match_dup 4) (match_dup 5)))
-     (clobber (reg:CC 33))])]
-  "!TARGET_64BIT"
+    [(set (match_operand:SI 0 "register_operand" "=d")
+         (unspec:SI [(reg:CCU CC_REGNUM)] UNSPEC_CMPINT))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
 {
-  operands[4] = gen_reg_rtx (SImode);
-  operands[5] = gen_reg_rtx (SImode);
-  emit_move_insn (operands[5], force_operand (XEXP (operands[1], 0), NULL_RTX));
-  operands[1] = replace_equiv_address (operands[1], operands[5]);
+  /* As the result of CMPINT is inverted compared to what we need,
+     we have to swap the operands.  */
+  rtx op1 = operands[2];
+  rtx op2 = operands[1];
+  rtx addr1 = gen_reg_rtx (Pmode);
+  rtx addr2 = gen_reg_rtx (Pmode);
+
+  emit_move_insn (addr1, force_operand (XEXP (op1, 0), NULL_RTX));
+  emit_move_insn (addr2, force_operand (XEXP (op2, 0), NULL_RTX));
+  operands[1] = replace_equiv_address_nv (op1, addr1);
+  operands[2] = replace_equiv_address_nv (op2, addr2);
+  operands[3] = addr1;
+  operands[4] = addr2;
 })
 
-(define_insn "*strlensi"
-  [(set (match_operand:SI 0 "register_operand" "=a")
-       (unspec:SI [(match_operand:SI 2 "general_operand" "0")
-                   (mem:BLK (match_operand:SI 3 "register_operand" "1"))
-                   (reg:QI 0)
-                   (match_operand 4 "immediate_operand" "")] UNSPEC_SRST))
-   (clobber (match_scratch:SI 1 "=a"))
-   (clobber (reg:CC 33))]
-  "!TARGET_64BIT"
-  "srst\t%0,%1\;jo\t.-4"
+(define_insn "*cmpstr<mode>"
+  [(clobber (match_operand:P 0 "register_operand" "=d"))
+   (clobber (match_operand:P 1 "register_operand" "=d"))
+   (set (reg:CCU CC_REGNUM)
+       (compare:CCU (mem:BLK (match_operand:P 2 "register_operand" "0"))
+                    (mem:BLK (match_operand:P 3 "register_operand" "1"))))
+   (use (reg:SI 0))]
+  ""
+  "clst\t%0,%1\;jo\t.-4"
+  [(set_attr "length" "8")
+   (set_attr "type" "vs")])
+;
+; movstr instruction pattern.
+;
+
+(define_expand "movstr"
+  [(set (reg:SI 0) (const_int 0))
+   (parallel 
+    [(clobber (match_dup 3))
+     (set (match_operand:BLK 1 "memory_operand" "")
+         (match_operand:BLK 2 "memory_operand" ""))
+     (set (match_operand 0 "register_operand" "")
+         (unspec [(match_dup 1) 
+                  (match_dup 2)
+                  (reg:SI 0)] UNSPEC_MVST))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
+{
+  rtx addr1 = gen_reg_rtx (Pmode);
+  rtx addr2 = gen_reg_rtx (Pmode);
+
+  emit_move_insn (addr1, force_operand (XEXP (operands[1], 0), NULL_RTX));
+  emit_move_insn (addr2, force_operand (XEXP (operands[2], 0), NULL_RTX));
+  operands[1] = replace_equiv_address_nv (operands[1], addr1);
+  operands[2] = replace_equiv_address_nv (operands[2], addr2);
+  operands[3] = addr2;
+})
+
+(define_insn "*movstr"
+  [(clobber (match_operand:P 2 "register_operand" "=d"))
+   (set (mem:BLK (match_operand:P 1 "register_operand" "0"))
+       (mem:BLK (match_operand:P 3 "register_operand" "2")))
+   (set (match_operand:P 0 "register_operand" "=d")
+       (unspec [(mem:BLK (match_dup 1)) 
+                (mem:BLK (match_dup 3))
+                (reg:SI 0)] UNSPEC_MVST))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "mvst\t%1,%2\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
+  
 
 ;
 ; movmemM instruction pattern(s).
 ;
 
-(define_expand "movmemdi"
-  [(set (match_operand:BLK 0 "memory_operand" "")
-        (match_operand:BLK 1 "memory_operand" ""))
-   (use (match_operand:DI 2 "general_operand" ""))
-   (match_operand 3 "" "")]
-  "TARGET_64BIT"
-  "s390_expand_movmem (operands[0], operands[1], operands[2]); DONE;")
-
-(define_expand "movmemsi"
+(define_expand "movmem<mode>"
   [(set (match_operand:BLK 0 "memory_operand" "")
         (match_operand:BLK 1 "memory_operand" ""))
-   (use (match_operand:SI 2 "general_operand" ""))
+   (use (match_operand:GPR 2 "general_operand" ""))
    (match_operand 3 "" "")]
   ""
   "s390_expand_movmem (operands[0], operands[1], operands[2]); DONE;")
           (match_operand:BLK 1 "memory_operand" ""))
      (use (match_operand 2 "general_operand" ""))
      (use (match_dup 3))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   ""
 {
   enum machine_mode dword_mode = word_mode == DImode ? TImode : DImode;
   operands[3] = reg1;
 })
 
-(define_insn "*movmem_long_64"
-  [(clobber (match_operand:TI 0 "register_operand" "=d"))
-   (clobber (match_operand:TI 1 "register_operand" "=d"))
-   (set (mem:BLK (subreg:DI (match_operand:TI 2 "register_operand" "0") 0))
-        (mem:BLK (subreg:DI (match_operand:TI 3 "register_operand" "1") 0)))
+(define_insn "*movmem_long"
+  [(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
+   (clobber (match_operand:<DBL> 1 "register_operand" "=d"))
+   (set (mem:BLK (subreg:P (match_operand:<DBL> 2 "register_operand" "0") 0))
+        (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "1") 0)))
    (use (match_dup 2))
    (use (match_dup 3))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "mvcle\t%0,%1,0\;jo\t.-4"
-  [(set_attr "length" "8")
-   (set_attr "type" "vs")])
-
-(define_insn "*movmem_long_31"
-  [(clobber (match_operand:DI 0 "register_operand" "=d"))
-   (clobber (match_operand:DI 1 "register_operand" "=d"))
-   (set (mem:BLK (subreg:SI (match_operand:DI 2 "register_operand" "0") 0))
-        (mem:BLK (subreg:SI (match_operand:DI 3 "register_operand" "1") 0)))
-   (use (match_dup 2))
-   (use (match_dup 3))
-   (clobber (reg:CC 33))]
-  "!TARGET_64BIT"
+   (clobber (reg:CC CC_REGNUM))]
+  ""
   "mvcle\t%0,%1,0\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
 
 ;
-; clrmemM instruction pattern(s).
+; setmemM instruction pattern(s).
 ;
 
-(define_expand "clrmemdi"
-  [(set (match_operand:BLK 0 "memory_operand" "")
-        (const_int 0))
-   (use (match_operand:DI 1 "general_operand" ""))
-   (match_operand 2 "" "")]
-  "TARGET_64BIT"
-  "s390_expand_clrmem (operands[0], operands[1]); DONE;")
-
-(define_expand "clrmemsi"
+(define_expand "setmem<mode>"
   [(set (match_operand:BLK 0 "memory_operand" "")
-        (const_int 0))
-   (use (match_operand:SI 1 "general_operand" ""))
-   (match_operand 2 "" "")]
+        (match_operand:QI 2 "general_operand" ""))
+   (use (match_operand:GPR 1 "general_operand" ""))
+   (match_operand 3 "" "")]
   ""
-  "s390_expand_clrmem (operands[0], operands[1]); DONE;")
+  "s390_expand_setmem (operands[0], operands[1], operands[2]); DONE;")
 
 ; Clear a block that is up to 256 bytes in length.
 ; The block length is taken as (operands[1] % 256) + 1.
      (use (match_operand 1 "nonmemory_operand" ""))
      (use (const:BLK (unspec:BLK [(const_int 0)] UNSPEC_INSN)))
      (clobber (match_dup 2))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "operands[2] = gen_rtx_SCRATCH (Pmode);")
 
    (use (match_operand 1 "nonmemory_operand" "n,a,a"))
    (use (match_operand 2 "immediate_operand" "X,R,X"))
    (clobber (match_scratch 3 "=X,X,&a"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "(GET_MODE (operands[1]) == Pmode || GET_MODE (operands[1]) == VOIDmode)
    && GET_MODE (operands[3]) == Pmode"
   "#"
    (use (match_operand 1 "const_int_operand" ""))
    (use (match_operand 2 "immediate_operand" ""))
    (clobber (scratch))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (const_int 0))
      (use (match_dup 1))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[1] = GEN_INT ((INTVAL (operands[1]) & 0xff) + 1);")
 
 (define_split
    (use (match_operand 1 "register_operand" ""))
    (use (match_operand 2 "memory_operand" ""))
    (clobber (scratch))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(unspec [(match_dup 1) (match_dup 2)
               (const_int 0)] UNSPEC_EXECUTE)
      (set (match_dup 0) (const_int 0))
      (use (const_int 1))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "")
 
 (define_split
    (use (match_operand 1 "register_operand" ""))
    (use (const:BLK (unspec:BLK [(const_int 0)] UNSPEC_INSN)))
    (clobber (match_operand 2 "register_operand" ""))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed && TARGET_CPU_ZARCH"
   [(set (match_dup 2) (label_ref (match_dup 3)))
    (parallel
               (label_ref (match_dup 3))] UNSPEC_EXECUTE)
      (set (match_dup 0) (const_int 0))
      (use (const_int 1))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[3] = gen_label_rtx ();")
 
-; Clear a block of arbitrary length.
+; Initialize a block of arbitrary length with (operands[2] % 256). 
 
-(define_expand "clrmem_long"
+(define_expand "setmem_long"
   [(parallel
     [(clobber (match_dup 1))
      (set (match_operand:BLK 0 "memory_operand" "")
-          (const_int 0))
+          (match_operand 2 "shift_count_or_setmem_operand" ""))
      (use (match_operand 1 "general_operand" ""))
-     (use (match_dup 2))
-     (clobber (reg:CC 33))])]
+     (use (match_dup 3))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
 {
   enum machine_mode dword_mode = word_mode == DImode ? TImode : DImode;
 
   operands[0] = replace_equiv_address_nv (operands[0], addr0);
   operands[1] = reg0;
-  operands[2] = reg1;
+  operands[3] = reg1;
 })
 
-(define_insn "*clrmem_long_64"
-  [(clobber (match_operand:TI 0 "register_operand" "=d"))
-   (set (mem:BLK (subreg:DI (match_operand:TI 2 "register_operand" "0") 0))
-        (const_int 0))
-   (use (match_dup 2))
-   (use (match_operand:TI 1 "register_operand" "d"))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "mvcle\t%0,%1,0\;jo\t.-4"
+(define_insn "*setmem_long"
+  [(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
+   (set (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "0") 0))
+        (match_operand 2 "shift_count_or_setmem_operand" "Y"))
+   (use (match_dup 3))
+   (use (match_operand:<DBL> 1 "register_operand" "d"))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "mvcle\t%0,%1,%Y2\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
 
-(define_insn "*clrmem_long_31"
-  [(clobber (match_operand:DI 0 "register_operand" "=d"))
-   (set (mem:BLK (subreg:SI (match_operand:DI 2 "register_operand" "0") 0))
-        (const_int 0))
-   (use (match_dup 2))
-   (use (match_operand:DI 1 "register_operand" "d"))
-   (clobber (reg:CC 33))]
-  "!TARGET_64BIT"
-  "mvcle\t%0,%1,0\;jo\t.-4"
+(define_insn "*setmem_long_and"
+  [(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
+   (set (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "0") 0))
+        (and (match_operand 2 "shift_count_or_setmem_operand" "Y")
+            (match_operand 4 "const_int_operand"             "n")))
+   (use (match_dup 3))
+   (use (match_operand:<DBL> 1 "register_operand" "d"))
+   (clobber (reg:CC CC_REGNUM))]
+  "(INTVAL (operands[4]) & 255) == 255"
+  "mvcle\t%0,%1,%Y2\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
-
 ;
 ; cmpmemM instruction pattern(s).
 ;
 
 (define_expand "cmpmem_short"
   [(parallel
-    [(set (reg:CCU 33)
+    [(set (reg:CCU CC_REGNUM)
           (compare:CCU (match_operand:BLK 0 "memory_operand" "")
                        (match_operand:BLK 1 "memory_operand" "")))
      (use (match_operand 2 "nonmemory_operand" ""))
   "operands[3] = gen_rtx_SCRATCH (Pmode);")
 
 (define_insn "*cmpmem_short"
-  [(set (reg:CCU 33)
+  [(set (reg:CCU CC_REGNUM)
         (compare:CCU (match_operand:BLK 0 "memory_operand" "Q,Q,Q")
                      (match_operand:BLK 1 "memory_operand" "Q,Q,Q")))
    (use (match_operand 2 "nonmemory_operand" "n,a,a"))
   [(set_attr "type" "cs")])
 
 (define_split
-  [(set (reg:CCU 33)
+  [(set (reg:CCU CC_REGNUM)
         (compare:CCU (match_operand:BLK 0 "memory_operand" "")
                      (match_operand:BLK 1 "memory_operand" "")))
    (use (match_operand 2 "const_int_operand" ""))
    (clobber (scratch))]
   "reload_completed"
   [(parallel
-    [(set (reg:CCU 33) (compare:CCU (match_dup 0) (match_dup 1)))
+    [(set (reg:CCU CC_REGNUM) (compare:CCU (match_dup 0) (match_dup 1)))
      (use (match_dup 2))])]
   "operands[2] = GEN_INT ((INTVAL (operands[2]) & 0xff) + 1);")
 
 (define_split
-  [(set (reg:CCU 33)
+  [(set (reg:CCU CC_REGNUM)
         (compare:CCU (match_operand:BLK 0 "memory_operand" "")
                      (match_operand:BLK 1 "memory_operand" "")))
    (use (match_operand 2 "register_operand" ""))
   [(parallel
     [(unspec [(match_dup 2) (match_dup 3)
               (const_int 0)] UNSPEC_EXECUTE)
-     (set (reg:CCU 33) (compare:CCU (match_dup 0) (match_dup 1)))
+     (set (reg:CCU CC_REGNUM) (compare:CCU (match_dup 0) (match_dup 1)))
      (use (const_int 1))])]
   "")
 
 (define_split
-  [(set (reg:CCU 33)
+  [(set (reg:CCU CC_REGNUM)
         (compare:CCU (match_operand:BLK 0 "memory_operand" "")
                      (match_operand:BLK 1 "memory_operand" "")))
    (use (match_operand 2 "register_operand" ""))
    (parallel
     [(unspec [(match_dup 2) (mem:BLK (match_dup 3)) 
               (label_ref (match_dup 4))] UNSPEC_EXECUTE)
-     (set (reg:CCU 33) (compare:CCU (match_dup 0) (match_dup 1)))
+     (set (reg:CCU CC_REGNUM) (compare:CCU (match_dup 0) (match_dup 1)))
      (use (const_int 1))])]
   "operands[4] = gen_label_rtx ();")
 
   [(parallel
     [(clobber (match_dup 2))
      (clobber (match_dup 3))
-     (set (reg:CCU 33)
+     (set (reg:CCU CC_REGNUM)
           (compare:CCU (match_operand:BLK 0 "memory_operand" "")
                        (match_operand:BLK 1 "memory_operand" "")))
      (use (match_operand 2 "general_operand" ""))
   operands[3] = reg1;
 })
 
-(define_insn "*cmpmem_long_64"
-  [(clobber (match_operand:TI 0 "register_operand" "=d"))
-   (clobber (match_operand:TI 1 "register_operand" "=d"))
-   (set (reg:CCU 33)
-        (compare:CCU (mem:BLK (subreg:DI (match_operand:TI 2 "register_operand" "0") 0))
-                     (mem:BLK (subreg:DI (match_operand:TI 3 "register_operand" "1") 0))))
-   (use (match_dup 2))
-   (use (match_dup 3))]
-  "TARGET_64BIT"
-  "clcle\t%0,%1,0\;jo\t.-4"
-  [(set_attr "length" "8")
-   (set_attr "type" "vs")])
-
-(define_insn "*cmpmem_long_31"
-  [(clobber (match_operand:DI 0 "register_operand" "=d"))
-   (clobber (match_operand:DI 1 "register_operand" "=d"))
-   (set (reg:CCU 33)
-        (compare:CCU (mem:BLK (subreg:SI (match_operand:DI 2 "register_operand" "0") 0))
-                     (mem:BLK (subreg:SI (match_operand:DI 3 "register_operand" "1") 0))))
+(define_insn "*cmpmem_long"
+  [(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
+   (clobber (match_operand:<DBL> 1 "register_operand" "=d"))
+   (set (reg:CCU CC_REGNUM)
+        (compare:CCU (mem:BLK (subreg:P (match_operand:<DBL> 2 "register_operand" "0") 0))
+                     (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "1") 0))))
    (use (match_dup 2))
    (use (match_dup 3))]
-  "!TARGET_64BIT"
+  ""
   "clcle\t%0,%1,0\;jo\t.-4"
   [(set_attr "length" "8")
    (set_attr "type" "vs")])
   [(set (match_operand:SI 0 "register_operand" "=d")
         (unspec:SI [(match_operand:CCU 1 "register_operand" "0")]
                    UNSPEC_CMPINT))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   ""
   "#"
   "reload_completed"
   [(set (match_dup 0) (ashift:SI (match_dup 0) (const_int 2)))
    (parallel
     [(set (match_dup 0) (ashiftrt:SI (match_dup 0) (const_int 30)))
-     (clobber (reg:CC 33))])])
+     (clobber (reg:CC CC_REGNUM))])])
 
 (define_insn_and_split "*cmpint_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (unspec:SI [(match_operand:CCU 1 "register_operand" "0")]
                             UNSPEC_CMPINT)
                  (const_int 0)))
   [(set (match_operand:DI 0 "register_operand" "=d")
         (sign_extend:DI (unspec:SI [(match_operand:CCU 1 "register_operand" "0")]
                                    UNSPEC_CMPINT)))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "#"
   "&& reload_completed"
   [(set (match_dup 0) (ashift:DI (match_dup 0) (const_int 34)))
    (parallel
     [(set (match_dup 0) (ashiftrt:DI (match_dup 0) (const_int 62)))
-     (clobber (reg:CC 33))])])
+     (clobber (reg:CC CC_REGNUM))])])
 
 (define_insn_and_split "*cmpint_sign_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ashiftrt:DI (ashift:DI (subreg:DI 
                    (unspec:SI [(match_operand:CCU 1 "register_operand" "0")]
                               UNSPEC_CMPINT) 0)
 ;;- Conversion instructions.
 ;;
 
-
-(define_insn "*sethigh<mode>si"
+(define_insn "*sethighpartsi"
   [(set (match_operand:SI 0 "register_operand" "=d,d")
-        (unspec:SI [(match_operand:HQI 1 "s_operand" "Q,S")] UNSPEC_SETHIGH))
-   (clobber (reg:CC 33))]
+       (unspec:SI [(match_operand:BLK 1 "s_operand" "Q,S")
+                   (match_operand 2 "const_int_operand" "n,n")] UNSPEC_ICM))
+   (clobber (reg:CC CC_REGNUM))]
   ""
   "@
-   icm\t%0,<icm_hi>,%S1
-   icmy\t%0,<icm_hi>,%S1"
+   icm\t%0,%2,%S1
+   icmy\t%0,%2,%S1"
   [(set_attr "op_type" "RS,RSY")])
 
-(define_insn "*sethighqidi_64"
+(define_insn "*sethighpartdi_64"
   [(set (match_operand:DI 0 "register_operand" "=d")
-        (unspec:DI [(match_operand:QI 1 "s_operand" "QS")] UNSPEC_SETHIGH))
-   (clobber (reg:CC 33))]
+       (unspec:DI [(match_operand:BLK 1 "s_operand" "QS")
+                   (match_operand 2 "const_int_operand" "n")] UNSPEC_ICM))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
-  "icmh\t%0,8,%S1"
+  "icmh\t%0,%2,%S1"
   [(set_attr "op_type" "RSY")])
 
-(define_insn "*sethighqidi_31"
+(define_insn "*sethighpartdi_31"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
-        (unspec:DI [(match_operand:QI 1 "s_operand" "Q,S")] UNSPEC_SETHIGH))
-   (clobber (reg:CC 33))]
+       (unspec:DI [(match_operand:BLK 1 "s_operand" "Q,S")
+                   (match_operand 2 "const_int_operand" "n,n")] UNSPEC_ICM))
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT"
   "@
-   icm\t%0,8,%S1
-   icmy\t%0,8,%S1"
+   icm\t%0,%2,%S1
+   icmy\t%0,%2,%S1"
   [(set_attr "op_type" "RS,RSY")])
 
-(define_insn_and_split "*extractqi"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (zero_extract:SI (match_operand:QI 1 "s_operand" "Q")
-                         (match_operand 2 "const_int_operand" "n")
-                         (const_int 0)))
-   (clobber (reg:CC 33))]
-  "!TARGET_64BIT
-   && INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 8"
+(define_insn_and_split "*extzv<mode>"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+       (zero_extract:GPR (match_operand:QI 1 "s_operand" "QS")
+                         (match_operand 2 "const_int_operand" "n")
+                         (const_int 0)))
+   (clobber (reg:CC CC_REGNUM))]
+  "INTVAL (operands[2]) > 0
+   && INTVAL (operands[2]) <= GET_MODE_BITSIZE (SImode)"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (match_dup 0) (unspec:SI [(match_dup 1)] UNSPEC_SETHIGH))
-     (clobber (reg:CC 33))])
-    (set (match_dup 0) (lshiftrt:SI (match_dup 0) (match_dup 2)))]
+    [(set (match_dup 0) (unspec:GPR [(match_dup 1) (match_dup 3)] UNSPEC_ICM))
+     (clobber (reg:CC CC_REGNUM))])
+   (set (match_dup 0) (lshiftrt:GPR (match_dup 0) (match_dup 2)))]
 {
-  operands[2] = GEN_INT (32 - INTVAL (operands[2]));
-  operands[1] = change_address (operands[1], QImode, 0);
+  int bitsize = INTVAL (operands[2]);
+  int size = (bitsize - 1) / BITS_PER_UNIT + 1; /* round up */
+  int mask = ((1ul << size) - 1) << (GET_MODE_SIZE (SImode) - size);
+
+  operands[1] = adjust_address (operands[1], BLKmode, 0);
+  set_mem_size (operands[1], GEN_INT (size));
+  operands[2] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode) - bitsize);
+  operands[3] = GEN_INT (mask);
 })
 
-(define_insn_and_split "*extracthi"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (zero_extract:SI (match_operand:QI 1 "s_operand" "Q")
-                         (match_operand 2 "const_int_operand" "n")
-                         (const_int 0)))
-   (clobber (reg:CC 33))]
-  "!TARGET_64BIT
-   && INTVAL (operands[2]) >= 8 && INTVAL (operands[2]) < 16"
+(define_insn_and_split "*extv<mode>"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+       (sign_extract:GPR (match_operand:QI 1 "s_operand" "QS")
+                         (match_operand 2 "const_int_operand" "n")
+                         (const_int 0)))
+   (clobber (reg:CC CC_REGNUM))]
+  "INTVAL (operands[2]) > 0
+   && INTVAL (operands[2]) <= GET_MODE_BITSIZE (SImode)"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (match_dup 0) (unspec:SI [(match_dup 1)] UNSPEC_SETHIGH))
-     (clobber (reg:CC 33))])
-    (set (match_dup 0) (lshiftrt:SI (match_dup 0) (match_dup 2)))]
+    [(set (match_dup 0) (unspec:GPR [(match_dup 1) (match_dup 3)] UNSPEC_ICM))
+     (clobber (reg:CC CC_REGNUM))])
+   (parallel
+    [(set (match_dup 0) (ashiftrt:GPR (match_dup 0) (match_dup 2)))
+     (clobber (reg:CC CC_REGNUM))])]
+{
+  int bitsize = INTVAL (operands[2]);
+  int size = (bitsize - 1) / BITS_PER_UNIT + 1; /* round up */
+  int mask = ((1ul << size) - 1) << (GET_MODE_SIZE (SImode) - size);
+
+  operands[1] = adjust_address (operands[1], BLKmode, 0);
+  set_mem_size (operands[1], GEN_INT (size));
+  operands[2] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode) - bitsize);
+  operands[3] = GEN_INT (mask);
+})
+
+;
+; insv instruction patterns
+;
+
+(define_expand "insv"
+  [(set (zero_extract (match_operand 0 "nonimmediate_operand" "")
+                     (match_operand 1 "const_int_operand" "")
+                     (match_operand 2 "const_int_operand" ""))
+       (match_operand 3 "general_operand" ""))]
+  ""
 {
-  operands[2] = GEN_INT (32 - INTVAL (operands[2]));
-  operands[1] = change_address (operands[1], HImode, 0);
+  if (s390_expand_insv (operands[0], operands[1], operands[2], operands[3]))
+    DONE;
+  FAIL;
 })
 
+(define_insn "*insv<mode>_mem_reg"
+  [(set (zero_extract:P (match_operand:QI 0 "memory_operand" "+Q,S")
+                       (match_operand 1 "const_int_operand" "n,n")
+                       (const_int 0))
+       (match_operand:P 2 "register_operand" "d,d"))]
+  "INTVAL (operands[1]) > 0
+   && INTVAL (operands[1]) <= GET_MODE_BITSIZE (SImode)
+   && INTVAL (operands[1]) % BITS_PER_UNIT == 0"
+{
+    int size = INTVAL (operands[1]) / BITS_PER_UNIT;
+
+    operands[1] = GEN_INT ((1ul << size) - 1);
+    return (which_alternative == 0) ? "stcm\t%2,%1,%S0" 
+                                   : "stcmy\t%2,%1,%S0";
+}
+  [(set_attr "op_type" "RS,RSY")])
+
+(define_insn "*insvdi_mem_reghigh"
+  [(set (zero_extract:DI (match_operand:QI 0 "memory_operand" "+QS")
+                        (match_operand 1 "const_int_operand" "n")
+                        (const_int 0))
+       (lshiftrt:DI (match_operand:DI 2 "register_operand" "d")
+                    (const_int 32)))]
+  "TARGET_64BIT
+   && INTVAL (operands[1]) > 0
+   && INTVAL (operands[1]) <= GET_MODE_BITSIZE (SImode)
+   && INTVAL (operands[1]) % BITS_PER_UNIT == 0"
+{
+    int size = INTVAL (operands[1]) / BITS_PER_UNIT;
+
+    operands[1] = GEN_INT ((1ul << size) - 1);
+    return "stcmh\t%2,%1,%S0";
+}
+[(set_attr "op_type" "RSY")])
+
+(define_insn "*insv<mode>_reg_imm"
+  [(set (zero_extract:P (match_operand:P 0 "register_operand" "+d")
+                       (const_int 16)
+                       (match_operand 1 "const_int_operand" "n"))
+       (match_operand:P 2 "const_int_operand" "n"))]
+  "TARGET_ZARCH
+   && INTVAL (operands[1]) >= 0
+   && INTVAL (operands[1]) < BITS_PER_WORD
+   && INTVAL (operands[1]) % 16 == 0"
+{
+  switch (BITS_PER_WORD - INTVAL (operands[1]))
+    {
+      case 64: return "iihh\t%0,%x2"; break;
+      case 48: return "iihl\t%0,%x2"; break;
+      case 32: return "iilh\t%0,%x2"; break;
+      case 16: return "iill\t%0,%x2"; break;
+      default: gcc_unreachable();
+    }
+}
+  [(set_attr "op_type" "RI")])
+
+(define_insn "*insv<mode>_reg_extimm"
+  [(set (zero_extract:P (match_operand:P 0 "register_operand" "+d")
+                       (const_int 32)
+                       (match_operand 1 "const_int_operand" "n"))
+       (match_operand:P 2 "const_int_operand" "n"))]
+  "TARGET_EXTIMM
+   && INTVAL (operands[1]) >= 0
+   && INTVAL (operands[1]) < BITS_PER_WORD
+   && INTVAL (operands[1]) % 32 == 0"
+{
+  switch (BITS_PER_WORD - INTVAL (operands[1]))
+    {
+      case 64: return "iihf\t%0,%o2"; break;
+      case 32: return "iilf\t%0,%o2"; break;
+      default: gcc_unreachable();
+    }
+}
+  [(set_attr "op_type" "RIL")])
+
 ;
 ; extendsidi2 instruction pattern(s).
 ;
   [(set (match_operand:DI 0 "register_operand" "")
         (sign_extend:DI (match_operand:SI 1 "nonimmediate_operand" "")))]
   ""
-  "
 {
   if (!TARGET_64BIT)
     {
       emit_insn (gen_ashrdi3 (operands[0], operands[0], GEN_INT (32)));
       DONE;
     }
-}
-")
+})
 
 (define_insn "*extendsidi2"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
   [(set_attr "op_type" "RRE,RXY")])
 
 ;
-; extendhidi2 instruction pattern(s).
+; extend(hi|qi)(si|di)2 instruction pattern(s).
 ;
 
-(define_expand "extendhidi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (sign_extend:DI (match_operand:HI 1 "register_operand" "")))]
+(define_expand "extend<HQI:mode><DSI:mode>2"
+  [(set (match_operand:DSI 0 "register_operand" "")
+        (sign_extend:DSI (match_operand:HQI 1 "nonimmediate_operand" "")))]
   ""
-  "
 {
-  if (!TARGET_64BIT)
+  if (<DSI:MODE>mode == DImode && !TARGET_64BIT)
     {
       rtx tmp = gen_reg_rtx (SImode);
-      emit_insn (gen_extendhisi2 (tmp, operands[1]));
+      emit_insn (gen_extend<HQI:mode>si2 (tmp, operands[1]));
       emit_insn (gen_extendsidi2 (operands[0], tmp));
       DONE;
     }
-  else
+  else if (!TARGET_EXTIMM)
     {
-      operands[1] = gen_lowpart (DImode, operands[1]);
-      emit_insn (gen_ashldi3 (operands[0], operands[1], GEN_INT (48)));
-      emit_insn (gen_ashrdi3 (operands[0], operands[0], GEN_INT (48)));
+      rtx bitcount = GEN_INT (GET_MODE_BITSIZE (<DSI:MODE>mode) -
+                             GET_MODE_BITSIZE (<HQI:MODE>mode));
+
+      operands[1] = gen_lowpart (<DSI:MODE>mode, operands[1]);
+      emit_insn (gen_ashl<DSI:mode>3 (operands[0], operands[1], bitcount));
+      emit_insn (gen_ashr<DSI:mode>3 (operands[0], operands[0], bitcount));
       DONE;
     }
-}
-")
-
-(define_insn "*extendhidi2"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (sign_extend:DI (match_operand:HI 1 "memory_operand" "m")))]
-  "TARGET_64BIT"
-  "lgh\t%0,%1"
-  [(set_attr "op_type" "RXY")])
+})
 
 ;
-; extendqidi2 instruction pattern(s).
+; extendhidi2 instruction pattern(s).
 ;
 
-(define_expand "extendqidi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (sign_extend:DI (match_operand:QI 1 "register_operand" "")))]
-  ""
-  "
-{
-  if (!TARGET_64BIT)
-    {
-      rtx tmp = gen_reg_rtx (SImode);
-      emit_insn (gen_extendqisi2 (tmp, operands[1]));
-      emit_insn (gen_extendsidi2 (operands[0], tmp));
-      DONE;
-    }
-  else
-    {
-      operands[1] = gen_lowpart (DImode, operands[1]);
-      emit_insn (gen_ashldi3 (operands[0], operands[1], GEN_INT (56)));
-      emit_insn (gen_ashrdi3 (operands[0], operands[0], GEN_INT (56)));
-      DONE;
-    }
-}
-")
+(define_insn "*extendhidi2_extimm"
+  [(set (match_operand:DI 0 "register_operand" "=d,d")
+        (sign_extend:DI (match_operand:HI 1 "nonimmediate_operand" "d,m")))]
+  "TARGET_64BIT && TARGET_EXTIMM"
+  "@
+   lghr\t%0,%1
+   lgh\t%0,%1"
+  [(set_attr "op_type" "RRE,RXY")])
 
-(define_insn "*extendqidi2"
+(define_insn "*extendhidi2"
   [(set (match_operand:DI 0 "register_operand" "=d")
-        (sign_extend:DI (match_operand:QI 1 "memory_operand" "m")))]
-  "TARGET_64BIT && TARGET_LONG_DISPLACEMENT"
-  "lgb\t%0,%1"
+        (sign_extend:DI (match_operand:HI 1 "memory_operand" "m")))]
+  "TARGET_64BIT"
+  "lgh\t%0,%1"
   [(set_attr "op_type" "RXY")])
 
-(define_insn_and_split "*extendqidi2_short_displ"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (sign_extend:DI (match_operand:QI 1 "s_operand" "Q")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && !TARGET_LONG_DISPLACEMENT"
-  "#"
-  "&& reload_completed"
-  [(parallel
-    [(set (match_dup 0) (unspec:DI [(match_dup 1)] UNSPEC_SETHIGH))
-     (clobber (reg:CC 33))])
-   (parallel
-    [(set (match_dup 0) (ashiftrt:DI (match_dup 0) (const_int 56)))
-     (clobber (reg:CC 33))])]
-  "")
-
 ;
 ; extendhisi2 instruction pattern(s).
 ;
 
-(define_expand "extendhisi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-        (sign_extend:SI (match_operand:HI 1 "register_operand" "")))]
-  ""
-  "
-{
-  operands[1] = gen_lowpart (SImode, operands[1]);
-  emit_insn (gen_ashlsi3 (operands[0], operands[1], GEN_INT (16)));
-  emit_insn (gen_ashrsi3 (operands[0], operands[0], GEN_INT (16)));
-  DONE;
-}
-")
+(define_insn "*extendhisi2_extimm"
+  [(set (match_operand:SI 0 "register_operand" "=d,d,d")
+        (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "d,R,T")))]
+  "TARGET_EXTIMM"
+  "@
+   lhr\t%0,%1
+   lh\t%0,%1
+   lhy\t%0,%1"
+  [(set_attr "op_type" "RRE,RX,RXY")])
 
 (define_insn "*extendhisi2"
   [(set (match_operand:SI 0 "register_operand" "=d,d")
         (sign_extend:SI (match_operand:HI 1 "memory_operand" "R,T")))]
-  ""
+  "!TARGET_EXTIMM"
   "@
    lh\t%0,%1
    lhy\t%0,%1"
   [(set_attr "op_type" "RX,RXY")])
 
 ;
-; extendqisi2 instruction pattern(s).
+; extendqi(si|di)2 instruction pattern(s).
 ;
 
-(define_expand "extendqisi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-        (sign_extend:SI (match_operand:QI 1 "register_operand" "")))]
-  ""
-  "
-{
-  operands[1] = gen_lowpart (SImode, operands[1]);
-  emit_insn (gen_ashlsi3 (operands[0], operands[1], GEN_INT (24)));
-  emit_insn (gen_ashrsi3 (operands[0], operands[0], GEN_INT (24)));
-  DONE;
-}
-")
+(define_insn "*extendqi<mode>2_extimm"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d")
+        (sign_extend:GPR (match_operand:QI 1 "nonimmediate_operand" "d,m")))]
+  "TARGET_EXTIMM"
+  "@
+   l<g>br\t%0,%1
+   l<g>b\t%0,%1"
+  [(set_attr "op_type" "RRE,RXY")])
 
-(define_insn "*extendqisi2"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (sign_extend:SI (match_operand:QI 1 "memory_operand" "m")))]
-  "TARGET_LONG_DISPLACEMENT"
-  "lb\t%0,%1"
+(define_insn "*extendqi<mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (sign_extend:GPR (match_operand:QI 1 "memory_operand" "m")))]
+  "!TARGET_EXTIMM && TARGET_LONG_DISPLACEMENT"
+  "l<g>b\t%0,%1"
   [(set_attr "op_type" "RXY")])
 
-(define_insn_and_split "*extendqisi2_short_displ"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (sign_extend:SI (match_operand:QI 1 "s_operand" "Q")))
-   (clobber (reg:CC 33))]
-  "!TARGET_LONG_DISPLACEMENT"
+(define_insn_and_split "*extendqi<mode>2_short_displ"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (sign_extend:GPR (match_operand:QI 1 "s_operand" "Q")))
+   (clobber (reg:CC CC_REGNUM))]
+  "!TARGET_EXTIMM && !TARGET_LONG_DISPLACEMENT"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (match_dup 0) (unspec:SI [(match_dup 1)] UNSPEC_SETHIGH))
-     (clobber (reg:CC 33))])
+    [(set (match_dup 0) (unspec:GPR [(match_dup 1) (const_int 8)] UNSPEC_ICM))
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (match_dup 0) (ashiftrt:SI (match_dup 0) (const_int 24)))
-     (clobber (reg:CC 33))])]
-  "")
-
-;
-; extendqihi2 instruction pattern(s).
-;
-
+    [(set (match_dup 0) (ashiftrt:GPR (match_dup 0) (match_dup 2)))
+     (clobber (reg:CC CC_REGNUM))])]
+{
+  operands[1] = adjust_address (operands[1], BLKmode, 0);
+  set_mem_size (operands[1], GEN_INT (GET_MODE_SIZE (QImode)));
+  operands[2] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode)
+                        - GET_MODE_BITSIZE (QImode));
+})
 
 ;
 ; zero_extendsidi2 instruction pattern(s).
   [(set (match_operand:DI 0 "register_operand" "")
         (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "")))]
   ""
-  "
 {
   if (!TARGET_64BIT)
     {
       emit_move_insn (gen_highpart (SImode, operands[0]), const0_rtx);
       DONE;
     }
-}
-")
+})
 
 (define_insn "*zero_extendsidi2"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
   [(set_attr "op_type" "RRE,RXY")])
 
 ;
-; zero_extendhidi2 instruction pattern(s).
-;
-
-(define_expand "zero_extendhidi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (zero_extend:DI (match_operand:HI 1 "register_operand" "")))]
-  ""
-  "
-{
-  if (!TARGET_64BIT)
-    {
-      rtx tmp = gen_reg_rtx (SImode);
-      emit_insn (gen_zero_extendhisi2 (tmp, operands[1]));
-      emit_insn (gen_zero_extendsidi2 (operands[0], tmp));
-      DONE;
-    }
-  else
-    {
-      operands[1] = gen_lowpart (DImode, operands[1]);
-      emit_insn (gen_ashldi3 (operands[0], operands[1], GEN_INT (48)));
-      emit_insn (gen_lshrdi3 (operands[0], operands[0], GEN_INT (48)));
-      DONE;
-    }
-}
-")
-
-(define_insn "*zero_extendhidi2"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (zero_extend:DI (match_operand:HI 1 "memory_operand" "m")))]
-  "TARGET_64BIT"
-  "llgh\t%0,%1"
-  [(set_attr "op_type" "RXY")])
-
-;
 ; LLGT-type instructions (zero-extend from 31 bit to 64 bit).
 ;
 
   [(set (match_operand:DI 0 "register_operand" "=d")
         (and:DI (subreg:DI (match_operand:SI 1 "memory_operand" "m") 0)
                (const_int 2147483647)))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "#"
   "&& reload_completed"
   [(set (match_operand:SI 0 "register_operand" "=d,d")
         (and:SI (match_operand:SI 1 "nonimmediate_operand" "d,m")
                (const_int 2147483647)))]
-  "TARGET_64BIT"
+  "TARGET_ZARCH"
   "@
    llgtr\t%0,%1
    llgt\t%0,%1"
   [(set_attr "op_type"  "RRE,RXE")])
 
-(define_split
-  [(set (match_operand:SI 0 "register_operand" "")
-        (and:SI (match_operand:SI 1 "nonimmediate_operand" "")
-               (const_int 2147483647)))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && reload_completed"
-  [(set (match_dup 0)
-        (and:SI (match_dup 1)
-               (const_int 2147483647)))]
-  "")
-
 (define_insn "*llgt_didi"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (and:DI (match_operand:DI 1 "nonimmediate_operand" "d,o")
   [(set_attr "op_type"  "RRE,RXE")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-        (and:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (const_int 2147483647)))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && reload_completed"
+  [(set (match_operand:GPR 0 "register_operand" "")
+        (and:GPR (match_operand:GPR 1 "nonimmediate_operand" "")
+                 (const_int 2147483647)))
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_ZARCH && reload_completed"
   [(set (match_dup 0)
-        (and:DI (match_dup 1)
-                (const_int 2147483647)))]
+        (and:GPR (match_dup 1)
+                 (const_int 2147483647)))]
   "")
 
 ;
-; zero_extendqidi2 instruction pattern(s)
+; zero_extend(hi|qi)(si|di)2 instruction pattern(s).
 ;
 
-(define_expand "zero_extendqidi2"
+(define_expand "zero_extend<mode>di2"
   [(set (match_operand:DI 0 "register_operand" "")
-        (zero_extend:DI (match_operand:QI 1 "register_operand" "")))]
+        (zero_extend:DI (match_operand:HQI 1 "nonimmediate_operand" "")))]
   ""
-  "
 {
   if (!TARGET_64BIT)
     {
       rtx tmp = gen_reg_rtx (SImode);
-      emit_insn (gen_zero_extendqisi2 (tmp, operands[1]));
+      emit_insn (gen_zero_extend<mode>si2 (tmp, operands[1]));
       emit_insn (gen_zero_extendsidi2 (operands[0], tmp));
       DONE;
     }
-  else
+  else if (!TARGET_EXTIMM)
     {
+      rtx bitcount = GEN_INT (GET_MODE_BITSIZE(DImode) - 
+                             GET_MODE_BITSIZE(<MODE>mode));
       operands[1] = gen_lowpart (DImode, operands[1]);
-      emit_insn (gen_ashldi3 (operands[0], operands[1], GEN_INT (56)));
-      emit_insn (gen_lshrdi3 (operands[0], operands[0], GEN_INT (56)));
+      emit_insn (gen_ashldi3 (operands[0], operands[1], bitcount));
+      emit_insn (gen_lshrdi3 (operands[0], operands[0], bitcount));
       DONE;
     }
-}
-")
-
-(define_insn "*zero_extendqidi2"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (zero_extend:DI (match_operand:QI 1 "memory_operand" "m")))]
-  "TARGET_64BIT"
-  "llgc\t%0,%1"
-  [(set_attr "op_type" "RXY")])
-
-;
-; zero_extendhisi2 instruction pattern(s).
-;
+})
 
-(define_expand "zero_extendhisi2"
+(define_expand "zero_extend<mode>si2"
   [(set (match_operand:SI 0 "register_operand" "")
-        (zero_extend:SI (match_operand:HI 1 "register_operand" "")))]
+        (zero_extend:SI (match_operand:HQI 1 "nonimmediate_operand" "")))]
   ""
-  "
 {
-  operands[1] = gen_lowpart (SImode, operands[1]);
-  emit_insn (gen_andsi3 (operands[0], operands[1], GEN_INT (0xffff)));
-  DONE;
-}
-")
+  if (!TARGET_EXTIMM)
+    {
+      operands[1] = gen_lowpart (SImode, operands[1]);
+      emit_insn (gen_andsi3 (operands[0], operands[1], 
+                   GEN_INT ((1 << GET_MODE_BITSIZE(<MODE>mode)) - 1)));
+      DONE;
+    }
+})
 
-(define_insn "*zero_extendhisi2_64"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (zero_extend:SI (match_operand:HI 1 "memory_operand" "m")))]
-  "TARGET_ZARCH"
-  "llgh\t%0,%1"
+(define_insn "*zero_extend<HQI:mode><GPR:mode>2_extimm"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d")
+        (zero_extend:GPR (match_operand:HQI 1 "nonimmediate_operand" "d,m")))]
+  "TARGET_EXTIMM"
+  "@
+   ll<g><hc>r\t%0,%1
+   ll<g><hc>\t%0,%1"
+  [(set_attr "op_type" "RRE,RXY")])
+
+(define_insn "*zero_extend<HQI:mode><GPR:mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (zero_extend:GPR (match_operand:HQI 1 "memory_operand" "m")))]
+  "TARGET_ZARCH && !TARGET_EXTIMM"
+  "llg<hc>\t%0,%1"
   [(set_attr "op_type" "RXY")])
 
 (define_insn_and_split "*zero_extendhisi2_31"
   [(set (match_operand:SI 0 "register_operand" "=&d")
         (zero_extend:SI (match_operand:HI 1 "s_operand" "QS")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH"
   "#"
   "&& reload_completed"
   [(set (match_dup 0) (const_int 0))
    (parallel
     [(set (strict_low_part (match_dup 2)) (match_dup 1))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[2] = gen_lowpart (HImode, operands[0]);")
 
-;
-; zero_extendqisi2 instruction pattern(s).
-;
-
-(define_expand "zero_extendqisi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))]
-  ""
-  "
-{
-  operands[1] = gen_lowpart (SImode, operands[1]);
-  emit_insn (gen_andsi3 (operands[0], operands[1], GEN_INT (0xff)));
-  DONE;
-}
-")
-
-(define_insn "*zero_extendqisi2_64"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (zero_extend:SI (match_operand:QI 1 "memory_operand" "m")))]
-  "TARGET_ZARCH"
-  "llgc\t%0,%1"
-  [(set_attr "op_type" "RXY")])
-
 (define_insn_and_split "*zero_extendqisi2_31"
   [(set (match_operand:SI 0 "register_operand" "=&d")
         (zero_extend:SI (match_operand:QI 1 "memory_operand" "m")))]
 (define_expand "zero_extendqihi2"
   [(set (match_operand:HI 0 "register_operand" "")
         (zero_extend:HI (match_operand:QI 1 "register_operand" "")))]
-  "TARGET_ZARCH"
-  "
+  "TARGET_ZARCH && !TARGET_EXTIMM"
 {
   operands[1] = gen_lowpart (HImode, operands[1]);
   emit_insn (gen_andhi3 (operands[0], operands[1], GEN_INT (0xff)));
   DONE;
-}
-")
+})
 
 (define_insn "*zero_extendqihi2_64"
   [(set (match_operand:HI 0 "register_operand" "=d")
         (zero_extend:HI (match_operand:QI 1 "memory_operand" "m")))]
-  "TARGET_ZARCH"
+  "TARGET_ZARCH && !TARGET_EXTIMM"
   "llgc\t%0,%1"
   [(set_attr "op_type" "RXY")])
 
 
 
 ;
-; fixuns_truncdfdi2 and fix_truncdfsi2 instruction pattern(s).
+; fixuns_trunc(sf|df)(si|di)2 and fix_trunc(sf|df)(si|di)2 instruction pattern(s).
 ;
 
-(define_expand "fixuns_truncdfdi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (unsigned_fix:DI (match_operand:DF 1 "register_operand" "")))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+(define_expand "fixuns_trunc<FPR:mode><GPR:mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "")
+        (unsigned_fix:GPR (match_operand:FPR 1 "register_operand" "")))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
 {
   rtx label1 = gen_label_rtx ();
   rtx label2 = gen_label_rtx ();
-  rtx temp = gen_reg_rtx (DFmode);
-  operands[1] = force_reg (DFmode, operands[1]);
-
-  emit_insn (gen_cmpdf (operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("9223372036854775808.0", DFmode), DFmode)));
+  rtx temp = gen_reg_rtx (<FPR:MODE>mode);
+  REAL_VALUE_TYPE cmp, sub;
+  
+  operands[1] = force_reg (<FPR:MODE>mode, operands[1]);
+  real_2expN (&cmp, GET_MODE_BITSIZE(<GPR:MODE>mode) - 1);
+  real_2expN (&sub, GET_MODE_BITSIZE(<GPR:MODE>mode));
+  
+  emit_insn (gen_cmp<FPR:mode> (operands[1],
+       CONST_DOUBLE_FROM_REAL_VALUE (cmp, <FPR:MODE>mode)));
   emit_jump_insn (gen_blt (label1));
-  emit_insn (gen_subdf3 (temp, operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("18446744073709551616.0", DFmode), DFmode)));
-  emit_insn (gen_fix_truncdfdi2_ieee (operands[0], temp, GEN_INT(7)));
+  emit_insn (gen_sub<FPR:mode>3 (temp, operands[1],
+       CONST_DOUBLE_FROM_REAL_VALUE (sub, <FPR:MODE>mode)));
+  emit_insn (gen_fix_trunc<FPR:mode><GPR:mode>2_ieee (operands[0], temp,
+       GEN_INT(7)));
   emit_jump (label2);
 
   emit_label (label1);
-  emit_insn (gen_fix_truncdfdi2_ieee (operands[0], operands[1], GEN_INT(5)));
+  emit_insn (gen_fix_trunc<FPR:mode><GPR:mode>2_ieee (operands[0],
+       operands[1], GEN_INT(5)));
   emit_label (label2);
   DONE;
 })
 
-(define_expand "fix_truncdfdi2"
+(define_expand "fix_trunc<mode>di2"
   [(set (match_operand:DI 0 "register_operand" "")
-        (fix:DI (match_operand:DF 1 "nonimmediate_operand" "")))]
+        (fix:DI (match_operand:DSF 1 "nonimmediate_operand" "")))]
   "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
 {
-  operands[1] = force_reg (DFmode, operands[1]);
-  emit_insn (gen_fix_truncdfdi2_ieee (operands[0], operands[1], GEN_INT(5)));
+  operands[1] = force_reg (<MODE>mode, operands[1]);
+  emit_insn (gen_fix_trunc<mode>di2_ieee (operands[0], operands[1],
+      GEN_INT(5)));
   DONE;
 })
 
-(define_insn "fix_truncdfdi2_ieee"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (fix:DI (match_operand:DF 1 "register_operand" "f")))
-   (unspec:DI [(match_operand:DI 2 "immediate_operand" "K")] UNSPEC_ROUND)
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cgdbr\t%0,%h2,%1"
+(define_insn "fix_trunc<FPR:mode><GPR:mode>2_ieee"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (fix:GPR (match_operand:FPR 1 "register_operand" "f")))
+   (unspec:GPR [(match_operand:GPR 2 "immediate_operand" "K")] UNSPEC_ROUND)
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "c<GPR:gf><FPR:xde>br\t%0,%h2,%1"
   [(set_attr "op_type" "RRE")
    (set_attr "type"    "ftoi")])
 
 ;
-; fixuns_truncdfsi2 and fix_truncdfsi2 instruction pattern(s).
+; fix_trunctf(si|di)2 instruction pattern(s).
 ;
 
-(define_expand "fixuns_truncdfsi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-        (unsigned_fix:SI (match_operand:DF 1 "register_operand" "")))]
+(define_expand "fix_trunctf<mode>2"
+  [(parallel [(set (match_operand:GPR 0 "register_operand" "")
+                  (fix:GPR (match_operand:TF 1 "register_operand" "")))
+             (unspec:GPR [(const_int 5)] UNSPEC_ROUND)
+             (clobber (reg:CC CC_REGNUM))])]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-{
-  rtx label1 = gen_label_rtx ();
-  rtx label2 = gen_label_rtx ();
-  rtx temp = gen_reg_rtx (DFmode);
-
-  operands[1] = force_reg (DFmode,operands[1]);
-  emit_insn (gen_cmpdf (operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("2147483648.0", DFmode), DFmode)));
-  emit_jump_insn (gen_blt (label1));
-  emit_insn (gen_subdf3 (temp, operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("4294967296.0", DFmode), DFmode)));
-  emit_insn (gen_fix_truncdfsi2_ieee (operands[0], temp, GEN_INT (7)));
-  emit_jump (label2);
+  "")
 
-  emit_label (label1);
-  emit_insn (gen_fix_truncdfsi2_ieee (operands[0], operands[1], GEN_INT (5)));
-  emit_label (label2);
-  DONE;
-})
+;
+; fix_truncdfsi2 instruction pattern(s).
+;
 
 (define_expand "fix_truncdfsi2"
   [(set (match_operand:SI 0 "register_operand" "")
   DONE;
 })
 
-(define_insn "fix_truncdfsi2_ieee"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (fix:SI (match_operand:DF 1 "register_operand" "f")))
-    (unspec:SI [(match_operand:SI 2 "immediate_operand" "K")] UNSPEC_ROUND)
-    (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cfdbr\t%0,%h2,%1"
-   [(set_attr "op_type" "RRE")
-    (set_attr "type"    "ftoi")])
-
 (define_insn "fix_truncdfsi2_ibm"
   [(set (match_operand:SI 0 "register_operand" "=d")
         (fix:SI (match_operand:DF 1 "nonimmediate_operand" "+f")))
    (use (match_operand:DI 2 "immediate_operand" "m"))
    (use (match_operand:DI 3 "immediate_operand" "m"))
    (use (match_operand:BLK 4 "memory_operand" "m"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
 {
    output_asm_insn ("sd\t%1,%2", operands);
   [(set_attr "length" "20")])
 
 ;
-; fixuns_truncsfdi2 and fix_truncsfdi2 instruction pattern(s).
+; fix_truncsfsi2 instruction pattern(s).
 ;
 
-(define_expand "fixuns_truncsfdi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (unsigned_fix:DI (match_operand:SF 1 "register_operand" "")))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-{
-  rtx label1 = gen_label_rtx ();
-  rtx label2 = gen_label_rtx ();
-  rtx temp = gen_reg_rtx (SFmode);
-
-  operands[1] = force_reg (SFmode, operands[1]);
-  emit_insn (gen_cmpsf (operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("9223372036854775808.0", SFmode), SFmode)));
-  emit_jump_insn (gen_blt (label1));
-
-  emit_insn (gen_subsf3 (temp, operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("18446744073709551616.0", SFmode), SFmode)));
-  emit_insn (gen_fix_truncsfdi2_ieee (operands[0], temp, GEN_INT(7)));
-  emit_jump (label2);
-
-  emit_label (label1);
-  emit_insn (gen_fix_truncsfdi2_ieee (operands[0], operands[1], GEN_INT(5)));
-  emit_label (label2);
-  DONE;
-})
-
-(define_expand "fix_truncsfdi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (fix:DI (match_operand:SF 1 "nonimmediate_operand" "")))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-{
-  operands[1] = force_reg (SFmode, operands[1]);
-  emit_insn (gen_fix_truncsfdi2_ieee (operands[0], operands[1], GEN_INT(5)));
-  DONE;
-})
-
-(define_insn "fix_truncsfdi2_ieee"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (fix:DI (match_operand:SF 1 "register_operand"  "f")))
-   (unspec:DI [(match_operand:DI 2 "immediate_operand" "K")] UNSPEC_ROUND)
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cgebr\t%0,%h2,%1"
-  [(set_attr "op_type" "RRE")
-   (set_attr "type"    "ftoi")])
-
-;
-; fixuns_truncsfsi2 and fix_truncsfsi2 instruction pattern(s).
-;
-
-(define_expand "fixuns_truncsfsi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-        (unsigned_fix:SI (match_operand:SF 1 "register_operand" "")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-{
-  rtx label1 = gen_label_rtx ();
-  rtx label2 = gen_label_rtx ();
-  rtx temp = gen_reg_rtx (SFmode);
-
-  operands[1] = force_reg (SFmode, operands[1]);
-  emit_insn (gen_cmpsf (operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("2147483648.0", SFmode), SFmode)));
-  emit_jump_insn (gen_blt (label1));
-  emit_insn (gen_subsf3 (temp, operands[1],
-       CONST_DOUBLE_FROM_REAL_VALUE (
-          REAL_VALUE_ATOF ("4294967296.0", SFmode), SFmode)));
-  emit_insn (gen_fix_truncsfsi2_ieee (operands[0], temp, GEN_INT (7)));
-  emit_jump (label2);
-
-  emit_label (label1);
-  emit_insn (gen_fix_truncsfsi2_ieee (operands[0], operands[1], GEN_INT (5)));
-  emit_label (label2);
-  DONE;
-})
-
 (define_expand "fix_truncsfsi2"
   [(set (match_operand:SI 0 "register_operand" "")
         (fix:SI (match_operand:SF 1 "nonimmediate_operand" "")))]
   DONE;
 })
 
-(define_insn "fix_truncsfsi2_ieee"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (fix:SI (match_operand:SF 1 "register_operand" "f")))
-    (unspec:SI [(match_operand:SI 2 "immediate_operand" "K")] UNSPEC_ROUND)
-    (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cfebr\t%0,%h2,%1"
-  [(set_attr "op_type" "RRE")
-   (set_attr "type"    "ftoi")])
-
 ;
-; floatdidf2 instruction pattern(s).
+; float(si|di)(tf|df|sf)2 instruction pattern(s).
 ;
 
-(define_insn "floatdidf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (float:DF (match_operand:DI 1 "register_operand" "d")))]
+(define_insn "floatdi<mode>2"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (float:FPR (match_operand:DI 1 "register_operand" "d")))]
   "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cdgbr\t%0,%1"
+  "c<xde>gbr\t%0,%1"
   [(set_attr "op_type" "RRE")
    (set_attr "type"    "itof" )])
 
-;
-; floatdisf2 instruction pattern(s).
-;
-
-(define_insn "floatdisf2"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (float:SF (match_operand:DI 1 "register_operand" "d")))]
-  "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cegbr\t%0,%1"
+(define_insn "floatsi<mode>2_ieee"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (float:FPR (match_operand:SI 1 "register_operand" "d")))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "c<xde>fbr\t%0,%1"
   [(set_attr "op_type" "RRE")
-   (set_attr "type"    "itof" )])
+   (set_attr "type"   "itof" )])
+
 
 ;
-; floatsidf2 instruction pattern(s).
+; floatsi(tf|df)2 instruction pattern(s).
 ;
 
+(define_expand "floatsitf2"
+  [(set (match_operand:TF 0 "register_operand" "")
+        (float:TF (match_operand:SI 1 "register_operand" "")))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "")
+
 (define_expand "floatsidf2"
   [(set (match_operand:DF 0 "register_operand" "")
         (float:DF (match_operand:SI 1 "register_operand" "")))]
     }
 })
 
-(define_insn "floatsidf2_ieee"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (float:DF (match_operand:SI 1 "register_operand" "d")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cdfbr\t%0,%1"
-  [(set_attr "op_type" "RRE")
-   (set_attr "type"   "itof" )])
-
 (define_insn "floatsidf2_ibm"
   [(set (match_operand:DF 0 "register_operand" "=f")
         (float:DF (match_operand:SI 1 "register_operand" "d")))
    (use (match_operand:DI 2 "immediate_operand" "m"))
    (use (match_operand:BLK 3 "memory_operand" "m"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
 {
    output_asm_insn ("st\t%1,%N3", operands);
     }
 })
 
-(define_insn "floatsisf2_ieee"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (float:SF (match_operand:SI 1 "register_operand" "d")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "cefbr\t%0,%1"
-  [(set_attr "op_type" "RRE")
-   (set_attr "type"    "itof" )])
-
 ;
 ; truncdfsf2 instruction pattern(s).
 ;
         (float_truncate:SF (match_operand:DF 1 "register_operand" "f")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "ledbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
+  [(set_attr "op_type"  "RRE")
+   (set_attr "type"   "ftruncdf")])
 
 (define_insn "truncdfsf2_ibm"
   [(set (match_operand:SF 0 "register_operand" "=f,f")
    ler\t%0,%1
    le\t%0,%1"
   [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"   "floads,floads")])
+   (set_attr "type"   "floadsf")])
+
+;
+; trunctfdf2 instruction pattern(s).
+;
+
+(define_expand "trunctfdf2"
+  [(parallel 
+    [(set (match_operand:DF 0 "register_operand" "")
+         (float_truncate:DF (match_operand:TF 1 "register_operand" "")))
+     (clobber (match_scratch:TF 2 "=f"))])]
+  "TARGET_HARD_FLOAT"
+  "")
+
+(define_insn "*trunctfdf2_ieee"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+        (float_truncate:DF (match_operand:TF 1 "register_operand" "f")))
+   (clobber (match_scratch:TF 2 "=f"))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "ldxbr\t%2,%1\;ldr\t%0,%2"
+  [(set_attr "length" "6")
+   (set_attr "type"   "ftrunctf")])   
+
+(define_insn "*trunctfdf2_ibm"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+        (float_truncate:DF (match_operand:TF 1 "register_operand" "f")))
+   (clobber (match_scratch:TF 2 "=f"))]
+  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
+  "ldxr\t%2,%1\;ldr\t%0,%2"
+  [(set_attr "length"  "4")
+   (set_attr "type"   "ftrunctf")])
+
+;
+; trunctfsf2 instruction pattern(s).
+;
+
+(define_expand "trunctfsf2"
+  [(parallel 
+    [(set (match_operand:SF 0 "register_operand" "=f")
+         (float_truncate:SF (match_operand:TF 1 "register_operand" "f")))
+     (clobber (match_scratch:TF 2 "=f"))])]
+  "TARGET_HARD_FLOAT"
+  "")
+
+(define_insn "*trunctfsf2_ieee"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+        (float_truncate:SF (match_operand:TF 1 "register_operand" "f")))
+   (clobber (match_scratch:TF 2 "=f"))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "lexbr\t%2,%1\;ler\t%0,%2"
+  [(set_attr "length"  "6")
+   (set_attr "type"   "ftrunctf")])
+
+(define_insn "*trunctfsf2_ibm"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+        (float_truncate:SF (match_operand:TF 1 "register_operand" "f")))
+   (clobber (match_scratch:TF 2 "=f"))]
+  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
+  "lexr\t%2,%1\;ler\t%0,%2"
+  [(set_attr "length"  "6")
+   (set_attr "type"   "ftrunctf")])
 
 ;
 ; extendsfdf2 instruction pattern(s).
    ldebr\t%0,%1
    ldeb\t%0,%1"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"   "floads,floads")])
+   (set_attr "type"   "fsimpsf, floadsf")])
 
 (define_insn "extendsfdf2_ibm"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
         (float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "f,R")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
    sdr\t%0,%0\;ler\t%0,%1
    sdr\t%0,%0\;le\t%0,%1"
   [(set_attr "length"   "4,6")
-   (set_attr "type"     "floads,floads")])
+   (set_attr "type"     "floadsf")])
+
+;
+; extenddftf2 instruction pattern(s).
+;
+
+(define_expand "extenddftf2"
+  [(set (match_operand:TF 0 "register_operand" "")
+        (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "")))]
+  "TARGET_HARD_FLOAT"
+  "")
+
+(define_insn "*extenddftf2_ieee"
+  [(set (match_operand:TF 0 "register_operand" "=f,f")
+        (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "f,R")))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "@
+   lxdbr\t%0,%1
+   lxdb\t%0,%1"
+  [(set_attr "op_type"  "RRE,RXE")
+   (set_attr "type"   "fsimptf, floadtf")])
+
+(define_insn "*extenddftf2_ibm"
+  [(set (match_operand:TF 0 "register_operand" "=f,f")
+        (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "f,R")))]
+  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
+  "@
+   lxdr\t%0,%1
+   lxd\t%0,%1"
+  [(set_attr "op_type"  "RRE,RXE")
+   (set_attr "type"   "fsimptf, floadtf")])
+
+;
+; extendsftf2 instruction pattern(s).
+;
+
+(define_expand "extendsftf2"
+  [(set (match_operand:TF 0 "register_operand" "")
+        (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "")))]
+  "TARGET_HARD_FLOAT"
+  "")
+
+(define_insn "*extendsftf2_ieee"
+  [(set (match_operand:TF 0 "register_operand" "=f,f")
+        (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "f,R")))]
+  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
+  "@
+   lxebr\t%0,%1
+   lxeb\t%0,%1"
+  [(set_attr "op_type"  "RRE,RXE")
+   (set_attr "type"   "fsimptf, floadtf")])
+
+(define_insn "*extendsftf2_ibm"
+  [(set (match_operand:TF 0 "register_operand" "=f,f")
+        (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "f,R")))]
+  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
+  "@
+   lxer\t%0,%1
+   lxe\t%0,%1"
+  [(set_attr "op_type"  "RRE,RXE")
+   (set_attr "type"   "fsimptf, floadtf")])
 
 
 ;;
   [(set (match_operand:TI 0 "register_operand" "=&d")
         (plus:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
                  (match_operand:TI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (reg:CCL1 33)
+    [(set (reg:CCL1 CC_REGNUM)
           (compare:CCL1 (plus:DI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (plus:DI (match_dup 7) (match_dup 8)))])
    (parallel
     [(set (match_dup 3) (plus:DI (plus:DI (match_dup 4) (match_dup 5))
-                                 (ltu:DI (reg:CCL1 33) (const_int 0))))
-     (clobber (reg:CC 33))])]
+                                 (ltu:DI (reg:CCL1 CC_REGNUM) (const_int 0))))
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[3] = operand_subword (operands[0], 0, 0, TImode);
    operands[4] = operand_subword (operands[1], 0, 0, TImode);
    operands[5] = operand_subword (operands[2], 0, 0, TImode);
 ; adddi3 instruction pattern(s).
 ;
 
+(define_expand "adddi3"
+  [(parallel
+    [(set (match_operand:DI 0 "register_operand" "")
+          (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
+                   (match_operand:DI 2 "general_operand" "")))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
+  "")
+
 (define_insn "*adddi3_sign"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (plus:DI (sign_extend:DI (match_operand:SI 2 "general_operand" "d,m"))
                  (match_operand:DI 1 "register_operand" "0,0")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "@
    agfr\t%0,%2
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*adddi3_zero_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (plus:DI (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m"))
                           (match_operand:DI 1 "register_operand" "0,0"))
                  (const_int 0)))
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*adddi3_zero_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (plus:DI (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m"))
                           (match_operand:DI 1 "register_operand" "0,0"))
                  (const_int 0)))
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (plus:DI (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m"))
                  (match_operand:DI 1 "register_operand" "0,0")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "@
    algfr\t%0,%2
    algf\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_insn "*adddi3_imm_cc"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "0")
-                          (match_operand:DI 2 "const_int_operand" "K"))
-                 (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d")
-        (plus:DI (match_dup 1) (match_dup 2)))]
-  "TARGET_64BIT
-   && s390_match_ccmode (insn, CCAmode)
-   && CONST_OK_FOR_CONSTRAINT_P (INTVAL (operands[2]), 'K', \"K\")"
-  "aghi\t%0,%h2"
-  [(set_attr "op_type"  "RI")])
-
-(define_insn "*adddi3_carry1_cc"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 1)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (plus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCL1mode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_carry1_cconly"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 1)))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCL1mode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_carry2_cc"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 2)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (plus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCL1mode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_carry2_cconly"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 2)))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCL1mode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_cc"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (plus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_cconly"
-  [(set (reg 33)
-        (compare (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_cconly2"
-  [(set (reg 33)
-        (compare (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                 (neg:SI (match_operand:DI 2 "general_operand" "d,m"))))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode(insn, CCLmode) && TARGET_64BIT"
-  "@
-   algr\t%0,%2
-   alg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_64"
-  [(set (match_operand:DI 0 "register_operand" "=d,d,d")
-        (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0")
-                 (match_operand:DI 2 "general_operand" "d,K,m") ) )
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "@
-   agr\t%0,%2
-   aghi\t%0,%h2
-   ag\t%0,%2"
-  [(set_attr "op_type"  "RRE,RI,RXY")])
-
 (define_insn_and_split "*adddi3_31z"
   [(set (match_operand:DI 0 "register_operand" "=&d")
         (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
                  (match_operand:DI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT && TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (reg:CCL1 33)
+    [(set (reg:CCL1 CC_REGNUM)
           (compare:CCL1 (plus:SI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (plus:SI (match_dup 7) (match_dup 8)))])
    (parallel
     [(set (match_dup 3) (plus:SI (plus:SI (match_dup 4) (match_dup 5))
-                                 (ltu:SI (reg:CCL1 33) (const_int 0))))
-     (clobber (reg:CC 33))])]
+                                 (ltu:SI (reg:CCL1 CC_REGNUM) (const_int 0))))
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[3] = operand_subword (operands[0], 0, 0, DImode);
    operands[4] = operand_subword (operands[1], 0, 0, DImode);
    operands[5] = operand_subword (operands[2], 0, 0, DImode);
   [(set (match_operand:DI 0 "register_operand" "=&d")
         (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
                  (match_operand:DI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(parallel
     [(set (match_dup 3) (plus:SI (match_dup 4) (match_dup 5)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (reg:CCL1 33)
+    [(set (reg:CCL1 CC_REGNUM)
           (compare:CCL1 (plus:SI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (plus:SI (match_dup 7) (match_dup 8)))])
    (set (pc)
-        (if_then_else (ltu (reg:CCL1 33) (const_int 0))
+        (if_then_else (ltu (reg:CCL1 CC_REGNUM) (const_int 0))
                       (pc)
                       (label_ref (match_dup 9))))
    (parallel
     [(set (match_dup 3) (plus:SI (match_dup 3) (const_int 1)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (match_dup 9)]
   "operands[3] = operand_subword (operands[0], 0, 0, DImode);
    operands[4] = operand_subword (operands[1], 0, 0, DImode);
    operands[8] = operand_subword (operands[2], 1, 0, DImode);
    operands[9] = gen_label_rtx ();")
 
-(define_expand "adddi3"
+;
+; addsi3 instruction pattern(s).
+;
+
+(define_expand "addsi3"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-          (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                   (match_operand:DI 2 "general_operand" "")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:SI 0 "register_operand" "")
+          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "")
+                   (match_operand:SI 2 "general_operand" "")))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "")
 
+(define_insn "*addsi3_sign"
+  [(set (match_operand:SI 0 "register_operand" "=d,d")
+        (plus:SI (sign_extend:SI (match_operand:HI 2 "memory_operand" "R,T"))
+                 (match_operand:SI 1 "register_operand" "0,0")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "@
+   ah\t%0,%2
+   ahy\t%0,%2"
+  [(set_attr "op_type"  "RX,RXY")])
+
 ;
-; addsi3 instruction pattern(s).
+; add(di|si)3 instruction pattern(s).
 ;
 
-(define_insn "*addsi3_imm_cc"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "0")
-                          (match_operand:SI 2 "const_int_operand" "K"))
-                 (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d")
-        (plus:SI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCAmode)
-   && CONST_OK_FOR_CONSTRAINT_P (INTVAL (operands[2]), 'K', \"K\")"
-  "ahi\t%0,%h2"
-  [(set_attr "op_type"  "RI")])
-
-(define_insn "*addsi3_carry1_cc"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*add<mode>3"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d,d,d,d,d")
+        (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0,0,0,0")
+                 (match_operand:GPR 2 "general_operand" "d,K,Op,On,R,T") ) )
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "@
+   a<g>r\t%0,%2
+   a<g>hi\t%0,%h2
+   al<g>fi\t%0,%2
+   sl<g>fi\t%0,%n2
+   a<g>\t%0,%2
+   a<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RI,RIL,RIL,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_carry1_cc"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,Op,On,R,T"))
                  (match_dup 1)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (plus:SI (match_dup 1) (match_dup 2)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d,d,d")
+        (plus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCL1mode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*addsi3_carry1_cconly"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+   al<g>r\t%0,%2
+   al<g>fi\t%0,%2
+   sl<g>fi\t%0,%n2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RIL,RIL,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_carry1_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (match_dup 1)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCL1mode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   al<g>r\t%0,%2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*addsi3_carry2_cc"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*add<mode>3_carry2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,Op,On,R,T"))
                  (match_dup 2)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (plus:SI (match_dup 1) (match_dup 2)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d,d,d")
+        (plus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCL1mode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*addsi3_carry2_cconly"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+   al<g>r\t%0,%2
+   al<g>fi\t%0,%2
+   sl<g>fi\t%0,%n2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RIL,RIL,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_carry2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (match_dup 2)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCL1mode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   al<g>r\t%0,%2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*addsi3_cc"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*add<mode>3_cc"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,Op,On,R,T"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (plus:SI (match_dup 1) (match_dup 2)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d,d,d")
+        (plus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCLmode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*addsi3_cconly"
-  [(set (reg 33)
-        (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                          (match_operand:SI 2 "general_operand" "d,R,T"))
+   al<g>r\t%0,%2
+   al<g>fi\t%0,%2
+   sl<g>fi\t%0,%n2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RIL,RIL,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0")
+                          (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCLmode)"
   "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*addsi3_cconly2"
-  [(set (reg 33)
-        (compare (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                 (neg:SI (match_operand:SI 2 "general_operand" "d,R,T"))))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
-  "s390_match_ccmode (insn, CCLmode)"
-  "@
-   alr\t%0,%2
-   al\t%0,%2
-   aly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*addsi3_sign"
-  [(set (match_operand:SI 0 "register_operand" "=d,d")
-        (plus:SI (sign_extend:SI (match_operand:HI 2 "memory_operand" "R,T"))
-                 (match_operand:SI 1 "register_operand" "0,0")))
-   (clobber (reg:CC 33))]
-  ""
-  "@
-   ah\t%0,%2
-   ahy\t%0,%2"
-  [(set_attr "op_type"  "RX,RXY")])
-
-(define_insn "addsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d,d,d,d")
-        (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
-                 (match_operand:SI 2 "general_operand" "d,K,R,T")))
-   (clobber (reg:CC 33))]
-  ""
-  "@
-   ar\t%0,%2
-   ahi\t%0,%h2
-   a\t%0,%2
-   ay\t%0,%2"
-  [(set_attr "op_type"  "RR,RI,RX,RXY")])
-
-;
-; adddf3 instruction pattern(s).
-;
-
-(define_expand "adddf3"
-  [(parallel
-    [(set (match_operand:DF 0 "register_operand" "=f,f")
-          (plus:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                   (match_operand:DF 2 "general_operand" "f,R")))
-     (clobber (reg:CC 33))])]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*adddf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (plus:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:DF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   adbr\t%0,%2
-   adb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*adddf3_cc"
-  [(set (reg 33)
-       (compare (plus:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                         (match_operand:DF 2 "general_operand" "f,R"))
-                (match_operand:DF 3 "const0_operand" "")))
-   (set (match_operand:DF 0 "register_operand" "=f,f")
-       (plus:DF (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   adbr\t%0,%2
-   adb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*adddf3_cconly"
-  [(set (reg 33)
-       (compare (plus:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                         (match_operand:DF 2 "general_operand" "f,R"))
-                (match_operand:DF 3 "const0_operand" "")))
-   (clobber (match_scratch:DF 0 "=f,f"))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-  adbr\t%0,%2
-  adb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*adddf3_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (plus:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:DF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
+   al<g>r\t%0,%2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_cconly2"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 1 "nonimmediate_operand" "%0,0,0")
+                 (neg:GPR (match_operand:GPR 2 "general_operand" "d,R,T"))))
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
+  "s390_match_ccmode(insn, CCLmode)"
+  "@
+   al<g>r\t%0,%2
+   al<g>\t%0,%2
+   al<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
+
+(define_insn "*add<mode>3_imm_cc"
+  [(set (reg CC_REGNUM)
+        (compare (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "0,0")
+                          (match_operand:GPR 2 "const_int_operand" "K,Os"))
+                 (const_int 0)))
+   (set (match_operand:GPR 0 "register_operand" "=d,d")
+        (plus:GPR (match_dup 1) (match_dup 2)))]
+  "s390_match_ccmode (insn, CCAmode)
+   && (CONST_OK_FOR_CONSTRAINT_P (INTVAL (operands[2]), 'K', \"K\")
+       || CONST_OK_FOR_CONSTRAINT_P (INTVAL (operands[2]), 'O', \"Os\"))
+   && INTVAL (operands[2]) != -((HOST_WIDE_INT)1 << (GET_MODE_BITSIZE(<MODE>mode) - 1))"
   "@
-   adr\t%0,%2
-   ad\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fsimpd,fsimpd")])
+   a<g>hi\t%0,%h2
+   a<g>fi\t%0,%2"
+  [(set_attr "op_type"  "RI,RIL")])
 
 ;
-; addsf3 instruction pattern(s).
+; add(df|sf)3 instruction pattern(s).
 ;
 
-(define_expand "addsf3"
+(define_expand "add<mode>3"
   [(parallel
-    [(set (match_operand:SF 0 "register_operand" "=f,f")
-          (plus:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                   (match_operand:SF 2 "general_operand" "f,R")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:FPR 0 "register_operand" "=f,f")
+          (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                    (match_operand:FPR 2 "general_operand" "f,<Rf>")))
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*addsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (plus:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
+(define_insn "*add<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:FPR 2 "general_operand" "f,<Rf>")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   aebr\t%0,%2
-   aeb\t%0,%2"
+   a<xde>br\t%0,%2
+   a<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
-
-(define_insn "*addsf3_cc"
-  [(set (reg 33)
-       (compare (plus:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                         (match_operand:SF 2 "general_operand" "f,R"))
-                (match_operand:SF 3 "const0_operand" "")))
-   (set (match_operand:SF 0 "register_operand" "=f,f")
-       (plus:SF (match_dup 1) (match_dup 2)))]
+   (set_attr "type"     "fsimp<mode>")])
+
+(define_insn "*add<mode>3_cc"
+  [(set (reg CC_REGNUM)
+       (compare (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                          (match_operand:FPR 2 "general_operand" "f,<Rf>"))
+                (match_operand:FPR 3 "const0_operand" "")))
+   (set (match_operand:FPR 0 "register_operand" "=f,f")
+       (plus:FPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   aebr\t%0,%2
-   aeb\t%0,%2"
+   a<xde>br\t%0,%2
+   a<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
-
-(define_insn "*addsf3_cconly"
-  [(set (reg 33)
-       (compare (plus:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                         (match_operand:SF 2 "general_operand" "f,R"))
-                (match_operand:SF 3 "const0_operand" "")))
-   (clobber (match_scratch:SF 0 "=f,f"))]
+   (set_attr "type"     "fsimp<mode>")])
+
+(define_insn "*add<mode>3_cconly"
+  [(set (reg CC_REGNUM)
+       (compare (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                          (match_operand:FPR 2 "general_operand" "f,<Rf>"))
+                (match_operand:FPR 3 "const0_operand" "")))
+   (clobber (match_scratch:FPR 0 "=f,f"))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   aebr\t%0,%2
-   aeb\t%0,%2"
+   a<xde>br\t%0,%2
+   a<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
 
-(define_insn "*addsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (plus:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
+(define_insn "*add<mode>3_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:FPR 2 "general_operand" "f,<Rf>")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
-   aer\t%0,%2
-   ae\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fsimps,fsimps")])
+   a<xde>r\t%0,%2
+   a<xde>\t%0,%2"
+  [(set_attr "op_type"  "<RRe>,<RXe>")
+   (set_attr "type"     "fsimp<mode>")])
 
 
 ;;
   [(set (match_operand:TI 0 "register_operand" "=&d")
         (minus:TI (match_operand:TI 1 "register_operand" "0")
                   (match_operand:TI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (reg:CCL2 33)
+    [(set (reg:CCL2 CC_REGNUM)
           (compare:CCL2 (minus:DI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (minus:DI (match_dup 7) (match_dup 8)))])
    (parallel
     [(set (match_dup 3) (minus:DI (minus:DI (match_dup 4) (match_dup 5))
-                                  (gtu:DI (reg:CCL2 33) (const_int 0))))
-     (clobber (reg:CC 33))])]
+                                  (gtu:DI (reg:CCL2 CC_REGNUM) (const_int 0))))
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[3] = operand_subword (operands[0], 0, 0, TImode);
    operands[4] = operand_subword (operands[1], 0, 0, TImode);
    operands[5] = operand_subword (operands[2], 0, 0, TImode);
 ; subdi3 instruction pattern(s).
 ;
 
+(define_expand "subdi3"
+  [(parallel
+    [(set (match_operand:DI 0 "register_operand" "")
+          (minus:DI (match_operand:DI 1 "register_operand" "")
+                    (match_operand:DI 2 "general_operand" "")))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
+  "")
+
 (define_insn "*subdi3_sign"
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (minus:DI (match_operand:DI 1 "register_operand" "0,0")
                   (sign_extend:DI (match_operand:SI 2 "general_operand" "d,m"))))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "@
    sgfr\t%0,%2
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*subdi3_zero_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
                            (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m")))
                  (const_int 0)))
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*subdi3_zero_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
                            (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m")))
                  (const_int 0)))
   [(set (match_operand:DI 0 "register_operand" "=d,d")
         (minus:DI (match_operand:DI 1 "register_operand" "0,0")
                   (zero_extend:DI (match_operand:SI 2 "general_operand" "d,m"))))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "@
    slgfr\t%0,%2
    slgf\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_insn "*subdi3_borrow_cc"
-  [(set (reg 33)
-        (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
-                           (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 1)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCL2mode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_borrow_cconly"
-  [(set (reg 33)
-        (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
-                           (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_dup 1)))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCL2mode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_cc"
-  [(set (reg 33)
-        (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
-                           (match_operand:DI 2 "general_operand" "d,m"))
-                 (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_cc2"
-  [(set (reg 33)
-        (compare (match_operand:DI 1 "register_operand" "0,0")
-                 (match_operand:DI 2 "general_operand" "d,m")))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCL3mode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_cconly"
-  [(set (reg 33)
-        (compare (minus:DI (match_operand:DI 1 "register_operand" "0,0")
-                           (match_operand:DI 2 "general_operand" "d,m"))
-                 (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_cconly2"
-  [(set (reg 33)
-        (compare (match_operand:DI 1 "register_operand" "0,0")
-                 (match_operand:DI 2 "general_operand" "d,m")))
-   (clobber (match_scratch:DI 0 "=d,d"))]
-  "s390_match_ccmode (insn, CCL3mode) && TARGET_64BIT"
-  "@
-   slgr\t%0,%2
-   slg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_64"
-  [(set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (match_operand:DI 1 "register_operand" "0,0")
-                  (match_operand:DI 2 "general_operand" "d,m") ) )
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "@
-   sgr\t%0,%2
-   sg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RRE")])
-
 (define_insn_and_split "*subdi3_31z"
   [(set (match_operand:DI 0 "register_operand" "=&d")
         (minus:DI (match_operand:DI 1 "register_operand" "0")
                   (match_operand:DI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT && TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(parallel
-    [(set (reg:CCL2 33)
+    [(set (reg:CCL2 CC_REGNUM)
           (compare:CCL2 (minus:SI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (minus:SI (match_dup 7) (match_dup 8)))])
    (parallel
     [(set (match_dup 3) (minus:SI (minus:SI (match_dup 4) (match_dup 5))
-                                  (gtu:SI (reg:CCL2 33) (const_int 0))))
-     (clobber (reg:CC 33))])]
+                                  (gtu:SI (reg:CCL2 CC_REGNUM) (const_int 0))))
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[3] = operand_subword (operands[0], 0, 0, DImode);
    operands[4] = operand_subword (operands[1], 0, 0, DImode);
    operands[5] = operand_subword (operands[2], 0, 0, DImode);
   [(set (match_operand:DI 0 "register_operand" "=&d")
         (minus:DI (match_operand:DI 1 "register_operand" "0")
                   (match_operand:DI 2 "general_operand" "do") ) )
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(parallel
     [(set (match_dup 3) (minus:SI (match_dup 4) (match_dup 5)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (reg:CCL2 33)
+    [(set (reg:CCL2 CC_REGNUM)
           (compare:CCL2 (minus:SI (match_dup 7) (match_dup 8))
                         (match_dup 7)))
      (set (match_dup 6) (minus:SI (match_dup 7) (match_dup 8)))])
    (set (pc)
-        (if_then_else (gtu (reg:CCL2 33) (const_int 0))
+        (if_then_else (gtu (reg:CCL2 CC_REGNUM) (const_int 0))
                       (pc)
                       (label_ref (match_dup 9))))
    (parallel
     [(set (match_dup 3) (plus:SI (match_dup 3) (const_int -1)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (match_dup 9)]
   "operands[3] = operand_subword (operands[0], 0, 0, DImode);
    operands[4] = operand_subword (operands[1], 0, 0, DImode);
    operands[8] = operand_subword (operands[2], 1, 0, DImode);
    operands[9] = gen_label_rtx ();")
 
-(define_expand "subdi3"
+;
+; subsi3 instruction pattern(s).
+;
+
+(define_expand "subsi3"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-          (minus:DI (match_operand:DI 1 "register_operand" "")
-                    (match_operand:DI 2 "general_operand" "")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:SI 0 "register_operand" "")
+          (minus:SI (match_operand:SI 1 "register_operand" "")
+                    (match_operand:SI 2 "general_operand" "")))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "")
 
+(define_insn "*subsi3_sign"
+  [(set (match_operand:SI 0 "register_operand" "=d,d")
+        (minus:SI (match_operand:SI 1 "register_operand" "0,0")
+                  (sign_extend:SI (match_operand:HI 2 "memory_operand" "R,T"))))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "@
+   sh\t%0,%2
+   shy\t%0,%2"
+  [(set_attr "op_type"  "RX,RXY")])
+
 ;
-; subsi3 instruction pattern(s).
+; sub(di|si)3 instruction pattern(s).
 ;
 
-(define_insn "*subsi3_borrow_cc"
-  [(set (reg 33)
-        (compare (minus:SI (match_operand:SI 1 "register_operand" "0,0,0")
-                           (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*sub<mode>3"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d,d")
+        (minus:GPR (match_operand:GPR 1 "register_operand" "0,0,0")
+                  (match_operand:GPR 2 "general_operand" "d,R,T") ) )
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "@
+   s<g>r\t%0,%2
+   s<g>\t%0,%2
+   s<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
+
+(define_insn "*sub<mode>3_borrow_cc"
+  [(set (reg CC_REGNUM)
+        (compare (minus:GPR (match_operand:GPR 1 "register_operand" "0,0,0")
+                           (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (match_dup 1)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (minus:SI (match_dup 1) (match_dup 2)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d")
+        (minus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCL2mode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*subsi3_borrow_cconly"
-  [(set (reg 33)
-        (compare (minus:SI (match_operand:SI 1 "register_operand" "0,0,0")
-                           (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*sub<mode>3_borrow_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (minus:GPR (match_operand:GPR 1 "register_operand" "0,0,0")
+                           (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (match_dup 1)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCL2mode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*subsi3_cc"
-  [(set (reg 33)
-        (compare (minus:SI (match_operand:SI 1 "register_operand" "0,0,0")
-                           (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*sub<mode>3_cc"
+  [(set (reg CC_REGNUM)
+        (compare (minus:GPR (match_operand:GPR 1 "register_operand" "0,0,0")
+                           (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (minus:SI (match_dup 1) (match_dup 2)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d")
+        (minus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCLmode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*subsi3_cc2"
-  [(set (reg 33)
-        (compare (match_operand:SI 1 "register_operand" "0,0,0")
-                 (match_operand:SI 2 "general_operand" "d,R,T")))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (minus:SI (match_dup 1) (match_dup 2)))]
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
+
+(define_insn "*sub<mode>3_cc2"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 1 "register_operand" "0,0,0")
+                 (match_operand:GPR 2 "general_operand" "d,R,T")))
+   (set (match_operand:GPR 0 "register_operand" "=d,d,d")
+        (minus:GPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCL3mode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*subsi3_cconly"
-  [(set (reg 33)
-        (compare (minus:SI (match_operand:SI 1 "register_operand" "0,0,0")
-                           (match_operand:SI 2 "general_operand" "d,R,T"))
+(define_insn "*sub<mode>3_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (minus:GPR (match_operand:GPR 1 "register_operand" "0,0,0")
+                           (match_operand:GPR 2 "general_operand" "d,R,T"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCLmode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
-(define_insn "*subsi3_cconly2"
-  [(set (reg 33)
-        (compare (match_operand:SI 1 "register_operand" "0,0,0")
-                 (match_operand:SI 2 "general_operand" "d,R,T")))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+(define_insn "*sub<mode>3_cconly2"
+  [(set (reg CC_REGNUM)
+        (compare (match_operand:GPR 1 "register_operand" "0,0,0")
+                 (match_operand:GPR 2 "general_operand" "d,R,T")))
+   (clobber (match_scratch:GPR 0 "=d,d,d"))]
   "s390_match_ccmode (insn, CCL3mode)"
   "@
-   slr\t%0,%2
-   sl\t%0,%2
-   sly\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-(define_insn "*subsi3_sign"
-  [(set (match_operand:SI 0 "register_operand" "=d,d")
-        (minus:SI (match_operand:SI 1 "register_operand" "0,0")
-                  (sign_extend:SI (match_operand:HI 2 "memory_operand" "R,T"))))
-   (clobber (reg:CC 33))]
-  ""
-  "@
-   sh\t%0,%2
-   shy\t%0,%2"
-  [(set_attr "op_type"  "RX,RXY")])
-
-(define_insn "subsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d,d,d")
-        (minus:SI (match_operand:SI 1 "register_operand" "0,0,0")
-                  (match_operand:SI 2 "general_operand" "d,R,T")))
-   (clobber (reg:CC 33))]
-  ""
-  "@
-   sr\t%0,%2
-   s\t%0,%2
-   sy\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
-
-
-;
-; subdf3 instruction pattern(s).
-;
-
-(define_expand "subdf3"
-  [(parallel
-    [(set (match_operand:DF 0 "register_operand" "=f,f")
-          (minus:DF (match_operand:DF 1 "register_operand" "0,0")
-                    (match_operand:DF 2 "general_operand" "f,R")))
-     (clobber (reg:CC 33))])]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*subdf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (minus:DF (match_operand:DF 1 "register_operand" "0,0")
-                  (match_operand:DF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   sdbr\t%0,%2
-   sdb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*subdf3_cc"
-  [(set (reg 33)
-       (compare (minus:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")
-                          (match_operand:DF 2 "general_operand" "f,R"))
-                (match_operand:DF 3 "const0_operand" "")))
-   (set (match_operand:DF 0 "register_operand" "=f,f")
-       (minus:DF (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   sdbr\t%0,%2
-   sdb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*subdf3_cconly"
-  [(set (reg 33)
-       (compare (minus:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")
-                          (match_operand:DF 2 "general_operand" "f,R"))
-                (match_operand:DF 3 "const0_operand" "")))
-   (clobber (match_scratch:DF 0 "=f,f"))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   sdbr\t%0,%2
-   sdb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimpd,fsimpd")])
-
-(define_insn "*subdf3_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (minus:DF (match_operand:DF 1 "register_operand" "0,0")
-                  (match_operand:DF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "@
-   sdr\t%0,%2
-   sd\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fsimpd,fsimpd")])
+   sl<g>r\t%0,%2
+   sl<g>\t%0,%2
+   sl<y>\t%0,%2"
+  [(set_attr "op_type"  "RR<E>,RX<Y>,RXY")])
 
 ;
-; subsf3 instruction pattern(s).
+; sub(df|sf)3 instruction pattern(s).
 ;
 
-(define_expand "subsf3"
+(define_expand "sub<mode>3"
   [(parallel
-    [(set (match_operand:SF 0 "register_operand" "=f,f")
-          (minus:SF (match_operand:SF 1 "register_operand" "0,0")
-                    (match_operand:SF 2 "general_operand" "f,R")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:FPR 0 "register_operand" "=f,f")
+          (minus:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                     (match_operand:FPR 2 "general_operand" "f,R")))
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*subsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (minus:SF (match_operand:SF 1 "register_operand" "0,0")
-                  (match_operand:SF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
+(define_insn "*sub<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (minus:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                   (match_operand:FPR 2 "general_operand" "f,<Rf>")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   sebr\t%0,%2
-   seb\t%0,%2"
+   s<xde>br\t%0,%2
+   s<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
-
-(define_insn "*subsf3_cc"
-  [(set (reg 33)
-       (compare (minus:SF (match_operand:SF 1 "nonimmediate_operand" "0,0")
-                          (match_operand:SF 2 "general_operand" "f,R"))
-                (match_operand:SF 3 "const0_operand" "")))
-   (set (match_operand:SF 0 "register_operand" "=f,f")
-       (minus:SF (match_dup 1) (match_dup 2)))]
+   (set_attr "type"     "fsimp<mode>")])
+
+(define_insn "*sub<mode>3_cc"
+  [(set (reg CC_REGNUM)
+       (compare (minus:FPR (match_operand:FPR 1 "nonimmediate_operand" "0,0")
+                           (match_operand:FPR 2 "general_operand" "f,<Rf>"))
+                (match_operand:FPR 3 "const0_operand" "")))
+   (set (match_operand:FPR 0 "register_operand" "=f,f")
+       (minus:FPR (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   sebr\t%0,%2
-   seb\t%0,%2"
+   s<xde>br\t%0,%2
+   s<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
-
-(define_insn "*subsf3_cconly"
-  [(set (reg 33)
-       (compare (minus:SF (match_operand:SF 1 "nonimmediate_operand" "0,0")
-                          (match_operand:SF 2 "general_operand" "f,R"))
-                (match_operand:SF 3 "const0_operand" "")))
-   (clobber (match_scratch:SF 0 "=f,f"))]
+   (set_attr "type"     "fsimp<mode>")])
+
+(define_insn "*sub<mode>3_cconly"
+  [(set (reg CC_REGNUM)
+       (compare (minus:FPR (match_operand:FPR 1 "nonimmediate_operand" "0,0")
+                           (match_operand:FPR 2 "general_operand" "f,<Rf>"))
+                (match_operand:FPR 3 "const0_operand" "")))
+   (clobber (match_scratch:FPR 0 "=f,f"))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   sebr\t%0,%2
-   seb\t%0,%2"
+   s<xde>br\t%0,%2
+   s<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fsimps,fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
 
-(define_insn "*subsf3_ibm"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (minus:SF (match_operand:SF 1 "register_operand" "0,0")
-                  (match_operand:SF 2 "general_operand" "f,R")))
-   (clobber (reg:CC 33))]
+(define_insn "*sub<mode>3_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (minus:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                   (match_operand:FPR 2 "general_operand" "f,<Rf>")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
-   ser\t%0,%2
-   se\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fsimps,fsimps")])
+   s<xde>r\t%0,%2
+   s<xde>\t%0,%2"
+  [(set_attr "op_type"  "<RRe>,<RXe>")
+   (set_attr "type"     "fsimp<mode>")])
 
 
 ;;
 ;;
 
 ;
-; adddicc instruction pattern(s).
+; add(di|si)cc instruction pattern(s).
 ;
 
-(define_insn "*adddi3_alc_cc"
-  [(set (reg 33)
-        (compare
-          (plus:DI (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:DI 2 "general_operand" "d,m"))
-                   (match_operand:DI 3 "s390_alc_comparison" ""))
-          (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (plus:DI (plus:DI (match_dup 1) (match_dup 2)) (match_dup 3)))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   alcgr\t%0,%2
-   alcg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*adddi3_alc"
-  [(set (match_operand:DI 0 "register_operand" "=d,d")
-        (plus:DI (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:DI 2 "general_operand" "d,m"))
-                 (match_operand:DI 3 "s390_alc_comparison" "")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "@
-   alcgr\t%0,%2
-   alcg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_slb_cc"
-  [(set (reg 33)
+(define_insn "*add<mode>3_alc_cc"
+  [(set (reg CC_REGNUM)
         (compare
-          (minus:DI (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
-                              (match_operand:DI 2 "general_operand" "d,m"))
-                    (match_operand:DI 3 "s390_slb_comparison" ""))
+          (plus:GPR (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0")
+                              (match_operand:GPR 2 "general_operand" "d,m"))
+                    (match_operand:GPR 3 "s390_alc_comparison" ""))
           (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (minus:DI (match_dup 1) (match_dup 2)) (match_dup 3)))]
-  "s390_match_ccmode (insn, CCLmode) && TARGET_64BIT"
-  "@
-   slbgr\t%0,%2
-   slbg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_insn "*subdi3_slb"
-  [(set (match_operand:DI 0 "register_operand" "=d,d")
-        (minus:DI (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
-                            (match_operand:DI 2 "general_operand" "d,m"))
-                  (match_operand:DI 3 "s390_slb_comparison" "")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "@
-   slbgr\t%0,%2
-   slbg\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")])
-
-(define_expand "adddicc"
-  [(match_operand:DI 0 "register_operand" "")
-   (match_operand 1 "comparison_operator" "")
-   (match_operand:DI 2 "register_operand" "")
-   (match_operand:DI 3 "const_int_operand" "")]
-  "TARGET_64BIT"
-  "if (!s390_expand_addcc (GET_CODE (operands[1]), 
-                          s390_compare_op0, s390_compare_op1, 
-                          operands[0], operands[2], 
-                          operands[3])) FAIL; DONE;")
-
-;
-; addsicc instruction pattern(s).
-;
-
-(define_insn "*addsi3_alc_cc"
-  [(set (reg 33)
-        (compare
-          (plus:SI (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:SI 2 "general_operand" "d,m"))
-                   (match_operand:SI 3 "s390_alc_comparison" ""))
-          (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d")
-        (plus:SI (plus:SI (match_dup 1) (match_dup 2)) (match_dup 3)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d")
+        (plus:GPR (plus:GPR (match_dup 1) (match_dup 2)) (match_dup 3)))]
   "s390_match_ccmode (insn, CCLmode) && TARGET_CPU_ZARCH"
   "@
-   alcr\t%0,%2
-   alc\t%0,%2"
+   alc<g>r\t%0,%2
+   alc<g>\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_insn "*addsi3_alc"
-  [(set (match_operand:SI 0 "register_operand" "=d,d")
-        (plus:SI (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
-                          (match_operand:SI 2 "general_operand" "d,m"))
-                 (match_operand:SI 3 "s390_alc_comparison" "")))
-   (clobber (reg:CC 33))]
+(define_insn "*add<mode>3_alc"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d")
+        (plus:GPR (plus:GPR (match_operand:GPR 1 "nonimmediate_operand" "%0,0")
+                            (match_operand:GPR 2 "general_operand" "d,m"))
+                  (match_operand:GPR 3 "s390_alc_comparison" "")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_CPU_ZARCH"
   "@
-   alcr\t%0,%2
-   alc\t%0,%2"
+   alc<g>r\t%0,%2
+   alc<g>\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_insn "*subsi3_slb_cc"
-  [(set (reg 33)
+(define_insn "*sub<mode>3_slb_cc"
+  [(set (reg CC_REGNUM)
         (compare
-          (minus:SI (minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
-                              (match_operand:SI 2 "general_operand" "d,m"))
-                    (match_operand:SI 3 "s390_slb_comparison" ""))
+          (minus:GPR (minus:GPR (match_operand:GPR 1 "nonimmediate_operand" "0,0")
+                                (match_operand:GPR 2 "general_operand" "d,m"))
+                     (match_operand:GPR 3 "s390_slb_comparison" ""))
           (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d")
-        (minus:SI (minus:SI (match_dup 1) (match_dup 2)) (match_dup 3)))]
+   (set (match_operand:GPR 0 "register_operand" "=d,d")
+        (minus:GPR (minus:GPR (match_dup 1) (match_dup 2)) (match_dup 3)))]
   "s390_match_ccmode (insn, CCLmode) && TARGET_CPU_ZARCH"
   "@
-   slbr\t%0,%2
-   slb\t%0,%2"
+   slb<g>r\t%0,%2
+   slb<g>\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_insn "*subsi3_slb"
-  [(set (match_operand:SI 0 "register_operand" "=d,d")
-        (minus:SI (minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
-                            (match_operand:SI 2 "general_operand" "d,m"))
-                  (match_operand:SI 3 "s390_slb_comparison" "")))
-   (clobber (reg:CC 33))]
+(define_insn "*sub<mode>3_slb"
+  [(set (match_operand:GPR 0 "register_operand" "=d,d")
+        (minus:GPR (minus:GPR (match_operand:GPR 1 "nonimmediate_operand" "0,0")
+                              (match_operand:GPR 2 "general_operand" "d,m"))
+                   (match_operand:GPR 3 "s390_slb_comparison" "")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_CPU_ZARCH"
   "@
-   slbr\t%0,%2
-   slb\t%0,%2"
+   slb<g>r\t%0,%2
+   slb<g>\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
-(define_expand "addsicc"
-  [(match_operand:SI 0 "register_operand" "")
+(define_expand "add<mode>cc"
+  [(match_operand:GPR 0 "register_operand" "")
    (match_operand 1 "comparison_operator" "")
-   (match_operand:SI 2 "register_operand" "")
-   (match_operand:SI 3 "const_int_operand" "")]
+   (match_operand:GPR 2 "register_operand" "")
+   (match_operand:GPR 3 "const_int_operand" "")]
   "TARGET_CPU_ZARCH"
   "if (!s390_expand_addcc (GET_CODE (operands[1]), 
                           s390_compare_op0, s390_compare_op1, 
 ; scond instruction pattern(s).
 ;
 
-(define_insn_and_split "*sconddi"
-  [(set (match_operand:DI 0 "register_operand" "=&d")
-        (match_operand:DI 1 "s390_alc_comparison" ""))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "#"
-  "&& reload_completed"
-  [(set (match_dup 0) (const_int 0))
-   (parallel
-    [(set (match_dup 0) (plus:DI (plus:DI (match_dup 0) (match_dup 0))
-                                 (match_dup 1)))
-     (clobber (reg:CC 33))])]
-  "")
-
-(define_insn_and_split "*scondsi"
-  [(set (match_operand:SI 0 "register_operand" "=&d")
-        (match_operand:SI 1 "s390_alc_comparison" ""))
-   (clobber (reg:CC 33))]
+(define_insn_and_split "*scond<mode>"
+  [(set (match_operand:GPR 0 "register_operand" "=&d")
+        (match_operand:GPR 1 "s390_alc_comparison" ""))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(set (match_dup 0) (const_int 0))
    (parallel
-    [(set (match_dup 0) (plus:SI (plus:SI (match_dup 0) (match_dup 0))
-                                 (match_dup 1)))
-     (clobber (reg:CC 33))])]
-  "")
-
-(define_insn_and_split "*sconddi_neg"
-  [(set (match_operand:DI 0 "register_operand" "=&d")
-        (match_operand:DI 1 "s390_slb_comparison" ""))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "#"
-  "&& reload_completed"
-  [(set (match_dup 0) (const_int 0))
-   (parallel
-    [(set (match_dup 0) (minus:DI (minus:DI (match_dup 0) (match_dup 0))
+    [(set (match_dup 0) (plus:GPR (plus:GPR (match_dup 0) (match_dup 0))
                                   (match_dup 1)))
-     (clobber (reg:CC 33))])
-   (parallel
-    [(set (match_dup 0) (neg:DI (match_dup 0)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "")
 
-(define_insn_and_split "*scondsi_neg"
-  [(set (match_operand:SI 0 "register_operand" "=&d")
-        (match_operand:SI 1 "s390_slb_comparison" ""))
-   (clobber (reg:CC 33))]
+(define_insn_and_split "*scond<mode>_neg"
+  [(set (match_operand:GPR 0 "register_operand" "=&d")
+        (match_operand:GPR 1 "s390_slb_comparison" ""))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_CPU_ZARCH"
   "#"
   "&& reload_completed"
   [(set (match_dup 0) (const_int 0))
    (parallel
-    [(set (match_dup 0) (minus:SI (minus:SI (match_dup 0) (match_dup 0))
-                                  (match_dup 1)))
-     (clobber (reg:CC 33))])
+    [(set (match_dup 0) (minus:GPR (minus:GPR (match_dup 0) (match_dup 0))
+                                   (match_dup 1)))
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (match_dup 0) (neg:SI (match_dup 0)))
-     (clobber (reg:CC 33))])]
+    [(set (match_dup 0) (neg:GPR (match_dup 0)))
+     (clobber (reg:CC CC_REGNUM))])]
   "")
 
-(define_expand "sltu"
-  [(match_operand:SI 0 "register_operand" "")]
-  "TARGET_CPU_ZARCH"
-  "if (!s390_expand_addcc (LTU, s390_compare_op0, s390_compare_op1,
-                          operands[0], const0_rtx, const1_rtx)) FAIL; DONE;")
 
-(define_expand "sgtu"
-  [(match_operand:SI 0 "register_operand" "")]
+(define_expand "s<code>"
+  [(set (match_operand:SI 0 "register_operand" "")
+       (SCOND (match_dup 0)
+              (match_dup 0)))]
   "TARGET_CPU_ZARCH"
-  "if (!s390_expand_addcc (GTU, s390_compare_op0, s390_compare_op1,
+  "if (!s390_expand_addcc (<CODE>, s390_compare_op0, s390_compare_op1,
                           operands[0], const0_rtx, const1_rtx)) FAIL; DONE;")
 
-(define_expand "sleu"
-  [(match_operand:SI 0 "register_operand" "")]
-  "TARGET_CPU_ZARCH"
-  "if (!s390_expand_addcc (LEU, s390_compare_op0, s390_compare_op1,
-                          operands[0], const0_rtx, const1_rtx)) FAIL; DONE;")
+(define_expand "seq"
+  [(parallel
+    [(set (match_operand:SI 0 "register_operand" "=d")
+          (match_dup 1))
+     (clobber (reg:CC CC_REGNUM))])
+   (parallel
+    [(set (match_dup 0) (xor:SI (match_dup 0) (const_int 1)))
+     (clobber (reg:CC CC_REGNUM))])]
+  ""
+{ 
+  if (!s390_compare_emitted || GET_MODE (s390_compare_emitted) != CCZ1mode)
+    FAIL;
+  operands[1] = s390_emit_compare (NE, s390_compare_op0, s390_compare_op1);
+  PUT_MODE (operands[1], SImode);
+})
 
-(define_expand "sgeu"
-  [(match_operand:SI 0 "register_operand" "")]
-  "TARGET_CPU_ZARCH"
-  "if (!s390_expand_addcc (GEU, s390_compare_op0, s390_compare_op1,
-                          operands[0], const0_rtx, const1_rtx)) FAIL; DONE;")
+(define_insn_and_split "*sne"
+  [(set (match_operand:SI 0 "register_operand" "=d")
+       (ne:SI (match_operand:CCZ1 1 "register_operand" "0") 
+              (const_int 0)))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "#"
+  "reload_completed"
+  [(parallel
+    [(set (match_dup 0) (ashiftrt:SI (match_dup 0) (const_int 28)))
+     (clobber (reg:CC CC_REGNUM))])])
 
 
 ;;
   [(set_attr "op_type"  "RR,RX")
    (set_attr "type"     "imulsi")])
 
-;
-; umulsidi3 instruction pattern(s).
-;
-
-(define_insn "umulsidi3"
-  [(set (match_operand:DI 0 "register_operand" "=d,d")
-        (mult:DI (zero_extend:DI
-                  (match_operand:SI 1 "register_operand" "%0,0"))
-                 (zero_extend:DI
-                  (match_operand:SI 2 "nonimmediate_operand" "d,m"))))]
-  "!TARGET_64BIT && TARGET_CPU_ZARCH"
-  "@
-   mlr\t%0,%2
-   ml\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXY")
-   (set_attr "type"     "imulsi")])
-
-;
-; muldf3 instruction pattern(s).
-;
-
-(define_expand "muldf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (mult:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*muldf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (mult:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   mdbr\t%0,%2
-   mdb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fmuld")])
-
-(define_insn "*muldf3_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (mult:DF (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "@
-   mdr\t%0,%2
-   md\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"    "fmuld")])
-
-(define_insn "*fmadddf"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-       (plus:DF (mult:DF (match_operand:DF 1 "register_operand" "%f,f")
-                         (match_operand:DF 2 "nonimmediate_operand"  "f,R"))
-                (match_operand:DF 3 "register_operand" "0,0")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD"
-  "@
-   madbr\t%0,%1,%2
-   madb\t%0,%1,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type" "fmuld")])
-
-(define_insn "*fmsubdf"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-       (minus:DF (mult:DF (match_operand:DF 1 "register_operand" "f,f")
-                          (match_operand:DF 2 "nonimmediate_operand"  "f,R"))
-                (match_operand:DF 3 "register_operand" "0,0")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD"
+;
+; umulsidi3 instruction pattern(s).
+;
+
+(define_insn "umulsidi3"
+  [(set (match_operand:DI 0 "register_operand" "=d,d")
+        (mult:DI (zero_extend:DI
+                  (match_operand:SI 1 "register_operand" "%0,0"))
+                 (zero_extend:DI
+                  (match_operand:SI 2 "nonimmediate_operand" "d,m"))))]
+  "!TARGET_64BIT && TARGET_CPU_ZARCH"
   "@
-   msdbr\t%0,%1,%2
-   msdb\t%0,%1,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type" "fmuld")])
+   mlr\t%0,%2
+   ml\t%0,%2"
+  [(set_attr "op_type"  "RRE,RXY")
+   (set_attr "type"     "imulsi")])
 
 ;
-; mulsf3 instruction pattern(s).
+; mul(df|sf)3 instruction pattern(s).
 ;
 
-(define_expand "mulsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (mult:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SF 2 "general_operand" "f,R")))]
+(define_expand "mul<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*mulsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (mult:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SF 2 "general_operand" "f,R")))]
+(define_insn "*mul<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   meebr\t%0,%2
-   meeb\t%0,%2"
+   m<xdee>br\t%0,%2
+   m<xdee>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fmuls")])
+   (set_attr "type"     "fmul<mode>")])
 
-(define_insn "*mulsf3_ibm"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (mult:SF (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SF 2 "general_operand" "f,R")))]
+(define_insn "*mul<mode>3_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
-   mer\t%0,%2
-   me\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fmuls")])
+   m<xde>r\t%0,%2
+   m<xde>\t%0,%2"
+  [(set_attr "op_type"  "<RRe>,<RXe>")
+   (set_attr "type"     "fmul<mode>")])
 
-(define_insn "*fmaddsf"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (plus:SF (mult:SF (match_operand:SF 1 "register_operand" "%f,f")
-                         (match_operand:SF 2 "nonimmediate_operand"  "f,R"))
-                (match_operand:SF 3 "register_operand" "0,0")))]
+(define_insn "*fmadd<mode>"
+  [(set (match_operand:DSF 0 "register_operand" "=f,f")
+       (plus:DSF (mult:DSF (match_operand:DSF 1 "register_operand" "%f,f")
+                           (match_operand:DSF 2 "nonimmediate_operand"  "f,R"))
+                (match_operand:DSF 3 "register_operand" "0,0")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD"
   "@
-   maebr\t%0,%1,%2
-   maeb\t%0,%1,%2"
+   ma<xde>br\t%0,%1,%2
+   ma<xde>b\t%0,%1,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type" "fmuls")])
+   (set_attr "type"     "fmul<mode>")])
 
-(define_insn "*fmsubsf"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (minus:SF (mult:SF (match_operand:SF 1 "register_operand" "f,f")
-                          (match_operand:SF 2 "nonimmediate_operand"  "f,R"))
-                 (match_operand:SF 3 "register_operand" "0,0")))]
+(define_insn "*fmsub<mode>"
+  [(set (match_operand:DSF 0 "register_operand" "=f,f")
+       (minus:DSF (mult:DSF (match_operand:DSF 1 "register_operand" "f,f")
+                            (match_operand:DSF 2 "nonimmediate_operand"  "f,R"))
+                (match_operand:DSF 3 "register_operand" "0,0")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD"
   "@
-   msebr\t%0,%1,%2
-   mseb\t%0,%1,%2"
+   ms<xde>br\t%0,%1,%2
+   ms<xde>b\t%0,%1,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type" "fmuls")])
+   (set_attr "type"     "fmul<mode>")])
 
 ;;
 ;;- Divide and modulo instructions.
 })
 
 ;
-; divdf3 instruction pattern(s).
-;
-
-(define_expand "divdf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (div:DF (match_operand:DF 1 "register_operand" "0,0")
-                (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*divdf3"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (div:DF (match_operand:DF 1 "register_operand" "0,0")
-                (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   ddbr\t%0,%2
-   ddb\t%0,%2"
-  [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fdivd")])
-
-(define_insn "*divdf3_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-        (div:DF (match_operand:DF 1 "register_operand" "0,0")
-                (match_operand:DF 2 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "@
-   ddr\t%0,%2
-   dd\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fdivd")])
-
-;
-; divsf3 instruction pattern(s).
+; div(df|sf)3 instruction pattern(s).
 ;
 
-(define_expand "divsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (div:SF (match_operand:SF 1 "register_operand" "0,0")
-                (match_operand:SF 2 "general_operand" "f,R")))]
+(define_expand "div<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (div:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                 (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*divsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (div:SF (match_operand:SF 1 "register_operand" "0,0")
-                (match_operand:SF 2 "general_operand" "f,R")))]
+(define_insn "*div<mode>3"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (div:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                 (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   debr\t%0,%2
-   deb\t%0,%2"
+   d<xde>br\t%0,%2
+   d<xde>b\t%0,%2"
   [(set_attr "op_type"  "RRE,RXE")
-   (set_attr "type"     "fdivs")])
+   (set_attr "type"     "fdiv<mode>")])
 
-(define_insn "*divsf3"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-        (div:SF (match_operand:SF 1 "register_operand" "0,0")
-                (match_operand:SF 2 "general_operand" "f,R")))]
+(define_insn "*div<mode>3_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+        (div:FPR (match_operand:FPR 1 "register_operand" "0,0")
+                 (match_operand:FPR 2 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
   "@
-   der\t%0,%2
-   de\t%0,%2"
-  [(set_attr "op_type"  "RR,RX")
-   (set_attr "type"     "fdivs")])
+   d<xde>r\t%0,%2
+   d<xde>\t%0,%2"
+  [(set_attr "op_type"  "<RRe>,<RXe>")
+   (set_attr "type"     "fdiv<mode>")])
 
 
 ;;
 ;;- And instructions.
 ;;
 
+(define_expand "and<mode>3"
+  [(set (match_operand:INT 0 "nonimmediate_operand" "")
+        (and:INT (match_operand:INT 1 "nonimmediate_operand" "")
+                 (match_operand:INT 2 "general_operand" "")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "s390_expand_logical_operator (AND, <MODE>mode, operands); DONE;")
+
 ;
 ; anddi3 instruction pattern(s).
 ;
 
 (define_insn "*anddi3_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (and:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*anddi3_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (and:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
    ng\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
+(define_insn "*anddi3_extimm"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,d,d,d,d,d,d,d,d,AQ,Q")
+        (and:DI (match_operand:DI 1 "nonimmediate_operand"
+                                    "%d,o,0,0,0,0,0,0,0,0,0,0")
+                (match_operand:DI 2 "general_operand"
+                                    "M,M,N0HDF,N1HDF,N2HDF,N3HDF,N0SDF,N1SDF,d,m,NxQDF,Q")))
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
+  "@
+   #
+   #
+   nihh\t%0,%j2
+   nihl\t%0,%j2
+   nilh\t%0,%j2
+   nill\t%0,%j2
+   nihf\t%0,%m2
+   nilf\t%0,%m2
+   ngr\t%0,%2
+   ng\t%0,%2
+   #
+   #"
+  [(set_attr "op_type" "RRE,RXE,RI,RI,RI,RI,RIL,RIL,RRE,RXY,SI,SS")])
+
 (define_insn "*anddi3"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,d,d,d,d,d,d,AQ,Q")
         (and:DI (match_operand:DI 1 "nonimmediate_operand"
                                     "%d,o,0,0,0,0,0,0,0,0")
                 (match_operand:DI 2 "general_operand"
                                     "M,M,N0HDF,N1HDF,N2HDF,N3HDF,d,m,NxQDF,Q")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && s390_logical_operator_ok_p (operands)"
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && !TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
   "@
    #
    #
 (define_split
   [(set (match_operand:DI 0 "s_operand" "")
         (and:DI (match_dup 0) (match_operand:DI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (and:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (AND, &operands[0], &operands[1]);")
 
-(define_expand "anddi3"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-        (and:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (match_operand:DI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "s390_expand_logical_operator (AND, DImode, operands); DONE;")
 
 ;
 ; andsi3 instruction pattern(s).
 ;
 
 (define_insn "*andsi3_cc"
-  [(set (reg 33)
-        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
+   (set (match_operand:SI 0 "register_operand" "=d,d,d,d")
         (and:SI (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode(insn, CCTmode)"
   "@
+   nilf\t%0,%o2
    nr\t%0,%2
    n\t%0,%2
    ny\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*andsi3_cconly"
-  [(set (reg 33)
-        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:SI 0 "=d,d,d,d"))]
   "s390_match_ccmode(insn, CCTmode)
    /* Do not steal TM patterns.  */
    && s390_single_part (operands[2], SImode, HImode, 0) < 0"
   "@
+   nilf\t%0,%o2
    nr\t%0,%2
    n\t%0,%2
    ny\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*andsi3_zarch"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,d,d,d,d,AQ,Q")
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,d,d,d,d,d,AQ,Q")
         (and:SI (match_operand:SI 1 "nonimmediate_operand"
-                                    "%d,o,0,0,0,0,0,0,0")
+                                   "%d,o,0,0,0,0,0,0,0,0")
                 (match_operand:SI 2 "general_operand"
-                                    "M,M,N0HSF,N1HSF,d,R,T,NxQSF,Q")))
-   (clobber (reg:CC 33))]
+                                   "M,M,N0HSF,N1HSF,Os,d,R,T,NxQSF,Q")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    #
    #
    nilh\t%0,%j2
    nill\t%0,%j2
+   nilf\t%0,%o2
    nr\t%0,%2
    n\t%0,%2
    ny\t%0,%2
    #
    #"
-  [(set_attr "op_type"  "RRE,RXE,RI,RI,RR,RX,RXY,SI,SS")])
+  [(set_attr "op_type"  "RRE,RXE,RI,RI,RIL,RR,RX,RXY,SI,SS")])
 
 (define_insn "*andsi3_esa"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,AQ,Q")
         (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
                 (match_operand:SI 2 "general_operand" "d,R,NxQSF,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    nr\t%0,%2
 (define_split
   [(set (match_operand:SI 0 "s_operand" "")
         (and:SI (match_dup 0) (match_operand:SI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (and:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (AND, &operands[0], &operands[1]);")
 
-(define_expand "andsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-        (and:SI (match_operand:SI 1 "nonimmediate_operand" "")
-                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (AND, SImode, operands); DONE;")
-
 ;
 ; andhi3 instruction pattern(s).
 ;
   [(set (match_operand:HI 0 "nonimmediate_operand" "=d,d,AQ,Q")
         (and:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0,0")
                 (match_operand:HI 2 "general_operand" "d,n,NxQHF,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    nr\t%0,%2
   [(set (match_operand:HI 0 "nonimmediate_operand" "=d,AQ,Q")
         (and:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0")
                 (match_operand:HI 2 "general_operand" "d,NxQHF,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    nr\t%0,%2
 (define_split
   [(set (match_operand:HI 0 "s_operand" "")
         (and:HI (match_dup 0) (match_operand:HI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (and:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (AND, &operands[0], &operands[1]);")
 
-(define_expand "andhi3"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "")
-        (and:HI (match_operand:HI 1 "nonimmediate_operand" "")
-                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (AND, HImode, operands); DONE;")
-
 ;
 ; andqi3 instruction pattern(s).
 ;
   [(set (match_operand:QI 0 "nonimmediate_operand" "=d,d,Q,S,Q")
         (and:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0,0,0")
                 (match_operand:QI 2 "general_operand" "d,n,n,n,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    nr\t%0,%2
   [(set (match_operand:QI 0 "nonimmediate_operand" "=d,Q,Q")
         (and:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
                 (match_operand:QI 2 "general_operand" "d,n,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    nr\t%0,%2
    #"
   [(set_attr "op_type"  "RR,SI,SS")])
 
-(define_expand "andqi3"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
-        (and:QI (match_operand:QI 1 "nonimmediate_operand" "")
-                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (AND, QImode, operands); DONE;")
-
 ;
 ; Block and (NC) patterns.
 ;
         (and:BLK (match_dup 0)
                  (match_operand:BLK 1 "memory_operand" "Q")))
    (use (match_operand 2 "const_int_operand" "n"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 256"
   "nc\t%O0(%2,%R0),%S1"
   [(set_attr "op_type" "SS")])
   [(set (match_operand 0 "memory_operand" "")
         (and (match_dup 0)
              (match_operand 1 "memory_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && GET_MODE_SIZE (GET_MODE (operands[0])) > 0"
   [(parallel
     [(set (match_dup 0) (and:BLK (match_dup 0) (match_dup 1)))
      (use (match_dup 2))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
 {
   operands[2] = GEN_INT (GET_MODE_SIZE (GET_MODE (operands[0])));
   operands[0] = adjust_address (operands[0], BLKmode, 0);
           (and:BLK (match_dup 0)
                    (match_operand:BLK 1 "memory_operand" "")))
      (use (match_operand 2 "const_int_operand" ""))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
     [(set (match_operand:BLK 3 "memory_operand" "")
           (and:BLK (match_dup 3)
                    (match_operand:BLK 4 "memory_operand" "")))
      (use (match_operand 5 "const_int_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_offset_p (operands[0], operands[3], operands[2])
    && s390_offset_p (operands[1], operands[4], operands[2])
+   && !s390_overlap_p (operands[0], operands[1], 
+                       INTVAL (operands[2]) + INTVAL (operands[5]))
    && INTVAL (operands[2]) + INTVAL (operands[5]) <= 256"
   [(parallel
     [(set (match_dup 6) (and:BLK (match_dup 6) (match_dup 7)))
      (use (match_dup 8))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[6] = gen_rtx_MEM (BLKmode, XEXP (operands[0], 0));
    operands[7] = gen_rtx_MEM (BLKmode, XEXP (operands[1], 0));
    operands[8] = GEN_INT (INTVAL (operands[2]) + INTVAL (operands[5]));")
 ;;- Bit set (inclusive or) instructions.
 ;;
 
+(define_expand "ior<mode>3"
+  [(set (match_operand:INT 0 "nonimmediate_operand" "")
+        (ior:INT (match_operand:INT 1 "nonimmediate_operand" "")
+                 (match_operand:INT 2 "general_operand" "")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "s390_expand_logical_operator (IOR, <MODE>mode, operands); DONE;")
+
 ;
 ; iordi3 instruction pattern(s).
 ;
 
 (define_insn "*iordi3_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*iordi3_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
    og\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
+(define_insn "*iordi3_extimm"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,d,d,d,d,d,d,AQ,Q")
+        (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0,0,0,0,0,0,0,0")
+                (match_operand:DI 2 "general_operand"
+                                    "N0HD0,N1HD0,N2HD0,N3HD0,N0SD0,N1SD0,d,m,NxQD0,Q")))
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
+  "@
+   oihh\t%0,%i2
+   oihl\t%0,%i2
+   oilh\t%0,%i2
+   oill\t%0,%i2
+   oihf\t%0,%k2
+   oilf\t%0,%k2
+   ogr\t%0,%2
+   og\t%0,%2
+   #
+   #"
+  [(set_attr "op_type"  "RI,RI,RI,RI,RIL,RIL,RRE,RXY,SI,SS")])
+
 (define_insn "*iordi3"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,d,d,d,d,AQ,Q")
         (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0,0,0,0,0,0")
                 (match_operand:DI 2 "general_operand"
                                     "N0HD0,N1HD0,N2HD0,N3HD0,d,m,NxQD0,Q")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && s390_logical_operator_ok_p (operands)"
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && !TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
   "@
    oihh\t%0,%i2
    oihl\t%0,%i2
 (define_split
   [(set (match_operand:DI 0 "s_operand" "")
         (ior:DI (match_dup 0) (match_operand:DI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (ior:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (IOR, &operands[0], &operands[1]);")
 
-(define_expand "iordi3"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-        (ior:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (match_operand:DI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "s390_expand_logical_operator (IOR, DImode, operands); DONE;")
-
 ;
 ; iorsi3 instruction pattern(s).
 ;
 
 (define_insn "*iorsi3_cc"
-  [(set (reg 33)
-        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
+   (set (match_operand:SI 0 "register_operand" "=d,d,d,d")
         (ior:SI (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode(insn, CCTmode)"
   "@
+   oilf\t%0,%o2
    or\t%0,%2
    o\t%0,%2
    oy\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*iorsi3_cconly"
-  [(set (reg 33)
-        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:SI 0 "=d,d,d,d"))]
   "s390_match_ccmode(insn, CCTmode)"
   "@
+   oilf\t%0,%o2
    or\t%0,%2
    o\t%0,%2
    oy\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*iorsi3_zarch"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,d,d,AQ,Q")
-        (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0,0,0,0")
-                (match_operand:SI 2 "general_operand" "N0HS0,N1HS0,d,R,T,NxQS0,Q")))
-   (clobber (reg:CC 33))]
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,d,d,d,AQ,Q")
+        (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0,0,0,0,0")
+                (match_operand:SI 2 "general_operand" "N0HS0,N1HS0,Os,d,R,T,NxQS0,Q")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    oilh\t%0,%i2
    oill\t%0,%i2
+   oilf\t%0,%o2
    or\t%0,%2
    o\t%0,%2
    oy\t%0,%2
    #
    #"
-  [(set_attr "op_type"  "RI,RI,RR,RX,RXY,SI,SS")])
+  [(set_attr "op_type"  "RI,RI,RIL,RR,RX,RXY,SI,SS")])
 
 (define_insn "*iorsi3_esa"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,AQ,Q")
         (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
                 (match_operand:SI 2 "general_operand" "d,R,NxQS0,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    or\t%0,%2
 (define_split
   [(set (match_operand:SI 0 "s_operand" "")
         (ior:SI (match_dup 0) (match_operand:SI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (ior:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (IOR, &operands[0], &operands[1]);")
 
-(define_expand "iorsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-        (ior:SI (match_operand:SI 1 "nonimmediate_operand" "")
-                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (IOR, SImode, operands); DONE;")
-
 ;
 ; iorhi3 instruction pattern(s).
 ;
   [(set (match_operand:HI 0 "nonimmediate_operand" "=d,d,AQ,Q")
         (ior:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0,0")
                 (match_operand:HI 2 "general_operand" "d,n,NxQH0,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    or\t%0,%2
   [(set (match_operand:HI 0 "nonimmediate_operand" "=d,AQ,Q")
         (ior:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0")
                 (match_operand:HI 2 "general_operand" "d,NxQH0,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    or\t%0,%2
 (define_split
   [(set (match_operand:HI 0 "s_operand" "")
         (ior:HI (match_dup 0) (match_operand:HI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (ior:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (IOR, &operands[0], &operands[1]);")
 
-(define_expand "iorhi3"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "")
-        (ior:HI (match_operand:HI 1 "nonimmediate_operand" "")
-                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (IOR, HImode, operands); DONE;")
-
 ;
 ; iorqi3 instruction pattern(s).
 ;
   [(set (match_operand:QI 0 "nonimmediate_operand" "=d,d,Q,S,Q")
         (ior:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0,0,0")
                 (match_operand:QI 2 "general_operand" "d,n,n,n,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    or\t%0,%2
   [(set (match_operand:QI 0 "nonimmediate_operand" "=d,Q,Q")
         (ior:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
                 (match_operand:QI 2 "general_operand" "d,n,Q")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_ZARCH && s390_logical_operator_ok_p (operands)"
   "@
    or\t%0,%2
    #"
   [(set_attr "op_type"  "RR,SI,SS")])
 
-(define_expand "iorqi3"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
-        (ior:QI (match_operand:QI 1 "nonimmediate_operand" "")
-                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (IOR, QImode, operands); DONE;")
-
 ;
 ; Block inclusive or (OC) patterns.
 ;
         (ior:BLK (match_dup 0)
                  (match_operand:BLK 1 "memory_operand" "Q")))
    (use (match_operand 2 "const_int_operand" "n"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 256"
   "oc\t%O0(%2,%R0),%S1"
   [(set_attr "op_type" "SS")])
   [(set (match_operand 0 "memory_operand" "")
         (ior (match_dup 0)
              (match_operand 1 "memory_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && GET_MODE_SIZE (GET_MODE (operands[0])) > 0"
   [(parallel
     [(set (match_dup 0) (ior:BLK (match_dup 0) (match_dup 1)))
      (use (match_dup 2))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
 {
   operands[2] = GEN_INT (GET_MODE_SIZE (GET_MODE (operands[0])));
   operands[0] = adjust_address (operands[0], BLKmode, 0);
           (ior:BLK (match_dup 0)
                    (match_operand:BLK 1 "memory_operand" "")))
      (use (match_operand 2 "const_int_operand" ""))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
     [(set (match_operand:BLK 3 "memory_operand" "")
           (ior:BLK (match_dup 3)
                    (match_operand:BLK 4 "memory_operand" "")))
      (use (match_operand 5 "const_int_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_offset_p (operands[0], operands[3], operands[2])
    && s390_offset_p (operands[1], operands[4], operands[2])
+   && !s390_overlap_p (operands[0], operands[1], 
+                       INTVAL (operands[2]) + INTVAL (operands[5]))
    && INTVAL (operands[2]) + INTVAL (operands[5]) <= 256"
   [(parallel
     [(set (match_dup 6) (ior:BLK (match_dup 6) (match_dup 7)))
      (use (match_dup 8))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[6] = gen_rtx_MEM (BLKmode, XEXP (operands[0], 0));
    operands[7] = gen_rtx_MEM (BLKmode, XEXP (operands[1], 0));
    operands[8] = GEN_INT (INTVAL (operands[2]) + INTVAL (operands[5]));")
 ;;- Xor instructions.
 ;;
 
+(define_expand "xor<mode>3"
+  [(set (match_operand:INT 0 "nonimmediate_operand" "")
+        (xor:INT (match_operand:INT 1 "nonimmediate_operand" "")
+                 (match_operand:INT 2 "general_operand" "")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "s390_expand_logical_operator (XOR, <MODE>mode, operands); DONE;")
+
 ;
 ; xordi3 instruction pattern(s).
 ;
 
 (define_insn "*xordi3_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
   [(set_attr "op_type"  "RRE,RXY")])
 
 (define_insn "*xordi3_cconly"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                          (match_operand:DI 2 "general_operand" "d,m"))
                  (const_int 0)))
    xr\t%0,%2"
   [(set_attr "op_type"  "RRE,RXY")])
 
+(define_insn "*xordi3_extimm"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,d,d,AQ,Q")
+        (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0,0,0,0")
+                (match_operand:DI 2 "general_operand" "N0SD0,N1SD0,d,m,NxQD0,Q")))
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
+  "@
+   xihf\t%0,%k2
+   xilf\t%0,%k2
+   xgr\t%0,%2
+   xg\t%0,%2
+   #
+   #"
+  [(set_attr "op_type"  "RIL,RIL,RRE,RXY,SI,SS")])
+
 (define_insn "*xordi3"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=d,d,AQ,Q")
         (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0,0")
                 (match_operand:DI 2 "general_operand" "d,m,NxQD0,Q")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT && s390_logical_operator_ok_p (operands)"
+   (clobber (reg:CC CC_REGNUM))]
+  "TARGET_64BIT && !TARGET_EXTIMM && s390_logical_operator_ok_p (operands)"
   "@
    xgr\t%0,%2
    xg\t%0,%2
 (define_split
   [(set (match_operand:DI 0 "s_operand" "")
         (xor:DI (match_dup 0) (match_operand:DI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (xor:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (XOR, &operands[0], &operands[1]);")
 
-(define_expand "xordi3"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-        (xor:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (match_operand:DI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "s390_expand_logical_operator (XOR, DImode, operands); DONE;")
-
 ;
 ; xorsi3 instruction pattern(s).
 ;
 
 (define_insn "*xorsi3_cc"
-  [(set (reg 33)
-        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d,d,d")
+   (set (match_operand:SI 0 "register_operand" "=d,d,d,d")
         (xor:SI (match_dup 1) (match_dup 2)))]
   "s390_match_ccmode(insn, CCTmode)"
   "@
+   xilf\t%0,%o2
    xr\t%0,%2
    x\t%0,%2
    xy\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*xorsi3_cconly"
-  [(set (reg 33)
-        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0")
-                         (match_operand:SI 2 "general_operand" "d,R,T"))
+  [(set (reg CC_REGNUM)
+        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0")
+                         (match_operand:SI 2 "general_operand" "Os,d,R,T"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d,d,d"))]
+   (clobber (match_scratch:SI 0 "=d,d,d,d"))]
   "s390_match_ccmode(insn, CCTmode)"
   "@
+   xilf\t%0,%o2
    xr\t%0,%2
    x\t%0,%2
    xy\t%0,%2"
-  [(set_attr "op_type"  "RR,RX,RXY")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY")])
 
 (define_insn "*xorsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,AQ,Q")
-        (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0,0")
-                (match_operand:SI 2 "general_operand" "d,R,T,NxQS0,Q")))
-   (clobber (reg:CC 33))]
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d,d,d,AQ,Q")
+        (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,0,0,0,0")
+                (match_operand:SI 2 "general_operand" "Os,d,R,T,NxQS0,Q")))
+   (clobber (reg:CC CC_REGNUM))]
   "s390_logical_operator_ok_p (operands)"
   "@
+   xilf\t%0,%o2
    xr\t%0,%2
    x\t%0,%2
    xy\t%0,%2
    #
    #"
-  [(set_attr "op_type"  "RR,RX,RXY,SI,SS")])
+  [(set_attr "op_type"  "RIL,RR,RX,RXY,SI,SS")])
 
 (define_split
   [(set (match_operand:SI 0 "s_operand" "")
         (xor:SI (match_dup 0) (match_operand:SI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (xor:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (XOR, &operands[0], &operands[1]);")
 
-(define_expand "xorsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-        (xor:SI (match_operand:SI 1 "nonimmediate_operand" "")
-                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (XOR, SImode, operands); DONE;")
-
 ;
 ; xorhi3 instruction pattern(s).
 ;
 
 (define_insn "*xorhi3"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=d,AQ,Q")
-        (xor:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0")
-                (match_operand:HI 2 "general_operand" "d,NxQH0,Q")))
-   (clobber (reg:CC 33))]
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=d,d,AQ,Q")
+        (xor:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,0,0")
+                (match_operand:HI 2 "general_operand" "Os,d,NxQH0,Q")))
+   (clobber (reg:CC CC_REGNUM))]
   "s390_logical_operator_ok_p (operands)"
   "@
+   xilf\t%0,%x2
    xr\t%0,%2
    #
    #"
-  [(set_attr "op_type"  "RR,SI,SS")])
+  [(set_attr "op_type"  "RIL,RR,SI,SS")])
 
 (define_split
   [(set (match_operand:HI 0 "s_operand" "")
         (xor:HI (match_dup 0) (match_operand:HI 1 "immediate_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed"
   [(parallel
     [(set (match_dup 0) (xor:QI (match_dup 0) (match_dup 1)))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_narrow_logical_operator (XOR, &operands[0], &operands[1]);")
 
-(define_expand "xorhi3"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "")
-        (xor:HI (match_operand:HI 1 "nonimmediate_operand" "")
-                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (XOR, HImode, operands); DONE;")
-
 ;
 ; xorqi3 instruction pattern(s).
 ;
 
 (define_insn "*xorqi3"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=d,Q,S,Q")
-        (xor:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0,0")
-                (match_operand:QI 2 "general_operand" "d,n,n,Q")))
-   (clobber (reg:CC 33))]
+  [(set (match_operand:QI 0 "nonimmediate_operand" "=d,d,Q,S,Q")
+        (xor:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0,0,0")
+                (match_operand:QI 2 "general_operand" "Os,d,n,n,Q")))
+   (clobber (reg:CC CC_REGNUM))]
   "s390_logical_operator_ok_p (operands)"
   "@
+   xilf\t%0,%b2
    xr\t%0,%2
    xi\t%S0,%b2
    xiy\t%S0,%b2
    #"
-  [(set_attr "op_type"  "RR,SI,SIY,SS")])
-
-(define_expand "xorqi3"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
-        (xor:QI (match_operand:QI 1 "nonimmediate_operand" "")
-                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 33))]
-  ""
-  "s390_expand_logical_operator (XOR, QImode, operands); DONE;")
+  [(set_attr "op_type"  "RIL,RR,SI,SIY,SS")])
 
 ;
 ; Block exclusive or (XC) patterns.
         (xor:BLK (match_dup 0)
                  (match_operand:BLK 1 "memory_operand" "Q")))
    (use (match_operand 2 "const_int_operand" "n"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 256"
   "xc\t%O0(%2,%R0),%S1"
   [(set_attr "op_type" "SS")])
   [(set (match_operand 0 "memory_operand" "")
         (xor (match_dup 0)
              (match_operand 1 "memory_operand" "")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "reload_completed
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && GET_MODE_SIZE (GET_MODE (operands[0])) > 0"
   [(parallel
     [(set (match_dup 0) (xor:BLK (match_dup 0) (match_dup 1)))
      (use (match_dup 2))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
 {
   operands[2] = GEN_INT (GET_MODE_SIZE (GET_MODE (operands[0])));
   operands[0] = adjust_address (operands[0], BLKmode, 0);
           (xor:BLK (match_dup 0)
                    (match_operand:BLK 1 "memory_operand" "")))
      (use (match_operand 2 "const_int_operand" ""))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
     [(set (match_operand:BLK 3 "memory_operand" "")
           (xor:BLK (match_dup 3)
                    (match_operand:BLK 4 "memory_operand" "")))
      (use (match_operand 5 "const_int_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_offset_p (operands[0], operands[3], operands[2])
    && s390_offset_p (operands[1], operands[4], operands[2])
+   && !s390_overlap_p (operands[0], operands[1], 
+                       INTVAL (operands[2]) + INTVAL (operands[5]))
    && INTVAL (operands[2]) + INTVAL (operands[5]) <= 256"
   [(parallel
     [(set (match_dup 6) (xor:BLK (match_dup 6) (match_dup 7)))
      (use (match_dup 8))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[6] = gen_rtx_MEM (BLKmode, XEXP (operands[0], 0));
    operands[7] = gen_rtx_MEM (BLKmode, XEXP (operands[1], 0));
    operands[8] = GEN_INT (INTVAL (operands[2]) + INTVAL (operands[5]));")
   [(set (match_operand:BLK 0 "memory_operand" "=Q")
         (const_int 0))
    (use (match_operand 1 "const_int_operand" "n"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "INTVAL (operands[1]) >= 1 && INTVAL (operands[1]) <= 256"
   "xc\t%O0(%1,%R0),%S0"
   [(set_attr "op_type" "SS")])
     [(set (match_operand:BLK 0 "memory_operand" "")
           (const_int 0))
      (use (match_operand 1 "const_int_operand" ""))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
     [(set (match_operand:BLK 2 "memory_operand" "")
           (const_int 0))
      (use (match_operand 3 "const_int_operand" ""))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "s390_offset_p (operands[0], operands[2], operands[1])
    && INTVAL (operands[1]) + INTVAL (operands[3]) <= 256"
   [(parallel
     [(set (match_dup 4) (const_int 0))
      (use (match_dup 5))
-     (clobber (reg:CC 33))])]
+     (clobber (reg:CC CC_REGNUM))])]
   "operands[4] = gen_rtx_MEM (BLKmode, XEXP (operands[0], 0));
    operands[5] = GEN_INT (INTVAL (operands[1]) + INTVAL (operands[3]));")
 
 ;;
 
 ;
-; negdi2 instruction pattern(s).
+; neg(di|si)2 instruction pattern(s).
 ;
 
-(define_expand "negdi2"
+(define_expand "neg<mode>2"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "=d")
-          (neg:DI (match_operand:DI 1 "register_operand" "d")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:DSI 0 "register_operand" "=d")
+          (neg:DSI (match_operand:DSI 1 "register_operand" "d")))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "")
 
 (define_insn "*negdi2_sign_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (neg:DI (ashiftrt:DI (ashift:DI (subreg:DI
                            (match_operand:SI 1 "register_operand" "d") 0)
                            (const_int 32)) (const_int 32)))
 (define_insn "*negdi2_sign"
   [(set (match_operand:DI 0 "register_operand" "=d")
         (neg:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "d"))))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "lcgfr\t%0,%1"
   [(set_attr "op_type"  "RRE")])
 
-(define_insn "*negdi2_cc"
-  [(set (reg 33)
-        (compare (neg:DI (match_operand:DI 1 "register_operand" "d"))
+(define_insn "*neg<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (neg:GPR (match_operand:GPR 1 "register_operand" "d"))
                  (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d")
-        (neg:DI (match_dup 1)))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lcgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
+   (set (match_operand:GPR 0 "register_operand" "=d")
+        (neg:GPR (match_dup 1)))]
+  "s390_match_ccmode (insn, CCAmode)"
+  "lc<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "*negdi2_cconly"
-  [(set (reg 33)
-        (compare (neg:DI (match_operand:DI 1 "register_operand" "d"))
+(define_insn "*neg<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (neg:GPR (match_operand:GPR 1 "register_operand" "d"))
                  (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d"))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lcgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
+   (clobber (match_scratch:GPR 0 "=d"))]
+  "s390_match_ccmode (insn, CCAmode)"
+  "lc<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "*negdi2_64"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (neg:DI (match_operand:DI 1 "register_operand" "d")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "lcgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
+(define_insn "*neg<mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (neg:GPR (match_operand:GPR 1 "register_operand" "d")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "lc<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
 
 (define_insn_and_split "*negdi2_31"
   [(set (match_operand:DI 0 "register_operand" "=d")
         (neg:DI (match_operand:DI 1 "register_operand" "d")))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT"
   "#"
   "&& reload_completed"
   [(parallel
     [(set (match_dup 2) (neg:SI (match_dup 3)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (parallel
-    [(set (reg:CCAP 33)
+    [(set (reg:CCAP CC_REGNUM)
           (compare:CCAP (neg:SI (match_dup 5)) (const_int 0)))
      (set (match_dup 4) (neg:SI (match_dup 5)))])
    (set (pc)
-        (if_then_else (ne (reg:CCAP 33) (const_int 0))
+        (if_then_else (ne (reg:CCAP CC_REGNUM) (const_int 0))
                       (pc)
                       (label_ref (match_dup 6))))
    (parallel
     [(set (match_dup 2) (plus:SI (match_dup 2) (const_int -1)))
-     (clobber (reg:CC 33))])
+     (clobber (reg:CC CC_REGNUM))])
    (match_dup 6)]
   "operands[2] = operand_subword (operands[0], 0, 0, DImode);
    operands[3] = operand_subword (operands[1], 0, 0, DImode);
    operands[6] = gen_label_rtx ();")
 
 ;
-; negsi2 instruction pattern(s).
-;
-
-(define_insn "*negsi2_cc"
-  [(set (reg 33)
-        (compare (neg:SI (match_operand:SI 1 "register_operand" "d"))
-                 (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d")
-        (neg:SI (match_dup 1)))]
-  "s390_match_ccmode (insn, CCAmode)"
-  "lcr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
-  
-(define_insn "*negsi2_cconly"
-  [(set (reg 33)
-        (compare (neg:SI (match_operand:SI 1 "register_operand" "d"))
-                 (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d"))]
-  "s390_match_ccmode (insn, CCAmode)"
-  "lcr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
-  
-(define_insn "negsi2"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (neg:SI (match_operand:SI 1 "register_operand" "d")))
-   (clobber (reg:CC 33))]
-  ""
-  "lcr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
-
-;
-; negdf2 instruction pattern(s).
-;
-
-(define_expand "negdf2"
-  [(parallel
-    [(set (match_operand:DF 0 "register_operand" "=f")
-          (neg:DF (match_operand:DF 1 "register_operand" "f")))
-     (clobber (reg:CC 33))])]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*negdf2_cc"
-  [(set (reg 33)
-        (compare (neg:DF (match_operand:DF 1 "register_operand" "f"))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (set (match_operand:DF 0 "register_operand" "=f")
-        (neg:DF (match_dup 1)))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*negdf2_cconly"
-  [(set (reg 33)
-        (compare (neg:DF (match_operand:DF 1 "register_operand" "f"))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (clobber (match_scratch:DF 0 "=f"))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*negdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (neg:DF (match_operand:DF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-
-(define_insn "*negdf2_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (neg:DF (match_operand:DF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "lcdr\t%0,%1"
-  [(set_attr "op_type"  "RR")
-   (set_attr "type"     "fsimpd")])
-
-;
-; negsf2 instruction pattern(s).
+; neg(df|sf)2 instruction pattern(s).
 ;
 
-(define_expand "negsf2"
+(define_expand "neg<mode>2"
   [(parallel
-    [(set (match_operand:SF 0 "register_operand" "=f")
-          (neg:SF (match_operand:SF 1 "register_operand" "f")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:FPR 0 "register_operand" "=f")
+          (neg:FPR (match_operand:FPR 1 "register_operand" "f")))
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*negsf2_cc"
-  [(set (reg 33)
-        (compare (neg:SF (match_operand:SF 1 "register_operand" "f"))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (set (match_operand:SF 0 "register_operand" "=f")
-        (neg:SF (match_dup 1)))]
+(define_insn "*neg<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (neg:FPR (match_operand:FPR 1 "register_operand" "f"))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (set (match_operand:FPR 0 "register_operand" "=f")
+        (neg:FPR (match_dup 1)))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcebr\t%0,%1"
+  "lc<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*negsf2_cconly"
-  [(set (reg 33)
-        (compare (neg:SF (match_operand:SF 1 "register_operand" "f"))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (clobber (match_scratch:SF 0 "=f"))]
+(define_insn "*neg<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (neg:FPR (match_operand:FPR 1 "register_operand" "f"))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (clobber (match_scratch:FPR 0 "=f"))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcebr\t%0,%1"
+  "lc<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*negsf2"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (neg:SF (match_operand:SF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
+(define_insn "*neg<mode>2"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (neg:FPR (match_operand:FPR 1 "register_operand" "f")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lcebr\t%0,%1"
+  "lc<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
 
-(define_insn "*negsf2"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (neg:SF (match_operand:SF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
+(define_insn "*neg<mode>2_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (neg:FPR (match_operand:FPR 1 "register_operand" "f")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "lcer\t%0,%1"
-  [(set_attr "op_type"  "RR")
-   (set_attr "type"     "fsimps")])
+  "lc<xde>r\t%0,%1"
+  [(set_attr "op_type"  "<RRe>")
+   (set_attr "type"     "fsimp<mode>")])
 
 
 ;;
 ;;
 
 ;
-; absdi2 instruction pattern(s).
+; abs(di|si)2 instruction pattern(s).
 ;
 
 (define_insn "*absdi2_sign_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (abs:DI (ashiftrt:DI (ashift:DI (subreg:DI
                            (match_operand:SI 1 "register_operand" "d") 0)
                            (const_int 32)) (const_int 32)))
 (define_insn "*absdi2_sign"
   [(set (match_operand:DI 0 "register_operand" "=d")
         (abs:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "d"))))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "lpgfr\t%0,%1"
   [(set_attr "op_type"  "RRE")])
 
-(define_insn "*absdi2_cc"
-  [(set (reg 33)
-        (compare (abs:DI (match_operand:DI 1 "register_operand" "d"))
-                 (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d")
-        (abs:DI (match_dup 1)))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lpgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
-  
-(define_insn "*absdi2_cconly"
-  [(set (reg 33)
-        (compare (abs:DI (match_operand:DI 1 "register_operand" "d"))
-                 (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d"))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lpgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
-  
-(define_insn "absdi2"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (abs:DI (match_operand:DI 1 "register_operand" "d")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "lpgr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
-
-;
-; abssi2 instruction pattern(s).
-;
-
-(define_insn "*abssi2_cc"
-  [(set (reg 33)
-        (compare (abs:SI (match_operand:SI 1 "register_operand" "d"))
+(define_insn "*abs<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (abs:GPR (match_operand:DI 1 "register_operand" "d"))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d")
-        (abs:SI (match_dup 1)))]
+   (set (match_operand:GPR 0 "register_operand" "=d")
+        (abs:GPR (match_dup 1)))]
   "s390_match_ccmode (insn, CCAmode)"
-  "lpr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
+  "lp<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "*abssi2_cconly"
-  [(set (reg 33)
-        (compare (abs:SI (match_operand:SI 1 "register_operand" "d"))
+(define_insn "*abs<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (abs:GPR (match_operand:GPR 1 "register_operand" "d"))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d"))]
+   (clobber (match_scratch:GPR 0 "=d"))]
   "s390_match_ccmode (insn, CCAmode)"
-  "lpr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
+  "lp<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "abssi2"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (abs:SI (match_operand:SI 1 "register_operand" "d")))
-   (clobber (reg:CC 33))]
+(define_insn "abs<mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (abs:GPR (match_operand:GPR 1 "register_operand" "d")))
+   (clobber (reg:CC CC_REGNUM))]
   ""
-  "lpr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
-
-;
-; absdf2 instruction pattern(s).
-;
-
-(define_expand "absdf2"
-  [(parallel
-    [(set (match_operand:DF 0 "register_operand" "=f")
-          (abs:DF (match_operand:DF 1 "register_operand" "f")))
-     (clobber (reg:CC 33))])]
-  "TARGET_HARD_FLOAT"
-  "")
-
-(define_insn "*absdf2_cc"
-  [(set (reg 33)
-        (compare (abs:DF (match_operand:DF 1 "register_operand" "f"))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (set (match_operand:DF 0 "register_operand" "=f")
-        (abs:DF (match_dup 1)))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*absdf2_cconly"
-  [(set (reg 33)
-        (compare (abs:DF (match_operand:DF 1 "register_operand" "f"))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (clobber (match_scratch:DF 0 "=f"))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*absdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (abs:DF (match_operand:DF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpdbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-
-(define_insn "*absdf2_ibm"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (abs:DF (match_operand:DF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "lpdr\t%0,%1"
-  [(set_attr "op_type"  "RR")
-   (set_attr "type"     "fsimpd")])
+  "lp<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
 
 ;
-; abssf2 instruction pattern(s).
+; abs(df|sf)2 instruction pattern(s).
 ;
 
-(define_expand "abssf2"
+(define_expand "abs<mode>2"
   [(parallel
-    [(set (match_operand:SF 0 "register_operand" "=f")
-          (abs:SF (match_operand:SF 1 "register_operand" "f")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:FPR 0 "register_operand" "=f")
+          (abs:FPR (match_operand:FPR 1 "register_operand" "f")))
+     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_HARD_FLOAT"
   "")
 
-(define_insn "*abssf2_cc"
-  [(set (reg 33)
-        (compare (abs:SF (match_operand:SF 1 "register_operand" "f"))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (set (match_operand:SF 0 "register_operand" "=f")
-        (abs:SF (match_dup 1)))]
+(define_insn "*abs<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (abs:FPR (match_operand:FPR 1 "register_operand" "f"))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (set (match_operand:FPR 0 "register_operand" "=f")
+        (abs:FPR (match_dup 1)))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpebr\t%0,%1"
+  "lp<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*abssf2_cconly"
-  [(set (reg 33)
-        (compare (abs:SF (match_operand:SF 1 "register_operand" "f"))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (clobber (match_scratch:SF 0 "=f"))]
+(define_insn "*abs<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (abs:FPR (match_operand:FPR 1 "register_operand" "f"))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (clobber (match_scratch:FPR 0 "=f"))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpebr\t%0,%1"
+  "lp<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*abssf2"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (abs:SF (match_operand:SF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
+(define_insn "*abs<mode>2"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (abs:FPR (match_operand:FPR 1 "register_operand" "f")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lpebr\t%0,%1"
+  "lp<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
 
-(define_insn "*abssf2_ibm"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (abs:SF (match_operand:SF 1 "register_operand" "f")))
-   (clobber (reg:CC 33))]
+(define_insn "*abs<mode>2_ibm"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (abs:FPR (match_operand:FPR 1 "register_operand" "f")))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT"
-  "lper\t%0,%1"
-  [(set_attr "op_type"  "RR")
-   (set_attr "type"     "fsimps")])
+  "lp<xde>r\t%0,%1"
+  [(set_attr "op_type"  "<RRe>")
+   (set_attr "type"     "fsimp<mode>")])
 
 ;;
 ;;- Negated absolute value instructions
 ;
 
 (define_insn "*negabsdi2_sign_cc"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (neg:DI (abs:DI (ashiftrt:DI (ashift:DI (subreg:DI
                            (match_operand:SI 1 "register_operand" "d") 0)
                            (const_int 32)) (const_int 32))))
   [(set (match_operand:DI 0 "register_operand" "=d")
        (neg:DI (abs:DI (sign_extend:DI
                           (match_operand:SI 1 "register_operand" "d")))))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
   "lngfr\t%0,%1"
   [(set_attr "op_type" "RRE")])
 
-(define_insn "*negabsdi2_cc"
-  [(set (reg 33)
-        (compare (neg:DI (abs:DI (match_operand:DI 1 "register_operand" "d")))
-                 (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d")
-        (neg:DI (abs:DI (match_dup 1))))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lngr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
-  
-(define_insn "*negabsdi2_cconly"
-  [(set (reg 33)
-        (compare (neg:DI (abs:DI (match_operand:DI 1 "register_operand" "d")))
-                 (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d"))]
-  "TARGET_64BIT && s390_match_ccmode (insn, CCAmode)"
-  "lngr\t%0,%1"
-  [(set_attr "op_type"  "RRE")])
-  
-(define_insn "*negabsdi2"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-       (neg:DI (abs:DI (match_operand:DI 1 "register_operand" "d"))))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "lngr\t%0,%1"
-  [(set_attr "op_type" "RRE")])
-
-(define_insn "*negabssi2_cc"
-  [(set (reg 33)
-        (compare (neg:SI (abs:SI (match_operand:SI 1 "register_operand" "d")))
+(define_insn "*negabs<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (neg:GPR (abs:GPR (match_operand:GPR 1 "register_operand" "d")))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d")
-        (neg:SI (abs:SI (match_dup 1))))]
+   (set (match_operand:GPR 0 "register_operand" "=d")
+        (neg:GPR (abs:GPR (match_dup 1))))]
   "s390_match_ccmode (insn, CCAmode)"
-  "lnr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
+  "ln<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "*negabssi2_cconly"
-  [(set (reg 33)
-        (compare (neg:SI (abs:SI (match_operand:SI 1 "register_operand" "d")))
+(define_insn "*negabs<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (neg:GPR (abs:GPR (match_operand:GPR 1 "register_operand" "d")))
                  (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d"))]
+   (clobber (match_scratch:GPR 0 "=d"))]
   "s390_match_ccmode (insn, CCAmode)"
-  "lnr\t%0,%1"
-  [(set_attr "op_type"  "RR")])
+  "ln<g>r\t%0,%1"
+  [(set_attr "op_type"  "RR<E>")])
   
-(define_insn "*negabssi2"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-       (neg:SI (abs:SI (match_operand:SI 1 "register_operand" "d"))))
-   (clobber (reg:CC 33))]
+(define_insn "*negabs<mode>2"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+       (neg:GPR (abs:GPR (match_operand:GPR 1 "register_operand" "d"))))
+   (clobber (reg:CC CC_REGNUM))]
   ""
-  "lnr\t%0,%1"
-  [(set_attr "op_type" "RR")])
+  "ln<g>r\t%0,%1"
+  [(set_attr "op_type" "RR<E>")])
 
 ;
 ; Floating point
 ;
 
-(define_insn "*negabsdf2_cc"
-  [(set (reg 33)
-        (compare (neg:DF (abs:DF (match_operand:DF 1 "register_operand" "f")))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (set (match_operand:DF 0 "register_operand" "=f")
-        (neg:DF (abs:DF (match_dup 1))))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lndbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*negabsdf2_cconly"
-  [(set (reg 33)
-        (compare (neg:DF (abs:DF (match_operand:DF 1 "register_operand" "f")))
-                 (match_operand:DF 2 "const0_operand" "")))
-   (clobber (match_scratch:DF 0 "=f"))]
-  "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lndbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-  
-(define_insn "*negabsdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (neg:DF (abs:DF (match_operand:DF 1 "register_operand" "f"))))
-   (clobber (reg:CC 33))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lndbr\t%0,%1"
-  [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimpd")])
-
-(define_insn "*negabssf2_cc"
-  [(set (reg 33)
-        (compare (neg:SF (abs:SF (match_operand:SF 1 "register_operand" "f")))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (set (match_operand:SF 0 "register_operand" "=f")
-        (neg:SF (abs:SF (match_dup 1))))]
+(define_insn "*negabs<mode>2_cc"
+  [(set (reg CC_REGNUM)
+        (compare (neg:FPR (abs:FPR (match_operand:FPR 1 "register_operand" "f")))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (set (match_operand:FPR 0 "register_operand" "=f")
+        (neg:FPR (abs:FPR (match_dup 1))))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lnebr\t%0,%1"
+  "ln<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*negabssf2_cconly"
-  [(set (reg 33)
-        (compare (neg:SF (abs:SF (match_operand:SF 1 "register_operand" "f")))
-                 (match_operand:SF 2 "const0_operand" "")))
-   (clobber (match_scratch:SF 0 "=f"))]
+(define_insn "*negabs<mode>2_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (neg:FPR (abs:FPR (match_operand:FPR 1 "register_operand" "f")))
+                 (match_operand:FPR 2 "const0_operand" "")))
+   (clobber (match_scratch:FPR 0 "=f"))]
   "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lnebr\t%0,%1"
+  "ln<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
   
-(define_insn "*negabssf2"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (neg:SF (abs:SF (match_operand:SF 1 "register_operand" "f"))))
-   (clobber (reg:CC 33))]
+(define_insn "*negabs<mode>2"
+  [(set (match_operand:FPR 0 "register_operand" "=f")
+        (neg:FPR (abs:FPR (match_operand:FPR 1 "register_operand" "f"))))
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "lnebr\t%0,%1"
+  "ln<xde>br\t%0,%1"
   [(set_attr "op_type"  "RRE")
-   (set_attr "type"     "fsimps")])
+   (set_attr "type"     "fsimp<mode>")])
 
 ;;
 ;;- Square root instructions.
 ;;
 
 ;
-; sqrtdf2 instruction pattern(s).
+; sqrt(df|sf)2 instruction pattern(s).
 ;
 
-(define_insn "sqrtdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-       (sqrt:DF (match_operand:DF 1 "general_operand" "f,R")))]
+(define_insn "sqrt<mode>2"
+  [(set (match_operand:FPR 0 "register_operand" "=f,f")
+       (sqrt:FPR (match_operand:FPR 1 "general_operand" "f,<Rf>")))]
   "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
   "@
-   sqdbr\t%0,%1
-   sqdb\t%0,%1"
+   sq<xde>br\t%0,%1
+   sq<xde>b\t%0,%1"
   [(set_attr "op_type" "RRE,RXE")
-   (set_attr "type" "fsqrtd")])
-
-;
-; sqrtsf2 instruction pattern(s).
-;
+   (set_attr "type" "fsqrt<mode>")])
 
-(define_insn "sqrtsf2"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (sqrt:SF (match_operand:SF 1 "general_operand" "f,R")))]
-  "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT"
-  "@
-   sqebr\t%0,%1
-   sqeb\t%0,%1"
-  [(set_attr "op_type" "RRE,RXE")
-   (set_attr "type" "fsqrts")])
 
 ;;
-;;- One complement instructions.
-;;
-
-;
-; one_cmpldi2 instruction pattern(s).
-;
-
-(define_expand "one_cmpldi2"
-  [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-          (xor:DI (match_operand:DI 1 "register_operand" "")
-                  (const_int -1)))
-     (clobber (reg:CC 33))])]
-  "TARGET_64BIT"
-  "")
+;;- One complement instructions.
+;;
 
 ;
-; one_cmplsi2 instruction pattern(s).
+; one_cmpl(di|si|hi|qi)2 instruction pattern(s).
 ;
 
-(define_expand "one_cmplsi2"
+(define_expand "one_cmpl<mode>2"
   [(parallel
-    [(set (match_operand:SI 0 "register_operand" "")
-          (xor:SI (match_operand:SI 1 "register_operand" "")
-                  (const_int -1)))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:INT 0 "register_operand" "")
+          (xor:INT (match_operand:INT 1 "register_operand" "")
+                  (const_int -1)))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "")
 
-;
-; one_cmplhi2 instruction pattern(s).
-;
 
-(define_expand "one_cmplhi2"
-  [(parallel
-    [(set (match_operand:HI 0 "register_operand" "")
-          (xor:HI (match_operand:HI 1 "register_operand" "")
-                  (const_int -1)))
-     (clobber (reg:CC 33))])]
-  ""
-  "")
+;;
+;; Find leftmost bit instructions.
+;;
 
-;
-; one_cmplqi2 instruction pattern(s).
-;
+(define_expand "clzdi2"
+  [(set (match_operand:DI 0 "register_operand" "=d")
+       (clz:DI (match_operand:DI 1 "register_operand" "d")))]
+  "TARGET_EXTIMM && TARGET_64BIT"
+{
+  rtx insn, clz_equal;
+  rtx wide_reg = gen_reg_rtx (TImode);
+  rtx msb = gen_rtx_CONST_INT (DImode, (unsigned HOST_WIDE_INT) 1 << 63);
 
-(define_expand "one_cmplqi2"
-  [(parallel
-    [(set (match_operand:QI 0 "register_operand" "")
-          (xor:QI (match_operand:QI 1 "register_operand" "")
-                  (const_int -1)))
-     (clobber (reg:CC 33))])]
-  ""
-  "")
+  clz_equal = gen_rtx_CLZ (DImode, operands[1]);
+
+  emit_insn (gen_clztidi2 (wide_reg, operands[1], msb));
+
+  insn = emit_move_insn (operands[0], gen_highpart (DImode, wide_reg));  
+  REG_NOTES (insn) =
+        gen_rtx_EXPR_LIST (REG_EQUAL, clz_equal, REG_NOTES (insn));
+
+  DONE;
+})
+
+(define_insn "clztidi2"
+  [(set (match_operand:TI 0 "register_operand" "=d")
+       (ior:TI
+         (ashift:TI 
+            (zero_extend:TI 
+             (xor:DI (match_operand:DI 1 "register_operand" "d")
+                      (lshiftrt (match_operand:DI 2 "const_int_operand" "")
+                               (subreg:SI (clz:DI (match_dup 1)) 4))))
+           
+           (const_int 64))
+          (zero_extend:TI (clz:DI (match_dup 1)))))
+   (clobber (reg:CC CC_REGNUM))]
+  "(unsigned HOST_WIDE_INT) INTVAL (operands[2]) 
+   == (unsigned HOST_WIDE_INT) 1 << 63
+   && TARGET_EXTIMM && TARGET_64BIT"
+  "flogr\t%0,%1"
+  [(set_attr "op_type"  "RRE")])
 
 
 ;;
 ;;
 
 ;
-; rotldi3 instruction pattern(s).
+; rotl(di|si)3 instruction pattern(s).
 ;
 
-(define_insn "rotldi3"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-       (rotate:DI (match_operand:DI 1 "register_operand" "d")
-                  (match_operand:SI 2 "shift_count_operand" "Y")))]
-  "TARGET_64BIT"
-  "rllg\t%0,%1,%Y2"
+(define_insn "rotl<mode>3"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+       (rotate:GPR (match_operand:GPR 1 "register_operand" "d")
+                   (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))]
+  "TARGET_CPU_ZARCH"
+  "rll<g>\t%0,%1,%Y2"
   [(set_attr "op_type"  "RSE")
    (set_attr "atype"    "reg")])
 
-;
-; rotlsi3 instruction pattern(s).
-;
-
-(define_insn "rotlsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-       (rotate:SI (match_operand:SI 1 "register_operand" "d")
-                  (match_operand:SI 2 "shift_count_operand" "Y")))]
-  "TARGET_CPU_ZARCH"
-  "rll\t%0,%1,%Y2"
+(define_insn "*rotl<mode>3_and"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+       (rotate:GPR (match_operand:GPR 1 "register_operand" "d")
+                   (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                           (match_operand:SI 3 "const_int_operand"   "n"))))]
+  "TARGET_CPU_ZARCH && (INTVAL (operands[3]) & 63) == 63"
+  "rll<g>\t%0,%1,%Y2"
   [(set_attr "op_type"  "RSE")
    (set_attr "atype"    "reg")])
 
 
 ;;
-;;- Arithmetic shift instructions.
+;;- Shift instructions.
 ;;
 
 ;
-; ashldi3 instruction pattern(s).
+; (ashl|lshr)(di|si)3 instruction pattern(s).
 ;
 
-(define_expand "ashldi3"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (ashift:DI (match_operand:DI 1 "register_operand" "")
-                   (match_operand:SI 2 "shift_count_operand" "")))]
+(define_expand "<shift><mode>3"
+  [(set (match_operand:DSI 0 "register_operand" "")
+        (SHIFT:DSI (match_operand:DSI 1 "register_operand" "")
+                   (match_operand:SI 2 "shift_count_or_setmem_operand" "")))]
   ""
   "")
 
-(define_insn "*ashldi3_31"
+(define_insn "*<shift>di3_31"
   [(set (match_operand:DI 0 "register_operand" "=d")
-        (ashift:DI (match_operand:DI 1 "register_operand" "0")
-                   (match_operand:SI 2 "shift_count_operand" "Y")))]
+        (SHIFT:DI (match_operand:DI 1 "register_operand" "0")
+                  (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))]
   "!TARGET_64BIT"
-  "sldl\t%0,%Y2"
+  "s<lr>dl\t%0,%Y2"
   [(set_attr "op_type"  "RS")
    (set_attr "atype"    "reg")])
 
-(define_insn "*ashldi3_64"
+(define_insn "*<shift><mode>3"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (SHIFT:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                   (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))]
+  ""
+  "s<lr>l<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
+   (set_attr "atype"    "reg")])
+
+(define_insn "*<shift>di3_31_and"
   [(set (match_operand:DI 0 "register_operand" "=d")
-        (ashift:DI (match_operand:DI 1 "register_operand" "d")
-                   (match_operand:SI 2 "shift_count_operand" "Y")))]
-  "TARGET_64BIT"
-  "sllg\t%0,%1,%Y2"
-  [(set_attr "op_type"  "RSE")
+        (SHIFT:DI (match_operand:DI 1 "register_operand" "0")
+                  (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                         (match_operand:SI 3 "const_int_operand"   "n"))))]
+  "!TARGET_64BIT && (INTVAL (operands[3]) & 63) == 63"
+  "s<lr>dl\t%0,%Y2"
+  [(set_attr "op_type"  "RS")
+   (set_attr "atype"    "reg")])
+
+(define_insn "*<shift><mode>3_and"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (SHIFT:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                   (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                          (match_operand:SI 3 "const_int_operand"   "n"))))]
+  "(INTVAL (operands[3]) & 63) == 63"
+  "s<lr>l<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
 ;
-; ashrdi3 instruction pattern(s).
+; ashr(di|si)3 instruction pattern(s).
 ;
 
-(define_expand "ashrdi3"
+(define_expand "ashr<mode>3"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-          (ashiftrt:DI (match_operand:DI 1 "register_operand" "")
-                       (match_operand:SI 2 "shift_count_operand" "")))
-     (clobber (reg:CC 33))])]
+    [(set (match_operand:DSI 0 "register_operand" "")
+          (ashiftrt:DSI (match_operand:DSI 1 "register_operand" "")
+                        (match_operand:SI 2 "shift_count_or_setmem_operand" "")))
+     (clobber (reg:CC CC_REGNUM))])]
   ""
   "")
 
 (define_insn "*ashrdi3_cc_31"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
+                              (match_operand:SI 2 "shift_count_or_setmem_operand" "Y"))
                  (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=d")
         (ashiftrt:DI (match_dup 1) (match_dup 2)))]
    (set_attr "atype"    "reg")])
 
 (define_insn "*ashrdi3_cconly_31"
-  [(set (reg 33)
+  [(set (reg CC_REGNUM)
         (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
+                              (match_operand:SI 2 "shift_count_or_setmem_operand" "Y"))
                  (const_int 0)))
    (clobber (match_scratch:DI 0 "=d"))]
   "!TARGET_64BIT && s390_match_ccmode(insn, CCSmode)"
 (define_insn "*ashrdi3_31"
   [(set (match_operand:DI 0 "register_operand" "=d")
         (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))
-   (clobber (reg:CC 33))]
+                     (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_64BIT"
   "srda\t%0,%Y2"
   [(set_attr "op_type"  "RS")
    (set_attr "atype"    "reg")])
 
-(define_insn "*ashrdi3_cc_64"
-  [(set (reg 33)
-        (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "d")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
+(define_insn "*ashr<mode>3_cc"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                               (match_operand:SI 2 "shift_count_or_setmem_operand" "Y"))
                  (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=d")
-        (ashiftrt:DI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT"
-  "srag\t%0,%1,%Y2"
-  [(set_attr "op_type"  "RSE")
+   (set (match_operand:GPR 0 "register_operand" "=d")
+        (ashiftrt:GPR (match_dup 1) (match_dup 2)))]
+  "s390_match_ccmode(insn, CCSmode)"
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
-(define_insn "*ashrdi3_cconly_64"
-  [(set (reg 33)
-        (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "d")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
+(define_insn "*ashr<mode>3_cconly"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                               (match_operand:SI 2 "shift_count_or_setmem_operand" "Y"))
                  (const_int 0)))
-   (clobber (match_scratch:DI 0 "=d"))]
-  "s390_match_ccmode(insn, CCSmode) && TARGET_64BIT"
-  "srag\t%0,%1,%Y2"
-  [(set_attr "op_type"  "RSE")
+   (clobber (match_scratch:GPR 0 "=d"))]
+  "s390_match_ccmode(insn, CCSmode)"
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
-(define_insn "*ashrdi3_64"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (ashiftrt:DI (match_operand:DI 1 "register_operand" "d")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))
-   (clobber (reg:CC 33))]
-  "TARGET_64BIT"
-  "srag\t%0,%1,%Y2"
-  [(set_attr "op_type"  "RSE")
+(define_insn "*ashr<mode>3"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                      (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))
+   (clobber (reg:CC CC_REGNUM))]
+  ""
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
 
-;
-; ashlsi3 instruction pattern(s).
-;
+; shift pattern with implicit ANDs
 
-(define_insn "ashlsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (ashift:SI (match_operand:SI 1 "register_operand" "0")
-                   (match_operand:SI 2 "shift_count_operand" "Y")))]
-  ""
-  "sll\t%0,%Y2"
+(define_insn "*ashrdi3_cc_31_and"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
+                              (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                                     (match_operand:SI 3 "const_int_operand"   "n")))
+                (const_int 0)))
+   (set (match_operand:DI 0 "register_operand" "=d")
+        (ashiftrt:DI (match_dup 1) (and:SI (match_dup 2) (match_dup 3))))]
+  "!TARGET_64BIT && s390_match_ccmode(insn, CCSmode)
+   && (INTVAL (operands[3]) & 63) == 63"
+  "srda\t%0,%Y2"
   [(set_attr "op_type"  "RS")
    (set_attr "atype"    "reg")])
 
-;
-; ashrsi3 instruction pattern(s).
-;
-
-(define_insn "*ashrsi3_cc"
-  [(set (reg 33)
-        (compare (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
+(define_insn "*ashrdi3_cconly_31_and"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
+                              (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                                     (match_operand:SI 3 "const_int_operand"   "n")))
                  (const_int 0)))
-   (set (match_operand:SI 0 "register_operand" "=d")
-        (ashiftrt:SI (match_dup 1) (match_dup 2)))]
-  "s390_match_ccmode(insn, CCSmode)"
-  "sra\t%0,%Y2"
+   (clobber (match_scratch:DI 0 "=d"))]
+  "!TARGET_64BIT && s390_match_ccmode(insn, CCSmode)
+   && (INTVAL (operands[3]) & 63) == 63"
+  "srda\t%0,%Y2"
   [(set_attr "op_type"  "RS")
    (set_attr "atype"    "reg")])
 
-
-(define_insn "*ashrsi3_cconly"
-  [(set (reg 33)
-        (compare (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                              (match_operand:SI 2 "shift_count_operand" "Y"))
-                 (const_int 0)))
-   (clobber (match_scratch:SI 0 "=d"))]
-  "s390_match_ccmode(insn, CCSmode)"
-  "sra\t%0,%Y2"
+(define_insn "*ashrdi3_31_and"
+  [(set (match_operand:DI 0 "register_operand" "=d")
+        (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
+                     (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                            (match_operand:SI 3 "const_int_operand"   "n"))))
+   (clobber (reg:CC CC_REGNUM))]
+  "!TARGET_64BIT && (INTVAL (operands[3]) & 63) == 63"
+  "srda\t%0,%Y2"
   [(set_attr "op_type"  "RS")
    (set_attr "atype"    "reg")])
 
-(define_insn "ashrsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))
-   (clobber (reg:CC 33))]
-  ""
-  "sra\t%0,%Y2"
-  [(set_attr "op_type"  "RS")
+(define_insn "*ashr<mode>3_cc_and"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                               (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                                      (match_operand:SI 3 "const_int_operand"   "n")))
+                (const_int 0)))
+   (set (match_operand:GPR 0 "register_operand" "=d")
+        (ashiftrt:GPR (match_dup 1) (and:SI (match_dup 2) (match_dup 3))))]
+  "s390_match_ccmode(insn, CCSmode) && (INTVAL (operands[3]) & 63) == 63"
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
-
-;;
-;;- logical shift instructions.
-;;
-
-;
-; lshrdi3 instruction pattern(s).
-;
-
-(define_expand "lshrdi3"
-  [(set (match_operand:DI 0 "register_operand" "")
-        (lshiftrt:DI (match_operand:DI 1 "register_operand" "")
-                     (match_operand:SI 2 "shift_count_operand" "")))]
-  ""
-  "")
-
-(define_insn "*lshrdi3_31"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))]
-  "!TARGET_64BIT"
-  "srdl\t%0,%Y2"
-   [(set_attr "op_type"  "RS")
-    (set_attr "atype"    "reg")])
-
-(define_insn "*lshrdi3_64"
-  [(set (match_operand:DI 0 "register_operand" "=d")
-        (lshiftrt:DI (match_operand:DI 1 "register_operand" "d")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))]
-  "TARGET_64BIT"
-  "srlg\t%0,%1,%Y2"
-  [(set_attr "op_type"  "RSE")
+(define_insn "*ashr<mode>3_cconly_and"
+  [(set (reg CC_REGNUM)
+        (compare (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                               (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                                      (match_operand:SI 3 "const_int_operand"   "n")))
+                 (const_int 0)))
+   (clobber (match_scratch:GPR 0 "=d"))]
+  "s390_match_ccmode(insn, CCSmode) && (INTVAL (operands[3]) & 63) == 63"
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
-;
-; lshrsi3 instruction pattern(s).
-;
-
-(define_insn "lshrsi3"
-  [(set (match_operand:SI 0 "register_operand" "=d")
-        (lshiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                     (match_operand:SI 2 "shift_count_operand" "Y")))]
-  ""
-  "srl\t%0,%Y2"
-  [(set_attr "op_type"  "RS")
+(define_insn "*ashr<mode>3_and"
+  [(set (match_operand:GPR 0 "register_operand" "=d")
+        (ashiftrt:GPR (match_operand:GPR 1 "register_operand" "<d0>")
+                      (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
+                             (match_operand:SI 3 "const_int_operand"   "n"))))
+   (clobber (reg:CC CC_REGNUM))]
+  "(INTVAL (operands[3]) & 63) == 63"
+  "sra<g>\t%0,<1>%Y2"
+  [(set_attr "op_type"  "RS<E>")
    (set_attr "atype"    "reg")])
 
 
 ;; Branch instruction patterns.
 ;;
 
-(define_expand "beq"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (EQ, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bne"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (NE, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bgt"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (GT, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bgtu"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (GTU, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "blt"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (LT, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bltu"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (LTU, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bge"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (GE, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bgeu"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (GEU, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "ble"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (LE, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bleu"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (LEU, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bunordered"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNORDERED, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bordered"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (ORDERED, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "buneq"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNEQ, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bunlt"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNLT, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bungt"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNGT, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bunle"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNLE, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bunge"
-  [(match_operand 0 "" "")]
-  ""
-  "s390_emit_jump (operands[0],
-    s390_emit_compare (UNGE, s390_compare_op0, s390_compare_op1)); DONE;")
-
-(define_expand "bltgt"
-  [(match_operand 0 "" "")]
+(define_expand "b<code>"
+  [(set (pc)
+        (if_then_else (COMPARE (match_operand 0 "" "")
+                               (const_int 0))
+                      (match_dup 0)
+                      (pc)))]
   ""
   "s390_emit_jump (operands[0],
-    s390_emit_compare (LTGT, s390_compare_op0, s390_compare_op1)); DONE;")
+    s390_emit_compare (<CODE>, s390_compare_op0, s390_compare_op1)); DONE;")
 
 
 ;;
 (define_insn "*cjump_64"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (label_ref (match_operand 0 "" ""))
           (pc)))]
   "TARGET_CPU_ZARCH"
 (define_insn "*cjump_31"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (label_ref (match_operand 0 "" ""))
           (pc)))]
   "!TARGET_CPU_ZARCH"
 {
-  if (get_attr_length (insn) == 4)
-    return "j%C1\t%l0";
-  else
-    abort ();
+  gcc_assert (get_attr_length (insn) == 4);
+  return "j%C1\t%l0";
 }
   [(set_attr "op_type" "RI")
    (set_attr "type"    "branch")
 (define_insn "*cjump_long"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (match_operand 0 "address_operand" "U")
           (pc)))]
   ""
 (define_insn "*icjump_64"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (pc)
           (label_ref (match_operand 0 "" ""))))]
   "TARGET_CPU_ZARCH"
 (define_insn "*icjump_31"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (pc)
           (label_ref (match_operand 0 "" ""))))]
   "!TARGET_CPU_ZARCH"
 {
-  if (get_attr_length (insn) == 4)
-    return "j%D1\t%l0";
-  else
-    abort ();
+  gcc_assert (get_attr_length (insn) == 4);
+  return "j%D1\t%l0";
 }
   [(set_attr "op_type" "RI")
    (set_attr "type"    "branch")
 (define_insn "*icjump_long"
   [(set (pc)
         (if_then_else
-          (match_operator 1 "s390_comparison" [(reg 33) (const_int 0)])
+          (match_operator 1 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
           (pc)
           (match_operand 0 "address_operand" "U")))]
   ""
 })
 
 (define_insn "*trap"
-  [(trap_if (match_operator 0 "s390_comparison" [(reg 33) (const_int 0)])
+  [(trap_if (match_operator 0 "s390_comparison" [(reg CC_REGNUM) (const_int 0)])
            (const_int 0))]
   ""
   "j%C0\t.+2";
    (set (match_operand:SI 2 "nonimmediate_operand" "=1,?*m*d")
         (plus:SI (match_dup 1) (const_int -1)))
    (clobber (match_scratch:SI 3 "=X,&1"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_CPU_ZARCH"
 {
   if (which_alternative != 0)
   "&& reload_completed
    && (! REG_P (operands[2])
        || ! rtx_equal_p (operands[1], operands[2]))"
-  [(parallel [(set (reg:CCAN 33)
+  [(parallel [(set (reg:CCAN CC_REGNUM)
                    (compare:CCAN (plus:SI (match_dup 3) (const_int -1))
                                  (const_int 0)))
               (set (match_dup 3) (plus:SI (match_dup 3) (const_int -1)))])
    (set (match_dup 2) (match_dup 3))
-   (set (pc) (if_then_else (ne (reg:CCAN 33) (const_int 0))
+   (set (pc) (if_then_else (ne (reg:CCAN CC_REGNUM) (const_int 0))
                            (label_ref (match_dup 0))
                            (pc)))]
   ""
    (set (match_operand:SI 2 "nonimmediate_operand" "=1,?*m*d")
         (plus:SI (match_dup 1) (const_int -1)))
    (clobber (match_scratch:SI 3 "=X,&1"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_CPU_ZARCH"
 {
   if (which_alternative != 0)
   else if (get_attr_length (insn) == 4)
     return "brct\t%1,%l0";
   else
-    abort ();
+    gcc_unreachable ();
 }
   "&& reload_completed
    && (! REG_P (operands[2])
        || ! rtx_equal_p (operands[1], operands[2]))"
-  [(parallel [(set (reg:CCAN 33)
+  [(parallel [(set (reg:CCAN CC_REGNUM)
                    (compare:CCAN (plus:SI (match_dup 3) (const_int -1))
                                  (const_int 0)))
               (set (match_dup 3) (plus:SI (match_dup 3) (const_int -1)))])
    (set (match_dup 2) (match_dup 3))
-   (set (pc) (if_then_else (ne (reg:CCAN 33) (const_int 0))
+   (set (pc) (if_then_else (ne (reg:CCAN CC_REGNUM) (const_int 0))
                            (label_ref (match_dup 0))
                            (pc)))]
   ""
    (set (match_operand:SI 2 "register_operand" "=1,?*m*d")
         (plus:SI (match_dup 1) (const_int -1)))
    (clobber (match_scratch:SI 3 "=X,&1"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "!TARGET_CPU_ZARCH"
 {
   if (get_attr_op_type (insn) == OP_TYPE_RR)
    (set (match_operand:DI 2 "nonimmediate_operand" "=1,?*m*d")
         (plus:DI (match_dup 1) (const_int -1)))
    (clobber (match_scratch:DI 3 "=X,&1"))
-   (clobber (reg:CC 33))]
+   (clobber (reg:CC CC_REGNUM))]
   "TARGET_64BIT"
 {
   if (which_alternative != 0)
   "&& reload_completed
    && (! REG_P (operands[2])
        || ! rtx_equal_p (operands[1], operands[2]))"
-  [(parallel [(set (reg:CCAN 33)
+  [(parallel [(set (reg:CCAN CC_REGNUM)
                    (compare:CCAN (plus:DI (match_dup 3) (const_int -1))
                                  (const_int 0)))
               (set (match_dup 3) (plus:DI (match_dup 3) (const_int -1)))])
    (set (match_dup 2) (match_dup 3))
-   (set (pc) (if_then_else (ne (reg:CCAN 33) (const_int 0))
+   (set (pc) (if_then_else (ne (reg:CCAN CC_REGNUM) (const_int 0))
                            (label_ref (match_dup 0))
                            (pc)))]
   ""
   [(set (pc) (label_ref (match_operand 0 "" "")))]
   "!TARGET_CPU_ZARCH"
 {
-  if (get_attr_length (insn) == 4)
-    return "j\t%l0";
-  else
-    abort ();
+  gcc_assert (get_attr_length (insn) == 4);
+  return "j\t%l0";
 }
   [(set_attr "op_type" "RI")
    (set_attr "type"  "branch")
 })
 
 (define_insn "*sibcall_br"
-  [(call (mem:QI (reg 1))
+  [(call (mem:QI (reg SIBCALL_REGNUM))
          (match_operand 0 "const_int_operand" "n"))]
   "SIBLING_CALL_P (insn)
    && GET_MODE (XEXP (XEXP (PATTERN (insn), 0), 0)) == Pmode"
 
 (define_insn "*sibcall_value_br"
   [(set (match_operand 0 "" "")
-       (call (mem:QI (reg 1))
+       (call (mem:QI (reg SIBCALL_REGNUM))
              (match_operand 1 "const_int_operand" "n")))]
   "SIBLING_CALL_P (insn)
    && GET_MODE (XEXP (XEXP (XEXP (PATTERN (insn), 1), 0), 0)) == Pmode"
 ;;
 
 (define_expand "get_tp_64"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "") (reg:DI 36))]
+  [(set (match_operand:DI 0 "nonimmediate_operand" "") (reg:DI TP_REGNUM))]
   "TARGET_64BIT"
   "")
 
 (define_expand "get_tp_31"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "") (reg:SI 36))]
+  [(set (match_operand:SI 0 "nonimmediate_operand" "") (reg:SI TP_REGNUM))]
   "!TARGET_64BIT"
   "")
 
 (define_expand "set_tp_64"
-  [(set (reg:DI 36) (match_operand:DI 0 "nonimmediate_operand" ""))
-   (set (reg:DI 36) (unspec_volatile:DI [(reg:DI 36)] UNSPECV_SET_TP))]
+  [(set (reg:DI TP_REGNUM) (match_operand:DI 0 "nonimmediate_operand" ""))
+   (set (reg:DI TP_REGNUM) (unspec_volatile:DI [(reg:DI TP_REGNUM)] UNSPECV_SET_TP))]
   "TARGET_64BIT"
   "")
 
 (define_expand "set_tp_31"
-  [(set (reg:SI 36) (match_operand:SI 0 "nonimmediate_operand" ""))
-   (set (reg:SI 36) (unspec_volatile:SI [(reg:SI 36)] UNSPECV_SET_TP))]
+  [(set (reg:SI TP_REGNUM) (match_operand:SI 0 "nonimmediate_operand" ""))
+   (set (reg:SI TP_REGNUM) (unspec_volatile:SI [(reg:SI TP_REGNUM)] UNSPECV_SET_TP))]
   "!TARGET_64BIT"
   "")
 
 (define_insn "*set_tp"
-  [(set (reg 36) (unspec_volatile [(reg 36)] UNSPECV_SET_TP))]
+  [(set (reg TP_REGNUM) (unspec_volatile [(reg TP_REGNUM)] UNSPECV_SET_TP))]
   ""
   ""
   [(set_attr "type" "none")
    (set_attr "atype" "agen")])
 
 ;;
+;;- Atomic operations
+;;
+
+;
+; memory barrier pattern.
+;
+
+(define_expand "memory_barrier"
+  [(set (mem:BLK (match_dup 0))
+       (unspec_volatile:BLK [(mem:BLK (match_dup 0))] UNSPECV_MB))]
+  ""
+{
+  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (DImode));
+  MEM_VOLATILE_P (operands[0]) = 1;
+})
+
+(define_insn "*memory_barrier"
+  [(set (match_operand:BLK 0 "" "")
+       (unspec_volatile:BLK [(match_operand:BLK 1 "" "")] UNSPECV_MB))]
+  ""
+  "bcr\t15,0"
+  [(set_attr "op_type" "RR")])
+
+;
+; compare and swap patterns.
+;
+
+(define_expand "sync_compare_and_swap<mode>"
+  [(parallel
+    [(set (match_operand:TDSI 0 "register_operand" "")
+         (match_operand:TDSI 1 "memory_operand" ""))
+     (set (match_dup 1)
+         (unspec_volatile:TDSI
+           [(match_dup 1)
+            (match_operand:TDSI 2 "register_operand" "")
+            (match_operand:TDSI 3 "register_operand" "")]
+           UNSPECV_CAS))
+     (set (reg:CCZ1 CC_REGNUM)
+         (compare:CCZ1 (match_dup 1) (match_dup 2)))])]
+  "")
+
+(define_expand "sync_compare_and_swap<mode>"
+  [(parallel
+    [(set (match_operand:HQI 0 "register_operand" "")
+         (match_operand:HQI 1 "memory_operand" ""))
+     (set (match_dup 1)
+         (unspec_volatile:HQI
+           [(match_dup 1)
+            (match_operand:HQI 2 "general_operand" "")
+            (match_operand:HQI 3 "general_operand" "")]
+           UNSPECV_CAS))
+     (set (reg:CCZ1 CC_REGNUM)
+         (compare:CCZ1 (match_dup 1) (match_dup 2)))])]
+  ""
+  "s390_expand_cs_hqi (<MODE>mode, operands[0], operands[1], 
+                      operands[2], operands[3]); DONE;")
+
+(define_expand "sync_compare_and_swap_cc<mode>"
+  [(parallel
+    [(set (match_operand:TDSI 0 "register_operand" "")
+         (match_operand:TDSI 1 "memory_operand" ""))
+     (set (match_dup 1)
+         (unspec_volatile:TDSI
+           [(match_dup 1)
+            (match_operand:TDSI 2 "register_operand" "")
+            (match_operand:TDSI 3 "register_operand" "")]
+           UNSPECV_CAS))
+     (set (match_dup 4)
+         (compare:CCZ1 (match_dup 1) (match_dup 2)))])]
+  ""
+{
+  /* Emulate compare.  */
+  operands[4] = gen_rtx_REG (CCZ1mode, CC_REGNUM);
+  s390_compare_op0 = operands[1];
+  s390_compare_op1 = operands[2];
+  s390_compare_emitted = operands[4];
+})
+
+(define_insn "*sync_compare_and_swap<mode>"
+  [(set (match_operand:DP 0 "register_operand" "=r")
+       (match_operand:DP 1 "memory_operand" "+Q"))
+   (set (match_dup 1)
+       (unspec_volatile:DP
+         [(match_dup 1)
+          (match_operand:DP 2 "register_operand" "0")
+          (match_operand:DP 3 "register_operand" "r")]
+         UNSPECV_CAS))
+   (set (reg:CCZ1 CC_REGNUM)
+       (compare:CCZ1 (match_dup 1) (match_dup 2)))]
+  ""
+  "cds<tg>\t%0,%3,%S1"
+  [(set_attr "op_type" "RS<TE>")
+   (set_attr "type"   "sem")])
+
+(define_insn "*sync_compare_and_swap<mode>"
+  [(set (match_operand:GPR 0 "register_operand" "=r")
+       (match_operand:GPR 1 "memory_operand" "+Q"))
+   (set (match_dup 1)
+       (unspec_volatile:GPR
+         [(match_dup 1)
+          (match_operand:GPR 2 "register_operand" "0")
+          (match_operand:GPR 3 "register_operand" "r")]
+         UNSPECV_CAS))
+   (set (reg:CCZ1 CC_REGNUM)
+       (compare:CCZ1 (match_dup 1) (match_dup 2)))]
+  "" 
+  "cs<g>\t%0,%3,%S1"
+  [(set_attr "op_type" "RS<E>")
+   (set_attr "type"   "sem")])
+
+
+;
+; Other atomic instruction patterns.
+;
+
+(define_expand "sync_lock_test_and_set<mode>"
+  [(match_operand:HQI 0 "register_operand")
+   (match_operand:HQI 1 "memory_operand")
+   (match_operand:HQI 2 "general_operand")]
+  ""
+  "s390_expand_atomic (<MODE>mode, SET, operands[0], operands[1], 
+                      operands[2], false); DONE;")
+
+(define_expand "sync_<atomic><mode>"
+  [(set (match_operand:HQI 0 "memory_operand")
+       (ATOMIC:HQI (match_dup 0)
+                   (match_operand:HQI 1 "general_operand")))]
+  ""
+  "s390_expand_atomic (<MODE>mode, <CODE>, NULL_RTX, operands[0], 
+                      operands[1], false); DONE;")
+
+(define_expand "sync_old_<atomic><mode>"
+  [(set (match_operand:HQI 0 "register_operand")
+       (match_operand:HQI 1 "memory_operand"))
+   (set (match_dup 1)
+       (ATOMIC:HQI (match_dup 1)
+                   (match_operand:HQI 2 "general_operand")))]
+  ""
+  "s390_expand_atomic (<MODE>mode, <CODE>, operands[0], operands[1], 
+                      operands[2], false); DONE;")
+
+(define_expand "sync_new_<atomic><mode>"
+  [(set (match_operand:HQI 0 "register_operand")
+       (ATOMIC:HQI (match_operand:HQI 1 "memory_operand")
+                   (match_operand:HQI 2 "general_operand"))) 
+   (set (match_dup 1) (ATOMIC:HQI (match_dup 1) (match_dup 2)))]
+  ""
+  "s390_expand_atomic (<MODE>mode, <CODE>, operands[0], operands[1], 
+                      operands[2], true); DONE;")
+
+;;
 ;;- Miscellaneous instructions.
 ;;
 
   DONE;
 })
 
+(define_expand "exception_receiver"
+  [(const_int 0)]
+  ""
+{
+  s390_set_has_landing_pad_p (true);
+  DONE;
+})
 
 ;
 ; nop instruction pattern(s).
   [(set (match_operand 0 "register_operand" "=a")
         (unspec_volatile [(const_int 0)] UNSPECV_MAIN_POOL))]
   "GET_MODE (operands[0]) == Pmode"
-  "* abort ();"
+{
+  gcc_unreachable ();
+}
   [(set (attr "type") 
         (if_then_else (ne (symbol_ref "TARGET_CPU_ZARCH") (const_int 0))
                       (const_string "larl") (const_string "la")))])
 (define_insn "pool"
   [(unspec_volatile [(match_operand 0 "const_int_operand" "n")] UNSPECV_POOL)]
   ""
-  "* abort ();"
+{
+  gcc_unreachable ();
+}
   [(set (attr "length") (symbol_ref "INTVAL (operands[0])"))])
 
 ;;
   ""
   "s390_emit_prologue (); DONE;")
 
-(define_insn "prologue_tpf"
-  [(unspec_volatile [(const_int 0)] UNSPECV_TPF_PROLOGUE)
-   (clobber (reg:DI 1))]
-  "TARGET_TPF_PROFILING"
-  "larl\t%%r1,.+14\;tm\t4065,255\;bnz\t4064"
-  [(set_attr "length"   "14")])
-
 (define_expand "epilogue"
   [(use (const_int 1))]
   ""
   "s390_emit_epilogue (false); DONE;")
 
-(define_insn "epilogue_tpf"
-  [(unspec_volatile [(const_int 0)] UNSPECV_TPF_EPILOGUE)
-   (clobber (reg:DI 1))]
-  "TARGET_TPF_PROFILING"
-  "larl\t%%r1,.+14\;tm\t4071,255\;bnz\t4070"
-  [(set_attr "length"   "14")])
-
 (define_expand "sibcall_epilogue"
   [(use (const_int 0))]
   ""
   DONE;
 })
 
+;
+; Stack Protector Patterns
+;
+
+(define_expand "stack_protect_set"
+  [(set (match_operand 0 "memory_operand" "")
+       (match_operand 1 "memory_operand" ""))]
+  ""
+{
+#ifdef TARGET_THREAD_SSP_OFFSET
+  operands[1]
+    = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, s390_get_thread_pointer (),
+                                        GEN_INT (TARGET_THREAD_SSP_OFFSET)));
+#endif
+  if (TARGET_64BIT)
+    emit_insn (gen_stack_protect_setdi (operands[0], operands[1]));
+  else
+    emit_insn (gen_stack_protect_setsi (operands[0], operands[1]));
+
+  DONE;
+})
+
+(define_insn "stack_protect_set<mode>"
+  [(set (match_operand:DSI 0 "memory_operand" "=Q")
+        (unspec:DSI [(match_operand:DSI 1 "memory_operand" "Q")] UNSPEC_SP_SET))]
+  ""
+  "mvc\t%O0(%G0,%R0),%S1"
+  [(set_attr "op_type" "SS")])
+
+(define_expand "stack_protect_test"
+  [(set (reg:CC CC_REGNUM)
+       (compare (match_operand 0 "memory_operand" "")
+                (match_operand 1 "memory_operand" "")))
+   (match_operand 2 "" "")]
+  ""
+{
+#ifdef TARGET_THREAD_SSP_OFFSET
+  operands[1]
+    = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, s390_get_thread_pointer (),
+                                        GEN_INT (TARGET_THREAD_SSP_OFFSET)));
+#endif
+  s390_compare_op0 = operands[0];
+  s390_compare_op1 = operands[1];
+  s390_compare_emitted = gen_rtx_REG (CCZmode, CC_REGNUM);
+
+  if (TARGET_64BIT)
+    emit_insn (gen_stack_protect_testdi (operands[0], operands[1]));
+  else
+    emit_insn (gen_stack_protect_testsi (operands[0], operands[1]));
+
+  emit_jump_insn (gen_beq (operands[2]));
+
+  DONE;
+})
+
+(define_insn "stack_protect_test<mode>"
+  [(set (reg:CCZ CC_REGNUM)
+        (unspec:CCZ [(match_operand:DSI 0 "memory_operand" "Q")
+                    (match_operand:DSI 1 "memory_operand" "Q")] UNSPEC_SP_TEST))]
+  ""
+  "clc\t%O0(%G0,%R0),%S1"
+  [(set_attr "op_type" "SS")])