From: Boris Figovsky <boris.figovsky@ravellosystems.com>
Date: Tue, 30 Aug 2011 07:00:55 +0000 (+0300)
Subject: x86: fix daa opcode for al register values higher than 0xf9
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~17^2~1768^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6bfc164e8f929e1e6a79f7b5a3cf096b22ef5f3;p=sdk%2Femulator%2Fqemu.git

x86: fix daa opcode for al register values higher than 0xf9

The second if statement should consider the original al register value,
and not the new one.

Signed-off-by: Boris Figovsky <boris.figovksy@ravellosystems.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 1bbc3b56dc..1fc248fa17 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -1970,20 +1970,20 @@ void helper_aas(void)
 
 void helper_daa(void)
 {
-    int al, af, cf;
+    int old_al, al, af, cf;
     int eflags;
 
     eflags = helper_cc_compute_all(CC_OP);
     cf = eflags & CC_C;
     af = eflags & CC_A;
-    al = EAX & 0xff;
+    old_al = al = EAX & 0xff;
 
     eflags = 0;
     if (((al & 0x0f) > 9 ) || af) {
         al = (al + 6) & 0xff;
         eflags |= CC_A;
     }
-    if ((al > 0x9f) || cf) {
+    if ((old_al > 0x99) || cf) {
         al = (al + 0x60) & 0xff;
         eflags |= CC_C;
     }