sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Gabe Black 2009-02-27 09:23:58 -08:00
parent 9dfa3f7f73
commit 3dfa564e70
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/arch/x86/emulenv.cc
View file

@ -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);
}

1
src/arch/x86/emulenv.hh
View file

@ -86,6 +86,7 @@ namespace X86ISA
{;} {;}
void doModRM(const ExtMachInst & machInst); void doModRM(const ExtMachInst & machInst);
void setSeg(const ExtMachInst & machInst);
}; };
}; };

11
src/arch/x86/isa/macroop.isa
View file

@ -135,7 +135,7 @@ def template MacroConstructor {{
%(adjust_env)s; %(adjust_env)s;
%(adjust_imm)s; %(adjust_imm)s;
%(adjust_disp)s; %(adjust_disp)s;
%(do_modrm)s; %(init_env)s;
%(constructor)s; %(constructor)s;
const char *macrocodeBlock = "%(class_name)s"; const char *macrocodeBlock = "%(class_name)s";
//alloc_microops is the code that sets up the microops //alloc_microops is the code that sets up the microops
@ -166,7 +166,7 @@ let {{
} }
self.declared = False self.declared = False
self.adjust_env = "" self.adjust_env = ""
self.doModRM = "" self.init_env = ""
self.adjust_imm = ''' self.adjust_imm = '''
uint64_t adjustedImm = IMMEDIATE; uint64_t adjustedImm = IMMEDIATE;
//This is to pacify gcc in case the immediate isn't used. //This is to pacify gcc in case the immediate isn't used.
@ -228,7 +228,7 @@ let {{
"adjust_disp" : self.adjust_disp, "adjust_disp" : self.adjust_disp,
"disassembly" : env.disassembly, "disassembly" : env.disassembly,
"regSize" : regSize, "regSize" : regSize,
"do_modrm" : self.doModRM}) "init_env" : self.initEnv})
return MacroConstructor.subst(iop) + \ return MacroConstructor.subst(iop) + \
MacroDisassembly.subst(iop); MacroDisassembly.subst(iop);
}}; }};
@ -304,6 +304,7 @@ let {{
let {{ let {{
doModRMString = "env.doModRM(machInst);\n" doModRMString = "env.doModRM(machInst);\n"
noModRMString = "env.setSeg(machInst);\n"
def genMacroop(Name, env): def genMacroop(Name, env):
blocks = OutputBlocks() blocks = OutputBlocks()
if not macroopDict.has_key(Name): if not macroopDict.has_key(Name):
@ -311,7 +312,9 @@ let {{
macroop = macroopDict[Name] macroop = macroopDict[Name]
if not macroop.declared: if not macroop.declared:
if env.doModRM: if env.doModRM:
macroop.doModRM = doModRMString macroop.initEnv = doModRMString
else:
macroop.initEnv = noModRMString
blocks.header_output = macroop.getDeclaration() blocks.header_output = macroop.getDeclaration()
blocks.decoder_output = macroop.getDefinition(env) blocks.decoder_output = macroop.getDefinition(env)
macroop.declared = True macroop.declared = True