openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQIcBAABAgAGBQJYNwZzAAoJEPMMOL0/L7482q0P/3TbgAqccdyBT6NQ8ksbz4lO
 70QYdwwjRm02TJThnHqwSgx8UJPPXhYXJ2E1lbzP2K2NcN+FPNkYtpbG0gvyHr76
 OXRQ2MjJ2rXCDdk0vVhudjZTCR2V9mtLma2o+MUa0v4bmapmSIPbjomeYFEDYUrI
 Zv8+RrtcJC7C67Rrk1UB8mV+rK6bjc0bUq9jmwMFQO4llXWvcnOwzr8vVc8EYAw8
 MuyQmt1rw3lc5NddOoidnAhPJlF82c+MPuLx7UiNKI7i7ZByMH4tDNsrrpKRjWUj
 UJyc79gZTltIg3pYSHtPu2y2druafm2A/VAd/0vtkCOGRC3Jzlk36+gflaCW1tpo
 n5BR0pzpc0iYI54Qnb38iv92Qz5PDrPva0vWzaKn6yntZyN+wc9AXGfjLXjgf8Da
 8CMP7iTqmIby9UUMhS64rohfQNNc9Hc0rV3dQMuz1sm+5T6LC0WzOGBMBjwCoNY8
 +3xH/VKZa8FZfb/hDWshQfKG/4SVgyFgZ/Q5COLLAfIW1jZPbMJPlTao/nusMCcg
 bvf37Dg1ZHFpi0I2rNbZ/3XUYQIYb4WZTXc86z1NjN8XAvhZwfaMuG7K13tYrgx8
 tOqvPMhpc6w5VjBcdS3XV+MzEj//7OC++TDk7xat+oZnxGBcuiHaEoAtxyMX2Yie
 28TfVOn18rfhDIwkB7dn
 =rvc6
 -----END PGP SIGNATURE-----

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: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2016-11-25 12:03:36 +00:00
parent 628d0a4bdf 4a18cd44f3
commit 511008f5cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-m68k/translate.c
View File

@ -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));