Commit 9575234d authored Mar 16, 2015 by Peter Maydell

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>

parents bc68d2e5 2374c4b8

tcg/optimize.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}