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

Add a -Wunmapped-char warning for characters not in the charmap (#1023)

Browse Source 
Fixes #1022
This commit is contained in:
Rangi
2022-08-28 15:12:43 -04:00
committed by GitHub
parent d29057e747
commit 8207dc57b7
14 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/bash_compl/_rgbasm.bash
View File

@@ -189,6 +189,7 @@ _rgbasm_completions() {
shift
shift-amount
truncation
unmapped-char
user
all
extra

1
contrib/zsh_compl/_rgbasm
View File

@@ -25,6 +25,7 @@ _rgbasm_warnings() {
'shift:Warn when shifting negative values'
'shift-amount:Warn when a shift'\''s operand it negative or \> 32'
'truncation:Warn when implicit truncation loses bits'
'unmapped-char:Warn on unmapped character'
'user:Warn when executing the WARN built-in'
)
# TODO: handle `no-` and `error=` somehow?

1
include/asm/warning.h
View File

@@ -36,6 +36,7 @@ enum WarningID {
WARNING_OBSOLETE, // Obsolete things
WARNING_SHIFT, // Shifting undefined behavior
WARNING_SHIFT_AMOUNT, // Strange shift amount
WARNING_UNMAPPED_CHAR, // Character without charmap entry
WARNING_USER, // User warnings
NB_PLAIN_WARNINGS,

6
man/rgbasm.1
View File

@@ -274,6 +274,12 @@ warns when an N-bit value's absolute value is 2**N or greater.
or just
.Fl Wtruncation
also warns when an N-bit value is less than -2**(N-1), which will not fit in two's complement encoding.
.It Fl Wunmapped-char
Warn when a character goes through charmap conversion but has no defined mapping.
This warning is always disabled if the active charmap is empty, and/or is the default charmap
.Sq main .
This warning is enabled by
.Fl Wall .
.It Fl Wno-user
Warn when the
.Ic WARN

7
src/asm/charmap.c
View File

@@ -242,6 +242,7 @@ size_t charmap_ConvertNext(char const **input, uint8_t **output)
return 1;
} else if (**input) { // No match found, but there is some input left
int firstChar = **input;
// This will write the codepoint's value to `output`, little-endian
size_t codepointLen = readUTF8Char(output ? *output : NULL,
*input);
@@ -254,6 +255,12 @@ size_t charmap_ConvertNext(char const **input, uint8_t **output)
if (output)
*output += codepointLen;
// Check if the character map is not the default "main" one, or if
// it has any mappings defined
if (strcmp(charmap->name, "main") || charmap->usedNodes > 1)
warning(WARNING_UNMAPPED_CHAR,
"Unmapped character %s\n", printChar(firstChar));
return codepointLen;
} else { // End of input

4
src/asm/warning.c
View File

@@ -38,6 +38,7 @@ static const enum WarningState defaultWarnings[ARRAY_SIZE(warningStates)] = {
[WARNING_OBSOLETE] = WARNING_ENABLED,
[WARNING_SHIFT] = WARNING_DISABLED,
[WARNING_SHIFT_AMOUNT] = WARNING_DISABLED,
[WARNING_UNMAPPED_CHAR] = WARNING_ENABLED,
[WARNING_USER] = WARNING_ENABLED,
[WARNING_NUMERIC_STRING_1] = WARNING_ENABLED,
@@ -85,6 +86,7 @@ static const char * const warningFlags[NB_WARNINGS] = {
"obsolete",
"shift",
"shift-amount",
"unmapped-char",
"user",
// Parametric warnings
@@ -160,6 +162,7 @@ static uint8_t const _wallCommands[] = {
WARNING_LONG_STR,
WARNING_NESTED_COMMENT,
WARNING_OBSOLETE,
WARNING_UNMAPPED_CHAR,
WARNING_NUMERIC_STRING_1,
META_WARNING_DONE
};
@@ -191,6 +194,7 @@ static uint8_t const _weverythingCommands[] = {
WARNING_OBSOLETE,
WARNING_SHIFT,
WARNING_SHIFT_AMOUNT,
WARNING_UNMAPPED_CHAR,
WARNING_NUMERIC_STRING_1,
WARNING_NUMERIC_STRING_2,
WARNING_TRUNCATION_1,

1
test/asm/charlen-charsub.asm
View File

@@ -1,3 +1,4 @@
opt Wno-unmapped-char
charmap "<NULL>", $00
charmap "A", $10
charmap "B", $20

2
test/asm/multiple-charmaps.asm
View File

@@ -1,3 +1,5 @@
opt Wno-unmapped-char
new_: MACRO
IF _NARG > 1
println "newcharmap \1, \2"

18
test/asm/multiple-charmaps.err
View File

@@ -1,19 +1,19 @@
warning: multiple-charmaps.asm(39) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(41) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
warning: multiple-charmaps.asm(47) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(49) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
warning: multiple-charmaps.asm(66) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(68) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
warning: multiple-charmaps.asm(89) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(91) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
warning: multiple-charmaps.asm(90) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(92) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
warning: multiple-charmaps.asm(98) -> multiple-charmaps.asm::print_mapped(27): [-Wnumeric-string]
warning: multiple-charmaps.asm(100) -> multiple-charmaps.asm::print_mapped(29): [-Wnumeric-string]
Treating 2-character string as a number
error: multiple-charmaps.asm(100) -> multiple-charmaps.asm::new_(7):
error: multiple-charmaps.asm(102) -> multiple-charmaps.asm::new_(9):
Charmap 'map1' already exists
error: multiple-charmaps.asm(102) -> multiple-charmaps.asm::set_(13):
error: multiple-charmaps.asm(104) -> multiple-charmaps.asm::set_(15):
Charmap 'map5' doesn't exist
error: multiple-charmaps.asm(104) -> multiple-charmaps.asm::pop_(23):
error: multiple-charmaps.asm(106) -> multiple-charmaps.asm::pop_(25):
No entries in the charmap stack
error: Assembly aborted (3 errors)!

18
test/asm/unmapped-char.asm Normal file
View File

@@ -0,0 +1,18 @@
SECTION "test", ROM0
db "A" ; OK, default empty charmap
pushc
newcharmap custom
db "A" ; unmapped in non-default charmap
popc
db "A" ; OK, default empty charmap again
charmap "B", $42
db "A" ; unmapped in non-empty charmap
println "A" ; does not use charmap
opt Wno-unmapped-char
db "A" ; warning silenced

4
test/asm/unmapped-char.err Normal file
View File

@@ -0,0 +1,4 @@
warning: unmapped-char.asm(7): [-Wunmapped-char]
Unmapped character 'A'
warning: unmapped-char.asm(13): [-Wunmapped-char]
Unmapped character 'A'

1
test/asm/unmapped-char.out Normal file
View File

@@ -0,0 +1 @@
A

1
test/asm/unmapped-char.out.bin Normal file
View File

@@ -0,0 +1 @@
AAAAA

2
test/asm/warn-numeric-string.asm
View File

@@ -1,6 +1,6 @@
opt Wno-unmapped-char
charmap "<NULL>", $00
SECTION "ROM", ROM0
MACRO try