Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-10 07:30:30 +00:00
Code Issues Projects Releases Wiki Activity

LLP64 fixes (64-bit Windows)

Browse Source
This commit is contained in:
gbeauche 2008-01-12 21:43:02 +00:00
parent b1fa25128a
commit f5e5da6916
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BasiliskII/src/Unix/vm_alloc.cpp
View File

@ -48,6 +48,14 @@
#endif #endif
#endif #endif
#ifdef HAVE_WIN32_VM
/* Windows is either ILP32 or LLP64 */
typedef UINT_PTR vm_uintptr_t;
#else
/* Other systems are sane as they are either ILP32 or LP64 */
typedef unsigned long vm_uintptr_t;
#endif
/* We want MAP_32BIT, if available, for SheepShaver and BasiliskII /* We want MAP_32BIT, if available, for SheepShaver and BasiliskII
because the emulated target is 32-bit and this helps to allocate because the emulated target is 32-bit and this helps to allocate
memory so that branches could be resolved more easily (32-bit memory so that branches could be resolved more easily (32-bit
@ -111,12 +119,12 @@ static int translate_map_flags(int vm_flags)
#ifdef HAVE_WIN32_VM #ifdef HAVE_WIN32_VM
static inline LPVOID align_addr_segment(LPVOID addr) static inline LPVOID align_addr_segment(LPVOID addr)
{ {
return (LPVOID)(((DWORD)addr) & -65536); return (LPVOID)(((vm_uintptr_t)addr) & -((vm_uintptr_t)65536));
} }
static inline DWORD align_size_segment(LPVOID addr, DWORD size) static inline DWORD align_size_segment(LPVOID addr, DWORD size)
{ {
return size + ((DWORD)addr - (DWORD)align_addr_segment(addr)); return size + ((vm_uintptr_t)addr - (vm_uintptr_t)align_addr_segment(addr));
} }
#endif #endif
@ -325,7 +333,7 @@ int vm_protect(void * addr, size_t size, int prot)
int vm_get_page_size(void) int vm_get_page_size(void)
{ {
#ifdef HAVE_WIN32_VM #ifdef HAVE_WIN32_VM
static unsigned long page_size = 0; static vm_uintptr_t page_size = 0;
if (page_size == 0) { if (page_size == 0) {
SYSTEM_INFO si; SYSTEM_INFO si;
GetSystemInfo(&si); GetSystemInfo(&si);
@ -359,8 +367,8 @@ int main(void)
signal(SIGBUS, fault_handler); signal(SIGBUS, fault_handler);
#endif #endif
#define page_align(address) ((char *)((unsigned long)(address) & -page_size)) #define page_align(address) ((char *)((vm_uintptr_t)(address) & -page_size))
unsigned long page_size = vm_get_page_size(); vm_uintptr_t page_size = vm_get_page_size();
const int area_size = 6 * page_size; const int area_size = 6 * page_size;
volatile char * area = (volatile char *) vm_acquire(area_size); volatile char * area = (volatile char *) vm_acquire(area_size);