174. Fix makedepend so that it can parse a unary '+' operator (#5185, Markxf-4_2_99_1

    Snitily).
173. Fix a typo in Xvesa's emulation of instructions forbidden in vm86 mode
    (#5184, Juliusz Chroboczek)
172. Fix a bounds check in Xlib's Region code (#5183, Owen Taylor).

1 files changed, 6 insertions, 7 deletions

diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index b6f604873..4c9c1ff76 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vm86.c,v 1.2 2002/02/19 00:18:05 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -372,13 +372,12 @@ vm86_emulate(Vm86InfoPtr vi)
         if(pref_rep) {
             if(pref_66) {
                 regs->ecx--;
-                if(regs->ecx != 0) {
+                if(regs->ecx != 0)
+                    goto again;
+            } else {
+                SET_16(regs->ecx, regs->ecx - 1);
+                if(regs->ecx & 0xFFFF != 0)
                     goto again;
-                } else {
-                    SET_16(regs->ecx, regs->ecx - 1);
-                    if(regs->ecx & 0xFFFF != 0)
-                        goto again;
-                }
             }
         }
         INC_IP(1);