OSDN Git Service

* target.h (invalid_conversion, invalid_unary_op,
[pf3gnuchains/gcc-fork.git] / gcc / config / ia64 / ia64.md
index 6a6f91f..18e6cb3 100644 (file)
@@ -1,24 +1,25 @@
 ;; IA-64 Machine description template
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 ;; Contributed by James E. Wilson <wilson@cygnus.com> and
 ;;               David Mosberger <davidm@hpl.hp.com>.
 
-;; This file is part of GNU CC.
+;; This file is part of GCC.
 
-;; GNU CC is free software; you can redistribute it and/or modify
+;; GCC is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; GNU CC is distributed in the hope that it will be useful,
+;; GCC is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU CC; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GCC; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;- See file "rtl.def" for documentation on define_insn, match_*, et. al.
 
 
 ;; ??? Need a better way to describe alternate fp status registers.
 
-;; Unspec usage:
-;;
-;; unspec:
-;;     1       gr_spill
-;;     2       gr_restore
-;;     3       fr_spill
-;;     4       fr_restore
-;;     5       recip_approx
-;;     7       pred_rel_mutex
-;;     8       popcnt
-;;     9       pic call
-;;     12      mf
-;;     13      cmpxchg_acq
-;;     19      fetchadd_acq
-;;     20      bsp_value
-;;     21      flushrs
-;;     22      bundle selector
-;;     23      cycle display
-;;
-;; unspec_volatile:
-;;     0       alloc
-;;     1       blockage
-;;     2       insn_group_barrier
-;;     5       set_bsp
-;;     8       pred.safe_across_calls all
-;;     9       pred.safe_across_calls normal
+(define_constants
+  [; Relocations
+   (UNSPEC_LTOFF_DTPMOD                0)
+   (UNSPEC_LTOFF_DTPREL                1)
+   (UNSPEC_DTPREL              2)
+   (UNSPEC_LTOFF_TPREL         3)
+   (UNSPEC_TPREL               4)
+   (UNSPEC_DTPMOD              5)
+
+   (UNSPEC_LD_BASE             9)
+   (UNSPEC_GR_SPILL            10)
+   (UNSPEC_GR_RESTORE          11)
+   (UNSPEC_FR_SPILL            12)
+   (UNSPEC_FR_RESTORE          13)
+   (UNSPEC_FR_RECIP_APPROX     14)
+   (UNSPEC_PRED_REL_MUTEX      15)
+   (UNSPEC_GETF_EXP            16)
+   (UNSPEC_PIC_CALL            17)
+   (UNSPEC_MF                  18)
+   (UNSPEC_CMPXCHG_ACQ         19)
+   (UNSPEC_FETCHADD_ACQ                20)
+   (UNSPEC_BSP_VALUE           21)
+   (UNSPEC_FLUSHRS             22)
+   (UNSPEC_BUNDLE_SELECTOR     23)
+   (UNSPEC_ADDP4               24)
+   (UNSPEC_PROLOGUE_USE                25)
+   (UNSPEC_RET_ADDR            26)
+   (UNSPEC_SETF_EXP             27)
+   (UNSPEC_FR_SQRT_RECIP_APPROX 28)
+   (UNSPEC_SHRP                        29)
+   (UNSPEC_COPYSIGN            30)
+   (UNSPEC_VECT_EXTR           31)
+  ])
+
+(define_constants
+  [(UNSPECV_ALLOC              0)
+   (UNSPECV_BLOCKAGE           1)
+   (UNSPECV_INSN_GROUP_BARRIER 2)
+   (UNSPECV_BREAK              3)
+   (UNSPECV_SET_BSP            4)
+   (UNSPECV_PSAC_ALL           5)      ; pred.safe_across_calls
+   (UNSPECV_PSAC_NORMAL                6)
+   (UNSPECV_SETJMP_RECEIVER    7)
+  ])
+
+(include "predicates.md")
 \f
 ;; ::::::::::::::::::::
 ;; ::
 ;; ::
 ;; ::::::::::::::::::::
 
+;; Processor type.  This attribute must exactly match the processor_type
+;; enumeration in ia64.h.
+(define_attr "cpu" "itanium,itanium2" (const (symbol_ref "ia64_tune")))
+
 ;; Instruction type.  This primarily determines how instructions can be
 ;; packed in bundles, and secondarily affects scheduling to function units.
 
 ;; multiple instructions, patterns which emit 0 instructions, and patterns
 ;; which emit instruction that can go in any slot (e.g. nop).
 
-(define_attr "itanium_class" "unknown,ignore,stop_bit,br,fcmp,fcvtfx,fld,fmac,fmisc,frar_i,frar_m,frbr,frfr,frpr,ialu,icmp,ilog,ishf,ld,chk_s,long_i,mmmul,mmshf,mmshfi,rse_m,scall,sem,stf,st,syst_m0,syst_m,tbit,toar_i,toar_m,tobr,tofr,topr,xmpy,xtd,nop_b,nop_f,nop_i,nop_m,nop_x"
-         (const_string "unknown"))
+(define_attr "itanium_class" "unknown,ignore,stop_bit,br,fcmp,fcvtfx,fld,
+       fmac,fmisc,frar_i,frar_m,frbr,frfr,frpr,ialu,icmp,ilog,ishf,ld,
+       chk_s,long_i,mmalua,mmmul,mmshf,mmshfi,rse_m,scall,sem,stf,
+        st,syst_m0, syst_m,tbit,toar_i,toar_m,tobr,tofr,topr,xmpy,xtd,nop,
+        nop_b,nop_f,nop_i,nop_m,nop_x,lfetch,pre_cycle"
+  (const_string "unknown"))
 
 ;; chk_s has an I and an M form; use type A for convenience.
 (define_attr "type" "unknown,A,I,M,F,B,L,X,S"
   (cond [(eq_attr "itanium_class" "ld,st,fld,stf,sem,nop_m") (const_string "M")
         (eq_attr "itanium_class" "rse_m,syst_m,syst_m0") (const_string "M")
         (eq_attr "itanium_class" "frar_m,toar_m,frfr,tofr") (const_string "M")
-        (eq_attr "itanium_class" "chk_s,ialu,icmp,ilog") (const_string "A")
+        (eq_attr "itanium_class" "lfetch") (const_string "M")
+        (eq_attr "itanium_class" "chk_s,ialu,icmp,ilog,mmalua")
+          (const_string "A")
         (eq_attr "itanium_class" "fmisc,fmac,fcmp,xmpy") (const_string "F")
         (eq_attr "itanium_class" "fcvtfx,nop_f") (const_string "F")
         (eq_attr "itanium_class" "frar_i,toar_i,frbr,tobr") (const_string "I")
 
 (define_attr "predicable" "no,yes" (const_string "yes"))
 
+;; Empty.  True iff this insn does not generate any code.
+
+(define_attr "empty" "no,yes" (const_string "no"))
+
+;; True iff this insn must be the first insn of an instruction group.
+;; This is true for the alloc instruction, and will also be true of others
+;; when we have full intrinsics support.
+
+(define_attr "first_insn" "no,yes" (const_string "no"))
 \f
-;; ::::::::::::::::::::
-;; ::
-;; :: Function Units
-;; ::
-;; ::::::::::::::::::::
+;; DFA descriptions of ia64 processors used for insn scheduling and
+;; bundling.
+
+(automata_option "ndfa")
+
+;; Uncomment the following line to output automata for debugging.
+;; (automata_option "v")
+
+(automata_option "w")
+
+(include "itanium1.md")
+(include "itanium2.md")
 
-;; We define 6 "dummy" functional units.  All the real work to decide which
-;; insn uses which unit is done by our MD_SCHED_REORDER hooks.  We only
-;; have to ensure here that there are enough copies of the dummy unit so
-;; that the scheduler doesn't get confused by MD_SCHED_REORDER.
-;; Other than the 6 dummies for normal insns, we also add a single dummy unit
-;; for stop bits.
-
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "br")     0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "scall")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "fcmp")   2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "fcvtfx") 7 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "fld")    9 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "fmac")   5 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "fmisc")  5 0)
-
-;; There is only one insn `mov = ar.bsp' for frar_i:
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "frar_i") 13 0)
-;; There is only ony insn `mov = ar.unat' for frar_m:
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "frar_m") 6 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "frbr")   2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "frfr")   2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "frpr")   2 0)
-
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "ialu")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "icmp")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "ilog")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "ishf")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "ld")     2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "long_i") 1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "mmmul")  2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "mmshf")  2 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "mmshfi")  2 0)
-
-;; Now we have only one insn (flushrs) of such class.  We assume that flushrs
-;; is the 1st syllable of the bundle after stop bit.
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "rse_m")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "sem")   11 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "stf")    1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "st")     1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "syst_m0") 1 0)
-;; Now we use only one insn `mf'.  Therfore latency time is set up to 0.
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "syst_m") 0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "tbit")   1 0)
-
-;; There is only one insn `mov ar.pfs =' for toar_i therefore we use
-;; latency time equal to 0:
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "toar_i") 0 0)
-;; There are only ony 2 insns `mov ar.ccv =' and `mov ar.unat =' for toar_m:
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "toar_m") 5 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "tobr")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "tofr")   9 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "topr")   1 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "xmpy")   7 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "xtd")    1 0)
-
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "nop_m")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "nop_i")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "nop_f")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "nop_b")  0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "nop_x")  0 0)
-
-(define_function_unit "stop_bit" 1 1 (eq_attr "itanium_class" "stop_bit") 0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "ignore") 0 0)
-(define_function_unit "dummy" 6 1 (eq_attr "itanium_class" "unknown") 0 0)
 \f
 ;; ::::::::::::::::::::
 ;; ::
    && GET_CODE (operands[1]) == REG && PR_REGNO_P (REGNO (operands[1]))"
   [(set (match_dup 2) (match_dup 4))
    (set (match_dup 3) (match_dup 5))
-   (set (match_dup 0) (unspec:BI [(match_dup 0)] 7))]
+   (set (match_dup 0) (unspec:BI [(match_dup 0)] UNSPEC_PRED_REL_MUTEX))]
   "operands[2] = gen_rtx_REG (CCImode, REGNO (operands[0]));
    operands[3] = gen_rtx_REG (CCImode, REGNO (operands[0]) + 1);
    operands[4] = gen_rtx_REG (CCImode, REGNO (operands[1]));
   [(set (match_operand:QI 0 "general_operand" "")
        (match_operand:QI 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (QImode, operands[1]);
-}")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movqi_internal"
   [(set (match_operand:QI 0 "destination_operand" "=r,r,r, m, r,*f,*f")
   [(set (match_operand:HI 0 "general_operand" "")
        (match_operand:HI 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (HImode, operands[1]);
-}")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movhi_internal"
   [(set (match_operand:HI 0 "destination_operand" "=r,r,r, m, r,*f,*f")
   [(set (match_operand:SI 0 "general_operand" "")
        (match_operand:SI 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (SImode, operands[1]);
-}")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movsi_internal"
   [(set (match_operand:SI 0 "destination_operand" "=r,r,r,r, m, r,*f,*f, r,*d")
   mov %0 = %1
   mov %0 = %1
   mov %0 = %r1"
-;; frar_m, toar_m ??? why not frar_i and toar_i
+  ;; frar_m, toar_m ??? why not frar_i and toar_i
   [(set_attr "itanium_class" "ialu,ialu,long_i,ld,st,frfr,tofr,fmisc,frar_m,toar_m")])
 
 (define_expand "movdi"
   [(set (match_operand:DI 0 "general_operand" "")
        (match_operand:DI 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (DImode, operands[1]);
-  if (! TARGET_NO_PIC && symbolic_operand (operands[1], DImode))
-    {
-      /* Before optimization starts, delay committing to any particular
-        type of PIC address load.  If this function gets deferred, we
-        may acquire information that changes the value of the
-        sdata_symbolic_operand predicate.  */
-      /* But don't delay for function pointers.  Loading a function address
-        actually loads the address of the descriptor not the function.
-        If we represent these as SYMBOL_REFs, then they get cse'd with
-        calls, and we end up with calls to the descriptor address instead of
-        calls to the function address.  Functions are not candidates for
-        sdata anyways.  */
-      if (rtx_equal_function_value_matters
-         && ! (GET_CODE (operands[1]) == SYMBOL_REF
-               && SYMBOL_REF_FLAG (operands[1])))
-       emit_insn (gen_movdi_symbolic (operands[0], operands[1], gen_reg_rtx (DImode)));
-      else
-        ia64_expand_load_address (operands[0], operands[1], NULL_RTX);
-      DONE;
-    }
-}")
-
-;; This is used during early compilation to delay the decision on
-;; how to refer to a variable as long as possible.  This is especially
-;; important between initial rtl generation and optimization for
-;; deferred functions, since we may acquire additional information
-;; on the variables used in the meantime.
-
-;; ??? This causes us to lose REG_LABEL notes, because the insn splitter
-;; does not attempt to preserve any REG_NOTES on the input instruction.
-
-(define_insn_and_split "movdi_symbolic"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (match_operand:DI 1 "symbolic_operand" "s"))
-   (clobber (match_operand:DI  2 "register_operand" "+r"))
-   (use (reg:DI 1))]
-  ""
-  "* abort ();"
-  ""
-  [(const_int 0)]
-  "ia64_expand_load_address (operands[0], operands[1], operands[2]); DONE;")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movdi_internal"
   [(set (match_operand:DI 0 "destination_operand"
                    "=r,r,r,r, m, r,*f,*f,*f, Q, r,*b, r,*e, r,*d, r,*c")
        (match_operand:DI 1 "move_operand"
-                   "rO,J,i,m,rO,*f,rO,*f, Q,*f,*b,rO,*e,rK,*d,rK,*c,rO"))]
+                   "rO,JT,i,m,rO,*f,rO,*f, Q,*f,*b,rO,*e,rK,*d,rK,*c,rO"))]
   "ia64_move_ok (operands[0], operands[1])"
-  "*
 {
   static const char * const alt[] = {
-    \"%,mov %0 = %r1\",
-    \"%,addl %0 = %1, r0\",
-    \"%,movl %0 = %1\",
-    \"%,ld8%O1 %0 = %1%P1\",
-    \"%,st8%Q0 %0 = %r1%P0\",
-    \"%,getf.sig %0 = %1\",
-    \"%,setf.sig %0 = %r1\",
-    \"%,mov %0 = %1\",
-    \"%,ldf8 %0 = %1%P1\",
-    \"%,stf8 %0 = %1%P0\",
-    \"%,mov %0 = %1\",
-    \"%,mov %0 = %r1\",
-    \"%,mov %0 = %1\",
-    \"%,mov %0 = %1\",
-    \"%,mov %0 = %1\",
-    \"%,mov %0 = %1\",
-    \"mov %0 = pr\",
-    \"mov pr = %1, -1\"
+    "%,mov %0 = %r1",
+    "%,addl %0 = %1, r0",
+    "%,movl %0 = %1",
+    "%,ld8%O1 %0 = %1%P1",
+    "%,st8%Q0 %0 = %r1%P0",
+    "%,getf.sig %0 = %1",
+    "%,setf.sig %0 = %r1",
+    "%,mov %0 = %1",
+    "%,ldf8 %0 = %1%P1",
+    "%,stf8 %0 = %1%P0",
+    "%,mov %0 = %1",
+    "%,mov %0 = %r1",
+    "%,mov %0 = %1",
+    "%,mov %0 = %1",
+    "%,mov %0 = %1",
+    "%,mov %0 = %1",
+    "mov %0 = pr",
+    "mov pr = %1, -1"
   };
 
-  if (which_alternative == 2 && ! TARGET_NO_PIC
-      && symbolic_operand (operands[1], VOIDmode))
-    abort ();
+  gcc_assert (which_alternative != 2 || TARGET_NO_PIC
+              || !symbolic_operand (operands[1], VOIDmode));
 
   return alt[which_alternative];
-}"
+}
   [(set_attr "itanium_class" "ialu,ialu,long_i,ld,st,frfr,tofr,fmisc,fld,stf,frbr,tobr,frar_i,toar_i,frar_m,toar_m,frpr,topr")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (match_operand:DI 1 "symbolic_operand" ""))]
-  "reload_completed && ! TARGET_NO_PIC"
+  [(set (match_operand 0 "register_operand" "")
+       (match_operand 1 "symbolic_operand" ""))]
+  "reload_completed"
   [(const_int 0)]
-  "
 {
-  ia64_expand_load_address (operands[0], operands[1], NULL_RTX);
-  DONE;
-}")
+  if (ia64_expand_load_address (operands[0], operands[1]))
+    DONE;
+  else
+    FAIL;
+})
 
 (define_expand "load_fptr"
-  [(set (match_dup 2)
-       (plus:DI (reg:DI 1) (match_operand:DI 1 "function_operand" "")))
-   (set (match_operand:DI 0 "register_operand" "") (match_dup 3))]
-  ""
-  "
+  [(set (match_operand:DI 0 "register_operand" "")
+       (plus:DI (match_dup 2) (match_operand 1 "function_operand" "")))
+   (set (match_dup 0) (match_dup 3))]
+  "reload_completed"
 {
-  operands[2] = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-  operands[3] = gen_rtx_MEM (DImode, operands[2]);
-  RTX_UNCHANGING_P (operands[3]) = 1;
-}")
+  operands[2] = pic_offset_table_rtx;
+  operands[3] = gen_const_mem (DImode, operands[0]);
+})
 
 (define_insn "*load_fptr_internal1"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (plus:DI (reg:DI 1) (match_operand:DI 1 "function_operand" "s")))]
-  ""
+       (plus:DI (reg:DI 1) (match_operand 1 "function_operand" "s")))]
+  "reload_completed"
   "addl %0 = @ltoff(@fptr(%1)), gp"
   [(set_attr "itanium_class" "ialu")])
 
 (define_insn "load_gprel"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (plus:DI (reg:DI 1) (match_operand:DI 1 "sdata_symbolic_operand" "s")))]
-  ""
+       (plus:DI (reg:DI 1) (match_operand 1 "sdata_symbolic_operand" "s")))]
+  "reload_completed"
   "addl %0 = @gprel(%1), gp"
   [(set_attr "itanium_class" "ialu")])
 
-(define_insn "gprel64_offset"
+(define_insn "*gprel64_offset"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (minus:DI (match_operand:DI 1 "symbolic_operand" "") (reg:DI 1)))]
-  ""
+  "reload_completed"
   "movl %0 = @gprel(%1)"
   [(set_attr "itanium_class" "long_i")])
 
 (define_expand "load_gprel64"
-  [(set (match_dup 2)
-       (minus:DI (match_operand:DI 1 "symbolic_operand" "") (match_dup 3)))
-   (set (match_operand:DI 0 "register_operand" "")
-       (plus:DI (match_dup 3) (match_dup 2)))]
-  ""
-  "
+  [(set (match_operand:DI 0 "register_operand" "")
+       (minus:DI (match_operand:DI 1 "symbolic_operand" "") (match_dup 2)))
+   (set (match_dup 0)
+       (plus:DI (match_dup 2) (match_dup 0)))]
+  "reload_completed"
 {
-  operands[2] = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-  operands[3] = pic_offset_table_rtx;
-}")
+  operands[2] = pic_offset_table_rtx;
+})
 
-(define_expand "load_symptr"
-  [(set (match_operand:DI 2 "register_operand" "")
-       (plus:DI (match_dup 4) (match_operand:DI 1 "got_symbolic_operand" "")))
-   (set (match_operand:DI 0 "register_operand" "") (match_dup 3))]
+;; This is used as a placeholder for the return address during early
+;; compilation.  We won't know where we've placed this until during
+;; reload, at which point it can wind up in b0, a general register,
+;; or memory.  The only safe destination under these conditions is a
+;; general register.
+
+(define_insn_and_split "*movdi_ret_addr"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(const_int 0)] UNSPEC_RET_ADDR))]
   ""
-  "
+  "#"
+  "reload_completed"
+  [(const_int 0)]
 {
-  operands[3] = gen_rtx_MEM (DImode, operands[2]);
-  operands[4] = pic_offset_table_rtx;
-  RTX_UNCHANGING_P (operands[3]) = 1;
-}")
+  ia64_split_return_addr_rtx (operands[0]);
+  DONE;
+}
+  [(set_attr "itanium_class" "ialu")])
 
-(define_insn "*load_symptr_internal1"
+(define_insn "*load_symptr_high"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (plus:DI (reg:DI 1) (match_operand:DI 1 "got_symbolic_operand" "s")))]
-  ""
-  "addl %0 = @ltoff(%1), gp"
+       (plus:DI (high:DI (match_operand 1 "got_symbolic_operand" "s"))
+                (match_operand:DI 2 "register_operand" "a")))]
+  "reload_completed"
+{
+  if (HAVE_AS_LTOFFX_LDXMOV_RELOCS)
+    return "%,addl %0 = @ltoffx(%1), %2";
+  else
+    return "%,addl %0 = @ltoff(%1), %2";
+}
   [(set_attr "itanium_class" "ialu")])
 
-;; With no offsettable memory references, we've got to have a scratch
-;; around to play with the second word.
-(define_expand "movti"
-  [(parallel [(set (match_operand:TI 0 "general_operand" "")
-                  (match_operand:TI 1 "general_operand" ""))
-             (clobber (match_scratch:DI 2 ""))])]
+(define_insn "*load_symptr_low"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (lo_sum:DI (match_operand:DI 1 "register_operand" "r")
+                  (match_operand 2 "got_symbolic_operand" "s")))]
+  "reload_completed"
+{
+  if (HAVE_AS_LTOFFX_LDXMOV_RELOCS)
+    return "%,ld8.mov %0 = [%1], %2";
+  else
+    return "%,ld8 %0 = [%1]";
+}
+  [(set_attr "itanium_class" "ld")])
+
+(define_insn_and_split "load_dtpmod"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                  UNSPEC_DTPMOD))]
   ""
