Commit 511008f5 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'vivier-m68k/tags/m68k-for-2.8-pull-request' into staging 



# gpg: Signature made Thu 24 Nov 2016 03:25:39 PM GMT
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* vivier-m68k/tags/m68k-for-2.8-pull-request:
  target-m68k: fix muluw/mulsw
  target-m68k: Fix cmpa operand size
  target-m68k: fix EXG instruction

Message-id: 1480001287-17515-1-git-send-email-laurent@vivier.eu
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 628d0a4b 4a18cd44

target-m68k/translate.c

+4 −4
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ DISAS_INSN(mulw) 
    SRC_EA(env, src, OS_WORD, sign, NULL);

    tcg_gen_mul_i32(tmp, tmp, src);

    tcg_gen_mov_i32(reg, tmp);

    gen_logic_cc(s, tmp, OS_WORD);

    gen_logic_cc(s, tmp, OS_LONG);

}



DISAS_INSN(divw)
@@ -2170,7 +2170,7 @@ DISAS_INSN(cmpa) 
    }

    SRC_EA(env, src, opsize, 1, NULL);

    reg = AREG(insn, 9);

    gen_update_cc_cmp(s, reg, src, opsize);

    gen_update_cc_cmp(s, reg, src, OS_LONG);

}



DISAS_INSN(eor)
@@ -2198,13 +2198,13 @@ static void do_exg(TCGv reg1, TCGv reg2) 
    tcg_temp_free(temp);

}



DISAS_INSN(exg_aa)

DISAS_INSN(exg_dd)

{

    /* exchange Dx and Dy */

    do_exg(DREG(insn, 9), DREG(insn, 0));

}



DISAS_INSN(exg_dd)

DISAS_INSN(exg_aa)

{

    /* exchange Ax and Ay */

    do_exg(AREG(insn, 9), AREG(insn, 0));