OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Queued sparc patch 

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJYtyaxAAoJEK0ScMxN0CebDmsIANYR6KJsQqD/EstekY+6aCG5
 L6rd5bwZz7ViQA8GMU7+yOFEAlbvCF+AROrcaGr0QCOC/v4jxsUFJjlmjj0QrhkT
 YPyfvQ8EMwUwCR6ScxpKOD4rMxRwvgviC4yzNmM6L+9U3lLLIn/po+6xDXamc5Fj
 rIm/6xhyPyzxHOZcBEXG3EsD6Meb32tI8NTJeMCkKXiHwxMkJe9Rn82oTzA2ObAv
 BiEP+t3KqHm/ZPnvByWcS590IL22Xat1SqwfC7OaNm21sRtfmMSmX/w3MRZJADTx
 XTBX3reJH+sZD11TvsTAY/zqmoT9VoBVWhq2hfjrqmukJluwHGsAEwVRFhhNRao=
 =Ieag
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-03-02 22:06:41 +00:00
parent 6835504887 3db010c339
commit ecb24d334a
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/sparc/translate.c
View File

@ -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;
}
}