summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKONRAD Frederic <frederic.konrad@adacore.com>2018-03-02 10:59:25 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2018-03-08 07:22:03 +0000
commit6e10f37c86068e35151f982c976a85f1bec07ef2 (patch)
tree1a57f740bc3840e1cb43455c4663bf95cd2d3fdd
parent12850b1bb31876fc7f6382ebffe137357b42e26e (diff)
downloadqemu-6e10f37c86068e35151f982c976a85f1bec07ef2.tar.gz
sparc: fix leon3 casa instruction when MMU is disabled
Since the commit af7a06bac7d3abb2da48ef3277d2a415772d2ae8: `casa [..](10), .., ..` (and probably others alternate space instructions) triggers a data access exception when the MMU is disabled. When we enter get_asi(...) dc->mem_idx is set to MMU_PHYS_IDX when the MMU is disabled. Just keep mem_idx unchanged in this case so we passthrough the MMU when it is disabled. Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-rw-r--r--target/sparc/translate.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index 71e0853e43..5aa367a182 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -2093,6 +2093,11 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop)
type = GET_ASI_BFILL;
break;
}
+
+ /* MMU_PHYS_IDX is used when the MMU is disabled to passthrough the
+ * permissions check in get_physical_address(..).
+ */
+ mem_idx = (dc->mem_idx == MMU_PHYS_IDX) ? MMU_PHYS_IDX : mem_idx;
} else {
gen_exception(dc, TT_PRIV_INSN);
type = GET_ASI_EXCP;