changeset 8d6e40f38063 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=8d6e40f38063
description:
X86: Move where CS is set so CPL checks work out.
diffstat:
1 file changed, 13 insertions(+), 11 deletions(-)
src/arch/x86/isa/insts/romutil.py | 24 +++++++++++++-----------
diffs (48 lines):
diff -r 62c521c36f61 -r 8d6e40f38063 src/arch/x86/isa/insts/romutil.py
--- a/src/arch/x86/isa/insts/romutil.py Wed Feb 25 10:18:06 2009 -0800
+++ b/src/arch/x86/isa/insts/romutil.py Wed Feb 25 10:18:16 2009 -0800
@@ -124,6 +124,18 @@
##
wrip t0, t9, dataSize=8
+ #
+ # Set up the target code segment. Do this now so we have the right
+ # permissions when setting up the stack frame.
+ #
+ srli t5, t4, 16, dataSize=8
+ andi t5, t5, 0xFF, dataSize=8
+ wrdl cs, t3, t5, dataSize=8
+ # Tuck away the old CS for use below
+ limm t10, 0, dataSize=8
+ rdsel t10, cs, dataSize=2
+ wrsel cs, t5, dataSize=2
+
#
# Build up the interrupt stack frame
@@ -133,9 +145,7 @@
# Write out the contents of memory
%(errorCodeCode)s
st t7, hs, [1, t0, t6], %(errorCodeSize)d, dataSize=8, addressSize=8
- limm t5, 0, dataSize=8
- rdsel t5, cs, dataSize=2
- st t5, hs, [1, t0, t6], 8 + %(errorCodeSize)d, dataSize=8, addressSize=8
+ st t10, hs, [1, t0, t6], 8 + %(errorCodeSize)d, dataSize=8, addressSize=8
rflags t10, dataSize=8
st t10, hs, [1, t0, t6], 16 + %(errorCodeSize)d, dataSize=8, addressSize=8
st rsp, hs, [1, t0, t6], 24 + %(errorCodeSize)d, dataSize=8, addressSize=8
@@ -147,14 +157,6 @@
wrsel ss, t11, dataSize=2
#
- # Set up the target code segment
- #
- srli t5, t4, 16, dataSize=8
- andi t5, t5, 0xFF, dataSize=8
- wrdl cs, t3, t5, dataSize=8
- wrsel cs, t5, dataSize=2
-
- #
# Adjust rflags which is still in t10 from above
#
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
