gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #601 from NieDzejkob/utf8decoder

Browse Source 
utf8decoder: Use byte-sized byte argument
This commit is contained in:
Eldred Habert
2020-10-12 01:49:57 +02:00
committed by GitHub
parent 176a57a1e9 6767d11c23
commit 0836f67d42
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern/utf8decoder.h vendored
View File

@@ -9,6 +9,6 @@
#ifndef EXTERN_UTF8DECODER_H #ifndef EXTERN_UTF8DECODER_H
#define EXTERN_UTF8DECODER_H #define EXTERN_UTF8DECODER_H
uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte); uint32_t decode(uint32_t *state, uint32_t *codep, uint8_t byte);
#endif /* EXTERN_UTF8DECODER_H */ #endif /* EXTERN_UTF8DECODER_H */

6
src/asm/parser.y
View File

@@ -61,7 +61,7 @@ static size_t strlenUTF8(const char *s)
uint32_t codep = 0; uint32_t codep = 0;
while (*s) { while (*s) {
switch (decode(&state, &codep, (uint8_t)*s)) { switch (decode(&state, &codep, *s)) {
case 1: case 1:
fatalerror("STRLEN: Invalid UTF-8 character\n"); fatalerror("STRLEN: Invalid UTF-8 character\n");
break; break;
@@ -95,7 +95,7 @@ static void strsubUTF8(char *dest, const char *src, uint32_t pos, uint32_t len)
/* Advance to starting position in source string. */ /* Advance to starting position in source string. */
while (src[srcIndex] && curPos < pos) { while (src[srcIndex] && curPos < pos) {
switch (decode(&state, &codep, (uint8_t)src[srcIndex])) { switch (decode(&state, &codep, src[srcIndex])) {
case 1: case 1:
fatalerror("STRSUB: Invalid UTF-8 character\n"); fatalerror("STRSUB: Invalid UTF-8 character\n");
break; break;
@@ -113,7 +113,7 @@ static void strsubUTF8(char *dest, const char *src, uint32_t pos, uint32_t len)
/* Copy from source to destination. */ /* Copy from source to destination. */
while (src[srcIndex] && destIndex < MAXSTRLEN && curLen < len) { while (src[srcIndex] && destIndex < MAXSTRLEN && curLen < len) {
switch (decode(&state, &codep, (uint8_t)src[srcIndex])) { switch (decode(&state, &codep, src[srcIndex])) {
case 1: case 1:
fatalerror("STRSUB: Invalid UTF-8 character\n"); fatalerror("STRSUB: Invalid UTF-8 character\n");
break; break;

2
src/asm/util.c
View File

@@ -69,7 +69,7 @@ size_t readUTF8Char(uint8_t *dest, char const *src)
size_t i = 0; size_t i = 0;
for (;;) { for (;;) {
if (decode(&state, &codep, (uint8_t)src[i]) == 1) if (decode(&state, &codep, src[i]) == 1)
fatalerror("invalid UTF-8 character\n"); fatalerror("invalid UTF-8 character\n");
dest[i] = src[i]; dest[i] = src[i];

2
src/extern/utf8decoder.c vendored
View File

@@ -38,7 +38,7 @@ static const uint8_t utf8d[] = {
1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* s8 */ 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* s8 */
}; };
uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte) uint32_t decode(uint32_t *state, uint32_t *codep, uint8_t byte)
{ {
uint32_t type = utf8d[byte]; uint32_t type = utf8d[byte];

5
test/asm/invalid-utf-8.asm Normal file
View File

@@ -0,0 +1,5 @@
; This test tries to pass invalid UTF-8 through a macro argument
; to exercise the lexer's reportGarbageChar
m:MACRO \1
ENDM
m <EFBFBD><EFBFBD>

5
test/asm/invalid-utf-8.err Normal file
View File

@@ -0,0 +1,5 @@
ERROR: invalid-utf-8.asm(4) -> invalid-utf-8.asm::m(3):
Unknown character 0xCF
ERROR: invalid-utf-8.asm(4) -> invalid-utf-8.asm::m(3):
Unknown character 0xD3
error: Assembly aborted (2 errors)!

0
test/asm/invalid-utf-8.out Normal file
View File