target-m68k: immediate ops manage word and byte operands

Backports commit 92c62548f69cb4ba739d7d046e9caf9ea75753e4 from qemu
This commit is contained in:
Laurent Vivier 2018-02-28 08:41:36 -05:00 committed by Lioncash
parent f7c29f73b3
commit 5daf91ea48
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -1480,52 +1480,65 @@ DISAS_INSN(arith_im)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
int op; int op;
uint32_t im; TCGv im;
TCGv src1; TCGv src1;
TCGv dest; TCGv dest;
TCGv addr; TCGv addr;
int opsize;
op = (insn >> 9) & 7; op = (insn >> 9) & 7;
SRC_EA(env, src1, OS_LONG, 0, (op == 6) ? NULL : &addr); opsize = insn_opsize(insn);
im = read_im32(env, s); switch (opsize) {
dest = tcg_temp_new(tcg_ctx); case OS_BYTE:
switch (op) { im = tcg_const_i32(tcg_ctx, (int8_t)read_im8(env, s));
case 0: /* ori */
tcg_gen_ori_i32(tcg_ctx, dest, src1, im);
gen_logic_cc(s, dest, OS_LONG);
break; break;
case 1: /* andi */ case OS_WORD:
tcg_gen_andi_i32(tcg_ctx, dest, src1, im); im = tcg_const_i32(tcg_ctx, (int16_t)read_im16(env, s));
gen_logic_cc(s, dest, OS_LONG);
break; break;
case 2: /* subi */ case OS_LONG:
tcg_gen_mov_i32(tcg_ctx, dest, src1); im = tcg_const_i32(tcg_ctx, read_im32(env, s));
tcg_gen_setcondi_i32(tcg_ctx, TCG_COND_LTU, tcg_ctx->QREG_CC_X, dest, im);
tcg_gen_subi_i32(tcg_ctx, dest, dest, im);
gen_update_cc_add(s, dest, tcg_const_i32(tcg_ctx, im), OS_LONG);
set_cc_op(s, CC_OP_SUBL);
break;
case 3: /* addi */
tcg_gen_mov_i32(tcg_ctx, dest, src1);
tcg_gen_addi_i32(tcg_ctx, dest, dest, im);
gen_update_cc_add(s, dest, tcg_const_i32(tcg_ctx, im), OS_LONG);
tcg_gen_setcondi_i32(tcg_ctx, TCG_COND_LTU, tcg_ctx->QREG_CC_X, dest, im);
set_cc_op(s, CC_OP_ADDL);
break;
case 5: /* eori */
tcg_gen_xori_i32(tcg_ctx, dest, src1, im);
gen_logic_cc(s, dest, OS_LONG);
break;
case 6: /* cmpi */
gen_update_cc_add(s, src1, tcg_const_i32(tcg_ctx, im), OS_LONG);
set_cc_op(s, CC_OP_CMPL);
break; break;
default: default:
abort(); abort();
} }
if (op != 6) { SRC_EA(env, src1, opsize, 1, (op == 6) ? NULL : &addr);
DEST_EA(env, insn, OS_LONG, dest, &addr); dest = tcg_temp_new(tcg_ctx);
switch (op) {
case 0: /* ori */
tcg_gen_or_i32(tcg_ctx, dest, src1, im);
gen_logic_cc(s, dest, opsize);
break;
case 1: /* andi */
tcg_gen_and_i32(tcg_ctx, dest, src1, im);
gen_logic_cc(s, dest, opsize);
break;
case 2: /* subi */
tcg_gen_setcond_i32(tcg_ctx, TCG_COND_LTU, tcg_ctx->QREG_CC_X, src1, im);
tcg_gen_sub_i32(tcg_ctx, dest, src1, im);
gen_update_cc_add(s, dest, im, opsize);
set_cc_op(s, CC_OP_SUBB + opsize);
break;
case 3: /* addi */
tcg_gen_add_i32(tcg_ctx, dest, src1, im);
gen_update_cc_add(s, dest, im, opsize);
tcg_gen_setcond_i32(tcg_ctx, TCG_COND_LTU, tcg_ctx->QREG_CC_X, dest, im);
set_cc_op(s, CC_OP_ADDB + opsize);
break;
case 5: /* eori */
tcg_gen_xor_i32(tcg_ctx, dest, src1, im);
gen_logic_cc(s, dest, opsize);
break;
case 6: /* cmpi */
gen_update_cc_cmp(s, src1, im, opsize);
break;
default:
abort();
} }
tcg_temp_free(tcg_ctx, im);
if (op != 6) {
DEST_EA(env, insn, opsize, dest, &addr);
}
tcg_temp_free(tcg_ctx, dest);
} }
DISAS_INSN(byterev) DISAS_INSN(byterev)