summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Harris <tharris@microsoft.com>2011-02-07 15:05:28 -0800
committerTim Harris <tharris@microsoft.com>2011-02-07 15:05:28 -0800
commit5810ab121c39f041aa6728696bc19e2e963eef90 (patch)
treefe4d1c6ea7e109d84c5516b4fa59361c732f8016 /src
parent10b4b364d9d42bcefda7ff18e1de9152dc6456d1 (diff)
downloadgem5-5810ab121c39f041aa6728696bc19e2e963eef90.tar.xz
X86: Read the LDT/GDT at CPL0 when executing an iret.
During iret access LDT/GDT at CPL0 rather than after transition to user mode (if I'm reading the Intel IA-64 architecture spec correctly, the contents of the descriptor table are read before the CPL is updated).
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py8
1 files changed, 4 insertions, 4 deletions
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 f8bafa540..19a344008 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
@@ -102,10 +102,10 @@ protToVirtFallThrough:
andi t6, t2, 0xF8, dataSize=8
andi t0, t2, 0x4, flags=(EZF,), dataSize=2
br label("globalCSDescriptor"), flags=(CEZF,)
- ld t8, tsl, [1, t0, t6], dataSize=8
+ ld t8, tsl, [1, t0, t6], dataSize=8, atCPL0=True
br label("processCSDescriptor")
globalCSDescriptor:
- ld t8, tsg, [1, t0, t6], dataSize=8
+ ld t8, tsg, [1, t0, t6], dataSize=8, atCPL0=True
processCSDescriptor:
chks t2, t6, dataSize=8
@@ -159,10 +159,10 @@ doPopStackStuff:
andi t7, t9, 0xF8, dataSize=8
andi t0, t9, 0x4, flags=(EZF,), dataSize=2
br label("globalSSDescriptor"), flags=(CEZF,)
- ld t7, tsl, [1, t0, t7], dataSize=8
+ ld t7, tsl, [1, t0, t7], dataSize=8, atCPL0=True
br label("processSSDescriptor")
globalSSDescriptor:
- ld t7, tsg, [1, t0, t7], dataSize=8
+ ld t7, tsg, [1, t0, t7], dataSize=8, atCPL0=True
processSSDescriptor:
chks t9, t7, dataSize=8