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

m68k: fix exception stack frame for 68000

Browse source 
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.

Backports commit 000761dc0c97d70e7314db3e8f52783880325a22 from qemu
This commit is contained in:
Pavel Dovgalyuk 2018-04-16 13:49:46 -04:00 committed by Lioncash
parent 9517a002da
commit fe353764e9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qemu/target/m68k/op_helper.c
View file

@ -280,22 +280,25 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
uint16_t format, uint16_t sr, uint16_t format, uint16_t sr,
uint32_t addr, uint32_t retaddr) uint32_t addr, uint32_t retaddr)
{ {
CPUState *cs = CPU(m68k_env_get_cpu(env)); if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
switch (format) { /* all except 68000 */
case 4: CPUState *cs = CPU(m68k_env_get_cpu(env));
*sp -= 4; switch (format) {
cpu_stl_kernel(env, *sp, env->pc); case 4:
*sp -= 4; *sp -= 4;
cpu_stl_kernel(env, *sp, addr); cpu_stl_kernel(env, *sp, env->pc);
break; *sp -= 4;
case 3: cpu_stl_kernel(env, *sp, addr);
case 2: break;
*sp -= 4; case 3:
cpu_stl_kernel(env, *sp, addr); case 2:
break; *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; *sp -= 4;
cpu_stl_kernel(env, *sp, retaddr); cpu_stl_kernel(env, *sp, retaddr);
*sp -= 2; *sp -= 2;