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

target-s390: Fix PSW_MASK handling 

We were treating psw.mask as the 32-bit quantity it is in ESA mode.
In particular, the CC field was at the wrong place.

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2012-09-24 12:06:15 -07:00
parent 2f22e2ec79
commit 51855ecf1a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-s390x/helper.c
View File

@ -454,18 +454,19 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr)
env->psw.addr = addr; env->psw.addr = addr;
env->psw.mask = mask; env->psw.mask = mask;
env->cc_op = (mask >> 13) & 3; env->cc_op = (mask >> 44) & 3;
} }
static uint64_t get_psw_mask(CPUS390XState *env) static uint64_t get_psw_mask(CPUS390XState *env)
{ {
uint64_t r = env->psw.mask; uint64_t r;
env->cc_op = calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, env->cc_vr); env->cc_op = calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, env->cc_vr);
r &= ~(3ULL << 13); r = env->psw.mask;
r &= ~PSW_MASK_CC;
assert(!(env->cc_op & ~3)); assert(!(env->cc_op & ~3));
r |= env->cc_op << 13; r |= (uint64_t)env->cc_op << 44;
return r; return r;
} }

2
target-s390x/translate.c
View File

@ -4559,6 +4559,8 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s)
tcg_gen_qemu_ld32u(tmp2, tmp, get_mem_index(s)); tcg_gen_qemu_ld32u(tmp2, tmp, get_mem_index(s));
tcg_gen_addi_i64(tmp, tmp, 4); tcg_gen_addi_i64(tmp, tmp, 4);
tcg_gen_qemu_ld32u(tmp3, tmp, get_mem_index(s)); tcg_gen_qemu_ld32u(tmp3, tmp, get_mem_index(s));
/* Convert the 32-bit PSW_MASK into the 64-bit PSW_MASK. */
tcg_gen_shli_i64(tmp2, tmp2, 32);
gen_helper_load_psw(cpu_env, tmp2, tmp3); gen_helper_load_psw(cpu_env, tmp2, tmp3);
tcg_temp_free_i64(tmp); tcg_temp_free_i64(tmp);
tcg_temp_free_i64(tmp2); tcg_temp_free_i64(tmp2);