gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment compatibility with current lower alignment

Browse Source
This commit is contained in:
Rangi42
2025-07-07 12:19:09 -04:00
committed by Eldred Habert
parent e14f68d1d7
commit 202c91471c
3 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/asm/section.cpp
View File

@@ -583,12 +583,14 @@ void sect_AlignPC(uint8_t alignment, uint16_t offset) {
actualOffset
);
}
} else if (uint32_t actualOffset =
((sect->alignOfs + curOffset) % (1u << sect->align)) % alignSize;
sect->align != 0 && actualOffset != offset) {
} else {
if (uint32_t actualOffset = (sect->alignOfs + curOffset) % alignSize,
sectAlignSize = 1 << sect->align;
sect->align != 0 && actualOffset % sectAlignSize != offset % sectAlignSize) {
error(
"Section is misaligned ($%04" PRIx32 " bytes into the section, expected ALIGN[%" PRIu32
", %" PRIu32 "], got ALIGN[%" PRIu32 ", %" PRIu32 "])\n",
"Section is misaligned ($%04" PRIx32
" bytes into the section, expected ALIGN[%" PRIu32 ", %" PRIu32
"], got ALIGN[%" PRIu32 ", %" PRIu32 "])\n",
curOffset,
alignment,
offset,
@@ -608,6 +610,7 @@ void sect_AlignPC(uint8_t alignment, uint16_t offset) {
// We need `(sect->alignOfs + curOffset) % alignSize == offset`
sect->alignOfs = (offset - curOffset) % alignSize;
}
}
}
static void growSection(uint32_t growth) {

15
test/asm/align-increasing.asm Normal file
View File

@@ -0,0 +1,15 @@
SECTION "test1", ROM0
align 4 ; PC = $xxx0
dw $0123
align 4, 2 ; PC = $xxx2
ds align [8, $C2] ; PC = $xxC2 (ds 0)
align 8, $C2 ; PC = $xxC2
dw $4567
SECTION "test2", ROM0[$01C0]
align 4 ; PC = $01C0
dw $89ab
align 4, 2 ; PC = $01C2
ds align [8, $C2] ; PC = $01C2 (ds 0)
align 8, $C2 ; PC = $01C2
dw $cdef

BIN
test/asm/align-increasing.out.bin Normal file
View File

Binary file not shown.