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.37 by cebix, 2001-07-03T15:59:47Z vs.
Revision 1.38 by gbeauche, 2001-07-07T09:07:38Z

#	Line 319 | Line 319 | int main(int argc, char **argv)
319		}
320		#endif
321
322	–	#if USE_SCRATCHMEM_SUBTERFUGE
323	–	// Allocate scratch memory
324	–	ScratchMem = (uint8 *)vm_acquire(SCRATCH_MEM_SIZE);
325	–	if (ScratchMem == VM_MAP_FAILED) {
326	–	ErrorAlert(STR_NO_MEM_ERR);
327	–	QuitEmulator();
328	–	}
329	–	ScratchMem += SCRATCH_MEM_SIZE/2;       // ScratchMem points to middle of block
330	–	#endif
331	–
322		// Create areas for Mac RAM and ROM
323		#if REAL_ADDRESSING
324		if (memory_mapped_from_zero) {
#	Line 346 | Line 336 | int main(int argc, char **argv)
336		}
337		}
338
339	+	#if USE_SCRATCHMEM_SUBTERFUGE
340	+	// Allocate scratch memory
341	+	ScratchMem = (uint8 *)vm_acquire(SCRATCH_MEM_SIZE);
342	+	if (ScratchMem == VM_MAP_FAILED) {
343	+	ErrorAlert(STR_NO_MEM_ERR);
344	+	QuitEmulator();
345	+	}
346	+	ScratchMem += SCRATCH_MEM_SIZE/2;       // ScratchMem points to middle of block
347	+	#endif
348	+
349		#if DIRECT_ADDRESSING
350		// RAMBaseMac shall always be zero
351		MEMBaseDiff = (uintptr)RAMBaseHost;

Diff Legend

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