-  "
+  "#"
+  "reload_completed"
+  [(set (match_dup 0)
+       (plus:DI (unspec:DI [(match_dup 1)] UNSPEC_LTOFF_DTPMOD)
+                (match_dup 2)))
+   (set (match_dup 0) (match_dup 3))]
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (TImode, operands[1]);
-}")
+  operands[2] = pic_offset_table_rtx;
+  operands[3] = gen_const_mem (DImode, operands[0]);
+})
 
-(define_insn_and_split "*movti_internal"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "=r,r,m")
-       (match_operand:TI 1 "general_operand"      "ri,m,r"))
-   (clobber (match_scratch:DI 2 "=X,&r,&r"))]
-  "ia64_move_ok (operands[0], operands[1])"
+(define_insn "*load_ltoff_dtpmod"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                           UNSPEC_LTOFF_DTPMOD)
+                (match_operand:DI 2 "register_operand" "a")))]
+  "reload_completed"
+  "addl %0 = @ltoff(@dtpmod(%1)), %2"
+  [(set_attr "itanium_class" "ialu")])
+
+(define_expand "load_dtprel"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                  UNSPEC_DTPREL))]
+  ""
+  "")
+
+(define_insn "*load_dtprel64"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "ld_tls_symbolic_operand" "")]
+                  UNSPEC_DTPREL))]
+  "TARGET_TLS64"
+  "movl %0 = @dtprel(%1)"
+  [(set_attr "itanium_class" "long_i")])
+
+(define_insn "*load_dtprel22"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "ld_tls_symbolic_operand" "")]
+                  UNSPEC_DTPREL))]
+  ""
+  "addl %0 = @dtprel(%1), r0"
+  [(set_attr "itanium_class" "ialu")])
+
+(define_insn_and_split "*load_dtprel_gd"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                  UNSPEC_DTPREL))]
+  ""
   "#"
   "reload_completed"
-  [(const_int 0)]
-  "
+  [(set (match_dup 0)
+       (plus:DI (unspec:DI [(match_dup 1)] UNSPEC_LTOFF_DTPREL)
+                (match_dup 2)))
+   (set (match_dup 0) (match_dup 3))]
 {
-  rtx adj1, adj2, in[2], out[2];
-  int first;
+  operands[2] = pic_offset_table_rtx;
+  operands[3] = gen_const_mem (DImode, operands[0]);
+})
+
+(define_insn "*load_ltoff_dtprel"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                           UNSPEC_LTOFF_DTPREL)
+                (match_operand:DI 2 "register_operand" "a")))]
+  ""
+  "addl %0 = @ltoff(@dtprel(%1)), %2"
+  [(set_attr "itanium_class" "ialu")])
 
-  adj1 = ia64_split_timode (in, operands[1], operands[2]);
-  adj2 = ia64_split_timode (out, operands[0], operands[2]);
+(define_expand "add_dtprel"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (plus:DI (unspec:DI [(match_operand 1 "ld_tls_symbolic_operand" "")]
+                           UNSPEC_DTPREL)
+                (match_operand:DI 2 "register_operand" "")))]
+  "!TARGET_TLS64"
+  "")
 
-  first = 0;
-  if (reg_overlap_mentioned_p (out[0], in[1]))
-    {
-      if (reg_overlap_mentioned_p (out[1], in[0]))
-       abort ();
-      first = 1;
-    }
+(define_insn "*add_dtprel14"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "ld_tls_symbolic_operand" "")]
+                           UNSPEC_DTPREL)
+                (match_operand:DI 2 "register_operand" "r")))]
+  "TARGET_TLS14"
+  "adds %0 = @dtprel(%1), %2"
+  [(set_attr "itanium_class" "ialu")])
 
-  if (adj1 && adj2)
-    abort ();
-  if (adj1)
-    emit_insn (adj1);
-  if (adj2)
-    emit_insn (adj2);
-  emit_insn (gen_rtx_SET (VOIDmode, out[first], in[first]));
-  emit_insn (gen_rtx_SET (VOIDmode, out[!first], in[!first]));
-  DONE;
-}"
-  [(set_attr "itanium_class" "unknown")
-   (set_attr "predicable" "no")])
+(define_insn "*add_dtprel22"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "ld_tls_symbolic_operand" "")]
+                           UNSPEC_DTPREL)
+                (match_operand:DI 2 "register_operand" "a")))]
+  "TARGET_TLS22"
+  "addl %0 = @dtprel(%1), %2"
+  [(set_attr "itanium_class" "ialu")])
+
+(define_expand "load_tprel"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
+                  UNSPEC_TPREL))]
+  ""
+  "")
+
+(define_insn "*load_tprel64"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "le_tls_symbolic_operand" "")]
+                  UNSPEC_TPREL))]
+  "TARGET_TLS64"
+  "movl %0 = @tprel(%1)"
+  [(set_attr "itanium_class" "long_i")])
+
+(define_insn "*load_tprel22"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "le_tls_symbolic_operand" "")]
+                  UNSPEC_TPREL))]
+  ""
+  "addl %0 = @tprel(%1), r0"
+  [(set_attr "itanium_class" "ialu")])
 
-;; ??? SSA creates these.  Can't allow memories since we don't have
-;; the scratch register.  Fortunately combine will know how to add
-;; the clobber and scratch.
-(define_insn_and_split "*movti_internal_reg"
-  [(set (match_operand:TI 0 "register_operand"  "=r")
-       (match_operand:TI 1 "nonmemory_operand" "ri"))]
+(define_insn_and_split "*load_tprel_ie"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (unspec:DI [(match_operand 1 "ie_tls_symbolic_operand" "")]
+                  UNSPEC_TPREL))]
   ""
   "#"
   "reload_completed"
-  [(const_int 0)]
-  "
+  [(set (match_dup 0)
+       (plus:DI (unspec:DI [(match_dup 1)] UNSPEC_LTOFF_TPREL)
+                (match_dup 2)))
+   (set (match_dup 0) (match_dup 3))]
 {
-  rtx in[2], out[2];
-  int first;
+  operands[2] = pic_offset_table_rtx;
+  operands[3] = gen_const_mem (DImode, operands[0]);
+})
 
-  ia64_split_timode (in, operands[1], NULL_RTX);
-  ia64_split_timode (out, operands[0], NULL_RTX);
+(define_insn "*load_ltoff_tprel"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "ie_tls_symbolic_operand" "")]
+                           UNSPEC_LTOFF_TPREL)
+                (match_operand:DI 2 "register_operand" "a")))]
+  ""
+  "addl %0 = @ltoff(@tprel(%1)), %2"
+  [(set_attr "itanium_class" "ialu")])
 
-  first = 0;
-  if (reg_overlap_mentioned_p (out[0], in[1]))
-    {
-      if (reg_overlap_mentioned_p (out[1], in[0]))
-       abort ();
-      first = 1;
-    }
+(define_expand "add_tprel"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (plus:DI (unspec:DI [(match_operand 1 "le_tls_symbolic_operand" "")]
+                           UNSPEC_TPREL)
+                (match_operand:DI 2 "register_operand" "")))]
+  "!TARGET_TLS64"
+  "")
 
-  emit_insn (gen_rtx_SET (VOIDmode, out[first], in[first]));
-  emit_insn (gen_rtx_SET (VOIDmode, out[!first], in[!first]));
-  DONE;
-}"
-  [(set_attr "itanium_class" "unknown")
-   (set_attr "predicable" "no")])
+(define_insn "*add_tprel14"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "le_tls_symbolic_operand" "")]
+                           UNSPEC_TPREL)
+                (match_operand:DI 2 "register_operand" "r")))]
+  "TARGET_TLS14"
+  "adds %0 = @tprel(%1), %2"
+  [(set_attr "itanium_class" "ialu")])
 
-(define_expand "reload_inti"
-  [(parallel [(set (match_operand:TI 0 "register_operand" "=r")
-                  (match_operand:TI 1 "" "m"))
-             (clobber (match_operand:TI 2 "register_operand" "=&r"))])]
+(define_insn "*add_tprel22"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (plus:DI (unspec:DI [(match_operand 1 "le_tls_symbolic_operand" "")]
+                           UNSPEC_TPREL)
+                (match_operand:DI 2 "register_operand" "a")))]
+  "TARGET_TLS22"
+  "addl %0 = @tprel(%1), %2"
+  [(set_attr "itanium_class" "ialu")])
+
+;; With no offsettable memory references, we've got to have a scratch
+;; around to play with the second word.  However, in order to avoid a
+;; reload nightmare we lie, claim we don't need one, and fix it up
+;; in ia64_split_tmode_move.
+(define_expand "movti"
+  [(set (match_operand:TI 0 "general_operand" "")
+       (match_operand:TI 1 "general_operand" ""))]
   ""
-  "
 {
-  unsigned int s_regno = REGNO (operands[2]);
-  if (s_regno == REGNO (operands[0]))
-    s_regno += 1;
-  operands[2] = gen_rtx_REG (DImode, s_regno);
-}")
-
-(define_expand "reload_outti"
-  [(parallel [(set (match_operand:TI 0 "" "=m")
-                  (match_operand:TI 1 "register_operand" "r"))
-             (clobber (match_operand:TI 2 "register_operand" "=&r"))])]
-  ""
-  "
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
+
+(define_insn_and_split "*movti_internal"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=r,r,m")
+       (match_operand:TI 1 "general_operand"      "ri,m,r"))]
+  "ia64_move_ok (operands[0], operands[1])"
+  "#"
+  "reload_completed"
+  [(const_int 0)]
 {
-  unsigned int s_regno = REGNO (operands[2]);
-  if (s_regno == REGNO (operands[1]))
-    s_regno += 1;
-  operands[2] = gen_rtx_REG (DImode, s_regno);
-}")
+  ia64_split_tmode_move (operands);
+  DONE;
+}
+  [(set_attr "itanium_class" "unknown")
+   (set_attr "predicable" "no")])
 
 ;; Floating Point Moves
 ;;
 ;; Note - Patterns for SF mode moves are compulsory, but
-;; patterns for DF are optional, as GCC can synthesise them.
+;; patterns for DF are optional, as GCC can synthesize them.
 
 (define_expand "movsf"
   [(set (match_operand:SF 0 "general_operand" "")
        (match_operand:SF 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (SFmode, operands[1]);
-}")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movsf_internal"
   [(set (match_operand:SF 0 "destination_operand" "=f,f, Q,*r, f,*r,*r, m")
        (match_operand:SF 1 "general_operand"     "fG,Q,fG,fG,*r,*r, m,*r"))]
   "ia64_move_ok (operands[0], operands[1])"
   "@
-  mov %0 = %F1
-  ldfs %0 = %1%P1
-  stfs %0 = %F1%P0
-  getf.s %0 = %F1
-  setf.s %0 = %1
-  mov %0 = %1
-  ld4%O1 %0 = %1%P1
-  st4%Q0 %0 = %1%P0"
+   mov %0 = %F1
+   ldfs %0 = %1%P1
+   stfs %0 = %F1%P0
+   getf.s %0 = %F1
+   setf.s %0 = %1
+   mov %0 = %1
+   ld4%O1 %0 = %1%P1
+   st4%Q0 %0 = %1%P0"
   [(set_attr "itanium_class" "fmisc,fld,stf,frfr,tofr,ialu,ld,st")])
 
 (define_expand "movdf"
   [(set (match_operand:DF 0 "general_operand" "")
        (match_operand:DF 1 "general_operand" ""))]
   ""
-  "
 {
-  if (! reload_in_progress && ! reload_completed
-      && ! ia64_move_ok (operands[0], operands[1]))
-    operands[1] = force_reg (DFmode, operands[1]);
-}")
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
 
 (define_insn "*movdf_internal"
   [(set (match_operand:DF 0 "destination_operand" "=f,f, Q,*r, f,*r,*r, m")
        (match_operand:DF 1 "general_operand"     "fG,Q,fG,fG,*r,*r, m,*r"))]
   "ia64_move_ok (operands[0], operands[1])"
   "@
-  mov %0 = %F1
-  ldfd %0 = %1%P1
-  stfd %0 = %F1%P0
-  getf.d %0 = %F1
-  setf.d %0 = %1
-  mov %0 = %1
-  ld8%O1 %0 = %1%P1
-  st8%Q0 %0 = %1%P0"
+   mov %0 = %F1
+   ldfd %0 = %1%P1
+   stfd %0 = %F1%P0
+   getf.d %0 = %F1
+   setf.d %0 = %1
+   mov %0 = %1
+   ld8%O1 %0 = %1%P1
+   st8%Q0 %0 = %1%P0"
   [(set_attr "itanium_class" "fmisc,fld,stf,frfr,tofr,ialu,ld,st")])
 
 ;; With no offsettable memory references, we've got to have a scratch
 ;; around to play with the second word if the variable winds up in GRs.
-(define_expand "movtf"
-  [(set (match_operand:TF 0 "general_operand" "")
-       (match_operand:TF 1 "general_operand" ""))]
+(define_expand "movxf"
+  [(set (match_operand:XF 0 "general_operand" "")
+       (match_operand:XF 1 "general_operand" ""))]
   ""
-  "
 {
-  /* We must support TFmode loads into general registers for stdarg/vararg
-     and unprototyped calls.  We split them into DImode loads for convenience.
-     We don't need TFmode stores from general regs, because a stdarg/vararg
-     routine does a block store to memory of unnamed arguments.  */
-  if (GET_CODE (operands[0]) == REG
-      && GR_REGNO_P (REGNO (operands[0])))
-    {
-      /* We're hoping to transform everything that deals with TFmode
-        quantities and GR registers early in the compiler.  */
-      if (no_new_pseudos)
-       abort ();
-
-      /* Struct to register can just use TImode instead.  */
-      if ((GET_CODE (operands[1]) == SUBREG
-          && GET_MODE (SUBREG_REG (operands[1])) == TImode)
-         || (GET_CODE (operands[1]) == REG
-             && GR_REGNO_P (REGNO (operands[1]))))
-       {
-         emit_move_insn (gen_rtx_REG (TImode, REGNO (operands[0])),
-                         SUBREG_REG (operands[1]));
-         DONE;
-       }
-
-      if (GET_CODE (operands[1]) == CONST_DOUBLE)
-       {
-         emit_move_insn (gen_rtx_REG (DImode, REGNO (operands[0])),
-                         operand_subword (operands[1], 0, 0, TFmode));
-         emit_move_insn (gen_rtx_REG (DImode, REGNO (operands[0]) + 1),
-                         operand_subword (operands[1], 1, 0, TFmode));
-         DONE;
-       }
-
-      /* If the quantity is in a register not known to be GR, spill it.  */
-      if (register_operand (operands[1], TFmode))
-       operands[1] = spill_tfmode_operand (operands[1], 1);
-
-      if (GET_CODE (operands[1]) == MEM)
-       {
-         rtx out[2];
-
-         out[WORDS_BIG_ENDIAN] = gen_rtx_REG (DImode, REGNO (operands[0]));
-         out[!WORDS_BIG_ENDIAN] = gen_rtx_REG (DImode, REGNO (operands[0])+1);
-
-         emit_move_insn (out[0], change_address (operands[1], DImode, NULL));
-         emit_move_insn (out[1],
-                         change_address (operands[1], DImode,
-                                         plus_constant (XEXP (operands[1], 0),
-                                                        8)));
-         DONE;
-       }
-
-      abort ();
-    }
+  if (ia64_expand_movxf_movrf (XFmode, operands))
+    DONE;
+})
 
-  if (! reload_in_progress && ! reload_completed)
-    {
-      operands[0] = spill_tfmode_operand (operands[0], 0);
-      operands[1] = spill_tfmode_operand (operands[1], 0);
+;; ??? There's no easy way to mind volatile acquire/release semantics.
 
-      if (! ia64_move_ok (operands[0], operands[1]))
-       operands[1] = force_reg (TFmode, operands[1]);
-    }
-}")
+(define_insn "*movxf_internal"
+  [(set (match_operand:XF 0 "destination_operand" "=f,f, m")
+       (match_operand:XF 1 "general_operand"     "fG,m,fG"))]
+  "ia64_move_ok (operands[0], operands[1])"
+  "@
+   mov %0 = %F1
+   ldfe %0 = %1%P1
+   stfe %0 = %F1%P0"
+  [(set_attr "itanium_class" "fmisc,fld,stf")])
 
-;; ??? There's no easy way to mind volatile acquire/release semantics.
+;; Same as for movxf, but for RFmode.
+(define_expand "movrf"
+  [(set (match_operand:RF 0 "general_operand" "")
+       (match_operand:RF 1 "general_operand" ""))]
+  ""
+{
+  if (ia64_expand_movxf_movrf (RFmode, operands))
+    DONE;
+})
 
-(define_insn "*movtf_internal"
-  [(set (match_operand:TF 0 "destination_tfmode_operand" "=f,f, m")
-       (match_operand:TF 1 "general_tfmode_operand"     "fG,m,fG"))]
+(define_insn "*movrf_internal"
+  [(set (match_operand:RF 0 "destination_operand" "=f,f, m")
+       (match_operand:RF 1 "general_operand"     "fG,m,fG"))]
   "ia64_move_ok (operands[0], operands[1])"
   "@
-  mov %0 = %F1
-  ldfe %0 = %1%P1
-  stfe %0 = %F1%P0"
+   mov %0 = %F1
+   ldf.fill %0 = %1%P1
+   stf.spill %0 = %F1%P0"
   [(set_attr "itanium_class" "fmisc,fld,stf")])
+
+;; Better code generation via insns that deal with TFmode register pairs
+;; directly.  Same concerns apply as for TImode.
+(define_expand "movtf"
+  [(set (match_operand:TF 0 "general_operand" "")
+       (match_operand:TF 1 "general_operand" ""))]
+  ""
+{
+  rtx op1 = ia64_expand_move (operands[0], operands[1]);
+  if (!op1)
+    DONE;
+  operands[1] = op1;
+})
+
+(define_insn_and_split "*movtf_internal"
+  [(set (match_operand:TF 0 "destination_operand"  "=r,r,m")
+       (match_operand:TF 1 "general_operand"      "ri,m,r"))]
+  "ia64_move_ok (operands[0], operands[1])"
+  "#"
+  "reload_completed"
+  [(const_int 0)]
+{
+  ia64_split_tmode_move (operands);
+  DONE;
+}
+  [(set_attr "itanium_class" "unknown")
+   (set_attr "predicable" "no")])
+
 \f
 ;; ::::::::::::::::::::
 ;; ::
          (match_operand:SI 1 "grfr_nonimmediate_operand" "r,m,f")))]
   ""
   "@
-   zxt4 %0 = %1
+   addp4 %0 = %1, r0
    ld4%O1 %0 = %1%P1
    fmix.r %0 = f0, %1"
-  [(set_attr "itanium_class" "xtd,ld,fmisc")])
+  [(set_attr "itanium_class" "ialu,ld,fmisc")])
 
 ;; Convert between floating point types of different sizes.
 
   "fnorm.d %0 = %1"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "extendsftf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (float_extend:TF (match_operand:SF 1 "fr_register_operand" "f")))]
+(define_insn "extendsfxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (float_extend:XF (match_operand:SF 1 "fr_register_operand" "f")))]
   ""
   "fnorm %0 = %1"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "extenddftf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (float_extend:TF (match_operand:DF 1 "fr_register_operand" "f")))]
+(define_insn "extenddfxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (float_extend:XF (match_operand:DF 1 "fr_register_operand" "f")))]
   ""
   "fnorm %0 = %1"
   [(set_attr "itanium_class" "fmac")])
   "fnorm.s %0 = %1"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "trunctfsf2"
+(define_insn "truncxfsf2"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
-       (float_truncate:SF (match_operand:TF 1 "fr_register_operand" "f")))]
+       (float_truncate:SF (match_operand:XF 1 "fr_register_operand" "f")))]
   ""
   "fnorm.s %0 = %1"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "trunctfdf2"
+(define_insn "truncxfdf2"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
-       (float_truncate:DF (match_operand:TF 1 "fr_register_operand" "f")))]
+       (float_truncate:DF (match_operand:XF 1 "fr_register_operand" "f")))]
   ""
   "fnorm.d %0 = %1"
   [(set_attr "itanium_class" "fmac")])
 
 ;; Convert between signed integer types and floating point.
 
