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 some numeric bases in RGBLINK output

Browse Source
This commit is contained in:
Rangi42
2024-03-06 17:43:26 -05:00
parent 75105016f7
commit 6d4a61f51d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/link/assign.cpp
View File

@@ -274,7 +274,7 @@ static void placeSection(Section &section) {
snprintf( snprintf(
where, where,
sizeof(where), sizeof(where),
"in bank $%02" PRIx32 " with align mask %" PRIx16, "in bank $%02" PRIx32 " with align mask $%" PRIx16,
section.bank, section.bank,
(uint16_t)~section.alignMask (uint16_t)~section.alignMask
); );
@@ -287,7 +287,7 @@ static void placeSection(Section &section) {
snprintf( snprintf(
where, where,
sizeof(where), sizeof(where),
"with align mask %" PRIx16 " and offset %" PRIx16, "with align mask $%" PRIx16 " and offset $%" PRIx16,
(uint16_t)~section.alignMask, (uint16_t)~section.alignMask,
section.alignOfs section.alignOfs
); );

2
src/link/script.y
View File

@@ -631,7 +631,7 @@ static void placeSection(std::string const &name, bool isOptional) {
scriptError( scriptError(
context, context,
"The linker script assigns section \"%s\" to address $%04" PRIx16 "The linker script assigns section \"%s\" to address $%04" PRIx16
", but then it would overflow %s by %" PRIx16 " byte%s", ", but then it would overflow %s by %" PRIu16 " byte%s",
name.c_str(), org, typeInfo.name.c_str(), overflowSize, overflowSize == 1 ? "" : "s" name.c_str(), org, typeInfo.name.c_str(), overflowSize, overflowSize == 1 ? "" : "s"
); );
// Fill as much as possible without going out of bounds. // Fill as much as possible without going out of bounds.

2
test/link/section-union/no-room.out
View File

@@ -1,2 +1,2 @@
error: Unable to place "test" (WRAMX section) in bank $02 with align mask ffc0 error: Unable to place "test" (WRAMX section) in bank $02 with align mask $ffc0
--- ---