From a1b193f02645e95e9daa77b18da526cf166eaee5 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 30 Jul 2007 13:31:27 -0700
Subject: [PATCH] X86: Hook in the new instructions.

--HG--
extra : convert_revision : c4233001b35b52161083482841593ec28da6ff7d
---
 src/arch/x86/isa/decoder/one_byte_opcodes.isa | 10 +++++-----
 src/arch/x86/isa/decoder/two_byte_opcodes.isa |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/arch/x86/isa/decoder/one_byte_opcodes.isa b/src/arch/x86/isa/decoder/one_byte_opcodes.isa
index 3b51f9d73..3253c9fec 100644
--- a/src/arch/x86/isa/decoder/one_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/one_byte_opcodes.isa
@@ -395,7 +395,7 @@
         }
         0x19: decode OPCODE_OP_BOTTOM3 {
             0x0: enter_Iw_Ib();
-            0x1: leave();
+            0x1: Inst::LEAVE();
             0x2: ret_far_Iw();
             0x3: ret_far();
             0x4: int3();
@@ -519,8 +519,8 @@
                 0x1: Inst::TEST(Eb,Iz);
                 0x2: Inst::NOT(Eb);
                 0x3: Inst::NEG(Eb);
-                0x4: mul_Eb();
-                0x5: imul_Eb();
+                0x4: Inst::MUL_B(Eb);
+                0x5: Inst::IMUL_B(Eb);
                 0x6: div_Eb();
                 0x7: idiv_Eb();
             }
@@ -530,8 +530,8 @@
                 0x1: Inst::TEST(Ev,Iz);
                 0x2: Inst::NOT(Ev);
                 0x3: Inst::NEG(Ev);
-                0x4: mul_Ev();
-                0x5: imul_Ev();
+                0x4: Inst::MUL(Ev);
+                0x5: Inst::IMUL(Ev);
                 0x6: div_Ev();
                 0x7: idiv_Ev();
             }
diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
index da4c82afa..a8c4e7062 100644
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
@@ -311,7 +311,7 @@
             0x14: decode OPCODE_OP_BOTTOM3 {
                 0x0: push_fs();
                 0x1: pop_fs();
-                0x2: cpuid();
+                0x2: Inst::CPUID(rAd);
                 0x3: bt_Ev_Gv();
                 0x4: shld_Ev_Gv_Ib();
                 0x5: shld_Ev_Gv_rCl();
-- 
2.30.2