-(define_insn "floatditf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (float:TF (match_operand:DI 1 "fr_register_operand" "f")))]
+(define_insn "floatdixf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (float:XF (match_operand:DI 1 "fr_register_operand" "f")))]
   ""
   "fcvt.xf %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
   "fcvt.fx.trunc %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
 
-(define_insn "fix_trunctfdi2"
+(define_insn "fix_truncxfdi2"
   [(set (match_operand:DI 0 "fr_register_operand" "=f")
-       (fix:DI (match_operand:TF 1 "fr_register_operand" "f")))]
+       (fix:DI (match_operand:XF 1 "fr_register_operand" "f")))]
   ""
   "fcvt.fx.trunc %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
 
-(define_insn "fix_trunctfdi2_alts"
+(define_insn "fix_truncxfdi2_alts"
   [(set (match_operand:DI 0 "fr_register_operand" "=f")
-       (fix:DI (match_operand:TF 1 "fr_register_operand" "f")))
+       (fix:DI (match_operand:XF 1 "fr_register_operand" "f")))
    (use (match_operand:SI 2 "const_int_operand" ""))]
   ""
   "fcvt.fx.trunc.s%2 %0 = %1"
   "fcvt.xuf.d %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
 
-(define_insn "floatunsditf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (unsigned_float:TF (match_operand:DI 1 "fr_register_operand" "f")))]
+(define_insn "floatunsdixf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (unsigned_float:XF (match_operand:DI 1 "fr_register_operand" "f")))]
   ""
   "fcvt.xuf %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
   "fcvt.fxu.trunc %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
 
-(define_insn "fixuns_trunctfdi2"
+(define_insn "fixuns_truncxfdi2"
   [(set (match_operand:DI 0 "fr_register_operand" "=f")
-       (unsigned_fix:DI (match_operand:TF 1 "fr_register_operand" "f")))]
+       (unsigned_fix:DI (match_operand:XF 1 "fr_register_operand" "f")))]
   ""
   "fcvt.fxu.trunc %0 = %1"
   [(set_attr "itanium_class" "fcvtfx")])
 
-(define_insn "fixuns_trunctfdi2_alts"
+(define_insn "fixuns_truncxfdi2_alts"
   [(set (match_operand:DI 0 "fr_register_operand" "=f")
-       (unsigned_fix:DI (match_operand:TF 1 "fr_register_operand" "f")))
+       (unsigned_fix:DI (match_operand:XF 1 "fr_register_operand" "f")))
    (use (match_operand:SI 2 "const_int_operand" ""))]
   ""
   "fcvt.fxu.trunc.s%2 %0 = %1"
                         (match_operand:DI 2 "const_int_operand" ""))
        (match_operand:DI 3 "nonmemory_operand" ""))]
   ""
-  "
 {
   int width = INTVAL (operands[1]);
   int shift = INTVAL (operands[2]);
       operands[2] = GEN_INT (shift);
 #endif
     }
-}")
+})
 
 (define_insn "*insv_internal"
   [(set (zero_extract:DI (match_operand:DI 0 "gr_register_operand" "+r")
   "dep %0 = %3, %0, %2, %1"
   [(set_attr "itanium_class" "ishf")])
 
-;; Combine doesn't like to create bitfield insertions into zero.
+;; Combine doesn't like to create bit-field insertions into zero.
+(define_insn "*shladdp4_internal"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+       (and:DI (ashift:DI (match_operand:DI 1 "gr_register_operand" "r")
+                          (match_operand:DI 2 "shladd_log2_operand" "n"))
+               (match_operand:DI 3 "const_int_operand" "n")))]
+  "ia64_depz_field_mask (operands[3], operands[2]) + INTVAL (operands[2]) == 32"
+  "shladdp4 %0 = %1, %2, r0"
+  [(set_attr "itanium_class" "ialu")])
+
 (define_insn "*depz_internal"
   [(set (match_operand:DI 0 "gr_register_operand" "=r")
        (and:DI (ashift:DI (match_operand:DI 1 "gr_register_operand" "r")
                (match_operand:DI 3 "const_int_operand" "n")))]
   "CONST_OK_FOR_M (INTVAL (operands[2]))
    && ia64_depz_field_mask (operands[3], operands[2]) > 0"
-  "*
 {
   operands[3] = GEN_INT (ia64_depz_field_mask (operands[3], operands[2]));
-  return \"%,dep.z %0 = %1, %2, %3\";
-}"
+  return "%,dep.z %0 = %1, %2, %3";
+}
   [(set_attr "itanium_class" "ishf")])
 
 (define_insn "shift_mix4left"
                         (const_int 32) (const_int 0))
        (match_operand:DI 1 "register_operand" ""))
    (clobber (match_operand:DI 2 "register_operand" ""))]
-  "reload_completed"
-  [(set (match_dup 3) (ashift:DI (match_dup 1) (const_int 32)))
-   (set (zero_extract:DI (match_dup 0) (const_int 32) (const_int 0))
-       (lshiftrt:DI (match_dup 3) (const_int 32)))]
-  "operands[3] = operands[2];")
-
-(define_split
-  [(set (zero_extract:DI (match_operand:DI 0 "register_operand" "")
-                        (const_int 32) (const_int 0))
-       (match_operand:DI 1 "register_operand" ""))
-   (clobber (match_operand:DI 2 "register_operand" ""))]
-  "! reload_completed"
+  ""
   [(set (match_dup 3) (ashift:DI (match_dup 1) (const_int 32)))
    (set (zero_extract:DI (match_dup 0) (const_int 32) (const_int 0))
        (lshiftrt:DI (match_dup 3) (const_int 32)))]
   ""
   "@
    #
-   tbit.z.and.orcm %0, %I0 = %2, 0
+   tbit.z.and.orcm %0, %I0 = %1, 0
    andcm %0 = %2, %1"
   "reload_completed
    && GET_CODE (operands[0]) == REG && PR_REGNO_P (REGNO (operands[0]))
-   && GET_CODE (operands[2]) == REG && PR_REGNO_P (REGNO (operands[2]))"
+   && GET_CODE (operands[1]) == REG && PR_REGNO_P (REGNO (operands[1]))"
   [(cond_exec (ne (match_dup 1) (const_int 0))
      (set (match_dup 0) (and:BI (ne:BI (const_int 0) (const_int 0))
                                (match_dup 0))))]
   ""
   "@
    #
-   tbit.z.or.andcm %0, %I0 = %2, 0"
+   tbit.z.or.andcm %0, %I0 = %1, 0"
   "reload_completed
    && GET_CODE (operands[0]) == REG && PR_REGNO_P (REGNO (operands[0]))
-   && GET_CODE (operands[2]) == REG && PR_REGNO_P (REGNO (operands[2]))"
+   && GET_CODE (operands[1]) == REG && PR_REGNO_P (REGNO (operands[1]))"
   [(cond_exec (eq (match_dup 1) (const_int 0))
      (set (match_dup 0) (ior:BI (eq:BI (const_int 0) (const_int 0))
                                (match_dup 0))))]
    (clobber (match_scratch:BI 2 ""))]
   "reload_completed
    && GET_CODE (operands[0]) == REG && PR_REGNO_P (REGNO (operands[0]))
-   && GET_CODE (operands[1]) == REG && PR_REGNO_P (REGNO (operands[1]))
    && rtx_equal_p (operands[0], operands[1])"
   [(set (match_dup 4) (match_dup 3))
    (set (match_dup 0) (const_int 1))
    (cond_exec (ne (match_dup 2) (const_int 0))
      (set (match_dup 0) (const_int 0)))
-   (set (match_dup 0) (unspec:BI [(match_dup 0)] 7))]
+   (set (match_dup 0) (unspec:BI [(match_dup 0)] UNSPEC_PRED_REL_MUTEX))]
   "operands[3] = gen_rtx_REG (CCImode, REGNO (operands[1]));
    operands[4] = gen_rtx_REG (CCImode, REGNO (operands[2]));")
 
      (set (match_dup 0) (const_int 0)))
    (cond_exec (eq (match_dup 1) (const_int 0))
      (set (match_dup 0) (const_int 1)))
-   (set (match_dup 0) (unspec:BI [(match_dup 0)] 7))]
+   (set (match_dup 0) (unspec:BI [(match_dup 0)] UNSPEC_PRED_REL_MUTEX))]
   "")
 
 (define_insn "*cmpsi_and_0"
    (set (match_operand:CCI 4 "register_operand" "")
        (match_operand:CCI 5 "register_operand" ""))
    (set (match_operand:BI 6 "register_operand" "")
-       (unspec:BI [(match_dup 6)] 7))]
+       (unspec:BI [(match_dup 6)] UNSPEC_PRED_REL_MUTEX))]
   "REGNO (operands[3]) == REGNO (operands[0])
    && REGNO (operands[4]) == REGNO (operands[0]) + 1
    && REGNO (operands[4]) == REGNO (operands[2]) + 1
                 (match_operand:SI 2 "gr_reg_or_22bit_operand" "r,I,J")))]
   ""
   "@
-  add %0 = %1, %2
-  adds %0 = %2, %1
-  addl %0 = %2, %1"
+   add %0 = %1, %2
+   adds %0 = %2, %1
+   addl %0 = %2, %1"
   [(set_attr "itanium_class" "ialu")])
 
 (define_insn "*addsi3_plus1"
                         (neg:SI (match_dup 1))
                         (match_dup 1)))]
   ""
-  "
-{
-  operands[2] = gen_reg_rtx (BImode);
-}")
+  { operands[2] = gen_reg_rtx (BImode); })
 
 (define_expand "sminsi3"
   [(set (match_dup 3)
        (if_then_else:SI (ne (match_dup 3) (const_int 0))
                         (match_dup 2) (match_dup 1)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "smaxsi3"
   [(set (match_dup 3)
        (if_then_else:SI (ne (match_dup 3) (const_int 0))
                         (match_dup 1) (match_dup 2)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "uminsi3"
   [(set (match_dup 3)
        (if_then_else:SI (ne (match_dup 3) (const_int 0))
                         (match_dup 2) (match_dup 1)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "umaxsi3"
   [(set (match_dup 3)
        (if_then_else:SI (ne (match_dup 3) (const_int 0))
                         (match_dup 1) (match_dup 2)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "divsi3"
   [(set (match_operand:SI 0 "register_operand" "")
        (div:SI (match_operand:SI 1 "general_operand" "")
                (match_operand:SI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
-  rtx op1_tf, op2_tf, op0_tf, op0_di, twon34;
+  rtx op1_xf, op2_xf, op0_xf, op0_di, twon34, twon34_exp;
 
-  op0_tf = gen_reg_rtx (TFmode);
+  op0_xf = gen_reg_rtx (XFmode);
   op0_di = gen_reg_rtx (DImode);
 
   if (CONSTANT_P (operands[1]))
     operands[1] = force_reg (SImode, operands[1]);
-  op1_tf = gen_reg_rtx (TFmode);
-  expand_float (op1_tf, operands[1], 0);
+  op1_xf = gen_reg_rtx (XFmode);
+  expand_float (op1_xf, operands[1], 0);
 
   if (CONSTANT_P (operands[2]))
     operands[2] = force_reg (SImode, operands[2]);
-  op2_tf = gen_reg_rtx (TFmode);
-  expand_float (op2_tf, operands[2], 0);
+  op2_xf = gen_reg_rtx (XFmode);
+  expand_float (op2_xf, operands[2], 0);
 
   /* 2^-34 */
-#if 0
-  twon34 = (CONST_DOUBLE_FROM_REAL_VALUE
-           (REAL_VALUE_FROM_TARGET_SINGLE (0x2e800000), TFmode));
-  twon34 = force_reg (TFmode, twon34);
-#else
-  twon34 = gen_reg_rtx (TFmode);
-  convert_move (twon34, force_const_mem (SFmode, CONST_DOUBLE_FROM_REAL_VALUE (REAL_VALUE_FROM_TARGET_SINGLE (0x2e800000), SFmode)), 0);
-#endif
+  twon34_exp = gen_reg_rtx (DImode);
+  emit_move_insn (twon34_exp, GEN_INT (65501));
+  twon34 = gen_reg_rtx (XFmode);
+  emit_insn (gen_setf_exp_xf (twon34, twon34_exp));
 
-  emit_insn (gen_divsi3_internal (op0_tf, op1_tf, op2_tf, twon34));
+  emit_insn (gen_divsi3_internal (op0_xf, op1_xf, op2_xf, twon34));
 
-  emit_insn (gen_fix_trunctfdi2_alts (op0_di, op0_tf, const1_rtx));
+  emit_insn (gen_fix_truncxfdi2_alts (op0_di, op0_xf, const1_rtx));
   emit_move_insn (operands[0], gen_lowpart (SImode, op0_di));
   DONE;
-}")
+})
 
 (define_expand "modsi3"
   [(set (match_operand:SI 0 "register_operand" "")
        (mod:SI (match_operand:SI 1 "general_operand" "")
                (match_operand:SI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
   rtx op2_neg, op1_di, div;
 
   emit_insn (gen_maddsi4 (operands[0], div, op2_neg,
                          gen_lowpart (SImode, op1_di)));
   DONE;
-}")
+})
 
 (define_expand "udivsi3"
   [(set (match_operand:SI 0 "register_operand" "")
        (udiv:SI (match_operand:SI 1 "general_operand" "")
                 (match_operand:SI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
-  rtx op1_tf, op2_tf, op0_tf, op0_di, twon34;
+  rtx op1_xf, op2_xf, op0_xf, op0_di, twon34, twon34_exp;
 
-  op0_tf = gen_reg_rtx (TFmode);
+  op0_xf = gen_reg_rtx (XFmode);
   op0_di = gen_reg_rtx (DImode);
 
   if (CONSTANT_P (operands[1]))
     operands[1] = force_reg (SImode, operands[1]);
-  op1_tf = gen_reg_rtx (TFmode);
-  expand_float (op1_tf, operands[1], 1);
+  op1_xf = gen_reg_rtx (XFmode);
+  expand_float (op1_xf, operands[1], 1);
 
   if (CONSTANT_P (operands[2]))
     operands[2] = force_reg (SImode, operands[2]);
-  op2_tf = gen_reg_rtx (TFmode);
-  expand_float (op2_tf, operands[2], 1);
+  op2_xf = gen_reg_rtx (XFmode);
+  expand_float (op2_xf, operands[2], 1);
 
   /* 2^-34 */
-#if 0
-  twon34 = (CONST_DOUBLE_FROM_REAL_VALUE
-           (REAL_VALUE_FROM_TARGET_SINGLE (0x2e800000), TFmode));
-  twon34 = force_reg (TFmode, twon34);
-#else
-  twon34 = gen_reg_rtx (TFmode);
-  convert_move (twon34, force_const_mem (SFmode, CONST_DOUBLE_FROM_REAL_VALUE (REAL_VALUE_FROM_TARGET_SINGLE (0x2e800000), SFmode)), 0);
-#endif
+  twon34_exp = gen_reg_rtx (DImode);
+  emit_move_insn (twon34_exp, GEN_INT (65501));
+  twon34 = gen_reg_rtx (XFmode);
+  emit_insn (gen_setf_exp_xf (twon34, twon34_exp));
 
-  emit_insn (gen_divsi3_internal (op0_tf, op1_tf, op2_tf, twon34));
+  emit_insn (gen_divsi3_internal (op0_xf, op1_xf, op2_xf, twon34));
 
-  emit_insn (gen_fixuns_trunctfdi2_alts (op0_di, op0_tf, const1_rtx));
+  emit_insn (gen_fixuns_truncxfdi2_alts (op0_di, op0_xf, const1_rtx));
   emit_move_insn (operands[0], gen_lowpart (SImode, op0_di));
   DONE;
-}")
+})
 
 (define_expand "umodsi3"
   [(set (match_operand:SI 0 "register_operand" "")
        (umod:SI (match_operand:SI 1 "general_operand" "")
                 (match_operand:SI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
   rtx op2_neg, op1_di, div;
 
   emit_insn (gen_maddsi4 (operands[0], div, op2_neg,
                          gen_lowpart (SImode, op1_di)));
   DONE;
-}")
+})
 
 (define_insn_and_split "divsi3_internal"
-  [(set (match_operand:TF 0 "fr_register_operand" "=&f")
-       (float:TF (div:SI (match_operand:TF 1 "fr_register_operand" "f")
-                         (match_operand:TF 2 "fr_register_operand" "f"))))
-   (clobber (match_scratch:TF 4 "=&f"))
-   (clobber (match_scratch:TF 5 "=&f"))
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (float:XF (div:SI (match_operand:XF 1 "fr_register_operand" "f")
+                         (match_operand:XF 2 "fr_register_operand" "f"))))
+   (clobber (match_scratch:XF 4 "=&f"))
+   (clobber (match_scratch:XF 5 "=&f"))
    (clobber (match_scratch:BI 6 "=c"))
-   (use (match_operand:TF 3 "fr_register_operand" "f"))]
-  "TARGET_INLINE_DIV"
+   (use (match_operand:XF 3 "fr_register_operand" "f"))]
+  "TARGET_INLINE_INT_DIV"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (div:TF (const_int 1) (match_dup 2)))
-             (set (match_dup 6) (unspec:BI [(match_dup 1) (match_dup 2)] 5))
+  [(parallel [(set (match_dup 0) (div:XF (const_int 1) (match_dup 2)))
+             (set (match_dup 6) (unspec:BI [(match_dup 1) (match_dup 2)]
+                                           UNSPEC_FR_RECIP_APPROX))
              (use (const_int 1))])
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 1) (match_dup 0)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 1) (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 5)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 7)))
+                    (minus:XF (match_dup 7)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 4))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 4))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 5)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 5))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 5))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 4))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 4))
                              (match_dup 4)))
                (use (const_int 1))]))
   ] 
-  "operands[7] = CONST1_RTX (TFmode);"
+  "operands[7] = CONST1_RTX (XFmode);"
   [(set_attr "predicable" "no")])
 \f
 ;; ::::::::::::::::::::
                 (match_operand:DI 2 "gr_reg_or_22bit_operand" "r,I,J")))]
   ""
   "@
-  add %0 = %1, %2
-  adds %0 = %2, %1
-  addl %0 = %2, %1"
+   add %0 = %1, %2
+   adds %0 = %2, %1
+   addl %0 = %2, %1"
   [(set_attr "itanium_class" "ialu")])
 
 (define_insn "*adddi3_plus1"
                         (neg:DI (match_dup 1))
                         (match_dup 1)))]
   ""
