yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-23 04:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-m68k: update move to/from ccr/sr

Browse source 
Backports commit 7c0eb318bdcc3667a861e7b0f140df0b6d9895e2 from qemu
This commit is contained in:
Laurent Vivier 2018-02-27 08:56:32 -05:00 committed by Lioncash
parent b8366d5b31
commit 12f9ba3fe4
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
qemu/target-m68k/translate.c
View file

@ -1379,12 +1379,10 @@ static TCGv gen_get_ccr(DisasContext *s)
DISAS_INSN(move_from_ccr) DISAS_INSN(move_from_ccr)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv reg;
TCGv ccr; TCGv ccr;
ccr = gen_get_ccr(s); ccr = gen_get_ccr(s);
reg = DREG(insn, 0); DEST_EA(env, insn, OS_WORD, ccr, NULL);
gen_partset_reg(s, OS_WORD, reg, ccr);
} }
DISAS_INSN(neg) DISAS_INSN(neg)
@ -1413,38 +1411,32 @@ static void gen_set_sr_im(DisasContext *s, uint16_t val, int ccr_only)
} }
} }
static void gen_set_sr(CPUM68KState *env, DisasContext *s, uint16_t insn, static void gen_set_sr(DisasContext *s, TCGv val, int ccr_only)
int ccr_only)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv tmp; TCGv tmp;
TCGv reg; tmp = tcg_temp_new(tcg_ctx);
tcg_gen_andi_i32(tcg_ctx, tcg_ctx->QREG_CC_DEST, val, 0xf);
tcg_gen_shri_i32(tcg_ctx, tmp, val, 4);
tcg_gen_andi_i32(tcg_ctx, tcg_ctx->QREG_CC_X, tmp, 1);
if (!ccr_only) {
gen_helper_set_sr(tcg_ctx, tcg_ctx->cpu_env, val);
}
}
static void gen_move_to_sr(CPUM68KState *env, DisasContext *s, uint16_t insn,
int ccr_only)
{
TCGv src;
TCGContext *tcg_ctx = s->uc->tcg_ctx;
s->cc_op = CC_OP_FLAGS; s->cc_op = CC_OP_FLAGS;
if ((insn & 0x38) == 0) SRC_EA(env, src, OS_WORD, 0, NULL);
{ gen_set_sr(s, src, ccr_only);
tmp = tcg_temp_new(tcg_ctx);
reg = DREG(insn, 0);
tcg_gen_andi_i32(tcg_ctx, tcg_ctx->QREG_CC_DEST, reg, 0xf);
tcg_gen_shri_i32(tcg_ctx, tmp, reg, 4);
tcg_gen_andi_i32(tcg_ctx, tcg_ctx->QREG_CC_X, tmp, 1);
if (!ccr_only) {
gen_helper_set_sr(tcg_ctx, tcg_ctx->cpu_env, reg);
}
}
else if ((insn & 0x3f) == 0x3c)
{
uint16_t val;
val = read_im16(env, s);
gen_set_sr_im(s, val, ccr_only);
}
else
disas_undef(env, s, insn);
} }
DISAS_INSN(move_to_ccr) DISAS_INSN(move_to_ccr)
{ {
gen_set_sr(env, s, insn, 1); gen_move_to_sr(env, s, insn, 1);
} }
DISAS_INSN(not) DISAS_INSN(not)
@ -2001,16 +1993,14 @@ DISAS_INSN(strldsr)
DISAS_INSN(move_from_sr) DISAS_INSN(move_from_sr)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv reg;
TCGv sr; TCGv sr;
if (IS_USER(s)) { if (IS_USER(s) && !m68k_feature(env, M68K_FEATURE_M68000)) {
gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); gen_exception(s, s->pc - 2, EXCP_PRIVILEGE);
return; return;
} }
sr = gen_get_sr(s); sr = gen_get_sr(s);
reg = DREG(insn, 0); DEST_EA(env, insn, OS_WORD, sr, NULL);
gen_partset_reg(s, OS_WORD, reg, sr);
} }
DISAS_INSN(move_to_sr) DISAS_INSN(move_to_sr)
@ -2019,7 +2009,7 @@ DISAS_INSN(move_to_sr)
gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); gen_exception(s, s->pc - 2, EXCP_PRIVILEGE);
return; return;
} }
gen_set_sr(env, s, insn, 0); gen_move_to_sr(env, s, insn, 0);
gen_lookup_tb(s); gen_lookup_tb(s);
} }
@ -2940,6 +2930,7 @@ void register_m68k_insns (CPUM68KState *env)
BASE(clr, 4200, ff00); BASE(clr, 4200, ff00);
BASE(undef, 42c0, ffc0); BASE(undef, 42c0, ffc0);
INSN(move_from_ccr, 42c0, fff8, CF_ISA_A); INSN(move_from_ccr, 42c0, fff8, CF_ISA_A);
INSN(move_from_ccr, 42c0, ffc0, M68000);
INSN(neg, 4480, fff8, CF_ISA_A); INSN(neg, 4480, fff8, CF_ISA_A);
INSN(neg, 4400, ff00, M68000); INSN(neg, 4400, ff00, M68000);
INSN(undef, 44c0, ffc0, M68000); INSN(undef, 44c0, ffc0, M68000);