Skip to content

Fix SIGBUS on ARM 32bit when starting level 3 #708

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

Open
emileb wants to merge 1 commit into
base: port
Choose a base branch
from
Open

Fix SIGBUS on ARM 32bit when starting level 3 #708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions port/src/preprocess/filepads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ static u32 convertPadsFile(u8 *dst, u8 *src)
host_header->ptr_waygroups = (dstpos);
dstpos = convertWayGroups(dst, dstpos, src, PD_BE32(n64_header->ptr_waygroups));

// On 32bit ARM the covers MUST be 32bit aligned for float access, otherwise SIGBUS
// This fixes crash when starting level 3
#if PLATFORM_ARM == 7
dstpos = (dstpos + 3) & ~3u;
#endif

// Cover
host_header->ptr_cover = (dstpos);
dstpos = convertCover(dst, dstpos, src, PD_BE32(n64_header->ptr_cover), num_covers);
Expand Down