X86: Implement the versions of PUNPCKLBW that use XMM registers.
[gem5.git] / src / arch / x86 / isa / decoder / two_byte_opcodes.isa
index da4c82afa53c51ebb84daa92dcf8ed2fa81e69f1..6b24b38262ccad32452c8f35e2a95836ac4872f7 100644 (file)
@@ -1,4 +1,32 @@
-// Copyright (c) 2007 The Hewlett-Packard Development Company
+// Copyright (c) 2008 The Regents of The University of Michigan
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met: redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer;
+// redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution;
+// neither the name of the copyright holders nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: Gabe Black
+
+// Copyright (c) 2007-2008 The Hewlett-Packard Development Company
 // All rights reserved.
 //
 // Redistribution and use of this software in source and binary forms,
     0x0F: decode OPCODE_OP_TOP5 {
         format WarnUnimpl {
             0x00: decode OPCODE_OP_BOTTOM3 {
-                0x00: group6();
-                0x01: group7();
+                //0x00: group6();
+                0x00: decode MODRM_REG {
+                    0x0: sldt_Mw_or_Rv();
+                    0x1: str_Mw_or_Rv();
+                    0x2: Inst::LLDT(Ew);
+                    0x3: Inst::LTR(Ew);
+                    0x4: verr_Mw_or_Rv();
+                    0x5: verw_Mw_or_Rv();
+                    //0x6: jmpe_Ev(); // IA-64
+                    default: Inst::UD2();
+                }
+                //0x01: group7(); // Ugly, ugly, ugly...
+                0x01: decode MODRM_MOD {
+                    0x3: decode MODRM_REG {
+                        0x0: decode MODRM_RM {
+                            0x1: vmcall();
+                            0x2: vmlaunch();
+                            0x3: vmresume();
+                            0x4: vmxoff();
+                            default: Inst::UD2();
+                        }
+                        0x1: decode MODRM_RM {
+                            0x0: monitor();
+                            0x1: mwait();
+                            default: Inst::UD2();
+                        }
+                        0x3: decode MODRM_RM {
+                            0x0: vmrun();
+                            0x1: vmmcall();
+                            0x2: vmload();
+                            0x3: vmsave();
+                            0x4: stgi();
+                            0x5: clgi();
+                            0x6: skinit();
+                            0x7: invlpga();
+                        }
+                        0x4: Inst::SMSW(Rv);
+                        0x6: Inst::LMSW(Rv);
+                        0x7: decode MODRM_RM {
+                            0x0: Inst::SWAPGS();
+                            0x1: rdtscp();
+                            default: Inst::UD2();
+                        }
+                        default: Inst::UD2();
+                    }
+                    default: decode MODRM_REG {
+                        0x0: sgdt_Ms();
+                        0x1: sidt_Ms();
+                        0x2: decode MODE_SUBMODE {
+                            0x0: Inst::LGDT(M);
+                            default: decode OPSIZE {
+                                // 16 bit operand sizes are special, but only
+                                // in legacy and compatability modes.
+                                0x2: Inst::LGDT_16(M);
+                                default: Inst::LGDT(M);
+                            }
+                        }
+                        0x3: decode MODE_SUBMODE {
+                            0x0: Inst::LIDT(M);
+                            default: decode OPSIZE {
+                                // 16 bit operand sizes are special, but only
+                                // in legacy and compatability modes.
+                                0x2: Inst::LIDT_16(M);
+                                default: Inst::LIDT(M);
+                            }
+                        }
+                        0x4: Inst::SMSW(Mw);
+                        0x6: Inst::LMSW(Mw);
+                        0x7: Inst::INVLPG(M);
+                        default: Inst::UD2();
+                    }
+                }
                 0x02: lar_Gv_Ew();
                 0x03: lsl_Gv_Ew();
-                //sandpile.org doesn't seem to know what this is... ?
-                0x04: loadall_or_reset_or_hang();
+                // sandpile.org doesn't seem to know what this is...? We'll
+                // use it for pseudo instructions. We've got 16 bits of space
+                // to play with so there can be quite a few pseudo
+                // instructions.
+                //0x04: loadall_or_reset_or_hang();
+                0x4: decode IMMEDIATE {
+                    format BasicOperate {
+#if FULL_SYSTEM
+                        0x00: m5arm({{
+                            PseudoInst::arm(xc->tcBase());
+                        }}, IsNonSpeculative);
+                        0x01: m5quiesce({{
+                            PseudoInst::quiesce(xc->tcBase());
+                        }}, IsNonSpeculative);
+                        0x02: m5quiesceNs({{
+                            PseudoInst::quiesceNs(xc->tcBase(), Rdi);
+                        }}, IsNonSpeculative);
+                        0x03: m5quiesceCycle({{
+                            PseudoInst::quiesceCycles(xc->tcBase(), Rdi);
+                        }}, IsNonSpeculative);
+                        0x04: m5quiesceTime({{
+                            Rax = PseudoInst::quiesceTime(xc->tcBase());
+                        }}, IsNonSpeculative);
+#endif
+                        0x07: m5rpns({{
+                            Rax = PseudoInst::rpns(xc->tcBase());
+                        }}, IsNonSpeculative);
+                        0x21: m5exit({{
+                            PseudoInst::m5exit(xc->tcBase(), Rdi);
+                        }}, IsNonSpeculative);
+#if FULL_SYSTEM
+                        0x30: m5initparam({{
+                            Rax = xc->tcBase()->getCpuPtr()->
+                                      system->init_param;
+                        }}, IsNonSpeculative);
+                        0x31: m5loadsymbol({{
+                            PseudoInst::loadsymbol(xc->tcBase());
+                        }}, IsNonSpeculative);
+#endif
+                        0x40: m5resetstats({{
+                            PseudoInst::resetstats(xc->tcBase(), Rdi, Rsi);
+                        }}, IsNonSpeculative);
+                        0x41: m5dumpstats({{
+                            PseudoInst::dumpstats(xc->tcBase(), Rdi, Rsi);
+                        }}, IsNonSpeculative);
+                        0x42: m5dumpresetstats({{
+                            PseudoInst::dumpresetstats(xc->tcBase(), Rdi, Rsi);
+                        }}, IsNonSpeculative);
+                        0x43: m5checkpoint({{
+                            PseudoInst::m5checkpoint(xc->tcBase(), Rdi, Rsi);
+                        }}, IsNonSpeculative);
+#if FULL_SYSTEM
+                        0x50: m5readfile({{
+                            Rax = PseudoInst::readfile(
+                                xc->tcBase(), Rdi, Rsi, Rdx);
+                        }}, IsNonSpeculative);
+#endif
+                        0x51: m5debugbreak({{
+                            PseudoInst::debugbreak(xc->tcBase());
+                        }}, IsNonSpeculative);
+                        0x52: m5switchcpu({{
+                            PseudoInst::switchcpu(xc->tcBase());
+                        }}, IsNonSpeculative);
+#if FULL_SYSTEM
+                        0x53: m5addsymbol({{
+                            PseudoInst::addsymbol(xc->tcBase(), Rdi, Rsi);
+                        }}, IsNonSpeculative);
+#endif
+                        0x54: m5panic({{
+                            panic("M5 panic instruction called at pc=%#x.\n",
+                                xc->readPC());
+                        }}, IsNonSpeculative);
+                        0x55: m5reserved1({{
+                            warn("M5 reserved opcode 1 ignored.\n");
+                        }}, IsNonSpeculative);
+                        0x56: m5reserved2({{
+                            warn("M5 reserved opcode 2 ignored.\n");
+                        }}, IsNonSpeculative);
+                        0x57: m5reserved3({{
+                            warn("M5 reserved opcode 3 ignored.\n");
+                        }}, IsNonSpeculative);
+                        0x58: m5reserved4({{
+                            warn("M5 reserved opcode 4 ignored.\n");
+                        }}, IsNonSpeculative);
+                        0x59: m5reserved5({{
+                            warn("M5 reserved opcode 5 ignored.\n");
+                        }}, IsNonSpeculative);
+                        default: Inst::UD2();
+                    }
+                }
 #if FULL_SYSTEM
-                0x05: syscall();
+                0x05: decode MODE_MODE {
+                    0x0: decode MODE_SUBMODE {
+                        0x0: Inst::SYSCALL_64();
+                        0x1: Inst::SYSCALL_COMPAT();
+                    }
+                    0x1: Inst::SYSCALL_LEGACY();
+                }
 #else
-                0x05: SyscallInst::syscall('xc->syscall(rax)');
+                0x05: SyscallInst::syscall('xc->syscall(Rax)', IsSyscall);
 #endif
-                0x06: clts();
-                //sandpile.org says (AMD) after sysret, so I might want to check
-                //if that means amd64 or AMD machines
-                0x07: loadall_or_sysret();
+                0x06: Inst::CLTS();
+                0x07: decode MODE_SUBMODE {
+                    0x0: decode OPSIZE {
+                        // Return to 64 bit mode.
+                        0x8: Inst::SYSRET_TO_64();
+                        // Return to compatibility mode.
+                        default: Inst::SYSRET_TO_COMPAT();
+                    }
+                    default: Inst::SYSRET_NON_64();
+                }
             }
             0x01: decode OPCODE_OP_BOTTOM3 {
                 0x0: invd();
                 0x2: Inst::UD2();
                 0x3: Inst::UD2();
                 0x4: Inst::UD2();
-                0x5: threednow();
-                0x6: threednow();
-                0x7: threednow();
+                0x5: Inst::PREFETCH(Mb);
+                0x6: FailUnimpl::femms();
+                0x7: FailUnimpl::threednow();
             }
             0x02: decode LEGACY_DECODEVAL {
                 // no prefix
                 0x0: decode OPCODE_OP_BOTTOM3 {
-                    0x0: holder();
-                    0x1: holder();
-                    0x2: holder();
-                    0x3: holder();
-                    0x4: holder();
-                    0x5: holder();
-                    0x6: holder();
-                    0x7: holder();
+                    0x0: movups_Vo_Wo();
+                    0x1: movups_Wo_Vo();
+                    0x2: decode MODRM_MOD {
+                        0x3: movhlps_Vq_VRq();
+                        default: movlps_Vq_Mq();
+                    }
+                    0x3: movlps_Mq_Vq();
+                    0x4: unpcklps();
+                    0x5: unpckhps();
+                    0x6: decode MODRM_MOD {
+                        0x3: movlhps_Vq_VRq();
+                        default: movhps_Vq_Mq();
+                    }
+                    0x7: movhps_Mq_Vq();
                 }
                 // repe (0xF3)
                 0x4: decode OPCODE_OP_BOTTOM3 {
-                    0x0: holder();
-                    0x1: holder();
-                    0x2: holder();
-                    0x3: holder();
-                    0x4: holder();
-                    0x5: holder();
-                    0x6: holder();
-                    0x7: holder();
+                    0x0: movss_Vd_Wd();
+                    0x1: movss_Wd_Vd();
+                    0x2: movsldup_Vo_Wo();
+                    0x6: movshdup_Vo_Wo();
+                    default: Inst::UD2();
                 }
                 // operand size (0x66)
                 0x1: decode OPCODE_OP_BOTTOM3 {
-                    0x0: holder();
-                    0x1: holder();
-                    0x2: holder();
-                    0x3: holder();
-                    0x4: holder();
-                    0x5: holder();
-                    0x6: holder();
-                    0x7: holder();
+                    0x0: movupd_Vo_Wo();
+                    0x1: movupd_Wo_Vo();
+                    0x2: Inst::MOVLPD(Vq,Mq);
+                    0x3: Inst::MOVLPD(Mq,Vq);
+                    0x4: unpcklpd_Vo_Wq();
+                    0x5: unpckhpd_Vo_Wo();
+                    0x6: movhpd_Vq_Mq();
+                    0x7: movhpd_Mq_Vq();
                 }
                 // repne (0xF2)
                 0x8: decode OPCODE_OP_BOTTOM3 {
-                    0x0: holder();
-                    0x1: holder();
-                    0x2: holder();
-                    0x3: holder();
-                    0x4: holder();
-                    0x5: holder();
-                    0x6: holder();
-                    0x7: holder();
+                    0x0: Inst::MOVSD(Vq,Wq);
+                    0x1: Inst::MOVSD(Wq,Vq);
+                    0x2: movddup_Vo_Wq();
+                    default: Inst::UD2();
                 }
                 default: Inst::UD2();
             }
             0x03: decode OPCODE_OP_BOTTOM3 {
-                0x0: group17();
-                0x1: group17();
-                0x2: group17();
-                0x3: group17();
-                0x4: group17();
-                0x5: group17();
-                0x6: group17();
-                0x7: group17();
+                //group17();
+                0x0: decode MODRM_REG {
+                    0x0: prefetch_nta();
+                    0x1: Inst::PREFETCH_T0(Mb);
+                    0x2: prefetch_t1();
+                    0x3: prefetch_t2();
+                    default: Inst::HINT_NOP();
+                }
+                0x1: Inst::HINT_NOP();
+                0x2: Inst::HINT_NOP();
+                0x3: Inst::HINT_NOP();
+                0x4: Inst::HINT_NOP();
+                0x5: Inst::HINT_NOP();
+                0x6: Inst::HINT_NOP();
+                0x7: Inst::HINT_NOP();
             }
-            0x04: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x04: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: Inst::MOV(Rd,Cd);
+                    0x1: Inst::MOV(Rd,Dd);
+                    0x2: Inst::MOV(Cd,Rd);
+                    0x3: Inst::MOV(Dd,Rd);
+                    0x4: mov_Rd_Td();
+                    0x6: mov_Td_Rd();
+                    default: Inst::UD2();
+                }
+                // lock prefix (0xF0)
+                0x2: decode OPCODE_OP_BOTTOM3 {
+                    0x0: mov_Rd_CR8D();
+                    0x2: mov_CR8D_Rd();
+                }
+                default: Inst::UD2();
             }
