u3: refactors address layout macros, combines darwin/aarch64

This commit is contained in:
Joe Bryan 2021-08-20 14:48:52 -04:00
parent 042b115b76
commit bdb5e29ff1

View File

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