X86: Respect segment override prefixes even when there's no ModRM byte.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc
index 30ed80942..0d7b32130 100644
--- a/src/arch/x86/emulenv.cc
+++ b/src/arch/x86/emulenv.cc
@@ -105,3 +105,11 @@ void EmulEnv::doModRM(const ExtMachInst & machInst)
     }
 }
 
+void EmulEnv::setSeg(const ExtMachInst & machInst)
+{
+    seg = SEGMENT_REG_DS;
+    //Handle any segment override that might have been in the instruction
+    int segFromInst = machInst.legacy.seg;
+    if (segFromInst)
+        seg = (SegmentRegIndex)(segFromInst - 1);
+}