diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 22:06:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-02 22:06:41 +0000 |
| commit | ecb24d334af1a98ef0329f4b3b0e14ae8cb8770d (patch) | |
| tree | 7ea55f96382ddec45bb8ff1352d25c8eeecbfa13 | |
| parent | 683550488717333fed4295f5f994328196c7bf3e (diff) | |
| parent | 3db010c3398d03646d74f2d36a68e62539342e6c (diff) | |
| download | qemu-ecb24d334af1a98ef0329f4b3b0e14ae8cb8770d.zip qemu-ecb24d334af1a98ef0329f4b3b0e14ae8cb8770d.tar.gz qemu-ecb24d334af1a98ef0329f4b3b0e14ae8cb8770d.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-20170302' into staging
Queued sparc patch
# gpg: Signature made Wed 01 Mar 2017 19:53:21 GMT
# 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-tgt-20170302:
target/sparc: Restore ldstub of odd asis
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/sparc/translate.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 655060c..aa6734d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -2448,8 +2448,31 @@ static void gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn) gen_ldstub(dc, dst, addr, da.mem_idx); break; default: - /* ??? Should be DAE_invalid_asi. */ - gen_exception(dc, TT_DATA_ACCESS); + /* ??? In theory, this should be raise DAE_invalid_asi. + But the SS-20 roms do ldstuba [%l0] #ASI_M_CTL, %o1. */ + if (parallel_cpus) { + gen_helper_exit_atomic(cpu_env); + } else { + TCGv_i32 r_asi = tcg_const_i32(da.asi); + TCGv_i32 r_mop = tcg_const_i32(MO_UB); + TCGv_i64 s64, t64; + + save_state(dc); + t64 = tcg_temp_new_i64(); + gen_helper_ld_asi(t64, cpu_env, addr, r_asi, r_mop); + + s64 = tcg_const_i64(0xff); + gen_helper_st_asi(cpu_env, addr, s64, r_asi, r_mop); + tcg_temp_free_i64(s64); + tcg_temp_free_i32(r_mop); + tcg_temp_free_i32(r_asi); + + tcg_gen_trunc_i64_tl(dst, t64); + tcg_temp_free_i64(t64); + + /* End the TB. */ + dc->npc = DYNAMIC_PC; + } break; } } |