diff options
| author | Peter Maydell | 2020-07-26 18:17:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-26 18:17:58 +0200 |
| commit | 194f8ca825854abef3aceca1ed7eb5a53b08751f (patch) | |
| tree | 2096fdc363978b002b9feca6c757720f0266daf1 /target | |
| parent | Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-07-24-1... (diff) | |
| parent | target/i386: Save cc_op before loop insns (diff) | |
| download | qemu-194f8ca825854abef3aceca1ed7eb5a53b08751f.tar.gz qemu-194f8ca825854abef3aceca1ed7eb5a53b08751f.tar.xz qemu-194f8ca825854abef3aceca1ed7eb5a53b08751f.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200725' into staging
Fix some cputlb commentary
Fix an hppa temporary leak
Fix an i386 translation issue with loop insns
# gpg: Signature made Sat 25 Jul 2020 17:03:59 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-tcg-20200725:
target/i386: Save cc_op before loop insns
target/hppa: Free some temps in do_sub
tcg: update comments for save_iotlb_data in cputlb
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/hppa/translate.c | 2 | ||||
| -rw-r--r-- | target/i386/translate.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 52d7bea1ea..4bd22d4820 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -1294,6 +1294,8 @@ static void do_sub(DisasContext *ctx, unsigned rt, TCGv_reg in1, save_or_nullify(ctx, cpu_psw_cb_msb, cb_msb); save_gpr(ctx, rt, dest); tcg_temp_free(dest); + tcg_temp_free(cb); + tcg_temp_free(cb_msb); /* Install the new nullification. */ cond_free(&ctx->null_cond); diff --git a/target/i386/translate.c b/target/i386/translate.c index a1d31f09c1..caea6f5fb1 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -7148,6 +7148,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) l1 = gen_new_label(); l2 = gen_new_label(); l3 = gen_new_label(); + gen_update_cc_op(s); b &= 3; switch(b) { case 0: /* loopnz */ |