Break out the one and two byte opcodes into different files. Also change what bits decode is done on to reflect where clumps of instructions are.

--HG--
extra : convert_revision : 8768676eac25e6a4f0dc50ce2dc576bdcdd6e025

1 files changed, 7 insertions, 7 deletions

diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index d7734be88..1df17d6d2 100644
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -144,12 +144,12 @@ namespace X86ISA
         int immediateCollected;
 
         enum State {
-            Prefix,
-            Opcode,
-            ModRM,
-            SIB,
-            Displacement,
-            Immediate,
+            PrefixState,
+            OpcodeState,
+            ModRMState,
+            SIBState,
+            DisplacementState,
+            ImmediateState,
             //We should never get to this state. Getting here is an error.
             ErrorState
         };
@@ -168,7 +168,7 @@ namespace X86ISA
         Predecoder(ThreadContext * _tc) :
             tc(_tc), basePC(0), offset(0),
             outOfBytes(true), emiIsReady(false),
-            state(Prefix)
+            state(PrefixState)
         {}
 
         ThreadContext * getTC()