Commit c6bfc164 authored by Boris Figovsky's avatar Boris Figovsky Committed by Stefan Hajnoczi
Browse files

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: default avatarBoris Figovsky <boris.figovksy@ravellosystems.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent 6f9faa91

target-i386/op_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }