[ViewVC] Diff of: cebix/BasiliskII/src/AmigaOS/main

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.12 by cebix, 2000-10-16T17:37:57Z vs.
Revision 1.26 by asvitkine, 2009-10-18T16:21:19Z

#	Line 1 \| Line 1
1		/*
2		* main_amiga.cpp - Startup code for AmigaOS
3		*
4	<	* Basilisk II (C) 1997-2000 Christian Bauer
4	>	* Basilisk II (C) 1997-2008 Christian Bauer
5		*
6		* This program is free software; you can redistribute it and/or modify
7		* it under the terms of the GNU General Public License as published by
#	Line 26 \| Line 26
26		#include <intuition/intuition.h>
27		#include <devices/timer.h>
28		#include <devices/ahi.h>
29	+	#define __USE_SYSBASE
30		#include <proto/exec.h>
31		#include <proto/dos.h>
32		#include <proto/intuition.h>
33	+	#include <inline/exec.h>
34	+	#include <inline/dos.h>
35	+	#include <inline/intuition.h>
36
37		#include "sysdeps.h"
38		#include "cpu_emulation.h"
#	Line 108 \| Line 112 \| *static struct timerequest timereq = NUL**
112		static struct MsgPort *ahi_port = NULL; // Port for AHI
113		static struct AHIRequest *ahi_io = NULL; // IORequest for AHI
114
115	+	static struct Process *xpram_proc = NULL; // XPRAM watchdog
116	+	static volatile bool xpram_proc_active = true; // Flag for quitting the XPRAM watchdog
117	+
118		static struct Process *tick_proc = NULL; // 60Hz process
119		static volatile bool tick_proc_active = true; // Flag for quitting the 60Hz process
120
#	Line 120 \| Line 127 \| struct trap_regs;
127		extern "C" void AtomicAnd(uint32 *p, uint32 val);
128		extern "C" void AtomicOr(uint32 *p, uint32 val);
129		extern "C" void MoveVBR(void);
130	+	extern "C" void DisableSuperBypass(void);
131		extern "C" void TrapHandlerAsm(void);
132		extern "C" void ExceptionHandlerAsm(void);
133		extern "C" void IllInstrHandler(trap_regs *regs);
#	Line 131 \| Line 139 \| uint16 EmulatedSR; // Emulated SR (s
139
140		// Prototypes
141		static void jump_to_rom(void);
142	+	static void xpram_func(void);
143		static void tick_func(void);
144
145
#	Line 138 \| Line 147 \| static void tick_func(void);
147		* Main program
148		*/
149
150	<	int main(void)
150	>	int main(int argc, char **argv)
151		{
152		// Initialize variables
153		RAMBaseHost = NULL;
#	Line 153 \| Line 162 \| int main(void)
162		printf(" %s\n", GetString(STR_ABOUT_TEXT2));
163
164		// Open libraries
165	<	GfxBase = OpenLibrary((UBYTE *)"graphics.library", 39);
165	>	GfxBase = OpenLibrary((UBYTE *) "graphics.library", 39);
166		if (GfxBase == NULL) {
167		printf("Cannot open graphics.library V39.\n");
168		exit(1);
169		}
170	<	IntuitionBase = (struct IntuitionBase )OpenLibrary((UBYTE )"intuition.library", 39);
170	>	IntuitionBase = (struct IntuitionBase )OpenLibrary((UBYTE ) "intuition.library", 39);
171		if (IntuitionBase == NULL) {
172		printf("Cannot open intuition.library V39.\n");
173		CloseLibrary(GfxBase);
174		exit(1);
175		}
176	<	DiskBase = (struct Library )OpenResource((UBYTE )"disk.resource");
176	>	DiskBase = (struct Library )OpenResource((UBYTE ) "disk.resource");
177		if (DiskBase == NULL)
178		QuitEmulator();
179	<	GadToolsBase = OpenLibrary((UBYTE *)"gadtools.library", 39);
179	>	GadToolsBase = OpenLibrary((UBYTE *) "gadtools.library", 39);
180		if (GadToolsBase == NULL) {
181	<	ErrorAlert(GetString(STR_NO_GADTOOLS_LIB_ERR));
181	>	ErrorAlert(STR_NO_GADTOOLS_LIB_ERR);
182		QuitEmulator();
183		}
184	<	IFFParseBase = OpenLibrary((UBYTE *)"iffparse.library", 39);
184	>	IFFParseBase = OpenLibrary((UBYTE *) "iffparse.library", 39);
185		if (IFFParseBase == NULL) {
186	<	ErrorAlert(GetString(STR_NO_IFFPARSE_LIB_ERR));
186	>	ErrorAlert(STR_NO_IFFPARSE_LIB_ERR);
187		QuitEmulator();
188		}
189	<	AslBase = OpenLibrary((UBYTE *)"asl.library", 36);
189	>	AslBase = OpenLibrary((UBYTE *) "asl.library", 36);
190		if (AslBase == NULL) {
191	<	ErrorAlert(GetString(STR_NO_ASL_LIB_ERR));
191	>	ErrorAlert(STR_NO_ASL_LIB_ERR);
192	>	QuitEmulator();
193	>	}
194	>
195	>	if (FindTask((UBYTE *) "� Enforcer �")) {
196	>	ErrorAlert(STR_ENFORCER_RUNNING_ERR);
197		QuitEmulator();
198		}
199
200		// These two can fail (the respective gfx support won't be available, then)
201	<	P96Base = OpenLibrary((UBYTE *)"Picasso96API.library", 2);
202	<	CyberGfxBase = OpenLibrary((UBYTE *)"cybergraphics.library", 2);
201	>	P96Base = OpenLibrary((UBYTE *) "Picasso96API.library", 2);
202	>	CyberGfxBase = OpenLibrary((UBYTE *) "cybergraphics.library", 2);
203
204		// Read preferences
205	<	PrefsInit();
205	>	PrefsInit(NULL, argc, argv);
206
207		// Open AHI
208		ahi_port = CreateMsgPort();
#	Line 196 \| Line 210 \| int main(void)
210		ahi_io = (struct AHIRequest *)CreateIORequest(ahi_port, sizeof(struct AHIRequest));
211		if (ahi_io) {
212		ahi_io->ahir_Version = 2;
213	<	if (OpenDevice((UBYTE )AHINAME, AHI_NO_UNIT, (struct IORequest )ahi_io, 0) == 0) {
213	>	if (OpenDevice((UBYTE ) AHINAME, AHI_NO_UNIT, (struct IORequest )ahi_io, 0) == 0) {
214		AHIBase = (struct Library *)ahi_io->ahir_Std.io_Device;
215		}
216		}
#	Line 211 \| Line 225 \| int main(void)
225		QuitEmulator();
226
227		// Check start of Chip memory (because we need access to 0x0000..0x2000)
228	<	if ((uint32)FindName(&SysBase->MemList, (UBYTE *)"chip memory") < 0x2000) {
229	<	ErrorAlert(GetString(STR_NO_PREPARE_EMUL_ERR));
228	>	if ((uint32)FindName(&SysBase->MemList, (UBYTE *) "chip memory") < 0x2000) {
229	>	ErrorAlert(STR_NO_PREPARE_EMUL_ERR);
230		QuitEmulator();
231		}
232
233		// Open timer.device
234		timereq = (struct timerequest *)AllocVec(sizeof(timerequest), MEMF_PUBLIC \| MEMF_CLEAR);
235		if (timereq == NULL) {
236	<	ErrorAlert(GetString(STR_NO_MEM_ERR));
236	>	ErrorAlert(STR_NO_MEM_ERR);
237		QuitEmulator();
238		}
239	<	if (OpenDevice((UBYTE )TIMERNAME, UNIT_MICROHZ, (struct IORequest )timereq, 0)) {
240	<	ErrorAlert(GetString(STR_NO_TIMER_DEV_ERR));
239	>	if (OpenDevice((UBYTE ) TIMERNAME, UNIT_MICROHZ, (struct IORequest )timereq, 0)) {
240	>	ErrorAlert(STR_NO_TIMER_DEV_ERR);
241		QuitEmulator();
242		}
243		TimerBase = (struct Library *)timereq->tr_node.io_Device;
#	Line 231 \| Line 245 \| int main(void)
245		// Allocate scratch memory
246		ScratchMem = (uint8 *)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
247		if (ScratchMem == NULL) {
248	<	ErrorAlert(GetString(STR_NO_MEM_ERR));
248	>	ErrorAlert(STR_NO_MEM_ERR);
249		QuitEmulator();
250		}
251		ScratchMem += SCRATCH_MEM_SIZE/2; // ScratchMem points to middle of block
#	Line 254 \| Line 268 \| int main(void)
268		QuitEmulator();
269
270		RAMSize = newRAMSize;
271	<	RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC);
271	>	RAMBaseHost = (uint8 *)AllocVec(RAMSize - 0x100000, MEMF_PUBLIC);
272		if (RAMBaseHost == NULL) {
273	<	ErrorAlert(GetString(STR_NO_MEM_ERR));
273	>	ErrorAlert(STR_NO_MEM_ERR);
274		QuitEmulator();
275		}
276		}
#	Line 271 \| Line 285 \| int main(void)
285
286		// Load Mac ROM
287		BPTR rom_fh = Open(rom_path ? (char )rom_path : (char )ROM_FILE_NAME, MODE_OLDFILE);
288	<	if (rom_fh == NULL) {
289	<	ErrorAlert(GetString(STR_NO_ROM_FILE_ERR));
288	>	if (rom_fh == 0) {
289	>	ErrorAlert(STR_NO_ROM_FILE_ERR);
290		QuitEmulator();
291		}
292		printf(GetString(STR_READING_ROM_FILE));
293		Seek(rom_fh, 0, OFFSET_END);
294		ROMSize = Seek(rom_fh, 0, OFFSET_CURRENT);
295		if (ROMSize != 5121024 && ROMSize != 10241024) {
296	<	ErrorAlert(GetString(STR_ROM_SIZE_ERR));
296	>	ErrorAlert(STR_ROM_SIZE_ERR);
297		Close(rom_fh);
298		QuitEmulator();
299		}
300		Seek(rom_fh, 0, OFFSET_BEGINNING);
301		if (Read(rom_fh, ROMBaseHost, ROMSize) != ROMSize) {
302	<	ErrorAlert(GetString(STR_ROM_FILE_READ_ERR));
302	>	ErrorAlert(STR_ROM_FILE_READ_ERR);
303		Close(rom_fh);
304		QuitEmulator();
305		}
#	Line 297 \| Line 311 \| int main(void)
311		FPUType = attn & AFF_68881 ? 1 : 0;
312
313		// Initialize everything
314	<	if (!InitAll())
314	>	if (!InitAll(NULL))
315		QuitEmulator();
316
317		// Move VBR away from 0 if neccessary
318		MoveVBR();
319
320	+	// On 68060, disable Super Bypass mode because of a CPU bug that is triggered by MacOS 8
321	+	if (CPUIs68060)
322	+	DisableSuperBypass();
323	+
324	+	memset((UBYTE *) 8, 0, 0x2000-8);
325	+
326		// Install trap handler
327		EmulatedSR = 0x2700;
328		OldTrapHandler = MainTask->tc_TrapCode;
#	Line 315 \| Line 335 \| int main(void)
335		MainTask->tc_ExceptCode = (APTR)ExceptionHandlerAsm;
336		SetExcept(SIGBREAKF_CTRL_C \| IRQSigMask, SIGBREAKF_CTRL_C \| IRQSigMask);
337
338	+	// Start XPRAM watchdog process
339	+	xpram_proc = CreateNewProcTags(
340	+	NP_Entry, (ULONG)xpram_func,
341	+	NP_Name, (ULONG)"Basilisk II XPRAM Watchdog",
342	+	NP_Priority, 0,
343	+	TAG_END
344	+	);
345	+
346		// Start 60Hz process
347		tick_proc = CreateNewProcTags(
348		NP_Entry, (ULONG)tick_func,
#	Line 362 \| Line 390 \| void __saveds quit_emulator(void)
390
391		void QuitEmulator(void)
392		{
393	<	// Stop 60Hz thread
393	>	// Stop 60Hz process
394		if (tick_proc) {
395		SetSignal(0, SIGF_SINGLE);
396		tick_proc_active = false;
397		Wait(SIGF_SINGLE);
398		}
399
400	+	// Stop XPRAM watchdog process
401	+	if (xpram_proc) {
402	+	SetSignal(0, SIGF_SINGLE);
403	+	xpram_proc_active = false;
404	+	Wait(SIGF_SINGLE);
405	+	}
406	+
407		// Restore stack
408		if (stack_swapped) {
409		stack_swapped = false;
#	Line 448 \| Line 483 \| *void FlushCodeCache(void start, uint32**
483
484
485		/*
486	+	* Mutexes
487	+	*/
488	+
489	+	struct B2_mutex {
490	+	int dummy; //!!
491	+	};
492	+
493	+	B2_mutex *B2_create_mutex(void)
494	+	{
495	+	return new B2_mutex;
496	+	}
497	+
498	+	void B2_lock_mutex(B2_mutex *mutex)
499	+	{
500	+	}
501	+
502	+	void B2_unlock_mutex(B2_mutex *mutex)
503	+	{
504	+	}
505	+
506	+	void B2_delete_mutex(B2_mutex *mutex)
507	+	{
508	+	delete mutex;
509	+	}
510	+
511	+
512	+	/*
513		* Interrupt flags (must be handled atomically!)
514		*/
515
#	Line 475 \| Line 537 \| void TriggerNMI(void)
537
538
539		/*
540	<	* 60Hz thread
540	>	* 60Hz thread (really 60.15Hz)
541		*/
542
543		static __saveds void tick_func(void)
#	Line 490 \| Line 552 \| static __saveds void tick_func(void)
552		if (timer_port) {
553		timer_io = (struct timerequest *)CreateIORequest(timer_port, sizeof(struct timerequest));
554		if (timer_io) {
555	<	if (!OpenDevice((UBYTE )TIMERNAME, UNIT_MICROHZ, (struct IORequest )timer_io, 0)) {
555	>	if (!OpenDevice((UBYTE ) TIMERNAME, UNIT_MICROHZ, (struct IORequest )timer_io, 0)) {
556		timer_mask = 1 << timer_port->mp_SigBit;
557		timer_io->tr_node.io_Command = TR_ADDREQUEST;
558		timer_io->tr_time.tv_secs = 0;
#	Line 542 \| Line 604 \| static __saveds void tick_func(void)
604
605
606		/*
607	+	* XPRAM watchdog thread (saves XPRAM every minute)
608	+	*/
609	+
610	+	static __saveds void xpram_func(void)
611	+	{
612	+	uint8 last_xpram[XPRAM_SIZE];
613	+	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
614	+
615	+	while (xpram_proc_active) {
616	+	for (int i=0; i<60 && xpram_proc_active; i++)
617	+	Delay(50); // Only wait 1 second so we quit promptly when xpram_proc_active becomes false
618	+	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
619	+	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
620	+	SaveXPRAM();
621	+	}
622	+	}
623	+
624	+	// Main task asked for termination, send signal
625	+	Forbid();
626	+	Signal(MainTask, SIGF_SINGLE);
627	+	}
628	+
629	+
630	+	/*
631		* Display error alert
632		*/
633
#	Line 612 \| Line 698 \| struct trap_regs { // This must match th
698
699		void __saveds IllInstrHandler(trap_regs *r)
700		{
701	+	// D(bug("IllInstrHandler/%ld\n", __LINE__));
702	+
703		uint16 opcode = (uint16 )(r->pc);
704		if ((opcode & 0xff00) != 0x7100) {
705		printf("Illegal Instruction %04x at %08lx\n", (uint16 )(r->pc), r->pc);

Diff Legend

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

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents): Revision 1.12 by cebix, 2000-10-16T17:37:57Z vs. Revision 1.26 by asvitkine, 2009-10-18T16:21:19Z

Diff Legend

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.12 by cebix, 2000-10-16T17:37:57Z vs.
Revision 1.26 by asvitkine, 2009-10-18T16:21:19Z