summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-08-23 09:44:19 -0700
committerGabe Black <gblack@eecs.umich.edu>2010-08-23 09:44:19 -0700
commitd43eb42d00a587405a512396c6524be95d5a6311 (patch)
treec265195d521b0af13581def7ba507f64f137cf91 /src/arch
parent69fc2af00600ced942d81dba082d9780e5325c9e (diff)
downloadgem5-d43eb42d00a587405a512396c6524be95d5a6311.tar.xz
X86: Mark serializing macroops and regular instructions as such.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/isa/formats/cpuid.isa2
-rw-r--r--src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py2
-rw-r--r--src/arch/x86/isa/insts/general_purpose/data_transfer/move.py3
-rw-r--r--src/arch/x86/isa/insts/system/invlpg.py2
-rw-r--r--src/arch/x86/isa/insts/system/msrs.py1
-rw-r--r--src/arch/x86/isa/insts/system/segmentation.py14
6 files changed, 24 insertions, 0 deletions
diff --git a/src/arch/x86/isa/formats/cpuid.isa b/src/arch/x86/isa/formats/cpuid.isa
index 64a3f70a2..cc3070ded 100644
--- a/src/arch/x86/isa/formats/cpuid.isa
+++ b/src/arch/x86/isa/formats/cpuid.isa
@@ -45,6 +45,8 @@ output header {{
OpClass __opClass) :
X86ISA::X86StaticInst(_mnemonic, _machInst, __opClass)
{
+ flags[IsSerializing] = 1;
+ flags[IsSerializeAfter] = 1;
}
std::string generateDisassembly(Addr pc,
diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py
index 925f4bef3..f8bafa540 100644
--- a/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py
+++ b/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py
@@ -37,10 +37,12 @@
microcode = '''
def macroop IRET_REAL {
+ .serializing
panic "Real mode iret isn't implemented!"
};
def macroop IRET_PROT {
+ .serializing
.adjust_env oszIn64Override
# Check for a nested task. This isn't supported at the moment.
diff --git a/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py b/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
index a43325288..3f5c2d303 100644
--- a/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
+++ b/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
@@ -174,16 +174,19 @@ def macroop MOVZX_W_R_P {
};
def macroop MOV_C_R {
+ .serializing
.adjust_env maxOsz
wrcr reg, regm
};
def macroop MOV_R_C {
+ .serializing
.adjust_env maxOsz
rdcr reg, regm
};
def macroop MOV_D_R {
+ .serializing
.adjust_env maxOsz
wrdr reg, regm
};
diff --git a/src/arch/x86/isa/insts/system/invlpg.py b/src/arch/x86/isa/insts/system/invlpg.py
index a54451a54..6d7292d50 100644
--- a/src/arch/x86/isa/insts/system/invlpg.py
+++ b/src/arch/x86/isa/insts/system/invlpg.py
@@ -40,10 +40,12 @@
microcode = '''
def macroop INVLPG_M {
+ .serializing
tia seg, sib, disp
};
def macroop INVLPG_P {
+ .serializing
rdip t7
tia seg, riprel, disp
};
diff --git a/src/arch/x86/isa/insts/system/msrs.py b/src/arch/x86/isa/insts/system/msrs.py
index 95832442c..d0e2675de 100644
--- a/src/arch/x86/isa/insts/system/msrs.py
+++ b/src/arch/x86/isa/insts/system/msrs.py
@@ -50,6 +50,7 @@ def macroop RDMSR
def macroop WRMSR
{
+ .serializing
mov t2, t2, rax, dataSize=4
slli t3, rdx, 32, dataSize=8
or t2, t2, t3, dataSize=8
diff --git a/src/arch/x86/isa/insts/system/segmentation.py b/src/arch/x86/isa/insts/system/segmentation.py
index 9675501bb..5ecb2e193 100644
--- a/src/arch/x86/isa/insts/system/segmentation.py
+++ b/src/arch/x86/isa/insts/system/segmentation.py
@@ -38,6 +38,7 @@
microcode = '''
def macroop LGDT_M
{
+ .serializing
.adjust_env maxOsz
# Get the limit
@@ -50,6 +51,7 @@ def macroop LGDT_M
def macroop LGDT_P
{
+ .serializing
.adjust_env maxOsz
rdip t7
@@ -68,6 +70,7 @@ def macroop LGDT_P
def macroop LGDT_16_M
{
+ .serializing
.adjust_env maxOsz
# Get the limit
@@ -81,6 +84,7 @@ def macroop LGDT_16_M
def macroop LGDT_16_P
{
+ .serializing
.adjust_env maxOsz
rdip t7
@@ -95,6 +99,7 @@ def macroop LGDT_16_P
def macroop LIDT_M
{
+ .serializing
.adjust_env maxOsz
# Get the limit
@@ -107,6 +112,7 @@ def macroop LIDT_M
def macroop LIDT_P
{
+ .serializing
.adjust_env maxOsz
rdip t7
@@ -125,6 +131,7 @@ def macroop LIDT_P
def macroop LIDT_16_M
{
+ .serializing
.adjust_env maxOsz
# Get the limit
@@ -138,6 +145,7 @@ def macroop LIDT_16_M
def macroop LIDT_16_P
{
+ .serializing
.adjust_env maxOsz
rdip t7
@@ -152,6 +160,7 @@ def macroop LIDT_16_P
def macroop LTR_R
{
+ .serializing
chks reg, t0, TRCheck
limm t4, 0, dataSize=8
srli t4, reg, 3, dataSize=2
@@ -168,6 +177,7 @@ def macroop LTR_R
def macroop LTR_M
{
+ .serializing
ld t5, seg, sib, disp, dataSize=2
chks t5, t0, TRCheck
limm t4, 0, dataSize=8
@@ -185,6 +195,7 @@ def macroop LTR_M
def macroop LTR_P
{
+ .serializing
rdip t7
ld t5, seg, riprel, disp, dataSize=2
chks t5, t0, TRCheck
@@ -203,6 +214,7 @@ def macroop LTR_P
def macroop LLDT_R
{
+ .serializing
chks reg, t0, InGDTCheck, flags=(EZF,)
br label("end"), flags=(CEZF,)
limm t4, 0, dataSize=8
@@ -219,6 +231,7 @@ end:
def macroop LLDT_M
{
+ .serializing
ld t5, seg, sib, disp, dataSize=2
chks t5, t0, InGDTCheck, flags=(EZF,)
br label("end"), flags=(CEZF,)
@@ -236,6 +249,7 @@ end:
def macroop LLDT_P
{
+ .serializing
rdip t7
ld t5, seg, riprel, disp, dataSize=2
chks t5, t0, InGDTCheck, flags=(EZF,)