ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/emul_op.cpp

Comparing BasiliskII/src/emul_op.cpp (file contents):
Revision 1.25 by cebix, 2001-07-03T15:59:45Z vs.
Revision 1.26 by cebix, 2001-07-09T11:21:59Z

#	Line 440 | Line 440 | void EmulOp(uint16 opcode, M68kRegisters
440		if (HasMacStarted()) {
441
442		// Mac has started, execute all 60Hz interrupt functions
443	–	ADBInterrupt();
443		TimerInterrupt();
444		VideoInterrupt();
445
#	Line 457 | Line 456 | void EmulOp(uint16 opcode, M68kRegisters
456
457		if (InterruptFlags & INTFLAG_1HZ) {
458		ClearInterruptFlag(INTFLAG_1HZ);
460	–
459		if (HasMacStarted()) {
460		SonyInterrupt();
461		DiskInterrupt();
#	Line 480 | Line 478 | void EmulOp(uint16 opcode, M68kRegisters
478		AudioInterrupt();
479		}
480
481	+	if (InterruptFlags & INTFLAG_ADB) {
482	+	ClearInterruptFlag(INTFLAG_ADB);
483	+	if (HasMacStarted())
484	+	ADBInterrupt();
485	+	}
486	+
487		if (InterruptFlags & INTFLAG_NMI) {
488		ClearInterruptFlag(INTFLAG_NMI);
489	<	if (HasMacStarted()) {
489	>	if (HasMacStarted())
490		TriggerNMI();
487	–	}
491		}
492		break;
493

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines