gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-12-01 15:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up label generation

Browse Source 
Only check for localness when we already know we have a local
This commit is contained in:
ISSOtm
2020-10-03 21:33:30 +02:00
parent f53ad359a6
commit 2e3db9d56a
8 changed files with 161 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/asm/asmy.y
View File

@@ -562,8 +562,6 @@ static inline void failAssertMsg(enum AssertionType type, char const *msg)
%left NEG /* negation -- unary minus */
%token <tzSym> T_LABEL
%type <tzSym> scoped_label
%type <tzSym> scoped_label_bare
%token <tzSym> T_ID
%token <tzSym> T_LOCAL_ID
%type <tzSym> scoped_id
@@ -674,41 +672,28 @@ line : label
| pseudoop
;
scoped_label_bare : T_LABEL {
warning(WARNING_OBSOLETE, "Non-local labels without a colon are deprecated\n");
strcpy($$, $1);
}
| T_LOCAL_ID {
strcpy($$, $1);
}
;
scoped_label : T_LABEL ':' {
strcpy($$, $1);
}
| T_LOCAL_ID ':' {
strcpy($$, $1);
}
;
scoped_id : T_ID | T_LOCAL_ID ;
label : /* empty */
| scoped_label_bare {
if ($1[0] == '.')
sym_AddLocalReloc($1);
else
sym_AddReloc($1);
| T_LOCAL_ID {
sym_AddLocalLabel($1);
}
| scoped_label {
if ($1[0] == '.')
sym_AddLocalReloc($1);
else
sym_AddReloc($1);
| T_LABEL {
warning(WARNING_OBSOLETE, "Non-local labels without a colon are deprecated\n");
sym_AddLabel($1);
}
| scoped_label ':' {
if ($1[0] == '.')
sym_AddLocalReloc($1);
else
sym_AddReloc($1);
| T_LOCAL_ID ':' {
sym_AddLocalLabel($1);
}
| T_LABEL ':' {
sym_AddLabel($1);
}
| T_LOCAL_ID ':' ':' {
sym_AddLocalLabel($1);
sym_Export($1);
}
| T_LABEL ':' ':' {
sym_AddLabel($1);
sym_Export($1);
}
;