Hook in a bunch of new instructions, fix a few minor bugs, and expand out one of...

[gem5.git] / src / arch / x86 / isa / decoder / two_byte_opcodes.isa

diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
index e042893bb9368a1ae51dfecdf1ec9b258aa6c273..da4c82afa53c51ebb84daa92dcf8ed2fa81e69f1 100644 (file)
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
@@ -80,22 +80,59 @@
             0x01: decode OPCODE_OP_BOTTOM3 {
                 0x0: invd();
                 0x1: wbinvd();
-                0x2: This_should_be_an_illegal_instruction();
-                0x3: UD1();
-                0x4: This_should_be_an_illegal_instruction();
+                0x2: Inst::UD2();
+                0x3: Inst::UD2();
+                0x4: Inst::UD2();
                 0x5: threednow();
                 0x6: threednow();
                 0x7: threednow();
             }
-            0x02: decode OPCODE_OP_BOTTOM3 {
-                0x0: holder();
-                0x1: holder();
-                0x2: holder();
-                0x3: holder();
-                0x4: holder();
-                0x5: holder();
-                0x6: holder();
-                0x7: holder();
+            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();
+                }
+                // repe (0xF3)
+                0x4: decode OPCODE_OP_BOTTOM3 {
+                    0x0: holder();
+                    0x1: holder();
+                    0x2: holder();
+                    0x3: holder();
+                    0x4: holder();
+                    0x5: holder();
+                    0x6: holder();
+                    0x7: holder();
+                }
+                // operand size (0x66)
+                0x1: decode OPCODE_OP_BOTTOM3 {
+                    0x0: holder();
+                    0x1: holder();
+                    0x2: holder();
+                    0x3: holder();
+                    0x4: holder();
+                    0x5: holder();
+                    0x6: holder();
+                    0x7: holder();
+                }
+                // repne (0xF2)
+                0x8: decode OPCODE_OP_BOTTOM3 {
+                    0x0: holder();
+                    0x1: holder();
+                    0x2: holder();
+                    0x3: holder();
+                    0x4: holder();
+                    0x5: holder();
+                    0x6: holder();
+                    0x7: holder();
+                }
+                default: Inst::UD2();
             }
             0x03: decode OPCODE_OP_BOTTOM3 {
                 0x0: group17();
@@ -134,7 +171,7 @@
                 0x3: rdpmc();
                 0x4: sysenter();
                 0x5: sysexit();
-                0x6: This_should_be_an_illegal_instruction();
+                0x6: Inst::UD2();
                 0x7: getsec();
             }
             0x07: decode OPCODE_OP_BOTTOM3 {
@@ -147,25 +184,27 @@
                 0x6: three_byte_opcode();
                 0x7: three_byte_opcode();
             }
