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

target-m68k: don't update cc_dest in helpers

Browse source 
Backports commit 91f90d7191f862ab27528dbdf76cee55c77f79cf from qemu
This commit is contained in:
Laurent Vivier 2018-02-27 09:04:48 -05:00 committed by Lioncash
parent 12f9ba3fe4
commit 125675e334
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/target-m68k/cpu.h
View file

@ -163,7 +163,6 @@ int cpu_m68k_exec(struct uc_struct *uc, CPUState *cpu);
is returned if the signal was handled by the virtual CPU. */ is returned if the signal was handled by the virtual CPU. */
int cpu_m68k_signal_handler(int host_signum, void *pinfo, int cpu_m68k_signal_handler(int host_signum, void *pinfo,
void *puc); void *puc);
void cpu_m68k_flush_flags(CPUM68KState *, int);
enum { enum {
CC_OP_DYNAMIC, /* Use env->cc_op */ CC_OP_DYNAMIC, /* Use env->cc_op */

28
qemu/target-m68k/helper.c
View file

@ -46,9 +46,8 @@ M68kCPU *cpu_m68k_init(struct uc_struct *uc, const char *cpu_model)
return cpu; return cpu;
} }
void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op) static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env);
int flags; int flags;
uint32_t src; uint32_t src;
uint32_t dest; uint32_t dest;
@ -116,7 +115,7 @@ void cpu_m68k_flush_flags(CPUM68KState *env, int cc_op)
flags = 0; flags = 0;
src = env->cc_src; src = env->cc_src;
dest = env->cc_dest; dest = env->cc_dest;
switch (cc_op) { switch (op) {
case CC_OP_FLAGS: case CC_OP_FLAGS:
flags = dest; flags = dest;
break; break;
@ -182,10 +181,9 @@ set_x:
SET_FLAGS_SHIFT(int32_t); SET_FLAGS_SHIFT(int32_t);
break; break;
default: default:
cpu_abort(CPU(cpu), "Bad CC_OP %d", cc_op); g_assert_not_reached();
} }
env->cc_op = CC_OP_FLAGS; return flags;
env->cc_dest = flags;
} }
void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val)
@ -336,20 +334,21 @@ uint32_t HELPER(subx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2)
{ {
uint32_t res; uint32_t res;
uint32_t old_flags; uint32_t old_flags;
int op;
old_flags = env->cc_dest; old_flags = env->cc_dest;
if (env->cc_x) { if (env->cc_x) {
env->cc_x = (op1 <= op2); env->cc_x = (op1 <= op2);
env->cc_op = CC_OP_SUBX; op = CC_OP_SUBX;
res = op1 - (op2 + 1); res = op1 - (op2 + 1);
} else { } else {
env->cc_x = (op1 < op2); env->cc_x = (op1 < op2);
env->cc_op = CC_OP_SUB; op = CC_OP_SUB;
res = op1 - op2; res = op1 - op2;
} }
env->cc_dest = res; env->cc_dest = res;
env->cc_src = op2; env->cc_src = op2;
cpu_m68k_flush_flags(env, env->cc_op); env->cc_dest = cpu_m68k_flush_flags(env, op);
/* !Z is sticky. */ /* !Z is sticky. */
env->cc_dest &= (old_flags | ~CCF_Z); env->cc_dest &= (old_flags | ~CCF_Z);
return res; return res;
@ -359,20 +358,21 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2)
{ {
uint32_t res; uint32_t res;
uint32_t old_flags; uint32_t old_flags;
int op;
old_flags = env->cc_dest; old_flags = env->cc_dest;
if (env->cc_x) { if (env->cc_x) {
res = op1 + op2 + 1; res = op1 + op2 + 1;
env->cc_x = (res <= op2); env->cc_x = (res <= op2);
env->cc_op = CC_OP_ADDX; op = CC_OP_ADDX;
} else { } else {
res = op1 + op2; res = op1 + op2;
env->cc_x = (res < op2); env->cc_x = (res < op2);
env->cc_op = CC_OP_ADD; op = CC_OP_ADD;
} }
env->cc_dest = res; env->cc_dest = res;
env->cc_src = op2; env->cc_src = op2;
cpu_m68k_flush_flags(env, env->cc_op); env->cc_dest = cpu_m68k_flush_flags(env, op);
/* !Z is sticky. */ /* !Z is sticky. */
env->cc_dest &= (old_flags | ~CCF_Z); env->cc_dest &= (old_flags | ~CCF_Z);
return res; return res;
@ -704,9 +704,9 @@ void HELPER(mac_set_flags)(CPUM68KState *env, uint32_t acc)
} }
} }
void HELPER(flush_flags)(CPUM68KState *env, uint32_t cc_op) uint32_t HELPER(flush_flags)(CPUM68KState *env, uint32_t op)
{ {
cpu_m68k_flush_flags(env, cc_op); return cpu_m68k_flush_flags(env, op);
} }
uint32_t HELPER(get_macf)(CPUM68KState *env, uint64_t val) uint32_t HELPER(get_macf)(CPUM68KState *env, uint64_t val)

2
qemu/target-m68k/helper.h
View file

@ -47,5 +47,5 @@ DEF_HELPER_3(set_mac_extf, void, env, i32, i32)
DEF_HELPER_3(set_mac_exts, void, env, i32, i32) DEF_HELPER_3(set_mac_exts, void, env, i32, i32)
DEF_HELPER_3(set_mac_extu, void, env, i32, i32) DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
DEF_HELPER_2(flush_flags, void, env, i32) DEF_HELPER_2(flush_flags, i32, env, i32)
DEF_HELPER_2(raise_exception, void, env, i32) DEF_HELPER_2(raise_exception, void, env, i32)

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

@ -398,7 +398,7 @@ static inline void gen_flush_flags(DisasContext *s)
if (s->cc_op == CC_OP_FLAGS) if (s->cc_op == CC_OP_FLAGS)
return; return;
gen_flush_cc_op(s); gen_flush_cc_op(s);
gen_helper_flush_flags(tcg_ctx, tcg_ctx->cpu_env, tcg_ctx->QREG_CC_OP); gen_helper_flush_flags(tcg_ctx, tcg_ctx->QREG_CC_DEST, tcg_ctx->cpu_env, tcg_ctx->QREG_CC_OP);
s->cc_op = CC_OP_FLAGS; s->cc_op = CC_OP_FLAGS;
} }
@ -705,6 +705,7 @@ static void gen_jmpcc(DisasContext *s, int cond, TCGLabel *l1)
/* TODO: Optimize compare/branch pairs rather than always flushing /* TODO: Optimize compare/branch pairs rather than always flushing
flag state to CC_OP_FLAGS. */ flag state to CC_OP_FLAGS. */
gen_flush_flags(s); gen_flush_flags(s);
gen_flush_cc_op(s);
switch (cond) { switch (cond) {
case 0: /* T */ case 0: /* T */
tcg_gen_br(tcg_ctx, l1); tcg_gen_br(tcg_ctx, l1);
@ -1700,7 +1701,6 @@ DISAS_INSN(branch)
/* bsr */ /* bsr */
gen_push(s, tcg_const_i32(tcg_ctx, s->pc)); gen_push(s, tcg_const_i32(tcg_ctx, s->pc));
} }
gen_flush_cc_op(s);
if (op > 1) { if (op > 1) {
/* Bcc */ /* Bcc */
l1 = gen_new_label(tcg_ctx); l1 = gen_new_label(tcg_ctx);