From 59ec6876bd9d68d17b615236c889486aa35998a9 Mon Sep 17 00:00:00 2001 From: Artyom Tarasenko Date: Thu, 1 Mar 2018 22:29:18 -0500 Subject: [PATCH] target-sparc: add ST_BLKINIT_ ASIs for UA2005+ CPUs In OpenSPARC T1+ TWINX ASIs in store instructions are aliased with Block Initializing Store ASIs. "UltraSPARC T1 Supplement Draft D2.1, 14 May 2007" describes them in the chapter "5.9 Block Initializing Store ASIs" Integer stores of all sizes are allowed with these ASIs. Backports commit 3390537b5df4014e24a30f9bdcfa05c2bd0cd6d8 from qemu --- qemu/target-sparc/translate.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c index bf658e54..abc81f4b 100644 --- a/qemu/target-sparc/translate.c +++ b/qemu/target-sparc/translate.c @@ -2477,8 +2477,19 @@ static void gen_st_asi(DisasContext *dc, TCGv src, TCGv addr, case GET_ASI_EXCP: break; case GET_ASI_DTWINX: /* Reserved for stda. */ +#ifndef TARGET_SPARC64 gen_exception(dc, TT_ILL_INSN); break; +#else + if (!(dc->def->features & CPU_FEATURE_HYPV)) { + /* Pre OpenSPARC CPUs don't have these */ + gen_exception(dc, TT_ILL_INSN); + return; + } + /* in OpenSPARC T1+ CPUs TWINX ASIs in store instructions + * are ST_BLKINIT_ ASIs */ + /* fall through */ +#endif case GET_ASI_DIRECT: gen_address_mask(dc, addr); tcg_gen_qemu_st_tl(dc->uc, src, addr, da.mem_idx, da.memop);