Skip to content

fix build and run on OpenBSD #238

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
fabienr wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix build and run on OpenBSD #238

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
97b03a3
on OpenBSD, stdarg.h is needed for va_list
fabienr Dec 28, 2025
64442db
On OpenBSD the game crashes. Check sample size and adjust aligned acc…
fabienr Dec 28, 2025
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
4 changes: 4 additions & 0 deletions include/PR/xstdio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#include <libultraship.h>
#include <stdio.h>

#ifdef __OpenBSD__
#include <stdarg.h> /* va_list */
#endif

#define FLAGS_SPACE 1
#define FLAGS_PLUS 2
#define FLAGS_MINUS 4
Expand Down
15 changes: 8 additions & 7 deletions src/audio/audio_synthesis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,20 +1069,21 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSub, NoteSynthesisSta
aligned = ALIGN16((nFramesToDecode * frameSize) + 0x10);
addr = DMEM_COMPRESSED_ADPCM_DATA - aligned;

#if __SANITIZE_ADDRESS__
uintptr_t actualAddrLoaded = samplesToLoadAddr - sampleDataChunkAlignPad;
uintptr_t offset = actualAddrLoaded - (uintptr_t) sampleAddr;
if (offset + aligned > bookSample->size) {
aligned -= (offset + aligned - bookSample->size);
}
#endif
if (nFramesToDecode != 0) {
if (1) {}
frameIndex = (synthState->samplePosInt + skipInitialSamples - nFirstFrameSamplesToIgnore) / 16;
sampleDataOffset = frameIndex * frameSize;
samplesToLoadAddr = (u8*) (sampleDmaStart + sampleDataOffset + sampleAddr);
sampleDataChunkAlignPad = ((uintptr_t) samplesToLoadAddr) % SAMPLES_PER_FRAME;

#if __SANITIZE_ADDRESS__ || defined(__OpenBSD__)
uintptr_t actualAddrLoaded = samplesToLoadAddr - sampleDataChunkAlignPad;
uintptr_t offset = actualAddrLoaded - (uintptr_t) sampleAddr;
if (offset + aligned > bookSample->size) {
aligned -= (offset + aligned - bookSample->size);
}
#endif

aLoadBuffer(aList++, OS_K0_TO_PHYSICAL(samplesToLoadAddr - sampleDataChunkAlignPad), addr, aligned);
} else {
numSamplesToDecode = 0;
Expand Down