mirror of https://github.com/xemu-project/xemu.git
target/sparc: Split out resolve_asi
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
8f75b8a4eb
commit
811cc0b0ce
|
@ -1919,15 +1919,25 @@ typedef struct {
|
|||
MemOp memop;
|
||||
} DisasASI;
|
||||
|
||||
static DisasASI get_asi(DisasContext *dc, int insn, MemOp memop)
|
||||
/*
|
||||
* Build DisasASI.
|
||||
* For asi == -1, treat as non-asi.
|
||||
* For ask == -2, treat as immediate offset (v8 error, v9 %asi).
|
||||
*/
|
||||
static DisasASI resolve_asi(DisasContext *dc, int asi, MemOp memop)
|
||||
{
|
||||
int asi = GET_FIELD(insn, 19, 26);
|
||||
ASIType type = GET_ASI_HELPER;
|
||||
int mem_idx = dc->mem_idx;
|
||||
|
||||
if (asi == -1) {
|
||||
/* Artificial "non-asi" case. */
|
||||
type = GET_ASI_DIRECT;
|
||||
goto done;
|
||||
}
|
||||
|
||||
#ifndef TARGET_SPARC64
|
||||
/* Before v9, all asis are immediate and privileged. */
|
||||
if (IS_IMM) {
|
||||
if (asi < 0) {
|
||||
gen_exception(dc, TT_ILL_INSN);
|
||||
type = GET_ASI_EXCP;
|
||||
} else if (supervisor(dc)
|
||||
|
@ -1970,7 +1980,7 @@ static DisasASI get_asi(DisasContext *dc, int insn, MemOp memop)
|
|||
type = GET_ASI_EXCP;
|
||||
}
|
||||
#else
|
||||
if (IS_IMM) {
|
||||
if (asi < 0) {
|
||||
asi = dc->asi;
|
||||
}
|
||||
/* With v9, all asis below 0x80 are privileged. */
|
||||
|
@ -2129,9 +2139,16 @@ static DisasASI get_asi(DisasContext *dc, int insn, MemOp memop)
|
|||
}
|
||||
#endif
|
||||
|
||||
done:
|
||||
return (DisasASI){ type, asi, mem_idx, memop };
|
||||
}
|
||||
|
||||
static DisasASI get_asi(DisasContext *dc, int insn, MemOp memop)
|
||||
{
|
||||
int asi = IS_IMM ? -2 : GET_FIELD(insn, 19, 26);
|
||||
return resolve_asi(dc, asi, memop);
|
||||
}
|
||||
|
||||
static void gen_ld_asi(DisasContext *dc, TCGv dst, TCGv addr,
|
||||
int insn, MemOp memop)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue