Various touch ups

--HG--
extra : convert_revision : 19ff30d969a46adbd256f674582a9e7d398b56ed

diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index fcff50b7085f3ac85e1fdf148e21a26e6cced58e..d5da8b4206bcb5d177440fbb87a662b17189d5ba 100644 (file)
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -58,8 +58,11 @@
 #ifndef __ARCH_X86_ISATRAITS_HH__
 #define __ARCH_X86_ISATRAITS_HH__
 
+#include "arch/x86/types.hh"
 #include "arch/x86/x86_traits.hh"
 
+class StaticInstPtr;
+
 namespace LittleEndianGuest {}
 
 namespace X86ISA
@@ -111,10 +114,15 @@ namespace X86ISA
     const int MaxInstDestRegs = 10;
 
     //4k. This value is not constant on x86.
-    const int LogVmPageSize = 12;
-    const int VMPageSize = (1 << LogVmPageSize);
+    const int LogVMPageSize = 12;
+    const int VMPageSize = (1 << LogVMPageSize);
+
+    const int PageShift = 13;
+    const int PageBytes = 1ULL << PageShift;
 
     const int BranchPredAddrShiftAmt = 0;
+
+    StaticInstPtr decodeInst(ExtMachInst);
 };
 
 #endif // __ARCH_X86_ISATRAITS_HH__