From: Artyom Tarasenko <atar4qemu@gmail.com>
Date: Fri, 24 Jun 2016 12:34:30 +0000 (+0200)
Subject: target-sparc: fix register corruption in ldstub if there is no write permission
X-Git-Tag: v2.6.1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9566ceeef41ccb5241d340b34776a33450e8f9e5;p=thirdparty%2Fqemu.git

target-sparc: fix register corruption in ldstub if there is no write permission

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
(cherry picked from commit b64d2e57e704edbb56ae969de864292dd38379bf)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 7998ff57bf0..502510c7506 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -4668,12 +4668,15 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn)
                 case 0xd:       /* ldstub -- XXX: should be atomically */
                     {
                         TCGv r_const;
+                        TCGv tmp = tcg_temp_new();
 
                         gen_address_mask(dc, cpu_addr);
-                        tcg_gen_qemu_ld8u(cpu_val, cpu_addr, dc->mem_idx);
+                        tcg_gen_qemu_ld8u(tmp, cpu_addr, dc->mem_idx);
                         r_const = tcg_const_tl(0xff);
                         tcg_gen_qemu_st8(r_const, cpu_addr, dc->mem_idx);
+                        tcg_gen_mov_tl(cpu_val, tmp);
                         tcg_temp_free(r_const);
+                        tcg_temp_free(tmp);
                     }
                     break;
                 case 0x0f: