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

target-m68k: Some fixes to SR and flags management

Browse source 
Backports commit 99c514485b1d7922c4ca1ed767fd45525de4701f from qemu
This commit is contained in:
Richard Henderson 2018-02-27 09:19:19 -05:00 committed by Lioncash
parent 9493b29399
commit 187c2a9807
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,8 @@ 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);
uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op); uint32_t cpu_m68k_get_ccr(CPUM68KState *env);
void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t);
typedef enum { typedef enum {
CC_OP_DYNAMIC, /* Use env->cc_op */ CC_OP_DYNAMIC, /* Use env->cc_op */

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

@ -46,7 +46,7 @@ M68kCPU *cpu_m68k_init(struct uc_struct *uc, const char *cpu_model)
return cpu; return cpu;
} }
uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op) static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)
{ {
int flags; int flags;
uint32_t src; uint32_t src;
@ -186,6 +186,18 @@ set_x:
return flags; return flags;
} }
uint32_t cpu_m68k_get_ccr(CPUM68KState *env)
{
return cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X;
}
void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t val)
{
env->cc_op = CC_OP_FLAGS;
env->cc_dest = val & 0xf;
env->cc_x = (val & CCF_X ? 1 : 0);
}
void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val)
{ {
M68kCPU *cpu = m68k_env_get_cpu(env); M68kCPU *cpu = m68k_env_get_cpu(env);
@ -380,7 +392,8 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2)
void HELPER(set_sr)(CPUM68KState *env, uint32_t val) void HELPER(set_sr)(CPUM68KState *env, uint32_t val)
{ {
env->sr = val & 0xffff; env->sr = val & 0xffe0;
cpu_m68k_set_ccr(env, val);
m68k_switch_sp(env); m68k_switch_sp(env);
} }

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

@ -64,9 +64,8 @@ static void do_rte(CPUM68KState *env)
fmt = cpu_ldl_kernel(env, sp); fmt = cpu_ldl_kernel(env, sp);
env->pc = cpu_ldl_kernel(env, sp + 4); env->pc = cpu_ldl_kernel(env, sp + 4);
sp |= (fmt >> 28) & 3; sp |= (fmt >> 28) & 3;
env->sr = fmt & 0xffff;
env->aregs[7] = sp + 8; env->aregs[7] = sp + 8;
m68k_switch_sp(env); helper_set_sr(env, fmt);
} }
static void do_interrupt_all(CPUM68KState *env, int is_hw) static void do_interrupt_all(CPUM68KState *env, int is_hw)
@ -104,6 +103,7 @@ static void do_interrupt_all(CPUM68KState *env, int is_hw)
fmt |= 0x40000000; fmt |= 0x40000000;
fmt |= vector << 16; fmt |= vector << 16;
fmt |= env->sr; fmt |= env->sr;
fmt |= cpu_m68k_get_ccr(env);
env->sr |= SR_S; env->sr |= SR_S;
if (is_hw) { if (is_hw) {