yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevents abort with m68K (#1012)

Browse Source 
* Prevents abort with m68K

Raises exception instead

* M68K remove one uses of abort

* Less aborts and logs instead for M68K
This commit is contained in:
Catena cyber
2018-09-16 15:50:35 +02:00
committed by Nguyen Anh Quynh
parent 4a86318cf4
commit 910999d396
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qemu/target-m68k/helper.c
View File

@ -142,8 +142,9 @@ void HELPER(movec)(CPUM68KState *env, uint32_t reg, uint32_t val)
break; break;
/* TODO: Implement control registers. */ /* TODO: Implement control registers. */
default: default:
cpu_abort(CPU(cpu), "Unimplemented control register write 0x%x = 0x%x\n", qemu_log("Unimplemented control register write 0x%x = 0x%x\n",
reg, val); reg, val);
raise_exception(env, EXCP_UNSUPPORTED);
} }
} }

12
qemu/target-m68k/translate.c
View File

@ -2148,7 +2148,8 @@ DISAS_INSN(wdebug)
return; return;
} }
/* TODO: Implement wdebug. */ /* TODO: Implement wdebug. */
cpu_abort(CPU(cpu), "WDEBUG not implemented"); qemu_log("WDEBUG not implemented\n");
gen_exception(s, s->pc - 2, EXCP_UNSUPPORTED);
} }
DISAS_INSN(trap) DISAS_INSN(trap)
@ -2245,8 +2246,9 @@ DISAS_INSN(fpu)
case 1: /* FPIAR */ case 1: /* FPIAR */
case 2: /* FPSR */ case 2: /* FPSR */
default: default:
cpu_abort(NULL, "Unimplemented: fmove to control %d", qemu_log("Unimplemented: fmove to control %d\n",
(ext >> 10) & 7); (ext >> 10) & 7);
goto undef;
} }
break; break;
case 5: /* fmove from control register. */ case 5: /* fmove from control register. */
@ -2258,8 +2260,8 @@ DISAS_INSN(fpu)
case 1: /* FPIAR */ case 1: /* FPIAR */
case 2: /* FPSR */ case 2: /* FPSR */
default: default:
cpu_abort(NULL, "Unimplemented: fmove from control %d", qemu_log("Unimplemented: fmove from control %d\n",
(ext >> 10) & 7); (ext >> 10) & 7);
goto undef; goto undef;
} }
DEST_EA(env, insn, OS_LONG, tmp32, NULL); DEST_EA(env, insn, OS_LONG, tmp32, NULL);