* resolution of eCos-vs.-sky merge conflict!
[ChangeLog] 1998-12-30 Frank Ch. Eigler <fche@cygnus.com> * mips.igen (BREAK): Call signal_exception instead of sim_engine_halt. start-sanitize-sky * interp.c (signal_exception): Call SIM_CPU_EXCEPTION_TRIGGER hook. Call sim_engine_halt on BreakPoint. end-sanitize-sky [ChangeLog.sky] 1998-12-30 Frank Ch. Eigler <fche@cygnus.com> * sky-gdb.c (sky_sim_engine_halt): Do not set CIA here.
This commit is contained in:
parent
bd164e2835
commit
08f758df94
|
@ -1,3 +1,11 @@
|
||||||
|
1998-12-30 Frank Ch. Eigler <fche@cygnus.com>
|
||||||
|
|
||||||
|
* mips.igen (BREAK): Call signal_exception instead of sim_engine_halt.
|
||||||
|
start-sanitize-sky
|
||||||
|
* interp.c (signal_exception): Call SIM_CPU_EXCEPTION_TRIGGER hook.
|
||||||
|
Call sim_engine_halt on BreakPoint.
|
||||||
|
end-sanitize-sky
|
||||||
|
|
||||||
Tue Dec 29 16:03:53 1998 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
|
Tue Dec 29 16:03:53 1998 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
|
||||||
|
|
||||||
* configure.in, configure (mips64vr5*-*-*): Added missing ;; in
|
* configure.in, configure (mips64vr5*-*-*): Added missing ;; in
|
||||||
|
|
|
@ -1941,6 +1941,11 @@ signal_exception (SIM_DESC sd,
|
||||||
/* Ensure that any active atomic read/modify/write operation will fail: */
|
/* Ensure that any active atomic read/modify/write operation will fail: */
|
||||||
LLBIT = 0;
|
LLBIT = 0;
|
||||||
|
|
||||||
|
/* Save registers before interrupt dispatching */
|
||||||
|
#ifdef SIM_CPU_EXCEPTION_TRIGGER
|
||||||
|
SIM_CPU_EXCEPTION_TRIGGER(sd, cpu, cia);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* First, handle any simulator specific magic exceptions. These are not "real" exceptions, but
|
/* First, handle any simulator specific magic exceptions. These are not "real" exceptions, but
|
||||||
are exceptions which the simulator uses to implement different features. */
|
are exceptions which the simulator uses to implement different features. */
|
||||||
|
|
||||||
|
@ -2144,10 +2149,13 @@ signal_exception (SIM_DESC sd,
|
||||||
sim_stopped, SIM_SIGFPE);
|
sim_stopped, SIM_SIGFPE);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case BreakPoint:
|
||||||
|
sim_engine_halt (SD, CPU, NULL, PC, sim_stopped, SIM_SIGTRAP);
|
||||||
|
break;
|
||||||
|
|
||||||
case TLBModification:
|
case TLBModification:
|
||||||
case TLBLoad:
|
case TLBLoad:
|
||||||
case TLBStore:
|
case TLBStore:
|
||||||
case BreakPoint:
|
|
||||||
case SystemCall:
|
case SystemCall:
|
||||||
case Trap:
|
case Trap:
|
||||||
sim_engine_restart (SD, CPU, NULL, PC);
|
sim_engine_restart (SD, CPU, NULL, PC);
|
||||||
|
|
Loading…
Reference in New Issue