--- BasiliskII/src/AmigaOS/main_amiga.cpp	2000/07/06 16:04:24	1.6
+++ BasiliskII/src/AmigaOS/main_amiga.cpp	2000/10/16 17:37:57	1.12
@@ -97,7 +97,7 @@ struct Library *AHIBase = NULL;
 struct Library *DiskBase = NULL;
 
 struct Task *MainTask;							// Our task
-uint32 ScratchMem = NULL;						// Scratch memory for Mac ROM writes
+uint8 *ScratchMem = NULL;						// Scratch memory for Mac ROM writes
 APTR OldTrapHandler = NULL;						// Old trap handler
 APTR OldExceptionHandler = NULL;				// Old exception handler
 BYTE IRQSig = -1;								// "Interrupt" signal number
@@ -125,6 +125,7 @@ extern "C" void ExceptionHandlerAsm(void
 extern "C" void IllInstrHandler(trap_regs *regs);
 extern "C" void PrivViolHandler(trap_regs *regs);
 extern "C" void quit_emulator(void);
+extern "C" void AsmTriggerNMI(void);
 uint16 EmulatedSR;					// Emulated SR (supervisor bit and interrupt mask)
 
 
@@ -228,7 +229,7 @@ int main(void)
 	TimerBase = (struct Library *)timereq->tr_node.io_Device;
 
 	// Allocate scratch memory
-	ScratchMem = (uint32)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
+	ScratchMem = (uint8 *)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
 	if (ScratchMem == NULL) {
 		ErrorAlert(GetString(STR_NO_MEM_ERR));
 		QuitEmulator();
@@ -242,10 +243,22 @@ int main(void)
 		WarningAlert(GetString(STR_SMALL_RAM_WARN));
 		RAMSize = 1024*1024;
 	}
-	RAMBaseHost = (uint8 *)AllocMem(RAMSize + 0x100000, MEMF_PUBLIC);
+	RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC);
 	if (RAMBaseHost == NULL) {
-		ErrorAlert(GetString(STR_NO_MEM_ERR));
-		QuitEmulator();
+		uint32 newRAMSize = AvailMem(MEMF_LARGEST) - 0x100000;
+		char xText[120];
+
+		sprintf(xText, GetString(STR_NOT_ENOUGH_MEM_WARN), RAMSize, newRAMSize);
+
+		if (ChoiceAlert(xText, "Use", "Quit") != 1)
+			QuitEmulator();
+
+		RAMSize = newRAMSize;
+		RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC);
+		if (RAMBaseHost == NULL) {
+			ErrorAlert(GetString(STR_NO_MEM_ERR));
+			QuitEmulator();
+		}
 	}
 	RAMBaseMac = (uint32)RAMBaseHost;
 	D(bug("Mac RAM starts at %08lx\n", RAMBaseHost));
@@ -313,6 +326,8 @@ int main(void)
 	// Set task priority to -1 so we don't use all processing time
 	SetTaskPri(MainTask, -1);
 
+	WriteMacInt32(0xbff, 0);	// MacsBugFlags
+
 	// Swap stack to Mac RAM area
 	stack_swap.stk_Lower = RAMBaseHost;
 	stack_swap.stk_Upper = (ULONG)RAMBaseHost + RAMSize;
@@ -347,6 +362,13 @@ void __saveds quit_emulator(void)
 
 void QuitEmulator(void)
 {
+	// Stop 60Hz thread
+	if (tick_proc) {
+		SetSignal(0, SIGF_SINGLE);
+		tick_proc_active = false;
+		Wait(SIGF_SINGLE);
+	}
+
 	// Restore stack
 	if (stack_swapped) {
 		stack_swapped = false;
@@ -360,13 +382,6 @@ void QuitEmulator(void)
 		FreeSignal(IRQSig);
 	}
 
-	// Stop 60Hz thread
-	if (tick_proc) {
-		SetSignal(0, SIGF_SINGLE);
-		tick_proc_active = false;
-		Wait(SIGF_SINGLE);
-	}
-
 	// Remove trap handler
 	MainTask->tc_TrapCode = OldTrapHandler;
 
@@ -375,7 +390,7 @@ void QuitEmulator(void)
 
 	// Delete RAM/ROM area
 	if (RAMBaseHost)
-		FreeMem(RAMBaseHost, RAMSize + 0x100000);
+		FreeVec(RAMBaseHost);
 
 	// Delete scratch memory area
 	if (ScratchMem)
@@ -453,6 +468,11 @@ void TriggerInterrupt(void)
 	Signal(MainTask, IRQSigMask);
 }
 
+void TriggerNMI(void)
+{
+	AsmTriggerNMI();
+}
+
 
 /*
  *  60Hz thread
@@ -495,6 +515,8 @@ static __saveds void tick_func(void)
 		if (++tick_counter > 60) {
 			tick_counter = 0;
 			WriteMacInt32(0x20c, TimerDateTime());
+			SetInterruptFlag(INTFLAG_1HZ);
+			TriggerInterrupt();
 		}
 
 		// Trigger 60Hz interrupt
@@ -608,7 +630,7 @@ void __saveds IllInstrHandler(trap_regs
 		EmulatedSR |= 0x0700;
 
 		// Call opcode routine
-		EmulOp(*(uint16 *)(r->pc), (M68kRegisters *)r);
+		EmulOp(opcode, (M68kRegisters *)r);
 		r->pc += 2;
 
 		// Restore interrupts