ARM: Add IsSerializeAfter and IsNonSpeculative flag to the syscall instruction .

[gem5.git] / src / arch / x86 / isa.hh

diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index 8d3b110c6e98c3d330149f7e5360f009d3bfb419..463a249a45bd26645aea922ae86447ffd29ea5fa 100644 (file)
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -31,14 +31,14 @@
 #ifndef __ARCH_X86_ISA_HH__
 #define __ARCH_X86_ISA_HH__
 
-#include "arch/x86/floatregs.hh"
-#include "arch/x86/miscregs.hh"
+#include <iostream>
+#include <string>
+
+#include "arch/x86/regs/float.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/registers.hh"
 #include "base/types.hh"
 
-#include <string>
-#include <iostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;
@@ -69,7 +69,7 @@ namespace X86ISA
         int
         flattenIntIndex(int reg)
         {
-            return reg & ~(1 << 6);
+            return reg & ~IntFoldBit;
         }
 
         int