summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-08-21 17:30:26 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-08-21 17:30:26 +0000
commit3f20e1ddf2770016f8c8fa15971e0d0ebdd1c731 (patch)
treef7530ec0b9beef55a25a2c83868decf6cd4b291f
parent75913b727e2702b7ee3099c0388502778554f681 (diff)
downloadqemu-3f20e1ddf2770016f8c8fa15971e0d0ebdd1c731.tar.gz
qemu-3f20e1ddf2770016f8c8fa15971e0d0ebdd1c731.tar.bz2
qemu-3f20e1ddf2770016f8c8fa15971e0d0ebdd1c731.zip
TSS error code push fix (malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1558 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--target-i386/helper.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 424dc52848..c7fea9553e 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -622,9 +622,10 @@ static void do_interrupt_protected(int intno, int is_int, int error_code,
raise_exception_err(EXCP0B_NOSEG, intno * 8 + 2);
switch_tss(intno * 8, e1, e2, SWITCH_TSS_CALL, old_eip);
if (has_error_code) {
- int mask;
+ int mask, type;
/* push the error code */
- shift = (env->segs[R_CS].flags >> DESC_B_SHIFT) & 1;
+ type = (env->tr.flags >> DESC_TYPE_SHIFT) & 0xf;
+ shift = type >> 3;
if (env->segs[R_SS].flags & DESC_B_MASK)
mask = 0xffffffff;
else