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

Allow negative alignment offsets (#1255)

Browse Source
This commit is contained in:
Rangi
2023-11-25 03:40:20 -05:00
committed by GitHub
parent 756f2866bb
commit 2ebd7f2ea3
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/asm/parser.y
View File

@@ -1026,15 +1026,16 @@ align_spec : uconst {
$$.alignOfs = 0;
}
}
| uconst T_COMMA uconst {
| uconst T_COMMA const {
if ($1 > 16) {
error("Alignment must be between 0 and 16, not %u\n", $1);
} else if ($3 >= 1 << $1) {
error("Alignment offset (%u) must be smaller than alignment size (%u)\n",
$3, 1 << $1);
} else if ($3 <= -(1 << $1) || $3 >= 1 << $1) {
error("The absolute alignment offset (%" PRIu32
") must be less than alignment size (%d)\n",
(uint32_t)($3 < 0 ? -$3 : $3), 1 << $1);
} else {
$$.alignment = $1;
$$.alignOfs = $3;
$$.alignOfs = $3 < 0 ? (1 << $1) + $3 : $3;
}
}
;

2
test/asm/align-large-ofs.err
View File

@@ -1,3 +1,3 @@
error: align-large-ofs.asm(2):
Alignment offset (2) must be smaller than alignment size (2)
The absolute alignment offset (2) must be less than alignment size (2)
error: Assembly aborted (1 error)!

6
test/asm/align-offset.asm Normal file
View File

@@ -0,0 +1,6 @@
SECTION "good", ROM0, ALIGN[4, -2]
align 4, 14 ; -2 == (1 << 4) - 2 == -2 mod (1 << 4)
SECTION "bad+", ROM0, ALIGN[4, 18] ; out of range
SECTION "bad-", ROM0, ALIGN[4, -20] ; out of range negative

5
test/asm/align-offset.err Normal file
View File

@@ -0,0 +1,5 @@
error: align-offset.asm(4):
The absolute alignment offset (18) must be less than alignment size (16)
error: align-offset.asm(6):
The absolute alignment offset (20) must be less than alignment size (16)
error: Assembly aborted (2 errors)!