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

Support missing register tokens

Browse Source 
Made possible by #491
This commit is contained in:
ISSOtm
2020-08-16 23:11:12 +02:00
parent ae77893021
commit 8d18b39eee
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/asm/lexer.c
View File

@@ -115,6 +115,8 @@ static struct KeywordMapping {
{"DE", T_MODE_DE}, {"DE", T_MODE_DE},
{"HL", T_MODE_HL}, {"HL", T_MODE_HL},
{"SP", T_MODE_SP}, {"SP", T_MODE_SP},
{"HLD", T_MODE_HL_DEC},
{"HLI", T_MODE_HL_INC},
{"A", T_TOKEN_A}, {"A", T_TOKEN_A},
{"B", T_TOKEN_B}, {"B", T_TOKEN_B},
@@ -429,7 +431,7 @@ struct KeywordDictNode {
uint16_t children[0x60 - ' ']; uint16_t children[0x60 - ' '];
struct KeywordMapping const *keyword; struct KeywordMapping const *keyword;
/* Since the keyword structure is invariant, the min number of nodes is known at compile time */ /* Since the keyword structure is invariant, the min number of nodes is known at compile time */
} keywordDict[336] = {0}; /* Make sure to keep this correct when adding keywords! */ } keywordDict[338] = {0}; /* Make sure to keep this correct when adding keywords! */
/* Convert a char into its index into the dict */ /* Convert a char into its index into the dict */
static inline uint8_t dictIndex(char c) static inline uint8_t dictIndex(char c)
@@ -1476,6 +1478,25 @@ static int yylex_NORMAL(void)
case '$': case '$':
yylval.nConstValue = 0; yylval.nConstValue = 0;
readHexNumber(); readHexNumber();
/* Attempt to match `$ff00+c` */
if (yylval.nConstValue == 0xff00) {
/* Whitespace is ignored anyways */
while (isWhitespace(c = peek(0)))
shiftChars(1);
if (c == '+') {
/* FIXME: not great due to large lookahead */
uint8_t distance = 1;
do {
c = peek(distance++);
} while (isWhitespace(c));
if (c == 'c' || c == 'C') {
shiftChars(distance);
return T_MODE_HW_C;
}
}
}
return T_NUMBER; return T_NUMBER;
case '0': /* Decimal number */ case '0': /* Decimal number */