tcg opt fix for or x,a,a

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVBvsHAAoJEK0ScMxN0CebtsoIANvZBGjO+dCF44jDe1e1tv6G
 6CPyrNW//uMVGHx0Q2KS7/JODnaId53znpe/0IAXS6SU9hR+X3lhk/5bCPe2v1f2
 Y02eMZuUGXvt3AWhVtrsqoNGWxueUYHpVfUtL/Y1XBFgh98sWBfeaBhwBvAvKt/B
 vIjG6cXzabcW4adCgZEQoHOa99Shu71hcvIUdPpi0jjuB/vh2ax05359cTbyKNkl
 6Ctu+vPyVFx84JvFzcbv4eIJ0ckfmVvv07S1nFhIR1rLuampfBa5NL7jd3lQrKkr
 2uHzq6RkTP/6rs9ggzf3nA59ZEPUKn//hBBE6g29QXtWN8guoE9e5721jc62Hdk=
 =7Jrr
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/rth/tags/tcg-pull-20150316' into staging

tcg opt fix for or x,a,a

# gpg: Signature made Mon Mar 16 15:47:19 2015 GMT using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"

* remotes/rth/tags/tcg-pull-20150316:
  tcg/optimize: Handle or r,a,a with constant a

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-03-16 17:22:32 +00:00
commit 9575234db1

View File

@ -980,8 +980,11 @@ static void tcg_constant_folding(TCGContext *s)
if (temps_are_copies(args[1], args[2])) {
if (temps_are_copies(args[0], args[1])) {
tcg_op_remove(s, op);
} else {
} else if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]);
} else {
tcg_opt_gen_movi(s, op, args, opc,
args[0], temps[args[1]].val);
}
continue;
}