-  "
-{
-  operands[2] = gen_reg_rtx (BImode);
-}")
+  { operands[2] = gen_reg_rtx (BImode); })
 
 (define_expand "smindi3"
   [(set (match_dup 3)
        (if_then_else:DI (ne (match_dup 3) (const_int 0))
                         (match_dup 2) (match_dup 1)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "smaxdi3"
   [(set (match_dup 3)
        (if_then_else:DI (ne (match_dup 3) (const_int 0))
                         (match_dup 1) (match_dup 2)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "umindi3"
   [(set (match_dup 3)
        (if_then_else:DI (ne (match_dup 3) (const_int 0))
                         (match_dup 2) (match_dup 1)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "umaxdi3"
   [(set (match_dup 3)
        (if_then_else:DI (ne (match_dup 3) (const_int 0))
                         (match_dup 1) (match_dup 2)))]
   ""
-  "
-{
-  operands[3] = gen_reg_rtx (BImode);
-}")
+  { operands[3] = gen_reg_rtx (BImode); })
 
 (define_expand "ffsdi2"
   [(set (match_dup 6)
    (set (match_dup 2) (plus:DI (match_dup 1) (const_int -1)))
    (set (match_dup 5) (const_int 0))
    (set (match_dup 3) (xor:DI (match_dup 1) (match_dup 2)))
-   (set (match_dup 4) (unspec:DI [(match_dup 3)] 8))
+   (set (match_dup 4) (popcount:DI (match_dup 3)))
    (set (match_operand:DI 0 "gr_register_operand" "")
        (if_then_else:DI (ne (match_dup 6) (const_int 0))
                         (match_dup 5) (match_dup 4)))]
   ""
-  "
 {
   operands[2] = gen_reg_rtx (DImode);
   operands[3] = gen_reg_rtx (DImode);
   operands[4] = gen_reg_rtx (DImode);
   operands[5] = gen_reg_rtx (DImode);
   operands[6] = gen_reg_rtx (BImode);
-}")
+})
 
-(define_insn "*popcnt"
+(define_expand "ctzdi2"
+  [(set (match_dup 2) (plus:DI (match_operand:DI 1 "gr_register_operand" "")
+                              (const_int -1)))
+   (set (match_dup 3) (not:DI (match_dup 1)))
+   (set (match_dup 4) (and:DI (match_dup 2) (match_dup 3)))
+   (set (match_operand:DI 0 "gr_register_operand" "")
+       (popcount:DI (match_dup 4)))]
+  ""
+{
+  operands[2] = gen_reg_rtx (DImode);
+  operands[3] = gen_reg_rtx (DImode);
+  operands[4] = gen_reg_rtx (DImode);
+})
+
+;; Note the computation here is op0 = 63 - (exp - 0xffff).
+(define_expand "clzdi2"
+  [(set (match_dup 2)
+       (unsigned_float:XF (match_operand:DI 1 "fr_register_operand" "")))
+   (set (match_dup 3)
+       (unspec:DI [(match_dup 2)] UNSPEC_GETF_EXP))
+   (set (match_dup 4) (const_int 65598))
+   (set (match_operand:DI 0 "gr_register_operand" "")
+       (minus:DI (match_dup 4) (match_dup 3)))]
+  ""
+{
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (DImode);
+  operands[4] = gen_reg_rtx (DImode);
+})
+
+(define_insn "popcountdi2"
   [(set (match_operand:DI 0 "gr_register_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "gr_register_operand" "r")] 8))]
+       (popcount:DI (match_operand:DI 1 "gr_register_operand" "r")))]
   ""
   "popcnt %0 = %1"
   [(set_attr "itanium_class" "mmmul")])
 
-(define_expand "divdi3"
+(define_insn "*getf_exp_xf"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+       (unspec:DI [(match_operand:XF 1 "fr_register_operand" "f")]
+                  UNSPEC_GETF_EXP))]
+  ""
+  "getf.exp %0 = %1"
+  [(set_attr "itanium_class" "frfr")])
+
+(define_expand "divdi3"
   [(set (match_operand:DI 0 "register_operand" "")
        (div:DI (match_operand:DI 1 "general_operand" "")
                (match_operand:DI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
-  rtx op1_tf, op2_tf, op0_tf;
+  rtx op1_xf, op2_xf, op0_xf;
 
-  op0_tf = gen_reg_rtx (TFmode);
+  op0_xf = gen_reg_rtx (XFmode);
 
   if (CONSTANT_P (operands[1]))
     operands[1] = force_reg (DImode, operands[1]);
-  op1_tf = gen_reg_rtx (TFmode);
-  expand_float (op1_tf, operands[1], 0);
+  op1_xf = gen_reg_rtx (XFmode);
+  expand_float (op1_xf, operands[1], 0);
 
   if (CONSTANT_P (operands[2]))
     operands[2] = force_reg (DImode, operands[2]);
-  op2_tf = gen_reg_rtx (TFmode);
-  expand_float (op2_tf, operands[2], 0);
+  op2_xf = gen_reg_rtx (XFmode);
+  expand_float (op2_xf, operands[2], 0);
 
-  if (TARGET_INLINE_DIV_LAT)
-    emit_insn (gen_divdi3_internal_lat (op0_tf, op1_tf, op2_tf));
+  if (TARGET_INLINE_INT_DIV == INL_MIN_LAT)
+    emit_insn (gen_divdi3_internal_lat (op0_xf, op1_xf, op2_xf));
   else
-    emit_insn (gen_divdi3_internal_thr (op0_tf, op1_tf, op2_tf));
+    emit_insn (gen_divdi3_internal_thr (op0_xf, op1_xf, op2_xf));
 
-  emit_insn (gen_fix_trunctfdi2_alts (operands[0], op0_tf, const1_rtx));
+  emit_insn (gen_fix_truncxfdi2_alts (operands[0], op0_xf, const1_rtx));
   DONE;
-}")
+})
 
 (define_expand "moddi3"
   [(set (match_operand:DI 0 "register_operand" "")
        (mod:SI (match_operand:DI 1 "general_operand" "")
                (match_operand:DI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
   rtx op2_neg, div;
 
 
   emit_insn (gen_madddi4 (operands[0], div, op2_neg, operands[1]));
   DONE;
-}")
+})
 
 (define_expand "udivdi3"
   [(set (match_operand:DI 0 "register_operand" "")
        (udiv:DI (match_operand:DI 1 "general_operand" "")
                 (match_operand:DI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
-  rtx op1_tf, op2_tf, op0_tf;
+  rtx op1_xf, op2_xf, op0_xf;
 
-  op0_tf = gen_reg_rtx (TFmode);
+  op0_xf = gen_reg_rtx (XFmode);
 
   if (CONSTANT_P (operands[1]))
     operands[1] = force_reg (DImode, operands[1]);
-  op1_tf = gen_reg_rtx (TFmode);
-  expand_float (op1_tf, operands[1], 1);
+  op1_xf = gen_reg_rtx (XFmode);
+  expand_float (op1_xf, operands[1], 1);
 
   if (CONSTANT_P (operands[2]))
     operands[2] = force_reg (DImode, operands[2]);
-  op2_tf = gen_reg_rtx (TFmode);
-  expand_float (op2_tf, operands[2], 1);
+  op2_xf = gen_reg_rtx (XFmode);
+  expand_float (op2_xf, operands[2], 1);
 
-  if (TARGET_INLINE_DIV_LAT)
-    emit_insn (gen_divdi3_internal_lat (op0_tf, op1_tf, op2_tf));
+  if (TARGET_INLINE_INT_DIV == INL_MIN_LAT)
+    emit_insn (gen_divdi3_internal_lat (op0_xf, op1_xf, op2_xf));
   else
-    emit_insn (gen_divdi3_internal_thr (op0_tf, op1_tf, op2_tf));
+    emit_insn (gen_divdi3_internal_thr (op0_xf, op1_xf, op2_xf));
 
-  emit_insn (gen_fixuns_trunctfdi2_alts (operands[0], op0_tf, const1_rtx));
+  emit_insn (gen_fixuns_truncxfdi2_alts (operands[0], op0_xf, const1_rtx));
   DONE;
-}")
+})
 
 (define_expand "umoddi3"
   [(set (match_operand:DI 0 "register_operand" "")
        (umod:DI (match_operand:DI 1 "general_operand" "")
                 (match_operand:DI 2 "general_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_INT_DIV"
 {
   rtx op2_neg, div;
 
 
   emit_insn (gen_madddi4 (operands[0], div, op2_neg, operands[1]));
   DONE;
-}")
+})
 
 (define_insn_and_split "divdi3_internal_lat"
-  [(set (match_operand:TF 0 "fr_register_operand" "=&f")
-       (float:TF (div:SI (match_operand:TF 1 "fr_register_operand" "f")
-                         (match_operand:TF 2 "fr_register_operand" "f"))))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=&f"))
-   (clobber (match_scratch:TF 5 "=&f"))
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (float:XF (div:SI (match_operand:XF 1 "fr_register_operand" "f")
+                         (match_operand:XF 2 "fr_register_operand" "f"))))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=&f"))
+   (clobber (match_scratch:XF 5 "=&f"))
    (clobber (match_scratch:BI 6 "=c"))]
-  "TARGET_INLINE_DIV_LAT"
+  "TARGET_INLINE_INT_DIV == INL_MIN_LAT"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (div:TF (const_int 1) (match_dup 2)))
-             (set (match_dup 6) (unspec:BI [(match_dup 1) (match_dup 2)] 5))
+  [(parallel [(set (match_dup 0) (div:XF (const_int 1) (match_dup 2)))
+             (set (match_dup 6) (unspec:BI [(match_dup 1) (match_dup 2)]
+                                           UNSPEC_FR_RECIP_APPROX))
              (use (const_int 1))])
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 7)))
+                    (minus:XF (match_dup 7)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 1) (match_dup 0)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 1) (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 5) (mult:TF (match_dup 3) (match_dup 3)))
+     (parallel [(set (match_dup 5) (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 4))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 4))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 4))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 4))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 3)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                              (match_dup 3)))
                (use (const_int 1))]))
   ] 
-  "operands[7] = CONST1_RTX (TFmode);"
+  "operands[7] = CONST1_RTX (XFmode);"
   [(set_attr "predicable" "no")])
 
 (define_insn_and_split "divdi3_internal_thr"
-  [(set (match_operand:TF 0 "fr_register_operand" "=&f")
-       (float:TF (div:SI (match_operand:TF 1 "fr_register_operand" "f")
-                         (match_operand:TF 2 "fr_register_operand" "f"))))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=f"))
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (float:XF (div:SI (match_operand:XF 1 "fr_register_operand" "f")
+                         (match_operand:XF 2 "fr_register_operand" "f"))))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=f"))
    (clobber (match_scratch:BI 5 "=c"))]
-  "TARGET_INLINE_DIV_THR"
+  "TARGET_INLINE_INT_DIV == INL_MAX_THR"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (div:TF (const_int 1) (match_dup 2)))
-             (set (match_dup 5) (unspec:BI [(match_dup 1) (match_dup 2)] 5))
+  [(parallel [(set (match_dup 0) (div:XF (const_int 1) (match_dup 2)))
+             (set (match_dup 5) (unspec:BI [(match_dup 1) (match_dup 2)] 
+                                           UNSPEC_FR_RECIP_APPROX))
              (use (const_int 1))])
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 6)))
+                    (minus:XF (match_dup 6)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 3) (mult:TF (match_dup 3) (match_dup 3)))
+     (parallel [(set (match_dup 3) (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 3) (mult:TF (match_dup 0) (match_dup 1)))
+     (parallel [(set (match_dup 3) (mult:XF (match_dup 0) (match_dup 1)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 3)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                              (match_dup 3)))
                (use (const_int 1))]))
   ] 
-  "operands[6] = CONST1_RTX (TFmode);"
+  "operands[6] = CONST1_RTX (XFmode);"
   [(set_attr "predicable" "no")])
 \f
 ;; ::::::::::::::::::::
   "fnegabs %0 = %1"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "minsf3"
+(define_insn "copysignsf3"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (unspec:SF [(match_operand:SF 1 "fr_reg_or_fp01_operand" "fG")
+                   (match_operand:SF 2 "fr_reg_or_fp01_operand" "fG")]
+                  UNSPEC_COPYSIGN))]
+  ""
+  "fmerge.s %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "*ncopysignsf3"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (neg:SF (unspec:SF [(match_operand:SF 1 "fr_reg_or_fp01_operand" "fG")
+                           (match_operand:SF 2 "fr_reg_or_fp01_operand" "fG")]
+                          UNSPEC_COPYSIGN)))]
+  ""
+  "fmerge.ns %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "sminsf3"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (smin:SF (match_operand:SF 1 "fr_register_operand" "f")
                 (match_operand:SF 2 "fr_reg_or_fp01_operand" "fG")))]
   "fmin %0 = %1, %F2"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "maxsf3"
+(define_insn "smaxsf3"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (smax:SF (match_operand:SF 1 "fr_register_operand" "f")
                 (match_operand:SF 2 "fr_reg_or_fp01_operand" "fG")))]
   "fnmpy.s %0 = %1, %2"
   [(set_attr "itanium_class" "fmac")])
 
-;; ??? Is it possible to canonicalize this as (minus (reg) (mult))?
-
 (define_insn "*nmaddsf4"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
-       (plus:SF (neg:SF (mult:SF
-                          (match_operand:SF 1 "fr_register_operand" "f")
-                          (match_operand:SF 2 "fr_register_operand" "f")))
-                (match_operand:SF 3 "fr_reg_or_fp01_operand" "fG")))]
+       (minus:SF (match_operand:SF 3 "fr_reg_or_fp01_operand" "fG") 
+                 (mult:SF (match_operand:SF 1 "fr_register_operand" "f")
+                          (match_operand:SF 2 "fr_register_operand" "f"))))]
   ""
   "fnma.s %0 = %1, %2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
+(define_insn "*nmaddsf4_alts"
+  [(set (match_operand:SF 0 "fr_register_operand" "=f")
+       (minus:SF (match_operand:SF 3 "fr_reg_or_fp01_operand" "fG") 
+                 (mult:SF (match_operand:SF 1 "fr_register_operand" "f")
+                          (match_operand:SF 2 "fr_register_operand" "f"))))
+   (use (match_operand:SI 4 "const_int_operand" ""))]
+  ""
+  "fnma.s.s%4 %0 = %1, %2, %F3"
+  [(set_attr "itanium_class" "fmac")])
+
 (define_expand "divsf3"
   [(set (match_operand:SF 0 "fr_register_operand" "")
        (div:SF (match_operand:SF 1 "fr_register_operand" "")
                (match_operand:SF 2 "fr_register_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_FLOAT_DIV"
 {
   rtx insn;
-  if (TARGET_INLINE_DIV_LAT)
+  if (TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT)
     insn = gen_divsf3_internal_lat (operands[0], operands[1], operands[2]);
   else
     insn = gen_divsf3_internal_thr (operands[0], operands[1], operands[2]);
   emit_insn (insn);
   DONE;
-}")
+})
 
 (define_insn_and_split "divsf3_internal_lat"
   [(set (match_operand:SF 0 "fr_register_operand" "=&f")
        (div:SF (match_operand:SF 1 "fr_register_operand" "f")
                (match_operand:SF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=f"))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=f"))
    (clobber (match_scratch:BI 5 "=c"))]
-  "TARGET_INLINE_DIV_LAT"
+  "TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 6) (div:TF (const_int 1) (match_dup 8)))
-             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 6) (div:XF (const_int 1) (match_dup 8)))
+             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 3) (mult:TF (match_dup 7) (match_dup 6)))
+     (parallel [(set (match_dup 3) (mult:XF (match_dup 7) (match_dup 6)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 8) (match_dup 6)))
-                             (match_dup 10)))
+                    (minus:XF (match_dup 10)
+                              (mult:XF (match_dup 8) (match_dup 6))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 4) (match_dup 4)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 4) (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 4) (match_dup 4)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 4) (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 9)
                     (float_truncate:DF
-                      (plus:TF (mult:TF (match_dup 4) (match_dup 3))
+                      (plus:XF (mult:XF (match_dup 4) (match_dup 3))
                              (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (set (match_dup 0)
          (float_truncate:SF (match_dup 6))))
   ] 
-  "operands[6] = gen_rtx_REG (TFmode, REGNO (operands[0]));
-   operands[7] = gen_rtx_REG (TFmode, REGNO (operands[1]));
-   operands[8] = gen_rtx_REG (TFmode, REGNO (operands[2]));
-   operands[9] = gen_rtx_REG (DFmode, REGNO (operands[0]));
-   operands[10] = CONST1_RTX (TFmode);"
+{
+  operands[6] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[2]));
+  operands[9] = gen_rtx_REG (DFmode, REGNO (operands[0]));
+  operands[10] = CONST1_RTX (XFmode);
+}
   [(set_attr "predicable" "no")])
 
 (define_insn_and_split "divsf3_internal_thr"
   [(set (match_operand:SF 0 "fr_register_operand" "=&f")
        (div:SF (match_operand:SF 1 "fr_register_operand" "f")
                (match_operand:SF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=f"))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=f"))
    (clobber (match_scratch:BI 5 "=c"))]
-  "TARGET_INLINE_DIV_THR"
+  "TARGET_INLINE_FLOAT_DIV == INL_MAX_THR"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 6) (div:TF (const_int 1) (match_dup 8)))
-             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 6) (div:XF (const_int 1) (match_dup 8)))
+             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 8) (match_dup 6)))
-                             (match_dup 10)))
+                    (minus:XF (match_dup 10)
+                              (mult:XF (match_dup 8) (match_dup 6))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 6)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 6))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 6))
                              (match_dup 6)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 9)
                     (float_truncate:SF
-                      (mult:TF (match_dup 7) (match_dup 6))))
+                      (mult:XF (match_dup 7) (match_dup 6))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 8) (match_dup 3)))
-                             (match_dup 7)))
+                    (minus:XF (match_dup 7)
+                              (mult:XF (match_dup 8) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (set (match_dup 0)
          (float_truncate:SF
-           (plus:TF (mult:TF (match_dup 4) (match_dup 6))
+           (plus:XF (mult:XF (match_dup 4) (match_dup 6))
                              (match_dup 3)))))
   ] 
-  "operands[6] = gen_rtx_REG (TFmode, REGNO (operands[0]));
-   operands[7] = gen_rtx_REG (TFmode, REGNO (operands[1]));
-   operands[8] = gen_rtx_REG (TFmode, REGNO (operands[2]));
-   operands[9] = gen_rtx_REG (SFmode, REGNO (operands[3]));
-   operands[10] = CONST1_RTX (TFmode);"
+{
+  operands[6] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[2]));
+  operands[9] = gen_rtx_REG (SFmode, REGNO (operands[3]));
+  operands[10] = CONST1_RTX (XFmode);
+}
+  [(set_attr "predicable" "no")])
+
+;; Inline square root.
+
+(define_insn "*sqrt_approx"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+        (div:XF (const_int 1)
+                (sqrt:XF (match_operand:XF 2 "fr_register_operand" "f"))))
+   (set (match_operand:BI 1 "register_operand" "=c")
+        (unspec:BI [(match_dup 2)] UNSPEC_FR_SQRT_RECIP_APPROX))
+   (use (match_operand:SI 3 "const_int_operand" "")) ]
+  ""
+  "frsqrta.s%3 %0, %1 = %2"
+  [(set_attr "itanium_class" "fmisc")
+   (set_attr "predicable" "no")])
+
+(define_insn "setf_exp_xf"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+        (unspec:XF [(match_operand:DI 1 "register_operand" "r")]
+                  UNSPEC_SETF_EXP))]
+  ""
+  "setf.exp %0 = %1"
+  [(set_attr "itanium_class" "frfr")])
+
+(define_expand "sqrtsf2"
+  [(set (match_operand:SF 0 "fr_register_operand" "=&f")
+       (sqrt:SF (match_operand:SF 1 "fr_register_operand" "f")))]
+  "TARGET_INLINE_SQRT"
+{
+  rtx insn;
+#if 0
+  if (TARGET_INLINE_SQRT == INL_MIN_LAT)
+    insn = gen_sqrtsf2_internal_lat (operands[0], operands[1]);
+  else
+#else
+  gcc_assert (TARGET_INLINE_SQRT != INL_MIN_LAT);
+#endif
+  insn = gen_sqrtsf2_internal_thr (operands[0], operands[1]);
+  emit_insn (insn);
+  DONE;
+})
+
+;; Latency-optimized square root.
+;; FIXME: Implement.
+
+;; Throughput-optimized square root.
+
+(define_insn_and_split "sqrtsf2_internal_thr"
+  [(set (match_operand:SF 0 "fr_register_operand" "=&f")
+       (sqrt:SF (match_operand:SF 1 "fr_register_operand" "f")))
+   ;; Register r2 in optimization guide.
+   (clobber (match_scratch:DI 2 "=r"))
+   ;; Register f8 in optimization guide
+   (clobber (match_scratch:XF 3 "=&f"))
+   ;; Register f9 in optimization guide
+   (clobber (match_scratch:XF 4 "=&f"))
+   ;; Register f10 in optimization guide
+   (clobber (match_scratch:XF 5 "=&f"))
+   ;; Register p6 in optimization guide.
+   (clobber (match_scratch:BI 6 "=c"))]
+  "TARGET_INLINE_SQRT == INL_MAX_THR"
+  "#"
+  "&& reload_completed"
+  [ ;; exponent of +1/2 in r2
+    (set (match_dup 2) (const_int 65534))
+    ;; +1/2 in f8
+    (set (match_dup 3) 
+         (unspec:XF [(match_dup 2)] UNSPEC_SETF_EXP))
+    ;; Step 1
+    ;; y0 = 1/sqrt(a) in f7
+    (parallel [(set (match_dup 7)
+                    (div:XF (const_int 1)
+                            (sqrt:XF (match_dup 8))))
+               (set (match_dup 6)
+                    (unspec:BI [(match_dup 8)]
+                                 UNSPEC_FR_SQRT_RECIP_APPROX))
+               (use (const_int 0))])
+    ;; Step 2
+    ;; H0 = 1/2 * y0 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 4)
+                      (plus:XF (mult:XF (match_dup 3) (match_dup 7))
+                               (match_dup 9)))
+                 (use (const_int 1))]))
+    ;; Step 3
+    ;; S0 = a * y0 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 7)
+                      (plus:XF (mult:XF (match_dup 8) (match_dup 7))
+                               (match_dup 9)))
+                 (use (const_int 1))]))
+    ;; Step 4
+    ;; d = 1/2 - S0 * H0 in f10
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 5)
+                      (minus:XF (match_dup 3)
+                               (mult:XF (match_dup 7) (match_dup 4))))
+                 (use (const_int 1))]))
+    ;; Step 5
+    ;; d' = d + 1/2 * d in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (plus:XF (mult:XF (match_dup 3) (match_dup 5))
+                                (match_dup 5)))
+                  (use (const_int 1))]))
+    ;; Step 6
+    ;; e = d + d * d' in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 3))
+                                (match_dup 5)))
+                  (use (const_int 1))]))
+    ;; Step 7
+    ;; S1 = S0 + e * S0 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 0)
+                     (float_truncate:SF
+                        (plus:XF (mult:XF (match_dup 3) (match_dup 7))
+                                 (match_dup 7))))
+                 (use (const_int 1))]))
+    ;; Step 8
+    ;; H1 = H0 + e * H0 in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (plus:XF (mult:XF (match_dup 3) (match_dup 4))
+                                (match_dup 4)))
+                  (use (const_int 1))]))
+    ;; Step 9 
+    ;; d1 = a - S1 * S1 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (minus:XF (match_dup 8)
+                                (mult:XF (match_dup 7) (match_dup 7))))
+                  (use (const_int 1))]))
+    ;; Step 10
+    ;; S = S1 + d1 * H1 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 0)
+                       (float_truncate:SF
+                         (plus:XF (mult:XF (match_dup 4) (match_dup 3))
+                                  (match_dup 7))))
+                  (use (const_int 0))]))]
+{
+  /* Generate 82-bit versions of the input and output operands.  */
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  /* Generate required floating-point constants.  */
+  operands[9] = CONST0_RTX (XFmode);
+}
   [(set_attr "predicable" "no")])
 \f
 ;; ::::::::::::::::::::
   "fnegabs %0 = %1"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "mindf3"
+(define_insn "copysigndf3"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (unspec:DF [(match_operand:DF 1 "fr_reg_or_fp01_operand" "fG")
+                   (match_operand:DF 2 "fr_reg_or_fp01_operand" "fG")]
+                  UNSPEC_COPYSIGN))]
+  ""
+  "fmerge.s %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "*ncopysigndf3"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (neg:DF (unspec:DF [(match_operand:DF 1 "fr_reg_or_fp01_operand" "fG")
+                           (match_operand:DF 2 "fr_reg_or_fp01_operand" "fG")]
+                          UNSPEC_COPYSIGN)))]
+  ""
+  "fmerge.ns %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "smindf3"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (smin:DF (match_operand:DF 1 "fr_register_operand" "f")
                 (match_operand:DF 2 "fr_reg_or_fp01_operand" "fG")))]
   "fmin %0 = %1, %F2"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "maxdf3"
+(define_insn "smaxdf3"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (smax:DF (match_operand:DF 1 "fr_register_operand" "f")
                 (match_operand:DF 2 "fr_reg_or_fp01_operand" "fG")))]
   "fnmpy.s %0 = %1, %2"
   [(set_attr "itanium_class" "fmac")])
 
