changeset 0b4d10f53c2d in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=0b4d10f53c2d
description:
x86: Flag instructions that call suspend as IsQuiesce
The o3 cpu relies upon instructions that suspend a thread context being
flagged as "IsQuiesce". If they are not, unpredictable behavior can
occur.
This patch fixes that for the x86 ISA.
diffstat:
src/arch/x86/isa/decoder/two_byte_opcodes.isa | 6 +++---
src/arch/x86/isa/microops/specop.isa | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diffs (33 lines):
diff -r 40d24a672351 -r 0b4d10f53c2d
src/arch/x86/isa/decoder/two_byte_opcodes.isa
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa Wed Sep 03 07:42:45
2014 -0400
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa Wed Sep 03 07:42:46
2014 -0400
@@ -141,13 +141,13 @@
}}, IsNonSpeculative);
0x01: m5quiesce({{
PseudoInst::quiesce(xc->tcBase());
- }}, IsNonSpeculative);
+ }}, IsNonSpeculative, IsQuiesce);
0x02: m5quiesceNs({{
PseudoInst::quiesceNs(xc->tcBase(), Rdi);
- }}, IsNonSpeculative);
+ }}, IsNonSpeculative, IsQuiesce);
0x03: m5quiesceCycle({{
PseudoInst::quiesceCycles(xc->tcBase(), Rdi);
- }}, IsNonSpeculative);
+ }}, IsNonSpeculative, IsQuiesce);
0x04: m5quiesceTime({{
Rax = PseudoInst::quiesceTime(xc->tcBase());
}}, IsNonSpeculative);
diff -r 40d24a672351 -r 0b4d10f53c2d src/arch/x86/isa/microops/specop.isa
--- a/src/arch/x86/isa/microops/specop.isa Wed Sep 03 07:42:45 2014 -0400
+++ b/src/arch/x86/isa/microops/specop.isa Wed Sep 03 07:42:46 2014 -0400
@@ -63,7 +63,8 @@
MicroHalt(ExtMachInst _machInst, const char * instMnem,
uint64_t setFlags) :
X86MicroopBase(_machInst, "halt", instMnem,
- setFlags | (ULL(1) << StaticInst::IsNonSpeculative),
+ setFlags | (ULL(1) << StaticInst::IsNonSpeculative)
|
+ (ULL(1) << StaticInst::IsQuiesce),
No_OpClass)
{
}
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev