Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-09 16:29:30 +00:00
Code Issues Projects Releases Wiki Activity

SS: Apple Silicon Mac: without shared memory

Browse Source
This commit is contained in:
kanjitalk755 2022-06-04 16:41:12 +09:00
parent 11e88dd94f
commit 8cd260690c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SheepShaver/src/MacOSX/config/config-macosx-aarch64.h
View File

@ -428,7 +428,7 @@
/* Define if the __PAGEZERO Mach-O Low Memory Globals hack works on this /* Define if the __PAGEZERO Mach-O Low Memory Globals hack works on this
system. */ system. */
/* #define PAGEZERO_HACK 1 */ #define PAGEZERO_HACK 1
/* Define as the return type of signal handlers (`int' or `void'). */ /* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void #define RETSIGTYPE void

4
SheepShaver/src/Unix/main_unix.cpp
View File

@ -196,7 +196,7 @@ uint8 *RAMBaseHost; // Base address of Mac RAM (host address space)
uint8 *ROMBaseHost; // Base address of Mac ROM (host address space) uint8 *ROMBaseHost; // Base address of Mac ROM (host address space)
uint32 ROMEnd; uint32 ROMEnd;
#if defined(__APPLE__) && defined(__x86_64__) #ifdef __APPLE__
uint8 gZeroPage[0x3000], gKernelData[0x2000]; uint8 gZeroPage[0x3000], gKernelData[0x2000];
#endif #endif
@ -921,7 +921,7 @@ int main(int argc, char **argv)
goto quit; goto quit;
} }
#if !defined(__APPLE__) || !defined(__x86_64__) #ifndef __APPLE__
// Create areas for Kernel Data // Create areas for Kernel Data
if (!kernel_data_init()) if (!kernel_data_init())
goto quit; goto quit;

2
SheepShaver/src/kpx_cpu/src/cpu/vm.hpp
View File

@ -206,7 +206,7 @@ const uintptr VMBaseDiff = NATMEM_OFFSET;
static inline uint8 * vm_do_get_real_address(vm_addr_t addr) static inline uint8 * vm_do_get_real_address(vm_addr_t addr)
{ {
uintptr a = vm_wrap_address(addr); uintptr a = vm_wrap_address(addr);
#if defined(__APPLE__) && defined(__x86_64__) #ifdef __APPLE__
extern uint8 gZeroPage[0x3000], gKernelData[0x2000]; extern uint8 gZeroPage[0x3000], gKernelData[0x2000];
if (a < 0x3000) return &gZeroPage[a]; if (a < 0x3000) return &gZeroPage[a];
else if ((a & ~0x1fff) == 0x68ffe000 || (a & ~0x1fff) == 0x5fffe000) return &gKernelData[a & 0x1fff]; else if ((a & ~0x1fff) == 0x68ffe000 || (a & ~0x1fff) == 0x5fffe000) return &gKernelData[a & 0x1fff];