Skip to content

Added support for AARCH64. #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asvitkine merged 2 commits into from
Jun 19, 2021
Merged

Added support for AARCH64. #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7794467
Added support for AARCH64.
rickyzhang82 Nov 28, 2020
9abe3b3
Added Travis CI for new architecture AARCH64.
rickyzhang82 Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,26 @@ matrix:
osx_image: xcode12
env :
- WITH_SDL=1

- os: linux
arch: arm64
dist: bionic
sudo: required
compiler: gcc
env :
- WITH_SDL=1
- SDL_MAJOR_VERSION=1
- CPU_ARCH=arm64
- os: linux
arch: arm64
dist: bionic
sudo: required
compiler: gcc
env :
- WITH_SDL=1
- SDL_MAJOR_VERSION=2
- CPU_ARCH=arm64


addons:
apt:
packages:
Expand All @@ -78,23 +97,27 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ $WITH_SDL == *"1"* ]]; then
if [[ $SDL_MAJOR_VERSION == *"1"* ]]; then
if [[ $CPU_ARCH == *"arm64"* ]]; then
./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon;
else
./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon --enable-addressing=$ADDRESSING_MODE;
make -j 4 || ERR_CODE=$?;
fi
else
if [[ $CPU_ARCH == *"arm64"* ]]; then
./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon --with-sdl2;
else
./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon --with-sdl2 --enable-addressing=$ADDRESSING_MODE;
make -j 4 || ERR_CODE=$?;
fi
fi
else
./configure --disable-jit-compiler --with-x --with-gtk --with-mon --enable-addressing=$ADDRESSING_MODE;
make -j 4 || ERR_CODE=$?;
fi
else
if [[ $WITH_SDL == *"1"* ]]; then
./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-gtk=no --with-mon --with-sdl2 --enable-addressing=banks;
make -j 4 || ERR_CODE=$?;
else
./configure --disable-vosf --disable-jit-compiler --with-gtk=no --with-mon --enable-addressing=banks;
make -j 4 || ERR_CODE=$?;
fi
fi
- make -j 4 || ERR_CODE=$?;
- (exit $ERR_CODE)
7 changes: 5 additions & 2 deletions BasiliskII/src/CrossPlatform/vm_alloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,14 @@ void * vm_acquire(size_t size, int options)

if ((addr = mmap((caddr_t)next_address, size, VM_PAGE_DEFAULT, the_map_flags, fd, 0)) == (void *)MAP_FAILED)
return VM_MAP_FAILED;

//For virtual addressing (a.k.a memory banks), there is no need to enforce that
//host memory must be under 4GiB. Bypass this sanity test of virtual adressing
//for aarch64, x86_64 architecture.
#if REAL_ADDRESSING || DIRECT_ADDRESSING
// Sanity checks for 64-bit platforms
if (sizeof(void *) == 8 && (options & VM_MAP_32BIT) && !((char *)addr <= (char *)0xffffffff))
return VM_MAP_FAILED;

#endif
next_address = (char *)addr + size;
#elif defined(HAVE_WIN32_VM)
int alloc_type = MEM_RESERVE | MEM_COMMIT;
Expand Down
Loading