diff options
| author | Peter Maydell | 2015-07-24 12:11:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-24 12:11:30 +0200 |
| commit | 30fdfae49d53cfc678859095e49ac60b79562d6f (patch) | |
| tree | c826b3863f589c16bc0ac4c7c9bdd054a315b489 /tcg/optimize.c | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20150723.0' in... (diff) | |
| parent | tcg/optimize: fix tcg_opt_gen_movi (diff) | |
| download | qemu-30fdfae49d53cfc678859095e49ac60b79562d6f.tar.gz qemu-30fdfae49d53cfc678859095e49ac60b79562d6f.tar.xz qemu-30fdfae49d53cfc678859095e49ac60b79562d6f.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150723' into staging
Last minute fixes for 2.4.
# gpg: Signature made Fri Jul 24 04:42:31 2015 BST 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/pull-tcg-20150723:
tcg/optimize: fix tcg_opt_gen_movi
tcg/aarch64: use 32-bit offset for 32-bit softmmu emulation
tcg/aarch64: use 32-bit offset for 32-bit user-mode emulation
tcg/aarch64: add ext argument to tcg_out_insn_3310
tcg/i386: Extend addresses for 32-bit guests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tcg/optimize.c')
| -rw-r--r-- | tcg/optimize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/optimize.c b/tcg/optimize.c index 0f6f7008da..18283cfd7b 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -205,7 +205,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args, temps[dst].state = TCG_TEMP_CONST; temps[dst].val = val; mask = val; - if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_mov_i32) { + if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_movi_i32) { /* High bits of the destination are now garbage. */ mask |= ~0xffffffffull; } |