diff options
| author | Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> | 2018-04-13 16:30:41 +0300 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2018-04-15 11:37:58 +0200 |
| commit | 000761dc0c97d70e7314db3e8f52783880325a22 (patch) | |
| tree | 8899a58ee758c62079e2f2053b9a390a48c1b1e1 | |
| parent | 38e83a71d02e026d4a6d0ab1ef9855c4924c2c68 (diff) | |
| download | qemu-000761dc0c97d70e7314db3e8f52783880325a22.tar.gz | |
m68k: fix exception stack frame for 68000
68000 CPUs do not save format in the exception stack frame.
This patch adds feature checking to prevent format saving for 68000.
m68k_ret() already includes this modification, this patch fixes
the exception processing function too.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180413133041.29509.59064.stgit@pasha-VirtualBox>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | target/m68k/op_helper.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 3a7f7f2219..8d09ed91c4 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -287,22 +287,25 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, uint16_t format, uint16_t sr, uint32_t addr, uint32_t retaddr) { - CPUState *cs = CPU(m68k_env_get_cpu(env)); - switch (format) { - case 4: - *sp -= 4; - cpu_stl_kernel(env, *sp, env->pc); - *sp -= 4; - cpu_stl_kernel(env, *sp, addr); - break; - case 3: - case 2: - *sp -= 4; - cpu_stl_kernel(env, *sp, addr); - break; + if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) { + /* all except 68000 */ + CPUState *cs = CPU(m68k_env_get_cpu(env)); + switch (format) { + case 4: + *sp -= 4; + cpu_stl_kernel(env, *sp, env->pc); + *sp -= 4; + cpu_stl_kernel(env, *sp, addr); + break; + case 3: + case 2: + *sp -= 4; + cpu_stl_kernel(env, *sp, addr); + break; + } + *sp -= 2; + cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2)); } - *sp -= 2; - cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2)); *sp -= 4; cpu_stl_kernel(env, *sp, retaddr); *sp -= 2; |