From 6d4a61f51df2d2e6c08df5e6dd501d2377a64a7c Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Wed, 6 Mar 2024 17:43:26 -0500 Subject: [PATCH] Fix some numeric bases in RGBLINK output --- src/link/assign.cpp | 4 ++-- src/link/script.y | 2 +- test/link/section-union/no-room.out | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/link/assign.cpp b/src/link/assign.cpp index 620ab0c5..d120414d 100644 --- a/src/link/assign.cpp +++ b/src/link/assign.cpp @@ -274,7 +274,7 @@ static void placeSection(Section §ion) { snprintf( where, sizeof(where), - "in bank $%02" PRIx32 " with align mask %" PRIx16, + "in bank $%02" PRIx32 " with align mask $%" PRIx16, section.bank, (uint16_t)~section.alignMask ); @@ -287,7 +287,7 @@ static void placeSection(Section §ion) { snprintf( where, sizeof(where), - "with align mask %" PRIx16 " and offset %" PRIx16, + "with align mask $%" PRIx16 " and offset $%" PRIx16, (uint16_t)~section.alignMask, section.alignOfs ); diff --git a/src/link/script.y b/src/link/script.y index c3e48858..38bfe4d3 100644 --- a/src/link/script.y +++ b/src/link/script.y @@ -631,7 +631,7 @@ static void placeSection(std::string const &name, bool isOptional) { scriptError( context, "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" ); // Fill as much as possible without going out of bounds. diff --git a/test/link/section-union/no-room.out b/test/link/section-union/no-room.out index e14ba53a..31069afc 100644 --- a/test/link/section-union/no-room.out +++ b/test/link/section-union/no-room.out @@ -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 ---