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

X86: Ensure that the CPUID instruction always writes its outputs.

Browse source 
The CPUID instruction was implemented so that it would only write its results
if the instruction was successful. This works fine on the simple CPU where
unwritten registers retain their old values, but on a CPU like O3 with
renaming this is broken. The instruction needs to write the old values back
into the registers explicitly if they aren't being changed.
This commit is contained in:
Gabe Black 2012-06-04 10:43:09 -07:00
parent 7b73c36f5d
commit 35fa5074aa
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/arch/x86/isa/decoder/two_byte_opcodes.isa
View file

@ -721,12 +721,19 @@
0x1: pop_fs();
0x2: CPUIDInst::CPUID({{
CpuidResult result;
success = doCpuid(xc->tcBase(), bits(Rax, 31, 0),
bool success = doCpuid(xc->tcBase(), bits(Rax, 31, 0),
bits(Rcx, 31, 0), result);
Rax = result.rax;
Rbx = result.rbx;
Rcx = result.rcx;
Rdx = result.rdx;
if (success) {
Rax = result.rax;
Rbx = result.rbx;
Rcx = result.rcx;
Rdx = result.rdx;
} else {
Rax = Rax;
Rbx = Rbx;
Rcx = Rcx;
Rdx = Rdx;
}
}});
0x3: Inst::BT(Ev,Gv);
0x4: Inst::SHLD(Ev,Gv,Ib);

5
src/arch/x86/isa/formats/cpuid.isa
View file

@ -73,13 +73,10 @@ def template CPUIDExecute {{
{
// If the CPUID instruction used a valid function number, this will
// be set to true. Otherwise, the instruction does nothing.
bool success;
%(op_decl)s;
%(op_rd)s;
%(code)s;
if (success) {
%(op_wb)s;
}
%(op_wb)s;
return NoFault;
}
}};