From c637447d5db263820b45aba8af08d6eb3b241d9f Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 28 Feb 2021 21:17:39 -0500 Subject: [PATCH] Make the "db/dw/dl directive without data in ROM" warning more specific Also use uppercase for DB/DW/DL to be consistent --- src/asm/section.c | 3 ++- test/asm/empty-data-directive.err | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/asm/section.c b/src/asm/section.c index 2e06822b..b470a55a 100644 --- a/src/asm/section.c +++ b/src/asm/section.c @@ -604,7 +604,8 @@ void out_Skip(int32_t skip, bool ds) reserveSpace(skip); if (!ds && sect_HasData(pCurrentSection->type)) - warning(WARNING_EMPTY_DATA_DIRECTIVE, "db/dw/dl directive without data in ROM\n"); + warning(WARNING_EMPTY_DATA_DIRECTIVE, "%s directive without data in ROM\n", + (skip == 4) ? "DL" : (skip == 2) ? "DW" : "DB"); if (!sect_HasData(pCurrentSection->type)) { growSection(skip); diff --git a/test/asm/empty-data-directive.err b/test/asm/empty-data-directive.err index dc4f03db..f54631eb 100644 --- a/test/asm/empty-data-directive.err +++ b/test/asm/empty-data-directive.err @@ -1,6 +1,6 @@ warning: empty-data-directive.asm(6): [-Wempty-data-directive] - db/dw/dl directive without data in ROM + DB directive without data in ROM warning: empty-data-directive.asm(7): [-Wempty-data-directive] - db/dw/dl directive without data in ROM + DW directive without data in ROM warning: empty-data-directive.asm(8): [-Wempty-data-directive] - db/dw/dl directive without data in ROM + DL directive without data in ROM