summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorArtyom Tarasenko <atar4qemu@gmail.com>2016-06-24 14:34:30 +0200
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2016-06-24 18:18:32 +0100
commitb64d2e57e704edbb56ae969de864292dd38379bf (patch)
tree37f99876f82ece03f0ca67f57b17fb1097f45b56
parenta01aef5d2f96c334d048f43f0d3573a1152b37ca (diff)
downloadfocaccia-qemu-b64d2e57e704edbb56ae969de864292dd38379bf.tar.gz
focaccia-qemu-b64d2e57e704edbb56ae969de864292dd38379bf.zip
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>
-rw-r--r--target-sparc/translate.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index afd46b878f..0f4faf7062 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -4679,12 +4679,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: