ViewVC Help

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

root/cebix/BasiliskII/src/Unix/main_unix.cpp

Comparing BasiliskII/src/Unix/main_unix.cpp (file contents):
Revision 1.16 by cebix, 2000-07-22T18:12:34Z vs.
Revision 1.20 by gbeauche, 2000-09-22T17:14:28Z

#	Line 30 | Line 30
30		# include <pthread.h>
31		#endif
32
33	<	#if defined(USE_MAPPED_MEMORY) || REAL_ADDRESSING
33	>	#if defined(USE_MAPPED_MEMORY) || REAL_ADDRESSING || DIRECT_ADDRESSING
34		# include <sys/mman.h>
35		#endif
36
#	Line 133 | Line 133 | static struct sigaction sigirq_sa;     // Vi
133		static struct sigaction sigill_sa;      // Illegal instruction
134		static void *sig_stack = NULL;          // Stack for signal handlers
135		uint16 EmulatedSR;                                      // Emulated bits of SR (supervisor bit and interrupt mask)
136	<	uint32 ScratchMem = NULL;                       // Scratch memory for Mac ROM writes
136	>	uint8 *ScratchMem = NULL;                       // Scratch memory for Mac ROM writes
137	>	#endif
138	>
139	>	#if USE_SCRATCHMEM_SUBTERFUGE
140	>	uint8 *ScratchMem = 0;                          // Scratch memory for Mac ROM writes
141		#endif
142
143		static struct sigaction timer_sa;       // sigaction used for timer
#	Line 150 | Line 154 | static void sigint_handler(...);
154
155		#if REAL_ADDRESSING
156		static bool lm_area_mapped = false;     // Flag: Low Memory area mmap()ped
157	+	static bool memory_mapped_from_zero = false; // Flag: Could allocate RAM area from 0
158		#endif
159
160		#ifdef USE_MAPPED_MEMORY
#	Line 260 | Line 265 | int main(int argc, char **argv)
265		RAMSize = 1024*1024;
266		}
267
268	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
269	+	const uint32 page_size = getpagesize();
270	+	const uint32 page_mask = page_size - 1;
271	+	const uint32 aligned_ram_size = (RAMSize + page_mask) & ~page_mask;
272	+	const uint32 ram_rom_size = aligned_ram_size + 0x100000;
273	+	#endif
274	+
275		#if REAL_ADDRESSING
276	+	// Try to allocate the complete address space from zero
277	+	// gb-- the Solaris manpage about mmap(2) states that using MAP_FIXED
278	+	// implies undefined behaviour for further use of sbrk(), malloc(), etc.
279	+	#if defined(OS_solaris)
280	+	// Anyway, it doesn't work...
281	+	if (0) {
282	+	#else
283	+	if (mmap((caddr_t)0x0000, ram_rom_size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) != MAP_FAILED) {
284	+	#endif
285	+	D(bug("Could allocate RAM and ROM from 0x0000\n"));
286	+	memory_mapped_from_zero = true;
287	+	}
288		// Create Low Memory area (0x0000..0x2000)
289	<	if (mmap((char *)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) == (void *)-1) {
289	>	else if (mmap((char *)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) != MAP_FAILED) {
290	>	D(bug("Could allocate the Low Memory globals\n"));
291	>	lm_area_mapped = true;
292	>	}
293	>	// Exit on error
294	>	else {
295		sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
296		ErrorAlert(str);
297		QuitEmulator();
298		}
270	–	lm_area_mapped = true;
299		#endif
300
301	<	#if !EMULATED_68K
301	>	#if !EMULATED_68K || USE_SCRATCHMEM_SUBTERFUGE
302		// Allocate scratch memory
303	<	ScratchMem = (uint32)malloc(SCRATCH_MEM_SIZE);
303	>	ScratchMem = (uint8 *)malloc(SCRATCH_MEM_SIZE);
304		if (ScratchMem == NULL) {
305		ErrorAlert(GetString(STR_NO_MEM_ERR));
306		QuitEmulator();
#	Line 300 | Line 328 | int main(int argc, char **argv)
328		mmap(good_address_map + i, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, good_address_fd, 0);
329		for (int i=0; i<0x80000; i+=4096)
330		mmap(good_address_map + i + 0x00400000, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, good_address_fd, 0);
331	+	#elif REAL_ADDRESSING || DIRECT_ADDRESSING
332	+	// gb-- Overkill, needs to be cleaned up. Probably explode it for either
333	+	// real or direct addressing mode.
334	+	#if REAL_ADDRESSING
335	+	if (memory_mapped_from_zero) {
336	+	RAMBaseHost = (uint8 *)0;
337	+	ROMBaseHost = RAMBaseHost + aligned_ram_size;
338	+	}
339	+	else
340	+	#endif
341	+	{
342	+	RAMBaseHost = (uint8 *)mmap(0, ram_rom_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zero_fd, 0);
343	+	if (RAMBaseHost == (uint8 *)MAP_FAILED) {
344	+	ErrorAlert(GetString(STR_NO_MEM_ERR));
345	+	QuitEmulator();
346	+	}
347	+	ROMBaseHost = RAMBaseHost + aligned_ram_size;
348	+	}
349		#else
350	<	RAMBaseHost = new uint8[RAMSize];
351	<	ROMBaseHost = new uint8[0x100000];
350	>	RAMBaseHost = (uint8 *)malloc(RAMSize);
351	>	ROMBaseHost = (uint8 *)malloc(0x100000);
352	>	if (RAMBaseHost == NULL || ROMBaseHost == NULL) {
353	>	ErrorAlert(GetString(STR_NO_MEM_ERR));
354	>	QuitEmulator();
355	>	}
356		#endif
357	<	#if REAL_ADDRESSING && !EMULATED_68K
357	>	#if DIRECT_ADDRESSING
358	>	// Initialize MEMBaseDiff now so that Host2MacAddr in the Video module
359	>	// will return correct results
360	>	RAMBaseMac = 0;
361	>	ROMBaseMac = RAMBaseMac + aligned_ram_size;
362	>	InitMEMBaseDiff(RAMBaseHost, RAMBaseMac);
363	>	#endif
364	>	#if REAL_ADDRESSING // && !EMULATED_68K
365		RAMBaseMac = (uint32)RAMBaseHost;
366		ROMBaseMac = (uint32)ROMBaseHost;
367		#endif
368		D(bug("Mac RAM starts at %p (%08x)\n", RAMBaseHost, RAMBaseMac));
369		D(bug("Mac ROM starts at %p (%08x)\n", ROMBaseHost, ROMBaseMac));
370	<
370	>
371		// Get rom file path from preferences
372		const char *rom_path = PrefsFindString("rom");
373
#	Line 431 | Line 488 | int main(int argc, char **argv)
488
489		// POSIX.4 timers and real-time signals available, start 60Hz timer
490		sigemptyset(&timer_sa.sa_mask);
491	<	timer_sa.sa_sigaction = one_tick;
491	>	timer_sa.sa_sigaction = (void (*)(int, siginfo_t *, void *))one_tick;
492		timer_sa.sa_flags = SA_SIGINFO | SA_RESTART;
493		if (sigaction(SIG_TIMER, &timer_sa, NULL) < 0) {
494		sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIG_TIMER", strerror(errno));
#	Line 560 | Line 617 | void QuitEmulator(void)
617		// Deinitialize everything
618		ExitAll();
619
620	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
621	+	// Unmap ROM area
622	+	if (ROMBaseHost != (uint8 *)MAP_FAILED) {
623	+	munmap((caddr_t)ROMBaseHost, 0x100000);
624	+	ROMBaseHost = 0;
625	+	}
626	+
627	+	//Unmap RAM area
628	+	if (RAMBaseHost != (uint8 *)MAP_FAILED) {
629	+	const uint32 page_size = getpagesize();
630	+	const uint32 page_mask = page_size - 1;
631	+	munmap((caddr_t)RAMBaseHost, ((RAMSize + page_mask) & ~page_mask));
632	+	}
633	+	#else
634		// Delete ROM area
635	<	delete[] ROMBaseHost;
635	>	if (ROMBaseHost) {
636	>	free(ROMBaseHost);
637	>	ROMBaseHost = NULL;
638	>	}
639
640		// Delete RAM area
641	<	delete[] RAMBaseHost;
641	>	if (RAMBaseHost) {
642	>	free(RAMBaseHost);
643	>	RAMBaseHost = NULL;
644	>	}
645	>	#endif
646
647	<	#if !EMULATED_68K
647	>	#if !EMULATED_68K || USE_SCRATMEM_SUBTERFUGE
648		// Delete scratch memory area
649	<	if (ScratchMem)
649	>	if (ScratchMem) {
650		free((void *)(ScratchMem - SCRATCH_MEM_SIZE/2));
651	+	ScratchMem = NULL;
652	+	}
653		#endif
654
655		#if REAL_ADDRESSING
#	Line 705 | Line 785 | static void one_second(void)
785		// Pseudo Mac 1Hz interrupt, update local time
786		WriteMacInt32(0x20c, TimerDateTime());
787
788	<	SetInterruptFlag(INTFLAG_60HZ);
788	>	SetInterruptFlag(INTFLAG_1HZ);
789		TriggerInterrupt();
790
791		#ifndef HAVE_PTHREADS

Diff Legend

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