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

Remove warning on DB/DW/DL emtpy lists

Browse Source 
This warning was added in 781c90b940 as a
way of catching the following cases, which are most likely programmer
mistakes:

    DB 1,, 2
    DB 1, 2,

However, the warning was also triggered in the following case:

    DB

It can be used as a replacement of:

    DS 1

In this case, it shouldn't output a warning.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
This commit is contained in:
Antonio Niño Díaz
2017-12-29 12:05:57 +01:00
parent 781c90b940
commit fe6e5e445b
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/asm/asmy.y
View File

@@ -806,13 +806,16 @@ ds : T_POP_DS uconst
{ out_Skip( $2 ); }
;
db : T_POP_DB constlist_8bit
db : T_POP_DB constlist_8bit_entry ',' constlist_8bit
| T_POP_DB constlist_8bit_entry_single
;
dw : T_POP_DW constlist_16bit
dw : T_POP_DW constlist_16bit_entry ',' constlist_16bit
| T_POP_DW constlist_16bit_entry_single
;
dl : T_POP_DL constlist_32bit
dl : T_POP_DL constlist_32bit_entry ',' constlist_32bit
| T_POP_DL constlist_32bit_entry_single
;
purge : T_POP_PURGE
@@ -1000,6 +1003,18 @@ constlist_8bit_entry : /* empty */ {
}
;
constlist_8bit_entry_single : /* empty */ {
out_Skip( 1 );
} | const_8bit {
out_RelByte( &$1 );
} | string {
char *s = $1;
int length = charmap_Convert(&s);
out_AbsByteGroup(s, length);
free(s);
}
;
constlist_16bit : constlist_16bit_entry
| constlist_16bit_entry ',' constlist_16bit
;
@@ -1013,6 +1028,13 @@ constlist_16bit_entry : /* empty */ {
}
;
constlist_16bit_entry_single : /* empty */ {
out_Skip( 2 );
} | const_16bit {
out_RelWord( &$1 );
}
;
constlist_32bit : constlist_32bit_entry
| constlist_32bit_entry ',' constlist_32bit
;
@@ -1026,6 +1048,13 @@ constlist_32bit_entry : /* empty */ {
}
;
constlist_32bit_entry_single : /* empty */ {
out_Skip( 4 );
} | relocconst {
out_RelLong( &$1 );
}
;
const_PCrel : relocconst
{
$$ = $1;

2
src/asm/rgbasm.5
View File

@@ -598,7 +598,7 @@ allocates a number of bytes.
The content is undefined.
This is the preferred method of allocationg space in a RAM section.
You can, however, use
.Ic DB ,
.Ic DB ,
.Ic DW
and
.Ic DL