diff options
author | Eric Anholt <[email protected]> | 2020-05-01 14:37:27 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2020-05-04 11:14:46 -0700 |
commit | 97b21110b8b845bb02596036bdbf9e9562cfa7a5 (patch) | |
tree | 9d6b5610070b1e44aa382f7bdb1e20e2a6197a79 /src/freedreno/ir3/ir3_parser.y | |
parent | 1e5b0c92c549b392065f4856a2e5370b2157d961 (diff) |
freedreno/ir3: Sync some new changes from envytools.
With this I also brought in a few new control flow instruction disasm
tests that I'd made back when I wrote the disasm test, but which were too
far from correct to include until now.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4857>
Diffstat (limited to 'src/freedreno/ir3/ir3_parser.y')
-rw-r--r-- | src/freedreno/ir3/ir3_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index c9cede4b725..08779380b12 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -596,7 +596,7 @@ cat0_src: '!' T_P0 { instr->cat0.inv = true; instr->cat0.comp = cat0_immed: '#' integer { instr->cat0.immed = $2; } cat0_instr: T_OP_NOP { new_instr(OPC_NOP); } -| T_OP_BR { new_instr(OPC_BR); } cat0_src ',' cat0_immed +| T_OP_BR { new_instr(OPC_B); } cat0_src ',' cat0_immed | T_OP_JUMP { new_instr(OPC_JUMP); } cat0_immed | T_OP_CALL { new_instr(OPC_CALL); } cat0_immed | T_OP_RET { new_instr(OPC_RET); } |