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

Support ! operator for condition codes (#720)

Browse Source 
Fixes #719
This commit is contained in:
Rangi
2021-11-01 19:16:52 -04:00
committed by GitHub
parent b16d2d0695
commit 47442941b6
6 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/asm/parser.y
View File

@@ -653,6 +653,7 @@ enum {
%type <constValue> reg_ss %type <constValue> reg_ss
%type <constValue> reg_rr %type <constValue> reg_rr
%type <constValue> reg_tt %type <constValue> reg_tt
%type <constValue> ccode_expr
%type <constValue> ccode %type <constValue> ccode
%type <expr> op_a_n %type <expr> op_a_n
%type <constValue> op_a_r %type <constValue> op_a_r
@@ -1775,7 +1776,7 @@ z80_call : T_Z80_CALL reloc_16bit {
sect_AbsByte(0xCD); sect_AbsByte(0xCD);
sect_RelWord(&$2, 1); sect_RelWord(&$2, 1);
} }
| T_Z80_CALL ccode T_COMMA reloc_16bit { | T_Z80_CALL ccode_expr T_COMMA reloc_16bit {
sect_AbsByte(0xC4 | ($2 << 3)); sect_AbsByte(0xC4 | ($2 << 3));
sect_RelWord(&$4, 1); sect_RelWord(&$4, 1);
} }
@@ -1822,7 +1823,7 @@ z80_jp : T_Z80_JP reloc_16bit {
sect_AbsByte(0xC3); sect_AbsByte(0xC3);
sect_RelWord(&$2, 1); sect_RelWord(&$2, 1);
} }
| T_Z80_JP ccode T_COMMA reloc_16bit { | T_Z80_JP ccode_expr T_COMMA reloc_16bit {
sect_AbsByte(0xC2 | ($2 << 3)); sect_AbsByte(0xC2 | ($2 << 3));
sect_RelWord(&$4, 1); sect_RelWord(&$4, 1);
} }
@@ -1835,7 +1836,7 @@ z80_jr : T_Z80_JR reloc_16bit {
sect_AbsByte(0x18); sect_AbsByte(0x18);
sect_PCRelByte(&$2, 1); sect_PCRelByte(&$2, 1);
} }
| T_Z80_JR ccode T_COMMA reloc_16bit { | T_Z80_JR ccode_expr T_COMMA reloc_16bit {
sect_AbsByte(0x20 | ($2 << 3)); sect_AbsByte(0x20 | ($2 << 3));
sect_PCRelByte(&$4, 1); sect_PCRelByte(&$4, 1);
} }
@@ -2017,7 +2018,7 @@ z80_res : T_Z80_RES const_3bit T_COMMA reg_r {
; ;
z80_ret : T_Z80_RET { sect_AbsByte(0xC9); } z80_ret : T_Z80_RET { sect_AbsByte(0xC9); }
| T_Z80_RET ccode { sect_AbsByte(0xC0 | ($2 << 3)); } | T_Z80_RET ccode_expr { sect_AbsByte(0xC0 | ($2 << 3)); }
; ;
z80_reti : T_Z80_RETI { sect_AbsByte(0xD9); } z80_reti : T_Z80_RETI { sect_AbsByte(0xD9); }
@@ -2172,6 +2173,12 @@ T_MODE_L : T_TOKEN_L
| T_OP_LOW T_LPAREN T_MODE_HL T_RPAREN | T_OP_LOW T_LPAREN T_MODE_HL T_RPAREN
; ;
ccode_expr : ccode
| T_OP_LOGICNOT ccode_expr {
$$ = $2 ^ 1;
}
;
ccode : T_CC_NZ { $$ = CC_NZ; } ccode : T_CC_NZ { $$ = CC_NZ; }
| T_CC_Z { $$ = CC_Z; } | T_CC_Z { $$ = CC_Z; }
| T_CC_NC { $$ = CC_NC; } | T_CC_NC { $$ = CC_NC; }

2
src/gbz80.7
View File

@@ -62,6 +62,8 @@ Execute if Z is not set.
Execute if C is set. Execute if C is set.
.It Sy NC .It Sy NC
Execute if C is not set. Execute if C is not set.
.It Sy ! cc
Negates a condition code.
.El .El
.It Ar vec .It Ar vec
One of the One of the

21
test/asm/ccode.asm Normal file
View File

@@ -0,0 +1,21 @@
SECTION "ccode test", ROM0[0]
Label:
.local1
jp z, Label
jr nz, .local1
call c, Label
call nc, Label
.local2
jp !nz, Label
jr !z, .local2
call !nc, Label
call !c, Label
.local3
jp !!z, Label
jr !!nz, .local3
call !!c, Label
call !!nc, Label

0
test/asm/ccode.err Normal file
View File

0
test/asm/ccode.out Normal file
View File

BIN
test/asm/ccode.out.bin Normal file
View File

Binary file not shown.