mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-s390: Convert SET SYSTEM MASK

Browse Source 
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2012-08-21 14:12:50 -07:00
parent c49daa51a8
commit 7d30bb73db
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-s390x/insn-data.def
View File

@ -383,4 +383,6 @@
/* We only do 64-bit, so accept this as a no-op. /* We only do 64-bit, so accept this as a no-op.
Let SAM24 and SAM31 signal illegal instruction. */ Let SAM24 and SAM31 signal illegal instruction. */
C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0)
/* SET SYSTEM MASK */
C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0)
#endif /* CONFIG_USER_ONLY */ #endif /* CONFIG_USER_ONLY */

25
target-s390x/translate.c
View File

@ -2356,22 +2356,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s)
switch (opc) { switch (opc) {
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
case 0x80: /* SSM D2(B2) [S] */
/* Set System Mask */
check_privileged(s);
insn = ld_code4(env, s->pc);
decode_rs(s, insn, &r1, &r3, &b2, &d2);
tmp = get_address(s, 0, b2, d2);
tmp2 = tcg_temp_new_i64();
tmp3 = tcg_temp_new_i64();
tcg_gen_andi_i64(tmp3, psw_mask, ~0xff00000000000000ULL);
tcg_gen_qemu_ld8u(tmp2, tmp, get_mem_index(s));
tcg_gen_shli_i64(tmp2, tmp2, 56);
tcg_gen_or_i64(psw_mask, tmp3, tmp2);
tcg_temp_free_i64(tmp);
tcg_temp_free_i64(tmp2);
tcg_temp_free_i64(tmp3);
break;
case 0x82: /* LPSW D2(B2) [S] */ case 0x82: /* LPSW D2(B2) [S] */
/* Load PSW */ /* Load PSW */
check_privileged(s); check_privileged(s);
@ -3607,6 +3591,15 @@ static ExitStatus op_ori(DisasContext *s, DisasOps *o)
return NO_EXIT; return NO_EXIT;
} }
#ifndef CONFIG_USER_ONLY
static ExitStatus op_ssm(DisasContext *s, DisasOps *o)
{
check_privileged(s);
tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, 56, 8);
return NO_EXIT;
}
#endif
static ExitStatus op_st8(DisasContext *s, DisasOps *o) static ExitStatus op_st8(DisasContext *s, DisasOps *o)
{ {
tcg_gen_qemu_st8(o->in1, o->in2, get_mem_index(s)); tcg_gen_qemu_st8(o->in1, o->in2, get_mem_index(s));