aboutsummaryrefslogtreecommitdiff
path: root/target-m68k
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2015-08-14 07:59:17 -0700
committerLaurent Vivier <laurent@vivier.eu>2016-10-25 20:54:47 +0200
commit99c514485b1d7922c4ca1ed767fd45525de4701f (patch)
tree0c7c7b24892bd625a4a883b859f953957001fd8e /target-m68k
parent8e394ccabdb1e439aab092de6b9d2f26432e962f (diff)
downloadqemu-arm-99c514485b1d7922c4ca1ed767fd45525de4701f.tar.gz
target-m68k: Some fixes to SR and flags management
Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'target-m68k')
-rw-r--r--target-m68k/cpu.h3
-rw-r--r--target-m68k/helper.c17
-rw-r--r--target-m68k/op_helper.c5
-rw-r--r--target-m68k/translate.c2
4 files changed, 21 insertions, 6 deletions
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 2f08a2cf8c..c0de97826d 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -158,7 +158,8 @@ M68kCPU *cpu_m68k_init(const char *cpu_model);
is returned if the signal was handled by the virtual CPU. */
int cpu_m68k_signal_handler(int host_signum, void *pinfo,
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);
/* Instead of computing the condition codes after each m68k instruction,
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index d9ea830c67..1a54e6678b 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -132,7 +132,7 @@ void m68k_cpu_init_gdb(M68kCPU *cpu)
/* TODO: Add [E]MAC registers. */
}
-uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)
+static uint32_t cpu_m68k_flush_flags(CPUM68KState *env, int op)
{
int flags;
uint32_t src;
@@ -272,6 +272,18 @@ set_x:
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)
{
M68kCPU *cpu = m68k_env_get_cpu(env);
@@ -466,7 +478,8 @@ uint32_t HELPER(addx_cc)(CPUM68KState *env, uint32_t op1, uint32_t op2)
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);
}
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index e41ae46498..af361776a6 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -63,9 +63,9 @@ static void do_rte(CPUM68KState *env)
fmt = cpu_ldl_kernel(env, sp);
env->pc = cpu_ldl_kernel(env, sp + 4);
sp |= (fmt >> 28) & 3;
- env->sr = fmt & 0xffff;
env->aregs[7] = sp + 8;
- m68k_switch_sp(env);
+
+ helper_set_sr(env, fmt);
}
static void do_interrupt_all(CPUM68KState *env, int is_hw)
@@ -112,6 +112,7 @@ static void do_interrupt_all(CPUM68KState *env, int is_hw)
fmt |= 0x40000000;
fmt |= vector << 16;
fmt |= env->sr;
+ fmt |= cpu_m68k_get_ccr(env);
env->sr |= SR_S;
if (is_hw) {
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index cecd12c984..73f9e9f483 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -3145,7 +3145,7 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
i, u.l.upper, u.l.lower, *(double *)&u.d);
}
cpu_fprintf (f, "PC = %08x ", env->pc);
- sr = env->sr | cpu_m68k_flush_flags(env, env->cc_op) | env->cc_x * CCF_X;
+ sr = env->sr | cpu_m68k_get_ccr(env);
cpu_fprintf(f, "SR = %04x %c%c%c%c%c ", sr, (sr & CCF_X) ? 'X' : '-',
(sr & CCF_N) ? 'N' : '-', (sr & CCF_Z) ? 'Z' : '-',
(sr & CCF_V) ? 'V' : '-', (sr & CCF_C) ? 'C' : '-');