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

Implement db, dw, dl, ds, and INCBIN with ld

Browse Source 
To do: let the `b` in `ld [b @]` be optional, and allow
`ld [b @:<len>] = "file.bin"[<ofs>:...]`
This commit is contained in:
Rangi
2021-03-30 10:47:05 -04:00
parent 8c4204c542
commit 9a930988c2
1 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/asm/parser.y
View File

@@ -819,6 +819,9 @@ directive : include
trailing_comma : %empty | T_COMMA trailing_comma : %empty | T_COMMA
; ;
optional_ellipsis : %empty | T_ELLIPSIS
;
equ : T_LABEL T_POP_EQU const { sym_AddEqu($1, $3); } equ : T_LABEL T_POP_EQU const { sym_AddEqu($1, $3); }
; ;
@@ -1627,6 +1630,7 @@ cpu_command : T_Z80_LD z80_ld_args
| T_Z80_LD T_MODE_DE T_COMMA z80_ld_de_comma_args | T_Z80_LD T_MODE_DE T_COMMA z80_ld_de_comma_args
| T_Z80_LD T_MODE_HL T_COMMA z80_ld_hl_comma_args | T_Z80_LD T_MODE_HL T_COMMA z80_ld_hl_comma_args
| T_Z80_LD T_MODE_SP T_COMMA z80_ld_sp_comma_args | T_Z80_LD T_MODE_SP T_COMMA z80_ld_sp_comma_args
| T_LBRACK T_TOKEN_B T_TOKEN_AT T_COLON optional_ellipsis T_RBRACK T_POP_EQUAL z80_ld_incbin_args
; ;
z80_ld_args : T_MODE_PC T_COMMA T_MODE_PC { out_AbsByte(0x00); } // $00: nop ==> ld pc, pc z80_ld_args : T_MODE_PC T_COMMA T_MODE_PC { out_AbsByte(0x00); } // $00: nop ==> ld pc, pc
@@ -1866,6 +1870,41 @@ z80_ld_args : T_MODE_PC T_COMMA T_MODE_PC { out_AbsByte(0x00); } // $00: nop ==>
out_AbsByte(0xCB); out_AbsByte(0xCB);
out_AbsByte(0x80 | ($5 << 6) | ($3 << 3) | $1); out_AbsByte(0x80 | ($5 << 6) | ($3 << 3) | $1);
} }
| T_LBRACK T_TOKEN_B T_TOKEN_AT T_RBRACK T_COMMA T_QUESTION {
// db ==> ld [b @], ?
out_Skip(1, false);
}
| T_LBRACK T_TOKEN_B T_TOKEN_AT T_RBRACK T_COMMA reloc_8bit_no_str {
// db <n> ==> ld [b @], <n>
out_RelByte(&$6, 0);
}
| T_LBRACK T_TOKEN_B T_TOKEN_AT T_COLON optional_ellipsis T_RBRACK T_COMMA constlist_8bit trailing_comma
// db <ns...> ==> ld [b @:...], <ns...>
| T_LBRACK T_TOKEN_W T_TOKEN_AT T_RBRACK T_COMMA T_QUESTION {
// dw ==> ld [w @], ?
out_Skip(2, false);
}
| T_LBRACK T_TOKEN_W T_TOKEN_AT T_RBRACK T_COMMA reloc_16bit_no_str {
// dw <n> ==> ld [w @], <n>
out_RelWord(&$6, 0);
}
| T_LBRACK T_TOKEN_W T_TOKEN_AT T_COLON optional_ellipsis T_RBRACK T_COMMA constlist_16bit trailing_comma
// dw <ns...> ==> ld [w @:...], <ns...>
| T_LBRACK T_TOKEN_L T_TOKEN_AT T_RBRACK T_COMMA T_QUESTION {
// dl ==> ld [l @], ?
out_Skip(4, false);
}
| T_LBRACK T_TOKEN_L T_TOKEN_AT T_RBRACK T_COMMA relocexpr_no_str {
// dl <n> ==> ld [l @], <n>
out_RelLong(&$6, 0);
}
| T_LBRACK T_TOKEN_L T_TOKEN_AT T_COLON optional_ellipsis T_RBRACK T_COMMA constlist_32bit trailing_comma
// dl <ns...> ==> ld [l @:...], <ns...>
| T_LBRACK T_TOKEN_B T_TOKEN_AT T_COLON uconst T_RBRACK T_COMMA ds_args trailing_comma {
// ds <len>, <ns...> ==> ld [b @:<len>], <ns...>
out_RelBytes($5, $8.args, $8.nbArgs);
freeDsArgList(&$8);
}
; ;
z80_ld_a_comma_args : reg_rr { // $0A,$1A,$2A,$3A: ld a, [<r16>] z80_ld_a_comma_args : reg_rr { // $0A,$1A,$2A,$3A: ld a, [<r16>]
@@ -2036,6 +2075,26 @@ z80_ld_sp_comma_args : reloc_16bit { // $31: ld sp, <imm16>
| T_MODE_HL { out_AbsByte(0xF9); } // $F9: ld sp, hl | T_MODE_HL { out_AbsByte(0xF9); } // $F9: ld sp, hl
; ;
z80_ld_incbin_args : string {
// INCBIN "file.bin" ==> ld [b @:...] = "file.bin"
out_BinaryFile($1, 0);
if (oFailedOnMissingInclude)
YYACCEPT;
}
| string T_LBRACK const T_COLON optional_ellipsis T_RBRACK {
// INCBIN "file.bin", <ofs> ==> ld [b @:...] = "file.bin"[<ofs>:...]
out_BinaryFile($1, $3);
if (oFailedOnMissingInclude)
YYACCEPT;
}
| string T_LBRACK const T_COLON const T_RBRACK {
// INCBIN "file.bin", <ofs>, <len> ==> ld [b @:...] = "file.bin"[<ofs>:<len>]
out_BinaryFileSlice($1, $3, $5);
if (oFailedOnMissingInclude)
YYACCEPT;
}
;
op_mem_ind : T_LBRACK reloc_16bit T_RBRACK { $$ = $2; } op_mem_ind : T_LBRACK reloc_16bit T_RBRACK { $$ = $2; }
; ;