-;; ??? Is it possible to canonicalize this as (minus (reg) (mult))?
-
 (define_insn "*nmadddf4"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
-       (plus:DF (neg:DF (mult:DF
-                          (match_operand:DF 1 "fr_register_operand" "f")
-                          (match_operand:DF 2 "fr_register_operand" "f")))
-                (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")))]
+       (minus:DF (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")
+                 (mult:DF (match_operand:DF 1 "fr_register_operand" "f")
+                          (match_operand:DF 2 "fr_register_operand" "f"))))]
   ""
   "fnma.d %0 = %1, %2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
 (define_insn "*nmadddf4_alts"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
-       (plus:DF (neg:DF (mult:DF
-                          (match_operand:DF 1 "fr_register_operand" "f")
-                          (match_operand:DF 2 "fr_register_operand" "f")))
-                (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")))
+       (minus:DF (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")
+                 (mult:DF (match_operand:DF 1 "fr_register_operand" "f")
+                          (match_operand:DF 2 "fr_register_operand" "f"))))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "fnma.d.s%4 %0 = %1, %2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmadddf4_trunc"
+(define_insn "*nmadddf4_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (plus:DF (neg:DF (mult:DF
-                            (match_operand:DF 1 "fr_register_operand" "f")
-                            (match_operand:DF 2 "fr_register_operand" "f")))
-                  (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG"))))]
+       (minus:DF (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")
+                 (mult:DF (match_operand:DF 1 "fr_register_operand" "f")
+                          (match_operand:DF 2 "fr_register_operand" "f")))))]
   ""
   "fnma.s %0 = %1, %2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
+(define_insn "*nmadddf4_truncsf_alts"
+  [(set (match_operand:SF 0 "fr_register_operand" "=f")
+       (float_truncate:SF
+       (minus:DF (match_operand:DF 3 "fr_reg_or_fp01_operand" "fG")
+                 (mult:DF (match_operand:DF 1 "fr_register_operand" "f")
+                          (match_operand:DF 2 "fr_register_operand" "f")))))
+   (use (match_operand:SI 4 "const_int_operand" ""))]
+  ""
+  "fnma.s.s%4 %0 = %1, %2, %F3"
+  [(set_attr "itanium_class" "fmac")])
+
 (define_expand "divdf3"
   [(set (match_operand:DF 0 "fr_register_operand" "")
        (div:DF (match_operand:DF 1 "fr_register_operand" "")
                (match_operand:DF 2 "fr_register_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+  "TARGET_INLINE_FLOAT_DIV"
 {
   rtx insn;
-  if (TARGET_INLINE_DIV_LAT)
+  if (TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT)
     insn = gen_divdf3_internal_lat (operands[0], operands[1], operands[2]);
   else
     insn = gen_divdf3_internal_thr (operands[0], operands[1], operands[2]);
   emit_insn (insn);
   DONE;
-}")
+})
 
 (define_insn_and_split "divdf3_internal_lat"
   [(set (match_operand:DF 0 "fr_register_operand" "=&f")
        (div:DF (match_operand:DF 1 "fr_register_operand" "f")
                (match_operand:DF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=&f"))
-   (clobber (match_scratch:TF 5 "=&f"))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=&f"))
+   (clobber (match_scratch:XF 5 "=&f"))
    (clobber (match_scratch:BI 6 "=c"))]
-  "TARGET_INLINE_DIV_LAT"
+  "TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 7) (div:TF (const_int 1) (match_dup 9)))
-             (set (match_dup 6) (unspec:BI [(match_dup 8) (match_dup 9)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 7) (div:XF (const_int 1) (match_dup 9)))
+             (set (match_dup 6) (unspec:BI [(match_dup 8) (match_dup 9)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 3) (mult:TF (match_dup 8) (match_dup 7)))
+     (parallel [(set (match_dup 3) (mult:XF (match_dup 8) (match_dup 7)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 9) (match_dup 7)))
-                             (match_dup 12)))
+                    (minus:XF (match_dup 12)
+                              (mult:XF (match_dup 9) (match_dup 7))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 5) (mult:TF (match_dup 4) (match_dup 4)))
+     (parallel [(set (match_dup 5) (mult:XF (match_dup 4) (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 7)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 7))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 7))
                              (match_dup 7)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 5) (match_dup 5)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 5) (match_dup 5)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 7)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 7))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 7))
                              (match_dup 7)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 10)
                     (float_truncate:DF
-                      (plus:TF (mult:TF (match_dup 4) (match_dup 3))
+                      (plus:XF (mult:XF (match_dup 4) (match_dup 3))
                              (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 7)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 7))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 7))
                              (match_dup 7)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (parallel [(set (match_dup 11)
                     (float_truncate:DF
-                      (plus:TF (neg:TF (mult:TF (match_dup 9) (match_dup 3)))
-                               (match_dup 8))))
+                      (minus:XF (match_dup 8)
+                                (mult:XF (match_dup 9) (match_dup 3)))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 6) (const_int 0))
      (set (match_dup 0)
-         (float_truncate:DF (plus:TF (mult:TF (match_dup 5) (match_dup 7))
+         (float_truncate:DF (plus:XF (mult:XF (match_dup 5) (match_dup 7))
                              (match_dup 3)))))
   ] 
-  "operands[7] = gen_rtx_REG (TFmode, REGNO (operands[0]));
-   operands[8] = gen_rtx_REG (TFmode, REGNO (operands[1]));
-   operands[9] = gen_rtx_REG (TFmode, REGNO (operands[2]));
-   operands[10] = gen_rtx_REG (DFmode, REGNO (operands[3]));
-   operands[11] = gen_rtx_REG (DFmode, REGNO (operands[5]));
-   operands[12] = CONST1_RTX (TFmode);"
+{
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  operands[9] = gen_rtx_REG (XFmode, REGNO (operands[2]));
+  operands[10] = gen_rtx_REG (DFmode, REGNO (operands[3]));
+  operands[11] = gen_rtx_REG (DFmode, REGNO (operands[5]));
+  operands[12] = CONST1_RTX (XFmode);
+}
   [(set_attr "predicable" "no")])
 
 (define_insn_and_split "divdf3_internal_thr"
   [(set (match_operand:DF 0 "fr_register_operand" "=&f")
        (div:DF (match_operand:DF 1 "fr_register_operand" "f")
                (match_operand:DF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
+   (clobber (match_scratch:XF 3 "=&f"))
    (clobber (match_scratch:DF 4 "=f"))
    (clobber (match_scratch:BI 5 "=c"))]
-  "TARGET_INLINE_DIV_THR"
+  "TARGET_INLINE_FLOAT_DIV == INL_MAX_THR"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 6) (div:TF (const_int 1) (match_dup 8)))
-             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 6) (div:XF (const_int 1) (match_dup 8)))
+             (set (match_dup 5) (unspec:BI [(match_dup 7) (match_dup 8)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 8) (match_dup 6)))
-                             (match_dup 10)))
+                    (minus:XF (match_dup 10)
+                              (mult:XF (match_dup 8) (match_dup 6))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 6)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 6))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 6))
                              (match_dup 6)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (mult:TF (match_dup 3) (match_dup 3)))
+                    (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 6)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 6))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 6))
                              (match_dup 6)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (mult:TF (match_dup 3) (match_dup 3)))
+                    (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 6)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 6))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 6))
                              (match_dup 6)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 9)
                     (float_truncate:DF
-                      (mult:TF (match_dup 7) (match_dup 3))))
+                      (mult:XF (match_dup 7) (match_dup 6))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:DF (neg:DF (mult:DF (match_dup 2) (match_dup 9)))
-                             (match_dup 1)))
+                    (minus:DF (match_dup 1)
+                              (mult:DF (match_dup 2) (match_dup 9))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (set (match_dup 0)
          (plus:DF (mult:DF (match_dup 4) (match_dup 0))
                            (match_dup 9))))
   ] 
-  "operands[6] = gen_rtx_REG (TFmode, REGNO (operands[0]));
-   operands[7] = gen_rtx_REG (TFmode, REGNO (operands[1]));
-   operands[8] = gen_rtx_REG (TFmode, REGNO (operands[2]));
-   operands[9] = gen_rtx_REG (DFmode, REGNO (operands[3]));
-   operands[10] = CONST1_RTX (TFmode);"
+{
+  operands[6] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[2]));
+  operands[9] = gen_rtx_REG (DFmode, REGNO (operands[3]));
+  operands[10] = CONST1_RTX (XFmode);
+}
+  [(set_attr "predicable" "no")])
+
+;; Inline square root.
+
+(define_expand "sqrtdf2"
+  [(set (match_operand:DF 0 "fr_register_operand" "=&f")
+       (sqrt:DF (match_operand:DF 1 "fr_register_operand" "f")))]
+  "TARGET_INLINE_SQRT"
+{
+  rtx insn;
+#if 0
+  if (TARGET_INLINE_SQRT == INL_MIN_LAT)
+    insn = gen_sqrtdf2_internal_lat (operands[0], operands[1]);
+  else
+#else
+  gcc_assert (TARGET_INLINE_SQRT != INL_MIN_LAT);
+#endif
+  insn = gen_sqrtdf2_internal_thr (operands[0], operands[1]);
+  emit_insn (insn);
+  DONE;
+})
+
+;; Latency-optimized square root.
+;; FIXME: Implement.
+
+;; Throughput-optimized square root.
+
+(define_insn_and_split "sqrtdf2_internal_thr"
+  [(set (match_operand:DF 0 "fr_register_operand" "=&f")
+       (sqrt:DF (match_operand:DF 1 "fr_register_operand" "f")))
+   ;; Register r2 in optimization guide.
+   (clobber (match_scratch:DI 2 "=r"))
+   ;; Register f8 in optimization guide
+   (clobber (match_scratch:XF 3 "=&f"))
+   ;; Register f9 in optimization guide
+   (clobber (match_scratch:XF 4 "=&f"))
+   ;; Register f10 in optimization guide
+   (clobber (match_scratch:XF 5 "=&f"))
+   ;; Register p6 in optimization guide.
+   (clobber (match_scratch:BI 6 "=c"))]
+  "TARGET_INLINE_SQRT == INL_MAX_THR"
+  "#"
+  "&& reload_completed"
+  [ ;; exponent of +1/2 in r2
+    (set (match_dup 2) (const_int 65534))
+    ;; +1/2 in f10
+    (set (match_dup 5) 
+         (unspec:XF [(match_dup 2)] UNSPEC_SETF_EXP))
+    ;; Step 1
+    ;; y0 = 1/sqrt(a) in f7
+    (parallel [(set (match_dup 7)
+                    (div:XF (const_int 1)
+                            (sqrt:XF (match_dup 8))))
+               (set (match_dup 6)
+                    (unspec:BI [(match_dup 8)]
+                                 UNSPEC_FR_SQRT_RECIP_APPROX))
+               (use (const_int 0))])
+    ;; Step 2
+    ;; H0 = 1/2 * y0 in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 3)
+                      (plus:XF (mult:XF (match_dup 5) (match_dup 7))
+                               (match_dup 9)))
+                 (use (const_int 1))]))
+    ;; Step 3
+    ;; G0 = a * y0 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 7)
+                      (plus:XF (mult:XF (match_dup 8) (match_dup 7))
+                               (match_dup 9)))
+                 (use (const_int 1))]))
+    ;; Step 4
+    ;; r0 = 1/2 - G0 * H0 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 4)
+                      (minus:XF (match_dup 5)
+                               (mult:XF (match_dup 7) (match_dup 3))))
+                 (use (const_int 1))]))
+    ;; Step 5
+    ;; H1 = H0 + r0 * H0 in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (plus:XF (mult:XF (match_dup 4) (match_dup 3))
+                                (match_dup 3)))
+                  (use (const_int 1))]))
+    ;; Step 6
+    ;; G1 = G0 + r0 * G0 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 7)
+                       (plus:XF (mult:XF (match_dup 4) (match_dup 7))
+                                (match_dup 7)))
+                  (use (const_int 1))]))
+    ;; Step 7
+    ;; r1 = 1/2 - G1 * H1 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+      (parallel [(set (match_dup 4)
+                      (minus:XF (match_dup 5)
+                               (mult:XF (match_dup 7) (match_dup 3))))
+                 (use (const_int 1))]))
+    ;; Step 8
+    ;; H2 = H1 + r1 * H1 in f8
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (plus:XF (mult:XF (match_dup 4) (match_dup 3))
+                                (match_dup 3)))
+                  (use (const_int 1))]))
+    ;; Step 9 
+    ;; G2 = G1 + r1 * G1 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 7)
+                       (plus:XF (mult:XF (match_dup 4) (match_dup 7))
+                                (match_dup 7)))
+                  (use (const_int 1))]))
+    ;; Step 10
+    ;; d2 = a - G2 * G2 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (minus:XF (match_dup 8)
+                                (mult:XF (match_dup 7) (match_dup 7))))
+                  (use (const_int 1))]))
+    ;; Step 11
+    ;; G3 = G2 + d2 * H2 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 7)
+                       (plus:XF (mult:XF (match_dup 4) (match_dup 3))
+                                (match_dup 7)))
+                  (use (const_int 1))]))
+    ;; Step 12
+    ;; d3 = a - G3 * G3 in f9
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (minus:XF (match_dup 8)
+                                (mult:XF (match_dup 7) (match_dup 7))))
+                  (use (const_int 1))]))
+    ;; Step 13
+    ;; S = G3 + d3 * H2 in f7
+    (cond_exec (ne (match_dup 6) (const_int 0))
+       (parallel [(set (match_dup 0)
+                       (float_truncate:DF
+                         (plus:XF (mult:XF (match_dup 4) (match_dup 3))
+                                  (match_dup 7))))
+                  (use (const_int 0))]))]
+{
+  /* Generate 82-bit versions of the input and output operands.  */
+  operands[7] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  /* Generate required floating-point constants.  */
+  operands[9] = CONST0_RTX (XFmode);
+}
   [(set_attr "predicable" "no")])
 \f
 ;; ::::::::::::::::::::
 ;; ::
 ;; ::::::::::::::::::::
 
-(define_insn "addtf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (plus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "addxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (plus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fadd %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*addtf3_truncsf"
+(define_insn "*addxf3_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (plus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (plus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fadd.s %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*addtf3_truncdf"
+(define_insn "*addxf3_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (plus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (plus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fadd.d %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "subtf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (minus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                 (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "subxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (minus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                 (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fsub %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*subtf3_truncsf"
+(define_insn "*subxf3_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (minus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                   (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                   (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fsub.s %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*subtf3_truncdf"
+(define_insn "*subxf3_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (minus:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                   (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                   (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fsub.d %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "multf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "mulxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fmpy %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*multf3_truncsf"
+(define_insn "*mulxf3_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fmpy.s %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*multf3_truncdf"
+(define_insn "*mulxf3_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+         (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fmpy.d %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*multf3_alts"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
+(define_insn "*mulxf3_alts"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))
    (use (match_operand:SI 3 "const_int_operand" ""))]
   ""
   "fmpy.s%3 %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*multf3_truncsf_alts"
+(define_insn "*mulxf3_truncsf_alts"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))
+         (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))
    (use (match_operand:SI 3 "const_int_operand" ""))]
   ""
   "fmpy.s.s%3 %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*multf3_truncdf_alts"
+(define_insn "*mulxf3_truncdf_alts"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                  (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))
+         (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                  (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))
    (use (match_operand:SI 3 "const_int_operand" ""))]
   ""
   "fmpy.d.s%3 %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "abstf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (abs:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "absxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (abs:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fabs %0 = %F1"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "negtf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (neg:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "negxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (neg:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fneg %0 = %F1"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "*nabstf2"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (neg:TF (abs:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG"))))]
+(define_insn "*nabsxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (neg:XF (abs:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fnegabs %0 = %F1"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "mintf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (smin:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "copysignxf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "fr_reg_or_fp01_operand" "fG")
+                   (match_operand:XF 2 "fr_reg_or_fp01_operand" "fG")]
+                  UNSPEC_COPYSIGN))]
+  ""
+  "fmerge.s %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "*ncopysignxf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (neg:XF (unspec:XF [(match_operand:XF 1 "fr_reg_or_fp01_operand" "fG")
+                           (match_operand:XF 2 "fr_reg_or_fp01_operand" "fG")]
+                          UNSPEC_COPYSIGN)))]
+  ""
+  "fmerge.ns %0 = %F2, %F1"
+  [(set_attr "itanium_class" "fmisc")])
+
+(define_insn "sminxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (smin:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fmin %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "maxtf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (smax:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "smaxxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (smax:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fmax %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmisc")])
 
