Commit 3c980d2e authored by Laurent Vivier's avatar Laurent Vivier
Browse files

target-m68k: some bit ops cleanup 



Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 415f4b62

target-m68k/translate.c

+15 −19
Original line number Diff line number Diff line
@@ -1290,39 +1290,36 @@ DISAS_INSN(bitop_reg) 
    else

        opsize = OS_LONG;

    op = (insn >> 6) & 3;



    gen_flush_flags(s);



    SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);

    src2 = DREG(insn, 9);

    dest = tcg_temp_new();



    tmp = tcg_temp_new();

    gen_flush_flags(s);

    src2 = tcg_temp_new();

    if (opsize == OS_BYTE)

        tcg_gen_andi_i32(tmp, src2, 7);

        tcg_gen_andi_i32(src2, DREG(insn, 9), 7);

    else

        tcg_gen_andi_i32(tmp, src2, 31);

        tcg_gen_andi_i32(src2, DREG(insn, 9), 31);



    src2 = tcg_const_i32(1);

    tcg_gen_shl_i32(src2, src2, tmp);

    tcg_temp_free(tmp);

    tmp = tcg_const_i32(1);

    tcg_gen_shl_i32(tmp, tmp, src2);

    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) {

    case 1: /* bchg */

        tcg_gen_xor_i32(dest, src1, src2);

        tcg_gen_xor_i32(dest, src1, tmp);

        break;

    case 2: /* bclr */

        tcg_gen_andc_i32(dest, src1, src2);

        tcg_gen_andc_i32(dest, src1, tmp);

        break;

    case 3: /* bset */

        tcg_gen_or_i32(dest, src1, src2);

        tcg_gen_or_i32(dest, src1, tmp);

        break;

    default: /* btst */

        break;

    }

    tcg_temp_free(src2);

    tcg_temp_free(tmp);

    if (op) {

        DEST_EA(env, insn, opsize, dest, &addr);

    }
@@ -1406,10 +1403,9 @@ DISAS_INSN(bitop_im) 
        return;

    }



    gen_flush_flags(s);



    SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);



    gen_flush_flags(s);

    if (opsize == OS_BYTE)

        bitnum &= 7;

    else