From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 21 Aug 2005 17:30:26 +0000 (+0000)
Subject: TSS error code push fix (malc)
X-Git-Tag: release_0_8_1~340
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f20e1ddf2770016f8c8fa15971e0d0ebdd1c731;p=thirdparty%2Fqemu.git

TSS error code push fix (malc)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1558 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 424dc528487..c7fea9553e5 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