-(define_insn "*maddtf4"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (plus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                         (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "*maddxf4"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                         (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fma %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*maddtf4_truncsf"
+(define_insn "*maddxf4_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (plus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                           (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                  (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                           (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                  (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fma.s %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*maddtf4_truncdf"
+(define_insn "*maddxf4_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (plus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                           (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                  (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                           (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                  (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fma.d %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*maddtf4_alts"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (plus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                         (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")))
+(define_insn "*maddxf4_alts"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                         (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "fma.s%4 %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*maddtf4_alts_truncdf"
+(define_insn "*maddxf4_alts_truncsf"
+  [(set (match_operand:SF 0 "fr_register_operand" "=f")
+       (float_truncate:SF
+         (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                           (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                  (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))
+   (use (match_operand:SI 4 "const_int_operand" ""))]
+  ""
+  "fma.s.s%4 %0 = %F1, %F2, %F3"
+  [(set_attr "itanium_class" "fmac")])
+
+(define_insn "*maddxf4_alts_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (plus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                           (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                  (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))
+         (plus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                           (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                  (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "fma.d.s%4 %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*msubtf4"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (minus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                          (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                 (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "*msubxf4"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (minus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                          (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                 (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")))]
   ""
   "fms %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*msubtf4_truncsf"
+(define_insn "*msubxf4_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (minus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                            (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                   (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                   (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fms.s %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*msubtf4_truncdf"
+(define_insn "*msubxf4_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (minus:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                            (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))
-                   (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))
+                   (match_operand:XF 3 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fms.d %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmultf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (neg:TF (mult:TF (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                        (match_operand:TF 2 "tfreg_or_fp01_operand" "fG"))))]
+(define_insn "*nmulxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (neg:XF (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                        (match_operand:XF 2 "xfreg_or_fp01_operand" "fG"))))]
   ""
   "fnmpy %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmultf3_truncsf"
+(define_insn "*nmulxf3_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (neg:TF (mult:TF
-                   (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                   (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))))]
+         (neg:XF (mult:XF
+                   (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                   (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))))]
   ""
   "fnmpy.s %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmultf3_truncdf"
+(define_insn "*nmulxf3_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (neg:TF (mult:TF
-                   (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                   (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))))]
+         (neg:XF (mult:XF
+                   (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                   (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")))))]
   ""
   "fnmpy.d %0 = %F1, %F2"
   [(set_attr "itanium_class" "fmac")])
 
-;; ??? Is it possible to canonicalize this as (minus (reg) (mult))?
-
-(define_insn "*nmaddtf4"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (plus:TF (neg:TF (mult:TF
-                         (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                         (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
-                (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")))]
+(define_insn "*nmaddxf4"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")
+                 (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                          (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   )))]
   ""
   "fnma %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmaddtf4_truncsf"
+(define_insn "*nmaddxf4_truncsf"
   [(set (match_operand:SF 0 "fr_register_operand" "=f")
        (float_truncate:SF
-         (plus:TF (neg:TF (mult:TF
-                           (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                           (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
-                  (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG") 
+                   (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   ))))]
   ""
   "fnma.s %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmaddtf4_truncdf"
+(define_insn "*nmaddxf4_truncdf"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (plus:TF (neg:TF (mult:TF
-                           (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                           (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
-                  (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))]
+         (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG") 
+                   (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   ))))]
   ""
   "fnma.d %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmaddtf4_alts"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (plus:TF (neg:TF (mult:TF
-                         (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                         (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
-                (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")))
+(define_insn "*nmaddxf4_alts"
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")
+                 (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                          (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   )))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "fnma.s%4 %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_insn "*nmaddtf4_truncdf_alts"
+(define_insn "*nmaddxf4_truncsf_alts"
+  [(set (match_operand:SF 0 "fr_register_operand" "=f")
+       (float_truncate:SF
+         (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG") 
+                   (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   ))))
+   (use (match_operand:SI 4 "const_int_operand" ""))]
+  ""
+  "fnma.s.s%4 %0 = %F1, %F2, %F3"
+  [(set_attr "itanium_class" "fmac")])
+
+(define_insn "*nmaddxf4_truncdf_alts"
   [(set (match_operand:DF 0 "fr_register_operand" "=f")
        (float_truncate:DF
-         (plus:TF (neg:TF
-                    (mult:TF
-                      (match_operand:TF 1 "tfreg_or_fp01_operand" "fG")
-                      (match_operand:TF 2 "tfreg_or_fp01_operand" "fG")))
-                (match_operand:TF 3 "tfreg_or_fp01_operand" "fG"))))
+         (minus:XF (match_operand:XF 3 "xfreg_or_fp01_operand" "fG") 
+                   (mult:XF (match_operand:XF 1 "xfreg_or_fp01_operand" "fG")
+                            (match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+   ))))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "fnma.d.s%4 %0 = %F1, %F2, %F3"
   [(set_attr "itanium_class" "fmac")])
 
-(define_expand "divtf3"
-  [(set (match_operand:TF 0 "fr_register_operand" "")
-       (div:TF (match_operand:TF 1 "fr_register_operand" "")
-               (match_operand:TF 2 "fr_register_operand" "")))]
-  "TARGET_INLINE_DIV"
-  "
+(define_expand "divxf3"
+  [(set (match_operand:XF 0 "fr_register_operand" "")
+       (div:XF (match_operand:XF 1 "fr_register_operand" "")
+               (match_operand:XF 2 "fr_register_operand" "")))]
+  "TARGET_INLINE_FLOAT_DIV"
 {
   rtx insn;
-  if (TARGET_INLINE_DIV_LAT)
-    insn = gen_divtf3_internal_lat (operands[0], operands[1], operands[2]);
+  if (TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT)
+    insn = gen_divxf3_internal_lat (operands[0], operands[1], operands[2]);
   else
-    insn = gen_divtf3_internal_thr (operands[0], operands[1], operands[2]);
+    insn = gen_divxf3_internal_thr (operands[0], operands[1], operands[2]);
   emit_insn (insn);
   DONE;
-}")
-
-(define_insn_and_split "divtf3_internal_lat"
-  [(set (match_operand:TF 0 "fr_register_operand" "=&f")
-       (div:TF (match_operand:TF 1 "fr_register_operand" "f")
-               (match_operand:TF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=&f"))
-   (clobber (match_scratch:TF 5 "=&f"))
-   (clobber (match_scratch:TF 6 "=&f"))
+})
+
+(define_insn_and_split "divxf3_internal_lat"
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (div:XF (match_operand:XF 1 "fr_register_operand" "f")
+               (match_operand:XF 2 "fr_register_operand" "f")))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=&f"))
+   (clobber (match_scratch:XF 5 "=&f"))
+   (clobber (match_scratch:XF 6 "=&f"))
    (clobber (match_scratch:BI 7 "=c"))]
-  "TARGET_INLINE_DIV_LAT"
+  "TARGET_INLINE_FLOAT_DIV == INL_MIN_LAT"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (div:TF (const_int 1) (match_dup 2)))
-             (set (match_dup 7) (unspec:BI [(match_dup 1) (match_dup 2)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 0) (div:XF (const_int 1) (match_dup 2)))
+             (set (match_dup 7) (unspec:BI [(match_dup 1) (match_dup 2)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 8)))
+                    (minus:XF (match_dup 8)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 1) (match_dup 0)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 1) (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
-     (parallel [(set (match_dup 5) (mult:TF (match_dup 3) (match_dup 3)))
+     (parallel [(set (match_dup 5) (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 6)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 5))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 5))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 5)
-                    (plus:TF (mult:TF (match_dup 6) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 6) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 5) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 5) (match_dup 3))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 4)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 4))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 5)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 8)))
+                    (minus:XF (match_dup 8)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 3)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 7) (const_int 0))
      (set (match_dup 0)
-         (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+         (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                   (match_dup 3))))
   ] 
-  "operands[8] = CONST1_RTX (TFmode);"
+  "operands[8] = CONST1_RTX (XFmode);"
   [(set_attr "predicable" "no")])
 
-(define_insn_and_split "divtf3_internal_thr"
-  [(set (match_operand:TF 0 "fr_register_operand" "=&f")
-       (div:TF (match_operand:TF 1 "fr_register_operand" "f")
-               (match_operand:TF 2 "fr_register_operand" "f")))
-   (clobber (match_scratch:TF 3 "=&f"))
-   (clobber (match_scratch:TF 4 "=&f"))
+(define_insn_and_split "divxf3_internal_thr"
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (div:XF (match_operand:XF 1 "fr_register_operand" "f")
+               (match_operand:XF 2 "fr_register_operand" "f")))
+   (clobber (match_scratch:XF 3 "=&f"))
+   (clobber (match_scratch:XF 4 "=&f"))
    (clobber (match_scratch:BI 5 "=c"))]
-  "TARGET_INLINE_DIV_THR"
+  "TARGET_INLINE_FLOAT_DIV == INL_MAX_THR"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (div:TF (const_int 1) (match_dup 2)))
-             (set (match_dup 5) (unspec:BI [(match_dup 1) (match_dup 2)] 5))
-             (use (const_int 1))])
+  [(parallel [(set (match_dup 0) (div:XF (const_int 1) (match_dup 2)))
+             (set (match_dup 5) (unspec:BI [(match_dup 1) (match_dup 2)]
+                                           UNSPEC_FR_RECIP_APPROX))
+             (use (const_int 0))])
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 6)))
+                    (minus:XF (match_dup 6)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 3) (mult:TF (match_dup 3) (match_dup 3)))
+     (parallel [(set (match_dup 3) (mult:XF (match_dup 3) (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 4))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 4))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
-     (parallel [(set (match_dup 4) (mult:TF (match_dup 1) (match_dup 0)))
+     (parallel [(set (match_dup 4) (mult:XF (match_dup 1) (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 3)))
-                             (match_dup 6)))
+                    (minus:XF (match_dup 6)
+                              (mult:XF (match_dup 2) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 0) (match_dup 3))
+                    (plus:XF (mult:XF (match_dup 0) (match_dup 3))
                              (match_dup 3)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 4)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 4))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 3)
-                    (plus:TF (mult:TF (match_dup 3) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 3) (match_dup 0))
                              (match_dup 4)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 0)))
-                             (match_dup 6)))
+                    (minus:XF (match_dup 6)
+                              (mult:XF (match_dup 2) (match_dup 0))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 0)
-                    (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+                    (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                              (match_dup 0)))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (parallel [(set (match_dup 4)
-                    (plus:TF (neg:TF (mult:TF (match_dup 2) (match_dup 3)))
-                             (match_dup 1)))
+                    (minus:XF (match_dup 1)
+                              (mult:XF (match_dup 2) (match_dup 3))))
                (use (const_int 1))]))
    (cond_exec (ne (match_dup 5) (const_int 0))
      (set (match_dup 0)
-         (plus:TF (mult:TF (match_dup 4) (match_dup 0))
+         (plus:XF (mult:XF (match_dup 4) (match_dup 0))
                   (match_dup 3))))
   ] 
-  "operands[6] = CONST1_RTX (TFmode);"
+  "operands[6] = CONST1_RTX (XFmode);"
+  [(set_attr "predicable" "no")])
+
+;; Inline square root.
+
+(define_expand "sqrtxf2"
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (sqrt:XF (match_operand:XF 1 "fr_register_operand" "f")))]
+  "TARGET_INLINE_SQRT"
+{
+  rtx insn;
+#if 0
+  if (TARGET_INLINE_SQRT == INL_MIN_LAT)
+    insn = gen_sqrtxf2_internal_lat (operands[0], operands[1]);
+  else
+#else
+  gcc_assert (TARGET_INLINE_SQRT != INL_MIN_LAT);
+#endif
+  insn = gen_sqrtxf2_internal_thr (operands[0], operands[1]);
+  emit_insn (insn);
+  DONE;
+})
+
+;; Latency-optimized square root.
+;; FIXME: Implement.
+
+;; Throughput-optimized square root.
+
+(define_insn_and_split "sqrtxf2_internal_thr"
+  [(set (match_operand:XF 0 "fr_register_operand" "=&f")
+       (sqrt:XF (match_operand:XF 1 "fr_register_operand" "f")))
+   ;; Register r2 in optimization guide.
+   (clobber (match_scratch:DI 2 "=r"))
+   ;; Register f8 in optimization guide
+   (clobber (match_scratch:XF 3 "=&f"))
+   ;; Register f9 in optimization guide
+   (clobber (match_scratch:XF 4 "=&f"))
+   ;; Register f10 in optimization guide
+   (clobber (match_scratch:XF 5 "=&f"))
+   ;; Register f11 in optimization guide
+   (clobber (match_scratch:XF 6 "=&f"))
+   ;; Register p6 in optimization guide.
+   (clobber (match_scratch:BI 7 "=c"))]
+  "TARGET_INLINE_SQRT == INL_MAX_THR"
+  "#"
+  "&& reload_completed"
+  [ ;; exponent of +1/2 in r2
+    (set (match_dup 2) (const_int 65534))
+    ;; +1/2 in f8.  The Intel manual mistakenly specifies f10.
+    (set (match_dup 3) 
+         (unspec:XF [(match_dup 2)] UNSPEC_SETF_EXP))
+    ;; Step 1
+    ;; y0 = 1/sqrt(a) in f7
+    (parallel [(set (match_dup 8)
+                    (div:XF (const_int 1)
+                            (sqrt:XF (match_dup 9))))
+               (set (match_dup 7)
+                    (unspec:BI [(match_dup 9)]
+                                 UNSPEC_FR_SQRT_RECIP_APPROX))
+               (use (const_int 0))])
+    ;; Step 2
+    ;; H0 = 1/2 * y0 in f9
+    (cond_exec (ne (match_dup 7) (const_int 0))
+      (parallel [(set (match_dup 4)
+                      (plus:XF (mult:XF (match_dup 3) (match_dup 8))
+                               (match_dup 10)))
+                 (use (const_int 1))]))
+    ;; Step 3
+    ;; S0 = a * y0 in f7
+    (cond_exec (ne (match_dup 7) (const_int 0))
+      (parallel [(set (match_dup 8)
+                      (plus:XF (mult:XF (match_dup 9) (match_dup 8))
+                               (match_dup 10)))
+                 (use (const_int 1))]))
+    ;; Step 4
+    ;; d0 = 1/2 - S0 * H0 in f10
+    (cond_exec (ne (match_dup 7) (const_int 0))
+      (parallel [(set (match_dup 5)
+                      (minus:XF (match_dup 3)
+                               (mult:XF (match_dup 8) (match_dup 4))))
+                 (use (const_int 1))]))
+    ;; Step 5
+    ;; H1 = H0 + d0 * H0 in f9
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 4))
+                                (match_dup 4)))
+                  (use (const_int 1))]))
+    ;; Step 6
+    ;; S1 = S0 + d0 * S0 in f7
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 8)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 8))
+                                (match_dup 8)))
+                  (use (const_int 1))]))
+    ;; Step 7
+    ;; d1 = 1/2 - S1 * H1 in f10
+    (cond_exec (ne (match_dup 7) (const_int 0))
+      (parallel [(set (match_dup 5)
+                      (minus:XF (match_dup 3)
+                               (mult:XF (match_dup 8) (match_dup 4))))
+                 (use (const_int 1))]))
+    ;; Step 8
+    ;; H2 = H1 + d1 * H1 in f9
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 4))
+                                (match_dup 4)))
+                  (use (const_int 1))]))
+    ;; Step 9 
+    ;; S2 = S1 + d1 * S1 in f7
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 8)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 8))
+                                (match_dup 8)))
+                  (use (const_int 1))]))
+    ;; Step 10
+    ;; d2 = 1/2 - S2 * H2 in f10
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 5)
+                       (minus:XF (match_dup 3)
+                                (mult:XF (match_dup 8) (match_dup 4))))
+                  (use (const_int 1))]))
+    ;; Step 11
+    ;; e2 = a - S2 * S2 in f8
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (minus:XF (match_dup 9)
+                                (mult:XF (match_dup 8) (match_dup 8))))
+                  (use (const_int 1))]))
+    ;; Step 12
+    ;; S3 = S2 + e2 * H2 in f7
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 8)
+                       (plus:XF (mult:XF (match_dup 3) (match_dup 4))
+                                (match_dup 8)))
+                  (use (const_int 1))]))
+    ;; Step 13
+    ;; H3 = H2 + d2 * H2 in f9
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 4)
+                       (plus:XF (mult:XF (match_dup 5) (match_dup 4))
+                                (match_dup 4)))
+                  (use (const_int 1))]))
+    ;; Step 14
+    ;; e3 = a - S3 * S3 in f8
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 3)
+                       (minus:XF (match_dup 9)
+                                (mult:XF (match_dup 8) (match_dup 8))))
+                  (use (const_int 1))]))
+    ;; Step 15
+    ;; S = S3 + e3 * H3 in f7
+    (cond_exec (ne (match_dup 7) (const_int 0))
+       (parallel [(set (match_dup 0)
+                       (plus:XF (mult:XF (match_dup 3) (match_dup 4))
+                                (match_dup 8)))
+                  (use (const_int 0))]))]
+{
+  /* Generate 82-bit versions of the input and output operands.  */
+  operands[8] = gen_rtx_REG (XFmode, REGNO (operands[0]));
+  operands[9] = gen_rtx_REG (XFmode, REGNO (operands[1]));
+  /* Generate required floating-point constants.  */
+  operands[10] = CONST0_RTX (XFmode);
+}
   [(set_attr "predicable" "no")])
 
 ;; ??? frcpa works like cmp.foo.unc.
 
 (define_insn "*recip_approx"
-  [(set (match_operand:TF 0 "fr_register_operand" "=f")
-       (div:TF (const_int 1)
-               (match_operand:TF 3 "fr_register_operand" "f")))
+  [(set (match_operand:XF 0 "fr_register_operand" "=f")
+       (div:XF (const_int 1)
+               (match_operand:XF 3 "fr_register_operand" "f")))
    (set (match_operand:BI 1 "register_operand" "=c")
-       (unspec:BI [(match_operand:TF 2 "fr_register_operand" "f")
-                   (match_dup 3)] 5))
+       (unspec:BI [(match_operand:XF 2 "fr_register_operand" "f")
+                   (match_dup 3)] UNSPEC_FR_RECIP_APPROX))
    (use (match_operand:SI 4 "const_int_operand" ""))]
   ""
   "frcpa.s%4 %0, %1 = %2, %3"
        (ashift:SI (match_operand:SI 1 "gr_register_operand" "")
                   (match_operand:SI 2 "gr_reg_or_5bit_operand" "")))]
   ""
-  "
 {
   if (GET_CODE (operands[2]) != CONST_INT)
     {
       emit_insn (gen_zero_extendsidi2 (subshift, operands[2]));
       operands[2] = subshift;
     }
-}")
+})
 
 (define_insn "*ashlsi3_internal"
   [(set (match_operand:SI 0 "gr_register_operand" "=r,r,r")
        (ashiftrt:SI (match_operand:SI 1 "gr_register_operand" "")
                     (match_operand:SI 2 "gr_reg_or_5bit_operand" "")))]
   ""
-  "
 {
   rtx subtarget = gen_reg_rtx (DImode);
   if (GET_CODE (operands[2]) == CONST_INT)
     }
   emit_move_insn (gen_lowpart (DImode, operands[0]), subtarget);
   DONE;
-}")
+})
 
 (define_expand "lshrsi3"
   [(set (match_operand:SI 0 "gr_register_operand" "")
        (lshiftrt:SI (match_operand:SI 1 "gr_register_operand" "")
                     (match_operand:SI 2 "gr_reg_or_5bit_operand" "")))]
   ""
-  "
 {
   rtx subtarget = gen_reg_rtx (DImode);
   if (GET_CODE (operands[2]) == CONST_INT)
     }
   emit_move_insn (gen_lowpart (DImode, operands[0]), subtarget);
   DONE;
-}")
+})
 
 ;; Use mix4.r/shr to implement rotrsi3.  We only get 32 bits of valid result
 ;; here, instead of 64 like the patterns above.  Keep the pattern together
        (rotatert:SI (match_operand:SI 1 "gr_register_operand" "")
                     (match_operand:SI 2 "gr_reg_or_5bit_operand" "")))]
   ""
-  "
 {
   if (GET_MODE (operands[2]) != VOIDmode)
     {
       emit_insn (gen_zero_extendsidi2 (tmp, operands[2]));
       operands[2] = tmp;
     }
-}")
+})
 
 (define_insn_and_split "*rotrsi3_internal"
   [(set (match_operand:SI 0 "gr_register_operand" "=&r")
        (rotate:SI (match_operand:SI 1 "gr_register_operand" "")
                   (match_operand:SI 2 "gr_reg_or_5bit_operand" "")))]
   ""
-  "
 {
   if (! shift_32bit_count_operand (operands[2], SImode))
     {
       emit_insn (gen_rotrsi3 (operands[0], operands[1], tmp));
       DONE;
     }
-}")
+})
 
 (define_insn_and_split "*rotlsi3_internal"
   [(set (match_operand:SI 0 "gr_register_operand" "=r")
                (ashift:DI (zero_extend:DI (match_dup 1)) (const_int 32))))
    (set (match_dup 3)
        (lshiftrt:DI (match_dup 3) (match_dup 2)))]
-  "operands[3] = gen_rtx_REG (DImode, REGNO (operands[0]));
-   operands[2] = GEN_INT (32 - INTVAL (operands[2]));")
+{
+  operands[3] = gen_rtx_REG (DImode, REGNO (operands[0]));
+  operands[2] = GEN_INT (32 - INTVAL (operands[2]));
+})
 \f
 ;; ::::::::::::::::::::
 ;; ::
                          (match_operand:DI 3 "nonmemory_operand" "r"))
                 (match_operand:DI 4 "nonmemory_operand" "rI")))]
   "reload_in_progress"
-  "* abort ();"
+  "* gcc_unreachable ();"
   "reload_completed"
   [(set (match_dup 0) (plus:DI (mult:DI (match_dup 1) (match_dup 2))
                               (match_dup 3)))
        (rotatert:DI (match_operand:DI 1 "gr_register_operand" "")
                     (match_operand:DI 2 "nonmemory_operand" "")))]
   ""
