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

target-sparc: implement UA2005 hypervisor traps 

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
This commit is contained in:
Artyom Tarasenko 2016-06-07 18:33:53 +02:00
parent 9a10756d12
commit 6e040755f1
No known key found for this signature in database
GPG Key ID: 3360C3F7411A125F
3 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/sparc/cpu.h
View File

@ -79,6 +79,7 @@
#define TT_FILL 0xc0 #define TT_FILL 0xc0
#define TT_WOTHER (1 << 5) #define TT_WOTHER (1 << 5)
#define TT_TRAP 0x100 #define TT_TRAP 0x100
#define TT_HTRAP 0x180
#endif #endif
#define PSR_NEG_SHIFT 23 #define PSR_NEG_SHIFT 23

37
target/sparc/int64_helper.c
View File

@ -78,8 +78,10 @@ void sparc_cpu_do_interrupt(CPUState *cs)
static int count; static int count;
const char *name; const char *name;
if (intno < 0 || intno >= 0x180) { if (intno < 0 || intno >= 0x1ff) {
name = "Unknown"; name = "Unknown";
} else if (intno >= 0x180) {
name = "Hyperprivileged Trap Instruction";
} else if (intno >= 0x100) { } else if (intno >= 0x100) {
name = "Trap Instruction"; name = "Trap Instruction";
} else if (intno >= 0xc0) { } else if (intno >= 0xc0) {
@ -135,16 +137,36 @@ void sparc_cpu_do_interrupt(CPUState *cs)
tsptr->tnpc = env->npc; tsptr->tnpc = env->npc;
tsptr->tt = intno; tsptr->tt = intno;
if (cpu_has_hypervisor(env)) {
env->htstate[env->tl] = env->hpstate;
/* XXX OpenSPARC T1 - UltraSPARC T3 have MAXPTL=2
but this may change in the future */
if (env->tl > 2) {
env->hpstate |= HS_PRIV;
}
}
switch (intno) { switch (intno) {
case TT_IVEC: case TT_IVEC:
cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_IG); if (!cpu_has_hypervisor(env)) {
cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_IG);
}
break; break;
case TT_TFAULT: case TT_TFAULT:
case TT_DFAULT: case TT_DFAULT:
case TT_TMISS ... TT_TMISS + 3: case TT_TMISS ... TT_TMISS + 3:
case TT_DMISS ... TT_DMISS + 3: case TT_DMISS ... TT_DMISS + 3:
case TT_DPROT ... TT_DPROT + 3: case TT_DPROT ... TT_DPROT + 3:
cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_MG); if (cpu_has_hypervisor(env)) {
env->hpstate |= HS_PRIV;
env->pstate = PS_PEF | PS_PRIV;
} else {
cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_MG);
}
break;
case TT_INSN_REAL_TRANSLATION_MISS ... TT_DATA_REAL_TRANSLATION_MISS:
case TT_HTRAP ... TT_HTRAP + 127:
env->hpstate |= HS_PRIV;
break; break;
default: default:
cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_AG); cpu_change_pstate(env, PS_PEF | PS_PRIV | PS_AG);
@ -158,8 +180,13 @@ void sparc_cpu_do_interrupt(CPUState *cs)
} else if ((intno & 0x1c0) == TT_FILL) { } else if ((intno & 0x1c0) == TT_FILL) {
cpu_set_cwp(env, cpu_cwp_inc(env, env->cwp + 1)); cpu_set_cwp(env, cpu_cwp_inc(env, env->cwp + 1));
} }
env->pc = env->tbr & ~0x7fffULL;
env->pc |= ((env->tl > 1) ? 1 << 14 : 0) | (intno << 5); if (cpu_hypervisor_mode(env)) {
env->pc = (env->htba & ~0x3fffULL) | (intno << 5);
} else {
env->pc = env->tbr & ~0x7fffULL;
env->pc |= ((env->tl > 1) ? 1 << 14 : 0) | (intno << 5);
}
env->npc = env->pc + 4; env->npc = env->pc + 4;
cs->exception_index = -1; cs->exception_index = -1;
} }

6
target/sparc/win_helper.c
View File

@ -366,6 +366,9 @@ void helper_done(CPUSPARCState *env)
env->asi = (tsptr->tstate >> 24) & 0xff; env->asi = (tsptr->tstate >> 24) & 0xff;
cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f); cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f);
cpu_put_cwp64(env, tsptr->tstate & 0xff); cpu_put_cwp64(env, tsptr->tstate & 0xff);
if (cpu_has_hypervisor(env)) {
env->hpstate = env->htstate[env->tl];
}
env->tl--; env->tl--;
trace_win_helper_done(env->tl); trace_win_helper_done(env->tl);
@ -387,6 +390,9 @@ void helper_retry(CPUSPARCState *env)
env->asi = (tsptr->tstate >> 24) & 0xff; env->asi = (tsptr->tstate >> 24) & 0xff;
cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f); cpu_change_pstate(env, (tsptr->tstate >> 8) & 0xf3f);
cpu_put_cwp64(env, tsptr->tstate & 0xff); cpu_put_cwp64(env, tsptr->tstate & 0xff);
if (cpu_has_hypervisor(env)) {
env->hpstate = env->htstate[env->tl];
}
env->tl--; env->tl--;
trace_win_helper_retry(env->tl); trace_win_helper_retry(env->tl);