-            0x05: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x05: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    //These moves should really use size o (octword), but
+                    //because they are split in two, they use q (quadword).
+                    0x0: Inst::MOVAPS(Vq,Wq);
+                    0x1: Inst::MOVAPS(Wq,Vq);
+                    0x2: decode MODRM_MOD {
+                        0x3: cvtpi2pS_Vq_Pq();
+                        default: cvtpi2ps_Vq_Mq();
+                    }
+                    0x3: movntps_Mo_Vo();
+                    0x4: cvttps2pi_Pq_Wq();
+                    0x5: cvtpS2pi_Pq_Wq();
+                    0x6: ucomiss_Vd_Wd();
+                    0x7: comiss_Vd_Wd();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x2: cvtsi2ss_Vd_Ed();
+                    0x4: cvttss2si_Gd_Wd();
+                    0x5: cvtss2si_Gd_Wd();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: movapd_Vo_Wo();
+                    0x1: movapd_Wo_Vo();
+                    0x2: decode MODRM_MOD {
+                        0x3: cvtpi2pd_Vo_Pq();
+                        default: cvtpi2pd_Vo_Mq();
+                    }
+                    0x3: movntpd_Mo_Vo();
+                    0x4: cvttpd2pi_Pq_Wo();
+                    0x5: cvtpd2pi_Pq_Wo();
+                    0x6: Inst::UCOMISD(Vq,Wq);
+                    0x7: comisd_Vq_Wq();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    // The size of the V operand should be q, not dp
+                    0x2: Inst::CVTSI2SD(Vdp,Edp);
+                    // The size of the W operand should be q, not dp
+                    0x4: Inst::CVTTSD2SI(Gdp,Wdp);
+                    0x5: cvtsd2si_Gd_Wq();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
             0x06: decode OPCODE_OP_BOTTOM3 {
-                0x0: wrmsr();
-                0x1: rdtsc();
-                0x2: rdmsr();
+                0x0: Inst::WRMSR();
+                0x1: Inst::RDTSC();
+                0x2: Inst::RDMSR();
                 0x3: rdpmc();
+#if FULL_SYSTEM
                 0x4: sysenter();
+#else
+                0x4: SyscallInst::sysenter('xc->syscall(Rax)', IsSyscall);
+#endif
                 0x5: sysexit();
                 0x6: Inst::UD2();
                 0x7: getsec();
                     0x7: CMOVNLE(Gv,Ev);
                 }
             }
-            0x0A: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0A: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: movmskps_Gd_VRo();
+                    0x1: sqrtps_Vo_Wo();
+                    0x2: rqsrtps_Vo_Wo();
+                    0x3: rcpps_Vo_Wo();
+                    0x4: andps_Vo_Wo();
+                    0x5: andnps_Vo_Wo();
+                    0x6: orps_Vo_Wo();
+                    0x7: xorps_Vo_Wo();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x1: sqrtss_Vd_Wd();
+                    0x2: rsqrtss_Vd_Wd();
+                    0x3: rcpss_Vd_Wd();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: movmskpd_Gd_VRo();
+                    0x1: sqrtpd_Vo_Wo();
+                    0x4: andpd_Vo_Wo();
+                    0x5: andnpd_Vo_Wo();
+                    0x6: orpd_Vo_Wo();
+                    //This really should be type o, but it works on q sized
+                    //chunks at a time.
+                    0x7: Inst::XORPD(Vq,Wq);
+                    default: Inst::UD2();
+                }
+                format Inst {
+                    // repne (0xF2)
+                    0x8: decode OPCODE_OP_BOTTOM3 {
+                        0x1: SQRTSD(Vq,Wq);
+                        default: UD2();
+                    }
+                    default: UD2();
+                }
             }
-            0x0B: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0B: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: addps_Vo_Wo();
+                    0x1: mulps_Vo_Wo();
+                    0x2: cvtps2pd_Vo_Wq();
+                    0x3: cvtdq2ps_Vo_Wo();
+                    0x4: subps_Vo_Wo();
+                    0x5: minps_Vo_Wo();
+                    0x6: divps_Vo_Wo();
+                    0x7: maxps_Vo_Wo();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x0: addss_Vd_Wd();
+                    0x1: mulss_Vd_Wd();
+                    0x2: cvtss2sd_Vq_Wd();
+                    0x3: cvttps2dq_Vo_Wo();
+                    0x4: subss_Vd_Wd();
+                    0x5: minss_Vd_Wd();
+                    0x6: divss_Vd_Wd();
+                    0x7: maxss_Vd_Wd();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: addpd_Vo_Wo();
+                    0x1: mulpd_Vo_Wo();
+                    0x2: cvtpd2ps_Vo_Wo();
+                    0x3: cvtps2dq_Vo_Wo();
+                    0x4: subpd_Vo_Wo();
+                    0x5: minpd_Vo_Wo();
+                    0x6: divpd_Vo_Wo();
+                    0x7: maxpd_Vo_Wo();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x0: Inst::ADDSD(Vq,Wq);
+                    0x1: Inst::MULSD(Vq,Wq);
+                    0x2: cvtsd2ss_Vd_Wq();
+                    0x4: Inst::SUBSD(Vq,Wq);
+                    0x5: minsd_Vq_Wq();
+                    0x6: Inst::DIVSD(Vq,Wq);
+                    0x7: maxsd_Vq_Wq();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
-            0x0C: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0C: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: Inst::PUNPCKLBW(Pq,Qd);
+                    0x1: punpcklwd_Pq_Qd();
+                    0x2: punpckldq_Pq_Qd();
+                    0x3: packsswb_Pq_Qq();
+                    0x4: pcmpgtb_Pq_Qq();
+                    0x5: pcmpgtw_Pq_Qq();
+                    0x6: pcmpgtd_Pq_Qq();
+                    0x7: packuswb_Pq_Qq();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: Inst::PUNPCKLBW(Vo,Wq);
+                    0x1: punpcklwd_Vo_Wq();
+                    0x2: punpckldq_Vo_Wq();
+                    0x3: packsswb_Vo_Wo();
+                    0x4: pcmpgtb_Vo_Wo();
+                    0x5: pcmpgtw_Vo_Wo();
+                    0x6: pcmpgtd_Vo_Wo();
+                    0x7: packuswb_Vo_Wo();
+                }
+                default: Inst::UD2();
             }
-            0x0D: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0D: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: punpckhbw_Pq_Qq();
+                    0x1: punpckhwd_Pq_Qq();
+                    0x2: punpckhdq_Pq_Qq();
+                    0x3: packssdw_Pq_Qq();
+                    0x6: Inst::MOVD(Pq,Edp);
+                    0x7: Inst::MOVQ(Pq,Qq);
+                    default: Inst::UD2();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x7: movdqu_Vo_Wo();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: punpckhbw_Vo_Wo();
+                    0x1: punpckhwd_Vo_Wo();
+                    0x2: punpckhdq_Vo_Wo();
+                    0x3: packssdw_Vo_Wo();
+                    0x4: punpcklqdq_Vo_Wq();
+                    0x5: punpcklqdq_Vo_Wq();
+                    0x6: movd_Vo_Ed();
+                    0x7: movdqa_Vo_Wo();
+                }
+                default: Inst::UD2();
             }
-            0x0E: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0E: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pshufw_Pq_Qq_Ib();
+                    //0x1: group13_pshimw();
+                    0x1: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrlw_PRq_Ib();
+                            0x1: psrlw_VRo_Ib();
+                        }
+                        0x4: decode LEGACY_OP {
+                            0x0: psraw_PRq_Ib();
+                            0x1: psraw_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: psllw_PRq_Ib();
+                            0x1: psllw_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    //0x2: group14_pshimd();
+                    0x2: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrld_PRq_Ib();
+                            0x1: psrld_VRo_Ib();
+                        }
+                        0x4: decode LEGACY_OP {
+                            0x0: psrad_PRq_Ib();
+                            0x1: psrad_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: pslld_PRq_Ib();
+                            0x1: pslld_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    //0x3: group15_pshimq();
+                    0x3: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrlq_PRq_Ib();
+                            0x1: psrlq_VRo_Ib();
+                        }
+                        0x3: decode LEGACY_OP {
+                            0x0: Inst::UD2();
+                            0x1: psrldq_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: psllq_PRq_Ib();
+                            0x1: psllq_VRo_Ib();
+                        }
+                        0x7: decode LEGACY_OP {
+                            0x0: Inst::UD2();
+                            0x1: pslldq_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    0x4: pcmpeqb_Pq_Qq();
+                    0x5: pcmpeqw_Pq_Qq();
+                    0x6: pcmpeqd_Pq_Qq();
+                    0x7: emms();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pshufhw_Vo_Wo_Ib();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pshufd_Vo_Wo_Ib();
+                    //0x1: group13_pshimw();
+                    0x1: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrlw_PRq_Ib();
+                            0x1: psrlw_VRo_Ib();
+                        }
+                        0x4: decode LEGACY_OP {
+                            0x0: psraw_PRq_Ib();
+                            0x1: psraw_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: psllw_PRq_Ib();
+                            0x1: psllw_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    //0x2: group14_pshimd();
+                    0x2: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrld_PRq_Ib();
+                            0x1: psrld_VRo_Ib();
+                        }
+                        0x4: decode LEGACY_OP {
+                            0x0: psrad_PRq_Ib();
+                            0x1: psrad_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: pslld_PRq_Ib();
+                            0x1: pslld_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    //0x3: group15_pshimq();
+                    0x3: decode MODRM_REG {
+                        0x2: decode LEGACY_OP {
+                            0x0: psrlq_PRq_Ib();
+                            0x1: psrlq_VRo_Ib();
+                        }
+                        0x3: decode LEGACY_OP {
+                            0x0: Inst::UD2();
+                            0x1: psrldq_VRo_Ib();
+                        }
+                        0x6: decode LEGACY_OP {
+                            0x0: psllq_PRq_Ib();
+                            0x1: psllq_VRo_Ib();
+                        }
+                        0x7: decode LEGACY_OP {
+                            0x0: Inst::UD2();
+                            0x1: pslldq_VRo_Ib();
+                        }
+                        default: Inst::UD2();
+                    }
+                    0x4: pcmpeqb_Vo_Wo();
+                    0x5: pcmpeqw_Vo_Wo();
+                    0x6: pcmpeqd_Vo_Wo();
+                    default: Inst::UD2();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pshuflw_Vo_Wo_Ib();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
-            0x0F: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x0F: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: vmread_Ed_or_Eq_Gd_or_Gq();
+                    0x1: vmwrite_Gd_or_Gq_Ed_or_Eq();
+                    0x6: Inst::MOVD(Edp,Pdp);
+                    0x7: Inst::MOVQ(Qq,Pq);
+                    default: Inst::UD2();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x6: Inst::MOVQ(Vq,Wq);
+                    0x7: movdqu_Wo_Vo();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x4: haddpd_Vo_Wo();
+                    0x5: hsubpd_Vo_Wo();
+                    0x6: movd_Ed_Vd();
+                    0x7: movdqa_Wo_Vo();
+                    default: Inst::UD2();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x4: haddps_Vo_Wo();
+                    0x5: hsubps_Vo_Wo();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
             format Inst {
                 0x10: decode OPCODE_OP_BOTTOM3 {
             0x14: decode OPCODE_OP_BOTTOM3 {
                 0x0: push_fs();
                 0x1: pop_fs();
-                0x2: cpuid();
-                0x3: bt_Ev_Gv();
-                0x4: shld_Ev_Gv_Ib();
-                0x5: shld_Ev_Gv_rCl();
+                0x2: CPUIDInst::CPUID({{
+                    CpuidResult result;
+                    success = doCpuid(xc->tcBase(), bits(Rax, 31, 0), result);
+                    Rax = result.rax;
+                    Rbx = result.rbx;
+                    Rcx = result.rcx;
+                    Rdx = result.rdx;
+                    }});
+                0x3: Inst::BT(Ev,Gv);
+                0x4: Inst::SHLD(Ev,Gv,Ib);
+                0x5: Inst::SHLD(Ev,Gv);
                 0x6: xbts_and_cmpxchg();
                 0x7: ibts_and_cmpxchg();
             }
                 0x0: push_gs();
                 0x1: pop_gs();
                 0x2: rsm_smm();
-                0x3: bts_Ev_Gv();
-                0x4: shrd_Ev_Gv_Ib();
-                0x5: shrd_Ev_Gv_rCl();
-                0x6: group16();
+                0x3: Inst::BTS(Ev,Gv);
+                0x4: Inst::SHRD(Ev,Gv,Ib);
+                0x5: Inst::SHRD(Ev,Gv);
+                //0x6: group16();
+                0x6: decode MODRM_REG {
+                    0x0: fxsave();
+                    0x1: fxrstor();
+                    0x2: ldmxcsr();
+                    0x3: stmxcsr();
+                    0x4: Inst::UD2();
+                    0x5: decode MODRM_MOD {
+                        0x3: BasicOperate::LFENCE(
+                                     {{/*Nothing*/}}, IsReadBarrier);
+                        default: Inst::UD2();
+                    }
+                    0x6: decode MODRM_MOD {
+                        0x3: BasicOperate::MFENCE(
+                                     {{/*Nothing*/}}, IsMemBarrier);
+                        default: Inst::UD2();
+                    }
+                    0x7: decode MODRM_MOD {
+                        0x3: BasicOperate::SFENCE(
+                                     {{/*Nothing*/}}, IsWriteBarrier);
+                        default: Inst::UD2();
+                    }
+                }
                 0x7: Inst::IMUL(Gv,Ev);
             }
             0x16: decode OPCODE_OP_BOTTOM3 {
-                0x0: cmpxchg_Eb_Gb();
-                0x1: cmpxchg_Ev_Gv();
+                0x0: Inst::CMPXCHG(Eb,Gb);
+                0x1: Inst::CMPXCHG(Ev,Gv);
                 0x2: lss_Gz_Mp();
-                0x3: btr_Ev_Gv();
+                0x3: Inst::BTR(Ev,Gv);
                 0x4: lfs_Gz_Mp();
                 0x5: lgs_Gz_Mp();
                 //The size of the second operand in these instructions should
             }
             0x17: decode OPCODE_OP_BOTTOM3 {
                 0x0: jmpe_Jz(); // IA-64?
-                0x1: group11_UD2();
-                0x2: group8_Ev_Ib();
-                0x3: btc_Ev_Gv();
-                0x4: bsf_Gv_Ev();
-                0x5: bsr_Gv_Ev();
+                format Inst {
+                    //0x1: group11_UD2();
+                    0x1: UD2();
+                    //0x2: group8_Ev_Ib();
+                    0x2: decode MODRM_REG {
+                        0x4: BT(Ev,Ib);
+                        0x5: BTS(Ev,Ib);
+                        0x6: BTR(Ev,Ib);
+                        0x7: BTC(Ev,Ib);
+                        default: UD2();
+                    }
+                    0x3: BTC(Ev,Gv);
+                }
+                0x4: Inst::BSF(Gv,Ev);
+                0x5: Inst::BSR(Gv,Ev);
                 //The size of the second operand in these instructions should
                 //really be "b" or "w", but it's set to v in order to have a
                 //consistent register size. This shouldn't affect behavior.
                 0x7: Inst::MOVSX_W(Gv,Ev);
             }
             0x18: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+                0x0: Inst::XADD(Eb,Gb);
+                0x1: Inst::XADD(Ev,Gv);
+                //0x7: group9();
+                0x7: decode MODRM_REG {
+                    //Also CMPXCHG16B
+                    0x1: Inst::CMPXCHG8B(Mdp);
+                    0x6: decode LEGACY_OP {
+                        0x1: vmclear_Mq();
+                        default: decode LEGACY_REP {
+                            0x1: vmxon_Mq();
+                            0x0: vmptrld_Mq();
+                        }
+                    }
+                    0x7: vmptrst_Mq();
+                    default: Inst::UD2();
+                }
+                default: decode LEGACY_DECODEVAL {
+                    // no prefix
+                    0x0: decode OPCODE_OP_BOTTOM3 {
+                        0x2: cmpccps_Vo_Wo_Ib();
+                        0x3: cvtdq2ps_Vo_Wo();
+                        0x4: subps_Vo_Wo();
+                        0x5: minps_Vo_Wo();
+                        0x6: divps_Vo_Wo();
+                    }
+                    // repe (0xF3)
+                    0x4: decode OPCODE_OP_BOTTOM3 {
+                        0x2: cmpccss_Vd_Wd_Ib();
+                        default: Inst::UD2();
+                    }
+                    // operand size (0x66)
+                    0x1: decode OPCODE_OP_BOTTOM3 {
+                        0x2: cmpccpd_Vo_Wo_Ib();
+                        0x4: subpd_Vo_Wo();
+                        0x5: minpd_Vo_Wo();
+                        0x6: divpd_Vo_Wo();
+                        default: Inst::UD2();
+                    }
+                    // repne (0xF2)
+                    0x8: decode OPCODE_OP_BOTTOM3 {
+                        0x2: cmpccsd_Vq_Wq_Ib();
+                        default: Inst::UD2();
+                    }
+                    default: Inst::UD2();
+                }
             }
-            0x19: bswap_B();
-            0x1A: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x19: decode OPSIZE {
+                4: Inst::BSWAP_D(Bd);
+                8: Inst::BSWAP_Q(Bq);
+                default: Inst::UD2();
             }
-            0x1B: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x1A: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x1: psrlw_Pq_Qq();
+                    0x2: psrld_Pq_Qq();
+                    0x3: psrlq_Pq_Qq();
+                    0x4: paddq_Pq_Qq();
+                    0x5: pmullw_Pq_Qq();
+                    0x7: pmovmskb_Gd_PRq();
+                    default: Inst::UD2();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x6: movq2dq_Vo_PRq();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: addsubpd_Vo_Wo();
+                    0x1: psrlw_Vo_Wo();
+                    0x2: psrld_Vo_Wo();
+                    0x3: psrlq_Vo_Wo();
+                    0x4: paddq_Vo_Wo();
+                    0x5: pmullw_Vo_Wo();
+                    0x6: Inst::MOVQ(Wq,Vq);
+                    0x7: pmovmskb_Gd_VRo();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x0: addsubps_Vo_Wo();
+                    0x6: movdq2q_Pq_VRq();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
-            0x1C: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x1B: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubusb_Pq_Qq();
+                    0x1: psubusw_Pq_Qq();
+                    0x2: pminub_Pq_Qq();
+                    0x3: pand_Pq_Qq();
+                    0x4: paddusb_Pq_Qq();
+                    0x5: paddusw_Pq_Qq();
+                    0x6: pmaxub_Pq_Qq();
+                    0x7: pandn_Pq_Qq();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubusb_Vo_Wo();
+                    0x1: psubusw_Vo_Wo();
+                    0x2: pminub_Vo_Wo();
+                    0x3: pand_Vo_Wo();
+                    0x4: paddusb_Vo_Wo();
+                    0x5: paddusw_Vo_Wo();
+                    0x6: pmaxub_Vo_Wo();
+                    0x7: pandn_Vo_Wo();
+                }
+                default: Inst::UD2();
             }
