Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 19:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target-m68k: some bit ops cleanup

Browse Source 
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Laurent Vivier 2016-01-17 12:51:45 +01:00
parent 415f4b62eb
commit 3c980d2ef6
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
target-m68k/translate.c
View File

@ -1290,39 +1290,36 @@ DISAS_INSN(bitop_reg)
else else
opsize = OS_LONG; opsize = OS_LONG;
op = (insn >> 6) & 3; op = (insn >> 6) & 3;
SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);
gen_flush_flags(s); gen_flush_flags(s);
src2 = tcg_temp_new();
SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);
src2 = DREG(insn, 9);
dest = tcg_temp_new();
tmp = tcg_temp_new();
if (opsize == OS_BYTE) if (opsize == OS_BYTE)
tcg_gen_andi_i32(tmp, src2, 7); tcg_gen_andi_i32(src2, DREG(insn, 9), 7);
else else
tcg_gen_andi_i32(tmp, src2, 31); tcg_gen_andi_i32(src2, DREG(insn, 9), 31);
src2 = tcg_const_i32(1); tmp = tcg_const_i32(1);
tcg_gen_shl_i32(src2, src2, tmp); tcg_gen_shl_i32(tmp, tmp, src2);
tcg_temp_free(tmp); tcg_temp_free(src2);
tcg_gen_and_i32(QREG_CC_Z, src1, src2); tcg_gen_and_i32(QREG_CC_Z, src1, tmp);
dest = tcg_temp_new();
switch (op) { switch (op) {
case 1: /* bchg */ case 1: /* bchg */
tcg_gen_xor_i32(dest, src1, src2); tcg_gen_xor_i32(dest, src1, tmp);
break; break;
case 2: /* bclr */ case 2: /* bclr */
tcg_gen_andc_i32(dest, src1, src2); tcg_gen_andc_i32(dest, src1, tmp);
break; break;
case 3: /* bset */ case 3: /* bset */
tcg_gen_or_i32(dest, src1, src2); tcg_gen_or_i32(dest, src1, tmp);
break; break;
default: /* btst */ default: /* btst */
break; break;
} }
tcg_temp_free(src2); tcg_temp_free(tmp);
if (op) { if (op) {
DEST_EA(env, insn, opsize, dest, &addr); DEST_EA(env, insn, opsize, dest, &addr);
} }
@ -1406,17 +1403,16 @@ DISAS_INSN(bitop_im)
return; return;
} }
gen_flush_flags(s);
SRC_EA(env, src1, opsize, 0, op ? &addr: NULL); SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);
gen_flush_flags(s);
if (opsize == OS_BYTE) if (opsize == OS_BYTE)
bitnum &= 7; bitnum &= 7;
else else
bitnum &= 31; bitnum &= 31;
mask = 1 << bitnum; mask = 1 << bitnum;
tcg_gen_andi_i32(QREG_CC_Z, src1, mask); tcg_gen_andi_i32(QREG_CC_Z, src1, mask);
if (op) { if (op) {
tmp = tcg_temp_new(); tmp = tcg_temp_new();