qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 08:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Rearrange the branch instructions

Browse source 
Now they're in a much more consistent arrangement, in particular with
the comparison opcodes if the conditional branch instructions are
considered to be fast comparisons with zero (ifnot -> ifeq, if -> ifne,
etc). Unconditional jump and call fill in the gaps. The goal was to get
them all in an arrangement that would work as a small enum for qfcc: it
can use the enum directly for the ruamoko IS, and a small map array for
v6p (except for call).
This commit is contained in:
Bill Currie 2022-01-09 01:07:23 +09:00
parent 7d5c692313
commit 86e81ba250
1 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
libs/gamecode/opcodes.py
View file

@ -3,13 +3,12 @@ bitmap_txt = """
0 0001 mmss store 0 0001 mmss store
0 0010 mmss push 0 0010 mmss push
0 0011 mmss pop 0 0011 mmss pop
0 0100 ccmm branch 0 010c ccmm branch
0 0101 0nnn rcall 1-8 (0 0100 11mm with 0 params for [r]call0) 0 0110 0nnn rcall 1-8 (0 0100 11mm with 0 params for [r]call0)
0 0101 10ss return 0 0110 10ss return
0 0101 1100 returnv 0 0110 1100 returnv
0 0101 1101 with (reg encoded in st->c) 0 0110 1101 with (reg encoded in st->c)
0 0101 111t state 0 0110 111t state
0 0110 ccmm branch2
0 0111 tooo vecops 0 0111 tooo vecops
0 1ccc ttss compare 0 1ccc ttss compare
1 0ooo ttss mathops 1 0ooo ttss mathops
@ -107,41 +106,27 @@ boolops_formats = {
}, },
} }
branch_formats = { branch_formats = {
"opcode": "OP_{op_cond[cc].upper()}_{op_mode[mm]}", "opcode": "OP_{op_cond[ccc].upper()}_{op_mode[mm]}",
"mnemonic": "{op_cond[cc]}", "mnemonic": "{op_cond[ccc]}",
"opname": "{op_cond[cc]}", "opname": "{op_cond[ccc]}",
"format": "{cond_fmt[cc]}{branch_fmt[mm]}", "format": "{cond_fmt[ccc]}{branch_fmt[mm]}",
"widths": "{cond_widths[cc]}", "widths": "{cond_widths[ccc]}",
"types": "ev_void, ev_void, ev_integer", "types": "ev_void, ev_void, ev_integer",
"args": { "args": {
"op_mode": "ABCD", "op_mode": "ABCD",
"op_cond": ["ifnot", "if", "jump", "call"], "op_cond": ["ifnot", "ifb", "ifa", "jump",
"branch_fmt": branch_fmt, "if", "ifae", "ifbe", "call"],
"cond_fmt": ["%Gc ", "%Gc ", "", ""],
"cond_widths": [
"0, 0, 1",
"0, 0, 1",
"0, 0, 0",
"0, 0, 0",
],
},
}
branch2_formats = {
"opcode": "OP_{op_cond[cc].upper()}_{op_mode[mm]}",
"mnemonic": "{op_cond[cc]}",
"opname": "{op_cond[cc]}",
"format": "%Gc {branch_fmt[mm]}",
"widths": "{cond_widths[cc]}",
"types": "ev_void, ev_void, ev_integer",
"args": {
"op_mode": "ABCD",
"op_cond": ["ifa", "ifbe", "ifb", "ifae"],
"branch_fmt": branch_fmt, "branch_fmt": branch_fmt,
"cond_fmt": ["%Gc ", "%Gc ", "%Gc ", "", "%Gc ", "%Gc ", "%Gc ", ""],
"cond_widths": [ "cond_widths": [
"0, 0, 1", "0, 0, 1",
"0, 0, 1", "0, 0, 1",
"0, 0, 1", "0, 0, 1",
"0, 0, 0",
"0, 0, 1", "0, 0, 1",
"0, 0, 1",
"0, 0, 1",
"0, 0, 0",
], ],
}, },
} }
@ -512,7 +497,6 @@ group_map = {
"bitops": bitops_formats, "bitops": bitops_formats,
"boolops": boolops_formats, "boolops": boolops_formats,
"branch": branch_formats, "branch": branch_formats,
"branch2": branch2_formats,
"compare": compare_formats, "compare": compare_formats,
"compare2": compare2_formats, "compare2": compare2_formats,
"convert": convert_formats, "convert": convert_formats,