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

Allow argument to rb, rw and rl to be optional

Browse Source 
Fixes #617
This commit is contained in:
ISSOtm
2020-12-09 09:30:15 +01:00
parent 4de6266442
commit eac365aef0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/asm/parser.y
View File

@@ -182,6 +182,7 @@ static inline void failAssertMsg(enum AssertionType type, char const *msg)
%type <sVal> relocexpr_no_str %type <sVal> relocexpr_no_str
%type <nConstValue> const %type <nConstValue> const
%type <nConstValue> uconst %type <nConstValue> uconst
%type <nConstValue> rs_uconst
%type <nConstValue> const_3bit %type <nConstValue> const_3bit
%type <sVal> reloc_8bit %type <sVal> reloc_8bit
%type <sVal> reloc_8bit_no_str %type <sVal> reloc_8bit_no_str
@@ -616,19 +617,27 @@ rsset : T_POP_RSSET uconst { sym_AddSet("_RS", $2); }
rsreset : T_POP_RSRESET { sym_AddSet("_RS", 0); } rsreset : T_POP_RSRESET { sym_AddSet("_RS", 0); }
; ;
rl : T_LABEL T_POP_RL uconst { rs_uconst : /* empty */ {
$$ = 1;
}
| uconst {
$$ = $1;
}
;
rl : T_LABEL T_POP_RL rs_uconst {
sym_AddEqu($1, sym_GetConstantValue("_RS")); sym_AddEqu($1, sym_GetConstantValue("_RS"));
sym_AddSet("_RS", sym_GetConstantValue("_RS") + 4 * $3); sym_AddSet("_RS", sym_GetConstantValue("_RS") + 4 * $3);
} }
; ;
rw : T_LABEL T_POP_RW uconst { rw : T_LABEL T_POP_RW rs_uconst {
sym_AddEqu($1, sym_GetConstantValue("_RS")); sym_AddEqu($1, sym_GetConstantValue("_RS"));
sym_AddSet("_RS", sym_GetConstantValue("_RS") + 2 * $3); sym_AddSet("_RS", sym_GetConstantValue("_RS") + 2 * $3);
} }
; ;
rb : T_LABEL T_POP_RB uconst { rb : T_LABEL T_POP_RB rs_uconst {
sym_AddEqu($1, sym_GetConstantValue("_RS")); sym_AddEqu($1, sym_GetConstantValue("_RS"));
sym_AddSet("_RS", sym_GetConstantValue("_RS") + $3); sym_AddSet("_RS", sym_GetConstantValue("_RS") + $3);
} }