ViewVC Help

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

root/cebix/BasiliskII/src/AmigaOS/main_amiga.cpp

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.10 by cebix, 2000-09-04T16:30:47Z vs.
Revision 1.12 by cebix, 2000-10-16T17:37:57Z

#	Line 97 | Line 97 | struct Library *AHIBase = NULL;
97		struct Library *DiskBase = NULL;
98
99		struct Task *MainTask;                                                  // Our task
100	<	uint32 ScratchMem = NULL;                                               // Scratch memory for Mac ROM writes
100	>	uint8 *ScratchMem = NULL;                                               // Scratch memory for Mac ROM writes
101		APTR OldTrapHandler = NULL;                                             // Old trap handler
102		APTR OldExceptionHandler = NULL;                                // Old exception handler
103		BYTE IRQSig = -1;                                                               // "Interrupt" signal number
#	Line 125 | Line 125 | extern "C" void ExceptionHandlerAsm(void
125		extern "C" void IllInstrHandler(trap_regs *regs);
126		extern "C" void PrivViolHandler(trap_regs *regs);
127		extern "C" void quit_emulator(void);
128	+	extern "C" void AsmTriggerNMI(void);
129		uint16 EmulatedSR;                                      // Emulated SR (supervisor bit and interrupt mask)
130
131
#	Line 228 | Line 229 | int main(void)
229		TimerBase = (struct Library *)timereq->tr_node.io_Device;
230
231		// Allocate scratch memory
232	<	ScratchMem = (uint32)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
232	>	ScratchMem = (uint8 *)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
233		if (ScratchMem == NULL) {
234		ErrorAlert(GetString(STR_NO_MEM_ERR));
235		QuitEmulator();

Diff Legend

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