From ebc292c174d7c3700a37df0e40d1cc38d430ee92 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 28 Feb 2018 12:28:05 -0500 Subject: [PATCH] target-sparc: Handle more twinx asis As used by HelenOS, presumably for ultra 2 and 3, prior to the sun4v platform and the current twinx names. Backports commit 34a6e13da70b2c798630a8dbd03d09f201c0198f from qemu --- qemu/target-sparc/translate.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c index a4bb94a9..b27c2136 100644 --- a/qemu/target-sparc/translate.c +++ b/qemu/target-sparc/translate.c @@ -2222,12 +2222,16 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) case ASI_REAL_IO_L: /* Bypass, non-cacheable LE */ case ASI_TWINX_REAL: /* Real address, twinx */ case ASI_TWINX_REAL_L: /* Real address, twinx, LE */ + case ASI_QUAD_LDD_PHYS: + case ASI_QUAD_LDD_PHYS_L: mem_idx = MMU_PHYS_IDX; break; case ASI_N: /* Nucleus */ case ASI_NL: /* Nucleus LE */ case ASI_TWINX_N: case ASI_TWINX_NL: + case ASI_NUCLEUS_QUAD_LDD: + case ASI_NUCLEUS_QUAD_LDD_L: mem_idx = MMU_NUCLEUS_IDX; break; case ASI_AIUP: /* As if user primary */ @@ -2309,6 +2313,10 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) case ASI_TWINX_PL: case ASI_TWINX_S: case ASI_TWINX_SL: + case ASI_QUAD_LDD_PHYS: + case ASI_QUAD_LDD_PHYS_L: + case ASI_NUCLEUS_QUAD_LDD: + case ASI_NUCLEUS_QUAD_LDD_L: type = GET_ASI_DTWINX; break; case ASI_BLK_COMMIT_P: