| Index: src/IceInst.def | 
| diff --git a/src/IceInst.def b/src/IceInst.def | 
| index 6bd2efbf1c8463f69bb9dcd9ea969f82209c72f9..6410d527a25381d513f40bcc3894032e1d1a4ba3 100644 | 
| --- a/src/IceInst.def | 
| +++ b/src/IceInst.def | 
| @@ -31,74 +31,74 @@ | 
| //      representable in the destination format. This standard does not | 
| //      specify which of the input NaNs will provide the payload." | 
|  | 
| -#define ICEINSTARITHMETIC_TABLE                   \ | 
| -  /* enum value, printable string, commutative */ \ | 
| -  X(Add,         "add",            1)             \ | 
| -  X(Fadd,        "fadd",           1)             \ | 
| -  X(Sub,         "sub",            0)             \ | 
| -  X(Fsub,        "fsub",           0)             \ | 
| -  X(Mul,         "mul",            1)             \ | 
| -  X(Fmul,        "fmul",           1)             \ | 
| -  X(Udiv,        "udiv",           0)             \ | 
| -  X(Sdiv,        "sdiv",           0)             \ | 
| -  X(Fdiv,        "fdiv",           0)             \ | 
| -  X(Urem,        "urem",           0)             \ | 
| -  X(Srem,        "srem",           0)             \ | 
| -  X(Frem,        "frem",           0)             \ | 
| -  X(Shl,         "shl",            0)             \ | 
| -  X(Lshr,        "lshr",           0)             \ | 
| -  X(Ashr,        "ashr",           0)             \ | 
| -  X(And,         "and",            1)             \ | 
| -  X(Or,          "or",             1)             \ | 
| +#define ICEINSTARITHMETIC_TABLE                                                \ | 
| +  /* enum value, printable string, commutative */                              \ | 
| +  X(Add,         "add",            1)                                          \ | 
| +  X(Fadd,        "fadd",           1)                                          \ | 
| +  X(Sub,         "sub",            0)                                          \ | 
| +  X(Fsub,        "fsub",           0)                                          \ | 
| +  X(Mul,         "mul",            1)                                          \ | 
| +  X(Fmul,        "fmul",           1)                                          \ | 
| +  X(Udiv,        "udiv",           0)                                          \ | 
| +  X(Sdiv,        "sdiv",           0)                                          \ | 
| +  X(Fdiv,        "fdiv",           0)                                          \ | 
| +  X(Urem,        "urem",           0)                                          \ | 
| +  X(Srem,        "srem",           0)                                          \ | 
| +  X(Frem,        "frem",           0)                                          \ | 
| +  X(Shl,         "shl",            0)                                          \ | 
| +  X(Lshr,        "lshr",           0)                                          \ | 
| +  X(Ashr,        "ashr",           0)                                          \ | 
| +  X(And,         "and",            1)                                          \ | 
| +  X(Or,          "or",             1)                                          \ | 
| X(Xor,         "xor",            1) | 
| //#define X(tag, str, commutative) | 
|  | 
| -#define ICEINSTCAST_TABLE            \ | 
| -  /* enum value, printable string */ \ | 
| -  X(Trunc,       "trunc")            \ | 
| -  X(Zext,        "zext")             \ | 
| -  X(Sext,        "sext")             \ | 
| -  X(Fptrunc,     "fptrunc")          \ | 
| -  X(Fpext,       "fpext")            \ | 
| -  X(Fptoui,      "fptoui")           \ | 
| -  X(Fptosi,      "fptosi")           \ | 
| -  X(Uitofp,      "uitofp")           \ | 
| -  X(Sitofp,      "sitofp")           \ | 
| +#define ICEINSTCAST_TABLE                                                      \ | 
| +  /* enum value, printable string */                                           \ | 
| +  X(Trunc,       "trunc")                                                      \ | 
| +  X(Zext,        "zext")                                                       \ | 
| +  X(Sext,        "sext")                                                       \ | 
| +  X(Fptrunc,     "fptrunc")                                                    \ | 
| +  X(Fpext,       "fpext")                                                      \ | 
| +  X(Fptoui,      "fptoui")                                                     \ | 
| +  X(Fptosi,      "fptosi")                                                     \ | 
| +  X(Uitofp,      "uitofp")                                                     \ | 
| +  X(Sitofp,      "sitofp")                                                     \ | 
| X(Bitcast,     "bitcast") | 
| //#define X(tag, str) | 
|  | 
| -#define ICEINSTFCMP_TABLE            \ | 
| -  /* enum value, printable string */ \ | 
| -  X(False,       "false")            \ | 
| -  X(Oeq,         "oeq")              \ | 
| -  X(Ogt,         "ogt")              \ | 
| -  X(Oge,         "oge")              \ | 
| -  X(Olt,         "olt")              \ | 
| -  X(Ole,         "ole")              \ | 
| -  X(One,         "one")              \ | 
| -  X(Ord,         "ord")              \ | 
| -  X(Ueq,         "ueq")              \ | 
| -  X(Ugt,         "ugt")              \ | 
| -  X(Uge,         "uge")              \ | 
| -  X(Ult,         "ult")              \ | 
| -  X(Ule,         "ule")              \ | 
| -  X(Une,         "une")              \ | 
| -  X(Uno,         "uno")              \ | 
| +#define ICEINSTFCMP_TABLE                                                      \ | 
| +  /* enum value, printable string */                                           \ | 
| +  X(False,       "false")                                                      \ | 
| +  X(Oeq,         "oeq")                                                        \ | 
| +  X(Ogt,         "ogt")                                                        \ | 
| +  X(Oge,         "oge")                                                        \ | 
| +  X(Olt,         "olt")                                                        \ | 
| +  X(Ole,         "ole")                                                        \ | 
| +  X(One,         "one")                                                        \ | 
| +  X(Ord,         "ord")                                                        \ | 
| +  X(Ueq,         "ueq")                                                        \ | 
| +  X(Ugt,         "ugt")                                                        \ | 
| +  X(Uge,         "uge")                                                        \ | 
| +  X(Ult,         "ult")                                                        \ | 
| +  X(Ule,         "ule")                                                        \ | 
| +  X(Une,         "une")                                                        \ | 
| +  X(Uno,         "uno")                                                        \ | 
| X(True,        "true") | 
| //#define X(tag, str) | 
|  | 
| -#define ICEINSTICMP_TABLE            \ | 
| -  /* enum value, printable string */ \ | 
| -  X(Eq,          "eq")               \ | 
| -  X(Ne,          "ne")               \ | 
| -  X(Ugt,         "ugt")              \ | 
| -  X(Uge,         "uge")              \ | 
| -  X(Ult,         "ult")              \ | 
| -  X(Ule,         "ule")              \ | 
| -  X(Sgt,         "sgt")              \ | 
| -  X(Sge,         "sge")              \ | 
| -  X(Slt,         "slt")              \ | 
| -  X(Sle,         "sle") | 
| -//#define X(tag, str) | 
| +#define ICEINSTICMP_TABLE                                                      \ | 
| +  /* enum value, reverse, printable string */                                  \ | 
| +  X(Eq,          Eq,      "eq")                                                \ | 
| +  X(Ne,          Ne,      "ne")                                                \ | 
| +  X(Ugt,         Ult,     "ugt")                                               \ | 
| +  X(Uge,         Ule,     "uge")                                               \ | 
| +  X(Ult,         Ugt,     "ult")                                               \ | 
| +  X(Ule,         Uge,     "ule")                                               \ | 
| +  X(Sgt,         Slt,     "sgt")                                               \ | 
| +  X(Sge,         Sle,     "sge")                                               \ | 
| +  X(Slt,         Sgt,     "slt")                                               \ | 
| +  X(Sle,         Sge,     "sle") | 
| +//#define X(tag, reverse, str) | 
|  | 
| #endif // SUBZERO_SRC_ICEINST_DEF | 
|  |