-  "
 {
   if (! shift_count_operand (operands[2], DImode))
     FAIL;
-}")
+})
 
 (define_insn "*rotrdi3_internal"
   [(set (match_operand:DI 0 "gr_register_operand" "=r")
        (rotate:DI (match_operand:DI 1 "gr_register_operand" "")
                   (match_operand:DI 2 "nonmemory_operand" "")))]
   ""
-  "
 {
   if (! shift_count_operand (operands[2], DImode))
     FAIL;
-}")
+})
 
 (define_insn "*rotldi3_internal"
   [(set (match_operand:DI 0 "gr_register_operand" "=r")
 \f
 ;; ::::::::::::::::::::
 ;; ::
+;; :: 128 bit Integer Shifts and Rotates
+;; ::
+;; ::::::::::::::::::::
+
+(define_expand "ashlti3"
+  [(set (match_operand:TI 0 "gr_register_operand" "")
+       (ashift:TI (match_operand:TI 1 "gr_register_operand" "")
+                  (match_operand:DI 2 "nonmemory_operand" "")))]
+  ""
+{
+  if (!dshift_count_operand (operands[2], DImode))
+    FAIL;
+})
+
+(define_insn_and_split "*ashlti3_internal"
+  [(set (match_operand:TI 0 "gr_register_operand" "=&r")
+       (ashift:TI (match_operand:TI 1 "gr_register_operand" "r")
+                  (match_operand:DI 2 "dshift_count_operand" "n")))]
+  ""
+  "#"
+  "reload_completed"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT shift = INTVAL (operands[2]);
+  rtx rl = gen_lowpart (DImode, operands[0]);
+  rtx rh = gen_highpart (DImode, operands[0]);
+  rtx lo = gen_lowpart (DImode, operands[1]);
+  rtx shiftlo = GEN_INT (shift & 63);
+
+  if (shift & 64)
+    {
+      emit_move_insn (rl, const0_rtx);
+      if (shift & 63)
+       emit_insn (gen_ashldi3 (rh, lo, shiftlo));
+      else
+       emit_move_insn (rh, lo);
+    }
+  else
+    {
+      rtx hi = gen_highpart (DImode, operands[1]);
+
+      emit_insn (gen_shrp (rh, hi, lo, GEN_INT (-shift & 63)));
+      emit_insn (gen_ashldi3 (rl, lo, shiftlo));
+    }
+  DONE;
+})
+
+(define_expand "ashrti3"
+  [(set (match_operand:TI 0 "gr_register_operand" "")
+       (ashiftrt:TI (match_operand:TI 1 "gr_register_operand" "")
+                    (match_operand:DI 2 "nonmemory_operand" "")))]
+  ""
+{
+  if (!dshift_count_operand (operands[2], DImode))
+    FAIL;
+})
+
+(define_insn_and_split "*ashrti3_internal"
+  [(set (match_operand:TI 0 "gr_register_operand" "=&r")
+       (ashiftrt:TI (match_operand:TI 1 "gr_register_operand" "r")
+                    (match_operand:DI 2 "dshift_count_operand" "n")))]
+  ""
+  "#"
+  "reload_completed"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT shift = INTVAL (operands[2]);
+  rtx rl = gen_lowpart (DImode, operands[0]);
+  rtx rh = gen_highpart (DImode, operands[0]);
+  rtx hi = gen_highpart (DImode, operands[1]);
+  rtx shiftlo = GEN_INT (shift & 63);
+
+  if (shift & 64)
+    {
+      if (shift & 63)
+       emit_insn (gen_ashrdi3 (rl, hi, shiftlo));
+      else
+       emit_move_insn (rl, hi);
+      emit_insn (gen_ashrdi3 (rh, hi, GEN_INT (63)));
+    }
+  else
+    {
+      rtx lo = gen_lowpart (DImode, operands[1]);
+
+      emit_insn (gen_shrp (rl, hi, lo, shiftlo));
+      emit_insn (gen_ashrdi3 (rh, hi, shiftlo));
+    }
+  DONE;
+})
+
+(define_expand "lshrti3"
+  [(set (match_operand:TI 0 "gr_register_operand" "")
+        (lshiftrt:TI (match_operand:TI 1 "gr_register_operand" "")
+                     (match_operand:DI 2 "nonmemory_operand" "")))]
+  ""
+{ 
+  if (!dshift_count_operand (operands[2], DImode))
+    FAIL;
+}) 
+
+(define_insn_and_split "*lshrti3_internal"
+  [(set (match_operand:TI 0 "gr_register_operand" "=&r")
+       (lshiftrt:TI (match_operand:TI 1 "gr_register_operand" "r")
+                    (match_operand:DI 2 "dshift_count_operand" "n")))]
+  ""
+  "#"
+  "reload_completed"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT shift = INTVAL (operands[2]);
+  rtx rl = gen_lowpart (DImode, operands[0]);
+  rtx rh = gen_highpart (DImode, operands[0]);
+  rtx hi = gen_highpart (DImode, operands[1]);
+  rtx shiftlo = GEN_INT (shift & 63);
+
+  if (shift & 64)
+    {
+      if (shift & 63)
+       emit_insn (gen_lshrdi3 (rl, hi, shiftlo));
+      else
+       emit_move_insn (rl, hi);
+      emit_move_insn (rh, const0_rtx);
+    }
+  else
+    {
+      rtx lo = gen_lowpart (DImode, operands[1]);
+
+      emit_insn (gen_shrp (rl, hi, lo, shiftlo));
+      emit_insn (gen_lshrdi3 (rh, hi, shiftlo));
+    }
+  DONE;
+})
+
+(define_insn "shrp"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+       (unspec:DI [(match_operand:DI 1 "gr_register_operand" "r")
+                   (match_operand:DI 2 "gr_register_operand" "r")
+                   (match_operand:DI 3 "shift_count_operand" "M")]
+                  UNSPEC_SHRP))]
+  ""
+  "shrp %0 = %1, %2, %3"
+  [(set_attr "itanium_class" "ishf")])
+\f
+;; ::::::::::::::::::::
+;; ::
 ;; :: 32 bit Integer Logical operations
 ;; ::
 ;; ::::::::::::::::::::
         (compare (match_operand:BI 0 "register_operand" "")
                 (match_operand:BI 1 "const_int_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
 
 (define_expand "cmpsi"
   [(set (cc0)
         (compare (match_operand:SI 0 "gr_register_operand" "")
                 (match_operand:SI 1 "gr_reg_or_8bit_and_adjusted_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
 
 (define_expand "cmpdi"
   [(set (cc0)
         (compare (match_operand:DI 0 "gr_register_operand" "")
                 (match_operand:DI 1 "gr_reg_or_8bit_and_adjusted_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
 
 (define_expand "cmpsf"
   [(set (cc0)
         (compare (match_operand:SF 0 "fr_reg_or_fp01_operand" "")
                 (match_operand:SF 1 "fr_reg_or_fp01_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
 
 (define_expand "cmpdf"
   [(set (cc0)
         (compare (match_operand:DF 0 "fr_reg_or_fp01_operand" "")
                 (match_operand:DF 1 "fr_reg_or_fp01_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
 
-(define_expand "cmptf"
+(define_expand "cmpxf"
   [(set (cc0)
-        (compare (match_operand:TF 0 "tfreg_or_fp01_operand" "")
-                (match_operand:TF 1 "tfreg_or_fp01_operand" "")))]
+        (compare (match_operand:XF 0 "xfreg_or_fp01_operand" "")
+                (match_operand:XF 1 "xfreg_or_fp01_operand" "")))]
   ""
-  "
 {
   ia64_compare_op0 = operands[0];
   ia64_compare_op1 = operands[1];
   DONE;
-}")
+})
+
+(define_expand "cmptf"
+  [(set (cc0)
+        (compare (match_operand:TF 0 "gr_register_operand" "")
+                (match_operand:TF 1 "gr_register_operand" "")))]
+  "TARGET_HPUX"
+{
+  ia64_compare_op0 = operands[0];
+  ia64_compare_op1 = operands[1];
+  DONE;
+})
 
 (define_insn "*cmpsi_normal"
   [(set (match_operand:BI 0 "register_operand" "=c")
   "fcmp.%D1 %0, %I0 = %F2, %F3"
   [(set_attr "itanium_class" "fcmp")])
 
-(define_insn "*cmptf_internal"
+(define_insn "*cmpxf_internal"
   [(set (match_operand:BI 0 "register_operand" "=c")
        (match_operator:BI 1 "comparison_operator"
-                  [(match_operand:TF 2 "tfreg_or_fp01_operand" "fG")
-                   (match_operand:TF 3 "tfreg_or_fp01_operand" "fG")]))]
+                  [(match_operand:XF 2 "xfreg_or_fp01_operand" "fG")
+                   (match_operand:XF 3 "xfreg_or_fp01_operand" "fG")]))]
   ""
   "fcmp.%D1 %0, %I0 = %F2, %F3"
   [(set_attr "itanium_class" "fcmp")])
    (use (match_operand 3 "" ""))       ; loop level
    (use (match_operand 4 "" ""))]      ; label
   ""
-  "
 {
   /* Only use cloop on innermost loops.  */
   if (INTVAL (operands[3]) > 1)
   emit_jump_insn (gen_doloop_end_internal (gen_rtx_REG (DImode, AR_LC_REGNUM),
                                           operands[4]));
   DONE;
-}")
+})
 
 (define_insn "doloop_end_internal"
   [(set (pc) (if_then_else (ne (match_operand:DI 0 "ar_lc_reg_operand" "")
                (label_ref (match_operand 1 "" ""))
                (pc)))
    (set (match_dup 0) (if_then_else:DI (ne (match_dup 0) (const_int 0))
-                        (match_dup 0)
-                        (plus:DI (match_dup 0) (const_int -1))))]
+                        (plus:DI (match_dup 0) (const_int -1))
+                        (match_dup 0)))]
   ""
   "br.cloop.sptk.few %l1"
   [(set_attr "itanium_class" "br")
           "rim,rim,rim, rim, *f, *b,*d*e,*f,*b,*d*e,rO,*f,rOQ,rO,  rK")))]
   "ia64_move_ok (operands[0], operands[2])
    && ia64_move_ok (operands[0], operands[3])"
-  "* abort ();"
+  { gcc_unreachable (); }
   [(set_attr "predicable" "no")])
 
 (define_split
          (match_operand 3 "move_operand" "")))]
   "reload_completed"
   [(const_int 0)]
-  "
 {
-  rtx tmp;
-  if (! rtx_equal_p (operands[0], operands[2]))
+  bool emitted_something = false;
+  rtx dest = operands[0];
+  rtx srct = operands[2];
+  rtx srcf = operands[3];
+  rtx cond = operands[4];
+
+  if (! rtx_equal_p (dest, srct))
     {
-      tmp = gen_rtx_SET (VOIDmode, operands[0], operands[2]);
-      tmp = gen_rtx_COND_EXEC (VOIDmode, operands[4], tmp);
-      emit_insn (tmp);
+      ia64_emit_cond_move (dest, srct, cond);
+      emitted_something = true;
     }
-  if (! rtx_equal_p (operands[0], operands[3]))
+  if (! rtx_equal_p (dest, srcf))
     {
-      tmp = gen_rtx_fmt_ee (GET_CODE (operands[4]) == NE ? EQ : NE,
-                           VOIDmode, operands[1], const0_rtx);
-      tmp = gen_rtx_COND_EXEC (VOIDmode, tmp,
-                              gen_rtx_SET (VOIDmode, operands[0],
-                                           operands[3]));
-      emit_insn (tmp);
+      cond = gen_rtx_fmt_ee (GET_CODE (cond) == NE ? EQ : NE,
+                            VOIDmode, operands[1], const0_rtx);
+      ia64_emit_cond_move (dest, srcf, cond);
+      emitted_something = true;
     }
+  if (! emitted_something)
+    emit_note (NOTE_INSN_DELETED);
   DONE;
-}")
+})
 
 ;; Absolute value pattern.
 
    (cond_exec
      (match_dup 5)
      (set (match_dup 0) (match_dup 3)))]
-  "
 {
   operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[4]) == NE ? EQ : NE,
                                VOIDmode, operands[1], const0_rtx);
-}")
+})
 
 ;;
 ;; SImode if_then_else patterns.
                    "rim*f,rO,rO,0,0,0,rim*f,rO,rO")))]
   "ia64_move_ok (operands[0], operands[2])
    && ia64_move_ok (operands[0], operands[3])"
-  "* abort ();"
+  { gcc_unreachable (); }
   [(set_attr "predicable" "no")])
 
 (define_insn "*abssi2_internal"
    (cond_exec
      (match_dup 5)
      (set (match_dup 0) (match_dup 3)))]
-  "
 {
   operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[4]) == NE ? EQ : NE,
                                VOIDmode, operands[1], const0_rtx);
-}")
+})
+
+(define_insn_and_split "*cond_opsi2_internal"
+  [(set (match_operand:SI 0 "gr_register_operand" "=r")
+       (match_operator:SI 5 "condop_operator"
+         [(if_then_else:SI
+            (match_operator 6 "predicate_operator"
+              [(match_operand:BI 1 "register_operand" "c")
+               (const_int 0)])
+            (match_operand:SI 2 "gr_register_operand" "r")
+            (match_operand:SI 3 "gr_register_operand" "r"))
+          (match_operand:SI 4 "gr_register_operand" "r")]))]
+  ""
+  "#"
+  "reload_completed"
+  [(cond_exec
+     (match_dup 6)
+     (set (match_dup 0) (match_op_dup:SI 5 [(match_dup 2) (match_dup 4)])))
+   (cond_exec
+     (match_dup 7)
+     (set (match_dup 0) (match_op_dup:SI 5 [(match_dup 3) (match_dup 4)])))]
+{
+  operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[6]) == NE ? EQ : NE,
+                               VOIDmode, operands[1], const0_rtx);
+}
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
+
+
+(define_insn_and_split "*cond_opsi2_internal_b"
+  [(set (match_operand:SI 0 "gr_register_operand" "=r")
+       (match_operator:SI 5 "condop_operator"
+         [(match_operand:SI 4 "gr_register_operand" "r")
+          (if_then_else:SI
+            (match_operator 6 "predicate_operator"
+              [(match_operand:BI 1 "register_operand" "c")
+               (const_int 0)])
+            (match_operand:SI 2 "gr_register_operand" "r")
+            (match_operand:SI 3 "gr_register_operand" "r"))]))]
+  ""
+  "#"
+  "reload_completed"
+  [(cond_exec
+     (match_dup 6)
+     (set (match_dup 0) (match_op_dup:SI 5 [(match_dup 4) (match_dup 2)])))
+   (cond_exec
+     (match_dup 7)
+     (set (match_dup 0) (match_op_dup:SI 5 [(match_dup 4) (match_dup 3)])))]
+{
+  operands[7] = gen_rtx_fmt_ee (GET_CODE (operands[6]) == NE ? EQ : NE,
+                               VOIDmode, operands[1], const0_rtx);
+}
+  [(set_attr "itanium_class" "ialu")
+   (set_attr "predicable" "no")])
 
 \f
 ;; ::::::::::::::::::::
    (use (match_operand 2 "" ""))
    (use (match_operand 3 "" ""))]
   ""
-  "
 {
-  ia64_expand_call (NULL_RTX, operands[0], operands[2], 0);
+  ia64_expand_call (NULL_RTX, operands[0], operands[2], false);
   DONE;
-}")
+})
 
 (define_expand "sibcall"
   [(use (match_operand:DI 0 "" ""))
    (use (match_operand 2 "" ""))
    (use (match_operand 3 "" ""))]
   ""
-  "
 {
-  ia64_expand_call (NULL_RTX, operands[0], operands[2], 1);
+  ia64_expand_call (NULL_RTX, operands[0], operands[2], true);
   DONE;
-}")
+})
 
 ;; Subroutine call instruction returning a value.  Operand 0 is the hard
 ;; register in which the value is returned.  There are three more operands,
    (use (match_operand 3 "" ""))
    (use (match_operand 4 "" ""))]
   ""
-  "
 {
-  ia64_expand_call (operands[0], operands[1], operands[3], 0);
+  ia64_expand_call (operands[0], operands[1], operands[3], false);
   DONE;
-}")
+})
 
 (define_expand "sibcall_value"
   [(use (match_operand 0 "" ""))
    (use (match_operand 3 "" ""))
    (use (match_operand 4 "" ""))]
   ""
-  "
 {
-  ia64_expand_call (operands[0], operands[1], operands[3], 1);
+  ia64_expand_call (operands[0], operands[1], operands[3], true);
   DONE;
-}")
+})
 
 ;; Call subroutine returning any type.
 
              (match_operand 1 "" "")
              (match_operand 2 "" "")])]
   ""
-  "
 {
   int i;
 
   emit_insn (gen_blockage ());
 
   DONE;
-}")
+})
 
-(define_insn "call_nopic"
-  [(call (mem:DI (match_operand:DI 0 "call_operand" "b,i"))
-        (match_operand 1 "" ""))
-   (clobber (match_operand:DI 2 "register_operand" "=b,b"))]
+(define_insn "call_nogp"
+  [(call (mem:DI (match_operand:DI 0 "call_operand" "?b,i"))
+        (const_int 0))
+   (clobber (match_operand:DI 1 "register_operand" "=b,b"))]
   ""
-  "br.call%+.many %2 = %0"
+  "br.call%+.many %1 = %0"
   [(set_attr "itanium_class" "br,scall")])
 
-(define_insn "call_value_nopic"
-  [(set (match_operand 0 "" "")
-       (call (mem:DI (match_operand:DI 1 "call_operand" "b,i"))
-             (match_operand 2 "" "")))
-   (clobber (match_operand:DI 3 "register_operand" "=b,b"))]
+(define_insn "call_value_nogp"
+  [(set (match_operand 0 "" "=X,X")
+       (call (mem:DI (match_operand:DI 1 "call_operand" "?b,i"))
+             (const_int 0)))
+   (clobber (match_operand:DI 2 "register_operand" "=b,b"))]
   ""
-  "br.call%+.many %3 = %1"
+  "br.call%+.many %2 = %1"
   [(set_attr "itanium_class" "br,scall")])
 
-(define_insn "sibcall_nopic"
-  [(call (mem:DI (match_operand:DI 0 "call_operand" "b,i"))
-        (match_operand 1 "" ""))
-   (use (match_operand:DI 2 "register_operand" "=b,b"))]
+(define_insn "sibcall_nogp"
+  [(call (mem:DI (match_operand:DI 0 "call_operand" "?b,i"))
+        (const_int 0))]
   ""
   "br%+.many %0"
   [(set_attr "itanium_class" "br,scall")])
 
-(define_insn "call_pic"
-  [(call (mem:DI (match_operand:DI 0 "call_operand" "b,i"))
-        (match_operand 1 "" ""))
-   (use (unspec [(reg:DI 1)] 9))
-   (clobber (match_operand:DI 2 "register_operand" "=b,b"))]
+(define_insn "call_gp"
+  [(call (mem:DI (match_operand:DI 0 "call_operand" "?r,i"))
+        (const_int 1))
+   (clobber (match_operand:DI 1 "register_operand" "=b,b"))
+   (clobber (match_scratch:DI 2 "=&r,X"))
+   (clobber (match_scratch:DI 3 "=b,X"))]
   ""
-  "br.call%+.many %2 = %0"
+  "#"
   [(set_attr "itanium_class" "br,scall")])
 
-(define_insn "call_value_pic"
-  [(set (match_operand 0 "" "")
-       (call (mem:DI (match_operand:DI 1 "call_operand" "b,i"))
-             (match_operand 2 "" "")))
-   (use (unspec [(reg:DI 1)] 9))
-   (clobber (match_operand:DI 3 "register_operand" "=b,b"))]
+;; Irritatingly, we don't have access to INSN within the split body.
+;; See commentary in ia64_split_call as to why these aren't peep2.
+(define_split
+  [(call (mem (match_operand 0 "call_operand" ""))
+        (const_int 1))
+   (clobber (match_operand:DI 1 "register_operand" ""))
+   (clobber (match_scratch:DI 2 ""))
+   (clobber (match_scratch:DI 3 ""))]
+  "reload_completed && find_reg_note (insn, REG_NORETURN, NULL_RTX)"
+  [(const_int 0)]
+{
+  ia64_split_call (NULL_RTX, operands[0], operands[1], operands[2],
+                  operands[3], true, false);
+  DONE;
+})
+
+(define_split
+  [(call (mem (match_operand 0 "call_operand" ""))
+        (const_int 1))
+   (clobber (match_operand:DI 1 "register_operand" ""))
+   (clobber (match_scratch:DI 2 ""))
+   (clobber (match_scratch:DI 3 ""))]
+  "reload_completed"
+  [(const_int 0)]
+{
+  ia64_split_call (NULL_RTX, operands[0], operands[1], operands[2],
+                  operands[3], false, false);
+  DONE;
+})
+
+(define_insn "call_value_gp"
+  [(set (match_operand 0 "" "=X,X")
+       (call (mem:DI (match_operand:DI 1 "call_operand" "?r,i"))
+             (const_int 1)))
+   (clobber (match_operand:DI 2 "register_operand" "=b,b"))
+   (clobber (match_scratch:DI 3 "=&r,X"))
+   (clobber (match_scratch:DI 4 "=b,X"))]
   ""
-  "br.call%+.many %3 = %1"
+  "#"
   [(set_attr "itanium_class" "br,scall")])
 
-(define_insn "sibcall_pic"
-  [(call (mem:DI (match_operand:DI 0 "call_operand" "bi"))
-        (match_operand 1 "" ""))
-   (use (unspec [(reg:DI 1)] 9))
-   (use (match_operand:DI 2 "register_operand" "=b"))]
+(define_split
+  [(set (match_operand 0 "" "")
+       (call (mem:DI (match_operand:DI 1 "call_operand" ""))
+             (const_int 1)))
+   (clobber (match_operand:DI 2 "register_operand" ""))
+   (clobber (match_scratch:DI 3 ""))
+   (clobber (match_scratch:DI 4 ""))]
+  "reload_completed && find_reg_note (insn, REG_NORETURN, NULL_RTX)"
+  [(const_int 0)]
+{
+  ia64_split_call (operands[0], operands[1], operands[2], operands[3],
+                  operands[4], true, false);
+  DONE;
+})
+
+(define_split
+  [(set (match_operand 0 "" "")
+       (call (mem:DI (match_operand:DI 1 "call_operand" ""))
+             (const_int 1)))
+   (clobber (match_operand:DI 2 "register_operand" ""))
+   (clobber (match_scratch:DI 3 ""))
+   (clobber (match_scratch:DI 4 ""))]
+  "reload_completed"
+  [(const_int 0)]
+{
+  ia64_split_call (operands[0], operands[1], operands[2], operands[3],
+                  operands[4], false, false);
+  DONE;
+})
+
+(define_insn_and_split "sibcall_gp"
+  [(call (mem:DI (match_operand:DI 0 "call_operand" "?r,i"))
+        (const_int 1))
+   (clobber (match_scratch:DI 1 "=&r,X"))
+   (clobber (match_scratch:DI 2 "=b,X"))]
   ""
-  "br%+.many %0"
+  "#"
+  "reload_completed"
+  [(const_int 0)]
+{
+  ia64_split_call (NULL_RTX, operands[0], NULL_RTX, operands[1],
+                  operands[2], true, true);
+  DONE;
+}
   [(set_attr "itanium_class" "br")])
 
 (define_insn "return_internal"
   [(set_attr "itanium_class" "br")])
 
 (define_expand "tablejump"
-  [(match_operand:DI 0 "register_operand" "")
-   (match_operand 1 "" "")]
+  [(parallel [(set (pc) (match_operand:DI 0 "memory_operand" ""))
+             (use (label_ref (match_operand 1 "" "")))])]
   ""
-  "
 {
-  rtx tmp1 = gen_reg_rtx (DImode);
-  rtx tmp2 = gen_reg_rtx (DImode);
+  rtx op0 = operands[0];
+  rtx addr;
+
+  /* ??? Bother -- do_tablejump is "helpful" and pulls the table
+     element into a register without bothering to see whether that
+     is necessary given the operand predicate.  Check for MEM just
+     in case someone fixes this.  */
+  if (GET_CODE (op0) == MEM)
+    addr = XEXP (op0, 0);
+  else
+    {
+      /* Otherwise, cheat and guess that the previous insn in the
+        stream was the memory load.  Grab the address from that.
+        Note we have to momentarily pop out of the sequence started
+        by the insn-emit wrapper in order to grab the last insn.  */
+      rtx last, set;
+
+      end_sequence ();
+      last = get_last_insn ();
+      start_sequence ();
+      set = single_set (last);
+
+      gcc_assert (rtx_equal_p (SET_DEST (set), op0)
+                 && GET_CODE (SET_SRC (set)) == MEM);
+      addr = XEXP (SET_SRC (set), 0);
+      gcc_assert (!rtx_equal_p (addr, op0));
+    }
 
-  emit_move_insn (tmp1, gen_rtx_LABEL_REF (Pmode, operands[1]));
-  emit_insn (gen_adddi3 (tmp2, operands[0], tmp1));
-  emit_jump_insn (gen_tablejump_internal (tmp2, operands[1]));
-  DONE;
-}")
+  /* Jump table elements are stored pc-relative.  That is, a displacement
+     from the entry to the label.  Thus to convert to an absolute address
+     we add the address of the memory from which the value is loaded.  */
+  operands[0] = expand_simple_binop (DImode, PLUS, op0, addr,
+                                    NULL_RTX, 1, OPTAB_DIRECT);
+})
 
-(define_insn "tablejump_internal"
+(define_insn "*tablejump_internal"
   [(set (pc) (match_operand:DI 0 "register_operand" "b"))
    (use (label_ref (match_operand 1 "" "")))]
   ""
 (define_expand "prologue"
   [(const_int 1)]
   ""
-  "
 {
   ia64_expand_prologue ();
   DONE;
-}")
+})
 
 (define_expand "epilogue"
   [(return)]
   ""
-  "
 {
   ia64_expand_epilogue (0);
   DONE;
-}")
+})
 
 (define_expand "sibcall_epilogue"
   [(return)]
   ""
-  "
 {
   ia64_expand_epilogue (1);
   DONE;
-}")
+})
 
 ;; This prevents the scheduler from moving the SP decrement past FP-relative
 ;; stack accesses.  This is the same as adddi3 plus the extra set.
   [(set (match_operand:DI 0 "register_operand" "=r,r,r")
        (plus:DI (match_operand:DI 1 "register_operand" "%r,r,a")
                 (match_operand:DI 2 "gr_reg_or_22bit_operand" "r,I,J")))
-   (set (match_operand:DI 3 "register_operand" "=r,r,r")
+   (set (match_operand:DI 3 "register_operand" "+r,r,r")
        (match_dup 3))]
   ""
   "@
-  add %0 = %1, %2
-  adds %0 = %2, %1
-  addl %0 = %2, %1"
+   add %0 = %1, %2
+   adds %0 = %2, %1
+   addl %0 = %2, %1"
   [(set_attr "itanium_class" "ialu")])
 
 ;; This prevents the scheduler from moving the SP restore past FP-relative
   "mov %0 = %1"
   [(set_attr "itanium_class" "ialu")])
 
+;; As USE insns aren't meaningful after reload, this is used instead
+;; to prevent deleting instructions setting registers for EH handling
+(define_insn "prologue_use"
+  [(unspec:DI [(match_operand:DI 0 "register_operand" "")]
+             UNSPEC_PROLOGUE_USE)]
+  ""
+  ""
+  [(set_attr "itanium_class" "ignore")
+   (set_attr "predicable" "no")
+   (set_attr "empty" "yes")])
+
 ;; Allocate a new register frame.
 
 (define_insn "alloc"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (unspec_volatile:DI [(const_int 0)] 0))
+       (unspec_volatile:DI [(const_int 0)] UNSPECV_ALLOC))
    (use (match_operand:DI 1 "const_int_operand" "i"))
    (use (match_operand:DI 2 "const_int_operand" "i"))
    (use (match_operand:DI 3 "const_int_operand" "i"))
   ""
   "alloc %0 = ar.pfs, %1, %2, %3, %4"
   [(set_attr "itanium_class" "syst_m0")
-   (set_attr "predicable" "no")])
+   (set_attr "predicable" "no")
+   (set_attr "first_insn" "yes")])
 
 ;; Modifies ar.unat
 (define_expand "gr_spill"
   [(parallel [(set (match_operand:DI 0 "memory_operand" "=m")
                   (unspec:DI [(match_operand:DI 1 "register_operand" "r")
-                              (match_operand:DI 2 "const_int_operand" "")] 1))
+                              (match_operand:DI 2 "const_int_operand" "")]
+                             UNSPEC_GR_SPILL))
              (clobber (match_dup 3))])]
   ""
   "operands[3] = gen_rtx_REG (DImode, AR_UNAT_REGNUM);")
 (define_insn "gr_spill_internal"
   [(set (match_operand:DI 0 "memory_operand" "=m")
        (unspec:DI [(match_operand:DI 1 "register_operand" "r")
-                   (match_operand:DI 2 "const_int_operand" "")] 1))
+                   (match_operand:DI 2 "const_int_operand" "")]
+                  UNSPEC_GR_SPILL))
    (clobber (match_operand:DI 3 "register_operand" ""))]
   ""
