diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-10 12:11:34 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-10 12:11:34 +0100 |
| commit | 6580476a14ae0db300733d8b9991fd937cf5e703 (patch) | |
| tree | b7cdc8a19d7d403de3566752ab0b15a62fbe7526 /tcg/mips/tcg-target.inc.c | |
| parent | 77d472291812cf04f97974dadbda767e59e31fde (diff) | |
| parent | 8b8d768f19037a825a0bc81654492caa7c8fab8b (diff) | |
| download | qemu-6580476a14ae0db300733d8b9991fd937cf5e703.zip qemu-6580476a14ae0db300733d8b9991fd937cf5e703.tar.gz qemu-6580476a14ae0db300733d8b9991fd937cf5e703.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170709' into staging
Queued TCG patches
# gpg: Signature made Mon 10 Jul 2017 08:31:44 BST
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20170709:
tcg/mips: Bugfix for crash when running program with qemu-i386.
util/cacheinfo: Fix warning generated by clang
tcg/aarch64: Enable indirect jump path using LDR (literal)
tcg/aarch64: Use ADRP+ADD to compute target address
tcg/aarch64: Introduce and use long branch to register
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tcg/mips/tcg-target.inc.c')
| -rw-r--r-- | tcg/mips/tcg-target.inc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 8cff9a6..85756b8 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -1547,8 +1547,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) } else if (guest_base == (int16_t)guest_base) { tcg_out_opc_imm(s, ALIAS_PADDI, base, addr_regl, guest_base); } else { - tcg_out_movi(s, TCG_TYPE_PTR, base, guest_base); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, addr_regl); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, guest_base); + tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP0, addr_regl); } tcg_out_qemu_ld_direct(s, data_regl, data_regh, base, opc, is_64); #endif @@ -1652,8 +1652,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) } else if (guest_base == (int16_t)guest_base) { tcg_out_opc_imm(s, ALIAS_PADDI, base, addr_regl, guest_base); } else { - tcg_out_movi(s, TCG_TYPE_PTR, base, guest_base); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, addr_regl); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, guest_base); + tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP0, addr_regl); } tcg_out_qemu_st_direct(s, data_regl, data_regh, base, opc); #endif |