ViewVC Help

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

root/cebix/BasiliskII/src/Windows/main_windows.cpp

Comparing BasiliskII/src/Windows/main_windows.cpp (file contents):
Revision 1.10 by gbeauche, 2006-05-08T16:56:07Z vs.
Revision 1.11 by gbeauche, 2007-01-13T18:21:30Z

#	Line 73 | Line 73 | int CPUType;
73		bool CPUIs68060;
74		int FPUType;
75		bool TwentyFourBitAddressing;
76	–	bool ThirtyThreeBitAddressing = false;
76
77
78		// Global variables
#	Line 134 | Line 133 | char *strdup(const char *s)
133
134		void *vm_acquire_mac(size_t size)
135		{
136	<	void *m = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_33BIT);
138	<	if (m == NULL) {
139	<	ThirtyThreeBitAddressing = false;
140	<	m = vm_acquire(size);
141	<	}
142	<	return m;
136	>	return vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
137		}
138
139
#	Line 356 | Line 350 | int main(int argc, char **argv)
350		vm_init();
351
352		// Create areas for Mac RAM and ROM
359	–	#ifdef USE_33BIT_ADDRESSING
360	–	// Speculatively enables 33-bit addressing
361	–	ThirtyThreeBitAddressing = true;
362	–	#endif
353		RAMBaseHost = (uint8 *)vm_acquire_mac(RAMSize);
354		ROMBaseHost = (uint8 *)vm_acquire_mac(0x100000);
355		if (RAMBaseHost == VM_MAP_FAILED || ROMBaseHost == VM_MAP_FAILED) {

Diff Legend

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