-            0x08: decode OPCODE_OP_BOTTOM3 {
-                0x0: cmovo_Gv_Ev();
-                0x1: cmovno_Gv_Ev();
-                0x2: cmovb_Gv_Ev();
-                0x3: cmovnb_Gv_Ev();
-                0x4: cmovz_Gv_Ev();
-                0x5: cmovnz_Gv_Ev();
-                0x6: cmovbe_Gv_Ev();
-                0x7: cmovnbe_Gv_Ev();
-            }
-            0x09: decode OPCODE_OP_BOTTOM3 {
-                0x0: cmovs_Gv_Ev();
-                0x1: cmovns_Gv_Ev();
-                0x2: cmovp_Gv_Ev();
-                0x3: cmovnp_Gv_Ev();
-                0x4: cmovl_Gv_Ev();
-                0x5: cmovnl_Gv_Ev();
-                0x6: cmovle_Gv_Ev();
-                0x7: cmovnle_Gv_Ev();
+            format Inst {
+                0x08: decode OPCODE_OP_BOTTOM3 {
+                    0x0: CMOVO(Gv,Ev);
+                    0x1: CMOVNO(Gv,Ev);
+                    0x2: CMOVB(Gv,Ev);
+                    0x3: CMOVNB(Gv,Ev);
+                    0x4: CMOVZ(Gv,Ev);
+                    0x5: CMOVNZ(Gv,Ev);
+                    0x6: CMOVBE(Gv,Ev);
+                    0x7: CMOVNBE(Gv,Ev);
+                }
+                0x09: decode OPCODE_OP_BOTTOM3 {
+                    0x0: CMOVS(Gv,Ev);
+                    0x1: CMOVNS(Gv,Ev);
+                    0x2: CMOVP(Gv,Ev);
+                    0x3: CMOVNP(Gv,Ev);
+                    0x4: CMOVL(Gv,Ev);
+                    0x5: CMOVNL(Gv,Ev);
+                    0x6: CMOVLE(Gv,Ev);
+                    0x7: CMOVNLE(Gv,Ev);
+                }
             }
             0x0A: decode OPCODE_OP_BOTTOM3 {
                 0x0: holder();
@@ -227,45 +266,47 @@
                 0x6: holder();
                 0x7: holder();
             }
-            0x10: decode OPCODE_OP_BOTTOM3 {
-                0x0: jo_Jz();
-                0x1: jno_Jz();
-                0x2: jb_Jz();
-                0x3: Inst::JNB(Jz);
-                0x4: Inst::JZ(Jz);
-                0x5: Inst::JNZ(Jz);
-                0x6: Inst::JBE(Jz);
-                0x7: jnbe_Jz();
-            }
-            0x11: decode OPCODE_OP_BOTTOM3 {
-                0x0: js_Jz();
-                0x1: jns_Jz();
-                0x2: jp_Jz();
-                0x3: jnp_Jz();
-                0x4: jl_Jz();
-                0x5: jnl_Jz();
-                0x6: jle_Jz();
-                0x7: jnle_Jz();
-            }
-            0x12: decode OPCODE_OP_BOTTOM3 {
-                0x0: seto_Eb();
-                0x1: setno_Eb();
-                0x2: setb_Eb();
-                0x3: setnb_Eb();
-                0x4: setz_Eb();
-                0x5: setnz_Eb();
-                0x6: setbe_Eb();
-                0x7: setnbe_Eb();
-            }
-            0x13: decode OPCODE_OP_BOTTOM3 {
-                0x0: sets_Eb();
-                0x1: setns_Eb();
-                0x2: setp_Eb();
-                0x3: setnp_Eb();
-                0x4: setl_Eb();
-                0x5: setnl_Eb();
-                0x6: setle_Eb();
-                0x7: setnle_Eb();
+            format Inst {
+                0x10: decode OPCODE_OP_BOTTOM3 {
+                    0x0: JO(Jz);
+                    0x1: JNO(Jz);
+                    0x2: JB(Jz);
+                    0x3: JNB(Jz);
+                    0x4: JZ(Jz);
+                    0x5: JNZ(Jz);
+                    0x6: JBE(Jz);
+                    0x7: JNBE(Jz);
+                }
+                0x11: decode OPCODE_OP_BOTTOM3 {
+                    0x0: JS(Jz);
+                    0x1: JNS(Jz);
+                    0x2: JP(Jz);
+                    0x3: JNP(Jz);
+                    0x4: JL(Jz);
+                    0x5: JNL(Jz);
+                    0x6: JLE(Jz);
+                    0x7: JNLE(Jz);
+                }
+                0x12: decode OPCODE_OP_BOTTOM3 {
+                    0x0: SETO(Eb);
+                    0x1: SETNO(Eb);
+                    0x2: SETB(Eb);
+                    0x3: SETNB(Eb);
+                    0x4: SETZ(Eb);
+                    0x5: SETNZ(Eb);
+                    0x6: SETBE(Eb);
+                    0x7: SETNBE(Eb);
+                }
+                0x13: decode OPCODE_OP_BOTTOM3 {
+                    0x0: SETS(Eb);
+                    0x1: SETNS(Eb);
+                    0x2: SETP(Eb);
+                    0x3: SETNP(Eb);
+                    0x4: SETL(Eb);
+                    0x5: SETNL(Eb);
+                    0x6: SETLE(Eb);
+                    0x7: SETNLE(Eb);
+                }
             }
             0x14: decode OPCODE_OP_BOTTOM3 {
                 0x0: push_fs();
@@ -285,7 +326,7 @@
                 0x4: shrd_Ev_Gv_Ib();
                 0x5: shrd_Ev_Gv_rCl();
                 0x6: group16();
-                0x7: imul_Gv_Ev();
+                0x7: Inst::IMUL(Gv,Ev);
             }
             0x16: decode OPCODE_OP_BOTTOM3 {
                 0x0: cmpxchg_Eb_Gb();
@@ -294,8 +335,11 @@
                 0x3: btr_Ev_Gv();
                 0x4: lfs_Gz_Mp();
                 0x5: lgs_Gz_Mp();
-                0x6: Inst::MOVZX_B(Gv,Eb);
-                0x7: Inst::MOVZX_W(Gv,Ew);
+                //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.
+                0x6: Inst::MOVZX_B(Gv,Ev);
+                0x7: Inst::MOVZX_W(Gv,Ev);
             }
             0x17: decode OPCODE_OP_BOTTOM3 {
                 0x0: jmpe_Jz(); // IA-64?
@@ -304,8 +348,11 @@
                 0x3: btc_Ev_Gv();
                 0x4: bsf_Gv_Ev();
                 0x5: bsr_Gv_Ev();
-                0x6: movsx_Gv_Eb();
-                0x7: movsx_Gv_Ew();
+                //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.
+                0x6: Inst::MOVSX_B(Gv,Ev);
+                0x7: Inst::MOVSX_W(Gv,Ev);
             }
             0x18: decode OPCODE_OP_BOTTOM3 {
                 0x0: holder();
@@ -317,16 +364,7 @@
                 0x6: holder();
                 0x7: holder();
             }
-            0x19: decode OPCODE_OP_BOTTOM3 {
-                0x0: bswap_rAx();
-                0x1: bswap_rCx();
-                0x2: bswap_rDx();
-                0x3: bswap_rBx();
-                0x4: bswap_rSP();
-                0x5: bswap_rBP();
-                0x6: bswap_rSI();
-                0x7: bswap_rDI();
-            }
+            0x19: bswap_B();
             0x1A: decode OPCODE_OP_BOTTOM3 {
                 0x0: holder();
                 0x1: holder();