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

Allow 'dw' and 'dl' to apply to characters of strings

Browse Source 
Fixes #568

The old behavior of `dw "string"` can be replicated with `dw ("string")`; likewise for dl
This commit is contained in:
Rangi
2020-12-09 15:04:54 -05:00
committed by Eldred Habert
parent e54e02dc77
commit 165bd8cb71
7 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/asm/parser.y
View File

@@ -202,6 +202,7 @@ static inline void failAssertMsg(enum AssertionType type, char const *msg)
%type <sVal> reloc_8bit
%type <sVal> reloc_8bit_no_str
%type <sVal> reloc_16bit
%type <sVal> reloc_16bit_no_str
%type <nConstValue> sectiontype
%type <tzString> string
@@ -842,7 +843,14 @@ constlist_16bit_entry : /* empty */ {
out_Skip(2, false);
nListCountEmpty++;
}
| reloc_16bit { out_RelWord(&$1); }
| reloc_16bit_no_str { out_RelWord(&$1); }
| string {
uint8_t *output = malloc(strlen($1)); /* Cannot be larger than that */
int32_t length = charmap_Convert($1, output);
out_AbsWordGroup(output, length);
free(output);
}
;
constlist_32bit : constlist_32bit_entry
@@ -853,7 +861,14 @@ constlist_32bit_entry : /* empty */ {
out_Skip(4, false);
nListCountEmpty++;
}
| relocexpr { out_RelLong(&$1); }
| relocexpr_no_str { out_RelLong(&$1); }
| string {
uint8_t *output = malloc(strlen($1)); /* Cannot be larger than that */
int32_t length = charmap_Convert($1, output);
out_AbsLongGroup(output, length);
free(output);
}
;
reloc_8bit : relocexpr {
@@ -880,6 +895,14 @@ reloc_16bit : relocexpr {
}
;
reloc_16bit_no_str : relocexpr_no_str {
if (rpn_isKnown(&$1)
&& ($1.nVal < -32768 || $1.nVal > 65535))
warning(WARNING_TRUNCATION, "Expression must be 16-bit\n");
$$ = $1;
}
;
relocexpr : relocexpr_no_str
| string {

18
src/asm/section.c
View File

@@ -506,6 +506,24 @@ void out_AbsByteGroup(uint8_t const *s, int32_t length)
writebyte(*s++);
}
void out_AbsWordGroup(uint8_t const *s, int32_t length)
{
checkcodesection();
reserveSpace(length * 2);
while (length--)
writeword(*s++);
}
void out_AbsLongGroup(uint8_t const *s, int32_t length)
{
checkcodesection();
reserveSpace(length * 4);
while (length--)
writelong(*s++);
}
/*
* Skip this many bytes
*/