Merge pull request #5174 from urbit/jb/darwin-loombase

u3: refactors address layout macros, combines darwin/aarch64
This commit is contained in:
Joe Bryan 2021-09-09 11:22:13 -07:00 committed by GitHub
commit a0ae7371a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -104,6 +104,8 @@
# endif
/** Address space layout.
***
*** NB: 2^29 words == 2GB
**/
# if defined(U3_OS_linux)
# ifdef __LP64__
@ -115,17 +117,24 @@
# else
# define U3_OS_LoomBase 0x36000000
# endif
# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB
# elif defined(U3_OS_osx) && defined(U3_CPU_aarch64) || defined(U3_OS_mingw)
# define U3_OS_LoomBits 29
# elif defined(U3_OS_mingw)
# define U3_OS_LoomBase 0x28000000000
# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB
# elif defined(U3_OS_osx) || defined(U3_OS_bsd)
# define U3_OS_LoomBits 29
# elif defined(U3_OS_osx)
# ifdef __LP64__
# define U3_OS_LoomBase 0x28000000000
# else
# define U3_OS_LoomBase 0x4000000
# endif
# define U3_OS_LoomBits 29
# elif defined(U3_OS_bsd)
# ifdef __LP64__
# define U3_OS_LoomBase 0x200000000
# else
# define U3_OS_LoomBase 0x4000000
# endif
# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB
# define U3_OS_LoomBits 29
# else
# error "port: LoomBase"
# endif