From 20d25b9da77cc681ef7d5bb101438bc0b0c6827c Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Tue, 5 Jun 2012 13:52:30 -0400
Subject: ISA: Back-out NoopMachInst as a StaticInstPtr change.

---
 src/arch/x86/x86_traits.hh | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/arch/x86/x86_traits.hh')

diff --git a/src/arch/x86/x86_traits.hh b/src/arch/x86/x86_traits.hh
index a94d806ef..6157cb30b 100644
--- a/src/arch/x86/x86_traits.hh
+++ b/src/arch/x86/x86_traits.hh
@@ -40,7 +40,6 @@
 
 #include <cassert>
 
-#include "arch/x86/types.hh"
 #include "base/types.hh"
 
 namespace X86ISA
@@ -105,18 +104,6 @@ namespace X86ISA
         assert(addr < PhysAddrAPICRangeSize);
         return PhysAddrPrefixInterrupts | (id * PhysAddrAPICRangeSize) | addr;
     }
-
-    const ExtMachInst NoopMachInst = {
-        0x0,                            // No legacy prefixes.
-        0x0,                            // No rex prefix.
-        { 1, 0x0, 0x0, 0x90 },          // One opcode byte, 0x90.
-        0x0, 0x0,                       // No modrm or sib.
-        0, 0,                           // No immediate or displacement.
-        8, 8, 8,                        // All sizes are 8.
-        0,                              // Displacement size is 0.
-        SixtyFourBitMode                // Behave as if we're in 64 bit
-                                        // mode (this doesn't actually matter).
-    };
 }
 
 #endif //__ARCH_X86_X86TRAITS_HH__
-- 
cgit v1.2.3