-  "*
 {
-  return \".mem.offset %2, 0\;%,st8.spill %0 = %1%P0\";
-}"
+  /* Note that we use a C output pattern here to avoid the predicate
+     being automatically added before the .mem.offset directive.  */
+  return ".mem.offset %2, 0\;%,st8.spill %0 = %1%P0";
+}
   [(set_attr "itanium_class" "st")])
 
 ;; Reads ar.unat
 (define_expand "gr_restore"
   [(parallel [(set (match_operand:DI 0 "register_operand" "=r")
                   (unspec:DI [(match_operand:DI 1 "memory_operand" "m")
-                              (match_operand:DI 2 "const_int_operand" "")] 2))
+                              (match_operand:DI 2 "const_int_operand" "")]
+                             UNSPEC_GR_RESTORE))
              (use (match_dup 3))])]
   ""
   "operands[3] = gen_rtx_REG (DImode, AR_UNAT_REGNUM);")
 (define_insn "gr_restore_internal"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (unspec:DI [(match_operand:DI 1 "memory_operand" "m")
-                   (match_operand:DI 2 "const_int_operand" "")] 2))
+                   (match_operand:DI 2 "const_int_operand" "")]
+                  UNSPEC_GR_RESTORE))
    (use (match_operand:DI 3 "register_operand" ""))]
   ""
-  "*
-{
-  return \".mem.offset %2, 0\;%,ld8.fill %0 = %1%P1\";
-}"
+  { return ".mem.offset %2, 0\;%,ld8.fill %0 = %1%P1"; }
   [(set_attr "itanium_class" "ld")])
 
 (define_insn "fr_spill"
-  [(set (match_operand:TF 0 "memory_operand" "=m")
-       (unspec:TF [(match_operand:TF 1 "register_operand" "f")] 3))]
+  [(set (match_operand:XF 0 "memory_operand" "=m")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "f")]
+                  UNSPEC_FR_SPILL))]
   ""
   "stf.spill %0 = %1%P0"
   [(set_attr "itanium_class" "stf")])
 
 (define_insn "fr_restore"
-  [(set (match_operand:TF 0 "register_operand" "=f")
-       (unspec:TF [(match_operand:TF 1 "memory_operand" "m")] 4))]
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "memory_operand" "m")]
+                  UNSPEC_FR_RESTORE))]
   ""
   "ldf.fill %0 = %1%P1"
   [(set_attr "itanium_class" "fld")])
 
 (define_insn "bsp_value"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (unspec:DI [(const_int 0)] 20))]
+       (unspec:DI [(const_int 0)] UNSPEC_BSP_VALUE))]
   ""
-  ";;\;mov %0 = ar.bsp"
+  "*
+{
+  return \";;\;%,mov %0 = ar.bsp\";
+}"
   [(set_attr "itanium_class" "frar_i")])
 
 (define_insn "set_bsp"
-  [(unspec_volatile [(match_operand:DI 0 "register_operand" "r")] 5)]
-  ""
-  "flushrs\;mov r19=ar.rsc\;;;\;and r19=0x1c,r19\;;;\;mov ar.rsc=r19\;;;\;mov ar.bspstore=%0\;;;\;or r19=0x3,r19\;;;\;loadrs\;invala\;;;\;mov ar.rsc=r19"
+  [(unspec_volatile [(match_operand:DI 0 "register_operand" "r")]
+                   UNSPECV_SET_BSP)]
+  ""
+  "flushrs
+       mov r19=ar.rsc
+       ;;
+       and r19=0x1c,r19
+       ;;
+       mov ar.rsc=r19
+       ;;
+       mov ar.bspstore=%0
+       ;;
+       or r19=0x3,r19
+       ;;
+       loadrs
+       invala
+       ;;
+       mov ar.rsc=r19"
   [(set_attr "itanium_class" "unknown")
    (set_attr "predicable" "no")])
 
 ;; fixed later.  This avoids an RSE DV.
 
 (define_insn "flushrs"
-  [(unspec [(const_int 0)] 21)]
+  [(unspec [(const_int 0)] UNSPEC_FLUSHRS)]
   ""
   ";;\;flushrs\;;;"
-  [(set_attr "itanium_class" "rse_m")])
+  [(set_attr "itanium_class" "rse_m")
+   (set_attr "predicable" "no")])
 \f
 ;; ::::::::::::::::::::
 ;; ::
 ;; ::
 ;; ::::::::::::::::::::
 
-;; ??? Emiting a NOP instruction isn't very useful.  This should probably
+;; ??? Emitting a NOP instruction isn't very useful.  This should probably
 ;; be emitting ";;" to force a break in the instruction packing.
 
 ;; No operation, needed in case the user uses -g but not -O.
   [(const_int 0)]
   ""
   "nop 0"
-  [(set_attr "itanium_class" "unknown")])
+  [(set_attr "itanium_class" "nop")])
 
 (define_insn "nop_m"
   [(const_int 1)]
   [(const_int 5)]
   ""
   ""
-  [(set_attr "itanium_class" "nop_x")])
-
-(define_expand "cycle_display"
-  [(unspec [(match_operand 0 "const_int_operand" "")] 23)]
-  "ia64_final_schedule"
-  "")
+  [(set_attr "itanium_class" "nop_x")
+   (set_attr "empty" "yes")])
 
-(define_insn "*cycle_display_1"
-  [(unspec [(match_operand 0 "const_int_operand" "")] 23)]
+;; The following insn will be never generated.  It is used only by
+;; insn scheduler to change state before advancing cycle.
+(define_insn "pre_cycle"
+  [(const_int 6)]
   ""
-  "// cycle %0"
-  [(set_attr "itanium_class" "ignore")
-   (set_attr "predicable" "no")])
+  ""
+  [(set_attr "itanium_class" "pre_cycle")])
 
 (define_insn "bundle_selector"
-  [(unspec [(match_operand 0 "const_int_operand" "")] 22)]
+  [(unspec [(match_operand 0 "const_int_operand" "")] UNSPEC_BUNDLE_SELECTOR)]
   ""
-  "*
-{
-  return get_bundle_name (INTVAL (operands[0]));
-}"
+  { return get_bundle_name (INTVAL (operands[0])); }
   [(set_attr "itanium_class" "ignore")
    (set_attr "predicable" "no")])
 
 ;; Pseudo instruction that prevents the scheduler from moving code above this
 ;; point.
 (define_insn "blockage"
-  [(unspec_volatile [(const_int 0)] 1)]
+  [(unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE)]
   ""
   ""
   [(set_attr "itanium_class" "ignore")
    (set_attr "predicable" "no")])
 
 (define_insn "insn_group_barrier"
-  [(unspec_volatile [(match_operand 0 "const_int_operand" "")] 2)]
+  [(unspec_volatile [(match_operand 0 "const_int_operand" "")]
+                   UNSPECV_INSN_GROUP_BARRIER)]
   ""
   ";;"
   [(set_attr "itanium_class" "stop_bit")
+   (set_attr "predicable" "no")
+   (set_attr "empty" "yes")])
+
+(define_expand "trap"
+  [(trap_if (const_int 1) (const_int 0))]
+  ""
+  "")
+
+;; ??? We don't have a match-any slot type.  Setting the type to unknown
+;; produces worse code that setting the slot type to A.
+
+(define_insn "*trap"
+  [(trap_if (const_int 1) (match_operand 0 "const_int_operand" ""))]
+  ""
+  "break %0"
+  [(set_attr "itanium_class" "chk_s")])
+
+(define_expand "conditional_trap"
+  [(trap_if (match_operand 0 "" "") (match_operand 1 "" ""))]
+  ""
+{
+  operands[0] = ia64_expand_compare (GET_CODE (operands[0]), VOIDmode);
+})
+
+(define_insn "*conditional_trap"
+  [(trap_if (match_operator 0 "predicate_operator"
+             [(match_operand:BI 1 "register_operand" "c")
+              (const_int 0)])  
+           (match_operand 2 "const_int_operand" ""))]
+  ""
+  "(%J0) break %2"
+  [(set_attr "itanium_class" "chk_s")
    (set_attr "predicable" "no")])
 
+(define_insn "break_f"
+  [(unspec_volatile [(const_int 0)] UNSPECV_BREAK)]
+  ""
+  "break.f 0"
+  [(set_attr "itanium_class" "nop_f")])
+
+(define_insn "prefetch"
+  [(prefetch (match_operand:DI 0 "address_operand" "p")
+            (match_operand:DI 1 "const_int_operand" "n")
+            (match_operand:DI 2 "const_int_operand" "n"))]
+  ""
+{
+  static const char * const alt[2][4] = {
+    {
+      "%,lfetch.nta [%0]",
+      "%,lfetch.nt1 [%0]",
+      "%,lfetch.nt2 [%0]",
+      "%,lfetch [%0]"
+    },
+    {
+      "%,lfetch.excl.nta [%0]",
+      "%,lfetch.excl.nt1 [%0]",
+      "%,lfetch.excl.nt2 [%0]",
+      "%,lfetch.excl [%0]"
+    }
+  };
+  int i = (INTVAL (operands[1]));
+  int j = (INTVAL (operands[2]));
+
+  gcc_assert (i == 0 || i == 1);
+  gcc_assert (j >= 0 && j <= 3);
+  return alt[i][j];
+}
+  [(set_attr "itanium_class" "lfetch")])
 \f
 ;; Non-local goto support.
 
   [(use (match_operand:OI 0 "memory_operand" ""))
    (use (match_operand:DI 1 "register_operand" ""))]
   ""
-  "
 {
   emit_library_call (gen_rtx_SYMBOL_REF (Pmode,
                                         \"__ia64_save_stack_nonlocal\"),
                     0, VOIDmode, 2, XEXP (operands[0], 0), Pmode,
                     operands[1], Pmode);
   DONE;
-}")
+})
 
 (define_expand "nonlocal_goto"
   [(use (match_operand 0 "general_operand" ""))
    (use (match_operand 2 "general_operand" ""))
    (use (match_operand 3 "general_operand" ""))]
   ""
-  "
 {
   emit_library_call (gen_rtx_SYMBOL_REF (Pmode, \"__ia64_nonlocal_goto\"),
-                    0, VOIDmode, 3,
+                    LCT_NORETURN, VOIDmode, 3,
                     operands[1], Pmode,
                     copy_to_reg (XEXP (operands[2], 0)), Pmode,
                     operands[3], Pmode);
   emit_barrier ();
   DONE;
-}")
+})
 
-;; Restore the GP after the exception/longjmp.  The preceeding call will
-;; have tucked it away.
-(define_expand "exception_receiver"
-  [(set (reg:DI 1) (match_dup 0))]
+(define_insn_and_split "builtin_setjmp_receiver"
+  [(unspec_volatile [(match_operand:DI 0 "" "")] UNSPECV_SETJMP_RECEIVER)]
   ""
-  "operands[0] = ia64_gp_save_reg (0);")
-
-;; The rest of the setjmp processing happens with the nonlocal_goto expander.
-;; ??? This is not tested.
-(define_expand "builtin_setjmp_setup"
-  [(use (match_operand:DI 0 "" ""))]
-  ""
-  "
-{
-  emit_move_insn (ia64_gp_save_reg (0), gen_rtx_REG (DImode, GR_REG (1)));
-  DONE;
-}")
-
-(define_expand "builtin_setjmp_receiver"
-  [(use (match_operand:DI 0 "" ""))]
-  ""
-  "
+  "#"
+  "reload_completed"
+  [(const_int 0)]
 {
-  emit_move_insn (gen_rtx_REG (DImode, GR_REG (1)), ia64_gp_save_reg (0));
+  ia64_reload_gp ();
   DONE;
-}")
+})
 
 (define_expand "eh_epilogue"
   [(use (match_operand:DI 0 "register_operand" "r"))
    (use (match_operand:DI 1 "register_operand" "r"))
    (use (match_operand:DI 2 "register_operand" "r"))]
   ""
-  "
 {
   rtx bsp = gen_rtx_REG (Pmode, 10);
   rtx sp = gen_rtx_REG (Pmode, 9);
 
   cfun->machine->ia64_eh_epilogue_sp = sp;
   cfun->machine->ia64_eh_epilogue_bsp = bsp;
-}")
+})
 \f
 ;; Builtin apply support.
 
   [(use (match_operand:DI 0 "register_operand" ""))
    (use (match_operand:OI 1 "memory_operand" ""))]
   ""
-  "
 {
   emit_library_call (gen_rtx_SYMBOL_REF (Pmode,
-                                        \"__ia64_restore_stack_nonlocal\"),
+                                        "__ia64_restore_stack_nonlocal"),
                     0, VOIDmode, 1,
                     copy_to_reg (XEXP (operands[1], 0)), Pmode);
   DONE;
-}")
+})
 
 \f
-;;; Intrinsics support.
-
-(define_expand "mf"
-  [(set (mem:BLK (match_dup 0))
-       (unspec:BLK [(mem:BLK (match_dup 0))] 12))]
-  ""
-  "
-{
-  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (DImode));
-  MEM_VOLATILE_P (operands[0]) = 1;
-}")
-
-(define_insn "*mf_internal"
-  [(set (match_operand:BLK 0 "" "")
-       (unspec:BLK [(match_operand:BLK 1 "" "")] 12))]
-  ""
-  "mf"
-  [(set_attr "itanium_class" "syst_m")])
-
-(define_insn "fetchadd_acq_si"
-  [(set (match_operand:SI 0 "gr_register_operand" "=r")
-       (match_dup 1))
-   (set (match_operand:SI 1 "not_postinc_memory_operand" "+S")
-       (unspec:SI [(match_dup 1)
-                   (match_operand:SI 2 "fetchadd_operand" "n")] 19))]
-  ""
-  "fetchadd4.acq %0 = %1, %2"
-  [(set_attr "itanium_class" "sem")])
-
-(define_insn "fetchadd_acq_di"
-  [(set (match_operand:DI 0 "gr_register_operand" "=r")
-       (match_dup 1))
-   (set (match_operand:DI 1 "not_postinc_memory_operand" "+S")
-       (unspec:DI [(match_dup 1)
-                   (match_operand:DI 2 "fetchadd_operand" "n")] 19))]
-  ""
-  "fetchadd8.acq %0 = %1, %2"
-  [(set_attr "itanium_class" "sem")])
-
-(define_insn "cmpxchg_acq_si"
-  [(set (match_operand:SI 0 "gr_register_operand" "=r")
-       (match_dup 1))
-   (set (match_operand:SI 1 "not_postinc_memory_operand" "+S")
-        (unspec:SI [(match_dup 1)
-                    (match_operand:SI 2 "gr_register_operand" "r")
-                   (match_operand:SI 3 "ar_ccv_reg_operand" "")] 13))]
-  ""
-  "cmpxchg4.acq %0 = %1, %2, %3"
-  [(set_attr "itanium_class" "sem")])
-
-(define_insn "cmpxchg_acq_di"
-  [(set (match_operand:DI 0 "gr_register_operand" "=r")
-       (match_dup 1))
-   (set (match_operand:DI 1 "not_postinc_memory_operand" "+S")
-        (unspec:DI [(match_dup 1)
-                    (match_operand:DI 2 "gr_register_operand" "r")
-                   (match_operand:DI 3 "ar_ccv_reg_operand" "")] 13))]
-  ""
-  "cmpxchg8.acq %0 = %1, %2, %3"
-  [(set_attr "itanium_class" "sem")])
-
-(define_insn "xchgsi"
-  [(set (match_operand:SI 0 "gr_register_operand" "=r")
-        (match_operand:SI 1 "not_postinc_memory_operand" "+S"))
-   (set (match_dup 1)
-        (match_operand:SI 2 "gr_register_operand" "r"))]
-  ""
-  "xchg4 %0 = %1, %2"
-  [(set_attr "itanium_class" "sem")])
-
-(define_insn "xchgdi"
-  [(set (match_operand:DI 0 "gr_register_operand" "=r")
-        (match_operand:DI 1 "not_postinc_memory_operand" "+S"))
-   (set (match_dup 1)
-        (match_operand:DI 2 "gr_register_operand" "r"))]
-  ""
-  "xchg8 %0 = %1, %2"
-  [(set_attr "itanium_class" "sem")])
-\f
 ;; Predication.
 
 (define_cond_exec
 
 (define_insn "pred_rel_mutex"
   [(set (match_operand:BI 0 "register_operand" "+c")
-       (unspec:BI [(match_dup 0)] 7))]
+       (unspec:BI [(match_dup 0)] UNSPEC_PRED_REL_MUTEX))]
   ""
   ".pred.rel.mutex %0, %I0"
   [(set_attr "itanium_class" "ignore")
    (set_attr "predicable" "no")])
 
 (define_insn "safe_across_calls_all"
-  [(unspec_volatile [(const_int 0)] 8)]
+  [(unspec_volatile [(const_int 0)] UNSPECV_PSAC_ALL)]
   ""
   ".pred.safe_across_calls p1-p63"
   [(set_attr "itanium_class" "ignore")
    (set_attr "predicable" "no")])
 
 (define_insn "safe_across_calls_normal"
-  [(unspec_volatile [(const_int 0)] 9)]
+  [(unspec_volatile [(const_int 0)] UNSPECV_PSAC_NORMAL)]
   ""
-  "*
 {
-  emit_safe_across_calls (asm_out_file);
-  return \"\";
-}"
+  emit_safe_across_calls ();
+  return "";
+}
   [(set_attr "itanium_class" "ignore")
    (set_attr "predicable" "no")])
 
+;; UNSPEC instruction definition to "swizzle" 32 bit pointer into 64 bit
+;; pointer.  This is used by the HP-UX 32 bit mode.
+
+(define_insn "ptr_extend"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+        (unspec:DI [(match_operand:SI 1 "gr_register_operand" "r")]
+                  UNSPEC_ADDP4))]
+  ""
+  "addp4 %0 = 0,%1"
+  [(set_attr "itanium_class" "ialu")])
+
+;;
+;; Optimizations for ptr_extend
+
+(define_insn "ptr_extend_plus_imm"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+        (unspec:DI
+         [(plus:SI (match_operand:SI 1 "basereg_operand" "r")
+                   (match_operand:SI 2 "gr_reg_or_14bit_operand" "rI"))]
+         UNSPEC_ADDP4))]
+  "addp4_optimize_ok (operands[1], operands[2])"
+  "addp4 %0 = %2, %1"
+  [(set_attr "itanium_class" "ialu")])
+
+(define_insn "*ptr_extend_plus_2"
+  [(set (match_operand:DI 0 "gr_register_operand" "=r")
+        (unspec:DI
+         [(plus:SI (match_operand:SI 1 "gr_register_operand" "r")
+                   (match_operand:SI 2 "basereg_operand" "r"))]
+         UNSPEC_ADDP4))]
+  "addp4_optimize_ok (operands[1], operands[2])"
+  "addp4 %0 = %1, %2"
+  [(set_attr "itanium_class" "ialu")])
+
+;;
+;; Get instruction pointer
+
+(define_insn "ip_value"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+        (pc))]
+ ""
+ "mov %0 = ip"
+  [(set_attr "itanium_class" "ialu")])
+
+;; Vector operations
+(include "vect.md")
+;; Atomic operations
+(include "sync.md")