Merge from default.

diff --cc mach/i80/ncg/table
index fe8b06e,9eea4b7..f949850
--- 1/mach/i80/ncg/table
--- 2/mach/i80/ncg/table
+++ b/mach/i80/ncg/table
@@@ -48,12 -48,12 +48,13 @@@ TOKEN
  
  const1                        = { INT num; } 1 num.
  const2                        = { INT num; } 2 num.
 -smallpconst2   = { INT num; } 2 num. /* Byte-sized positive constant */
 -smallnconst2   = { INT num; } 2 num. /* Byte-sized negative constant */
 -label                 = { ADDR off; } 2 off.
 -plabel      = { ADDR off; INT param; } 2 off param.
 +smallpconst2    = { INT num; } 2 num. /* Byte-sized positive constant */
 +smallnconst2    = { INT num; } 2 num. /* Byte-sized negative constant */
 +label           = { ADDR off; } 2 off.
 +plabel          = { ADDR off; INT param; } 2 off param.
  m                     = { } 2 cost(0,3) "m".
 +fp       = { } 2.
+ comment        = { ADDR str; } 2 "! " str.
  
  SETS
  
@@@ -1208,32 -1186,23 +1219,24 @@@ pat ciu                                              leaving cuu $
  pat loc loc cuu $1==$2
  
  pat loc loc cuu $1==2 && $2==4
 -   with src1or2
 -      yields {const2,0} %1
 +with src1or2                          yields {const2,0} %1
  
  pat loc loc cuu $1==4 && $1==2
 -   with src1or2 src1or2
 -              yields %1
 +with src1or2 src1or2                  yields %1
  
  pat loc loc cuu $1==1 && $2==2
--   with reg
-       uses reusing %1, regpair
-       gen
-          move %1,%a
-               yields %a
-    with regpair
-       gen
-          move {const1,0},%1.1
--      yields %1
++with reg
++   uses reusing %1, hl_or_de
++   gen move %1,%a                     yields %a
++with hl_or_de
++   gen move {const1,0},%1.1           yields %1
  
  pat loc loc cuu $1==1 && $2==4
--   with reg
-       uses reusing %1, regpair
-       gen
-          move %1,%a
-               yields {const2,0} %a
-    with regpair
-       gen
-          move {const1,0},%1.1
 -      uses reusing %1
 -      yields {const2,0} %1
 -   with hl_or_de
--      yields {const2,0} %1
++with reg
++   uses reusing %1, hl_or_de
++   gen move %1,%a                     yields {const2,0} %a
++with hl_or_de
++   gen move {const1,0},%1.1           yields {const2,0} %1
  
  pat cuu
  kills ALL