Merge from default.

diff --cc mach/i80/ncg/table
index 4db43d7,64e2721..d3e5a0a
--- 1/mach/i80/ncg/table
--- 2/mach/i80/ncg/table
+++ b/mach/i80/ncg/table
@@@ -48,9 -46,9 +48,10 @@@ TOKEN
  
  const1                        = { INT num; } 1 num.
  const2                        = { INT num; } 2 num.
- smallconst2    = { 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.
  m                     = { } 2 cost(0,3) "m".
  
  SETS