-            0x1D: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x1C: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pavgb_Pq_Qq();
+                    0x1: psraw_Pq_Qq();
+                    0x2: psrad_Pq_Qq();
+                    0x3: pavgw_Pq_Qq();
+                    0x4: pmulhuw_Pq_Qq();
+                    0x5: pmulhw_Pq_Qq();
+                    0x7: movntq_Mq_Pq();
+                    default: Inst::UD2();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x6: cvtdq2pd_Vo_Wq();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: pavgb_Vo_Wo();
+                    0x1: psraw_Vo_Wo();
+                    0x2: psrad_Vo_Wo();
+                    0x3: pavgw_Vo_Wo();
+                    0x4: pmulhuw_Vo_Wo();
+                    0x5: pmulhw_Vo_Wo();
+                    0x6: cvttpd2dq_Vo_Wo();
+                    0x7: movntdq_Mo_Vo();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x6: cvtpd2dq_Vo_Wo();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
-            0x1E: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x1D: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubsb_Pq_Qq();
+                    0x1: psubsw_Pq_Qq();
+                    0x2: pminsw_Pq_Qq();
+                    0x3: por_Pq_Qq();
+                    0x4: paddsb_Pq_Qq();
+                    0x5: paddsw_Pq_Qq();
+                    0x6: pmaxsw_Pq_Qq();
+                    0x7: pxor_Pq_Qq();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubsb_Vo_Wo();
+                    0x1: psubsw_Vo_Wo();
+                    0x2: pminsw_Vo_Wo();
+                    0x3: por_Vo_Wo();
+                    0x4: paddsb_Vo_Wo();
+                    0x5: paddsw_Vo_Wo();
+                    0x6: pmaxsw_Vo_Wo();
+                    0x7: pxor_Vo_Wo();
+                }
+                default: Inst::UD2();
+            }
+            0x1E: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x1: psllw_Pq_Qq();
+                    0x2: pslld_Pq_Qq();
+                    0x3: psllq_Pq_Qq();
+                    0x4: pmuludq_Pq_Qq();
+                    0x5: pmaddwd_Pq_Qq();
+                    0x6: psadbw_Pq_Qq();
+                    0x7: maskmovq_Pq_PRq();
+                    default: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x1: psllw_Vo_Wo();
+                    0x2: pslld_Vo_Wo();
+                    0x3: psllq_Vo_Wo();
+                    0x4: pmuludq_Vo_Wo();
+                    0x5: pmaddwd_Vo_Wo();
+                    0x6: psadbw_Vo_Wo();
+                    0x7: maskmovdqu_Vo_VRo();
+                    default: Inst::UD2();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x0: lddqu_Vo_Mo();
+                    default: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
-            0x1F: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            0x1F: decode LEGACY_DECODEVAL {
+                // no prefix
+                0x0: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubb_Pq_Qq();
+                    0x1: psubw_Pq_Qq();
+                    0x2: psubd_Pq_Qq();
+                    0x3: psubq_Pq_Qq();
+                    0x4: paddb_Pq_Qq();
+                    0x5: paddw_Pq_Qq();
+                    0x6: paddd_Pq_Qq();
+                    0x7: Inst::UD2();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: psubb_Vo_Wo();
+                    0x1: psubw_Vo_Wo();
+                    0x2: psubd_Vo_Wo();
+                    0x3: psubq_Vo_Wo();
+                    0x4: paddb_Vo_Wo();
+                    0x5: paddw_Vo_Wo();
+                    0x6: paddd_Vo_Wo();
+                    0x7: Inst::UD2();
+                }
+                default: Inst::UD2();
             }
             default: FailUnimpl::twoByteOps();
         }