Skip to content

Commit 0923707

Browse files
authored
fix: address missing assembly section for instructions with no operands (#1237)
Remove conditional check that hides Assembly section when assembly field is empty. Now instructions like `fence.i` will properly show "Assembly:: fence.i" in the instruction appendix instead of omitting the section entirely. Signed-off-by: Paul A. Clarke <[email protected]>
1 parent 9b8701a commit 0923707

File tree

2 files changed

+76
-3
lines changed

2 files changed

+76
-3
lines changed

backends/instructions_appendix/all_instructions.golden.adoc

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3744,6 +3744,9 @@ Included in::
37443744
Synopsis::
37453745
Breakpoint exception
37463746

3747+
Assembly::
3748+
c.ebreak
3749+
37473750
Encoding::
37483751
[wavedrom, ,svg,subs='attributes',width="100%"]
37493752
....
@@ -4678,6 +4681,9 @@ Included in::
46784681
Synopsis::
46794682
Compressed May-Be-Operation
46804683

4684+
Assembly::
4685+
c.mop.n
4686+
46814687
Encoding::
46824688
[wavedrom, ,svg,subs='attributes',width="100%"]
46834689
....
@@ -4789,6 +4795,9 @@ Included in::
47894795
Synopsis::
47904796
Non-operation
47914797

4798+
Assembly::
4799+
c.nop
4800+
47924801
Encoding::
47934802
[wavedrom, ,svg,subs='attributes',width="100%"]
47944803
....
@@ -4859,6 +4868,9 @@ Included in::
48594868
Synopsis::
48604869
Compressed non-temporal locality hint, all
48614870

4871+
Assembly::
4872+
c.ntl.all
4873+
48624874
Encoding::
48634875
[wavedrom, ,svg,subs='attributes',width="100%"]
48644876
....
@@ -4892,6 +4904,9 @@ Included in::
48924904
Synopsis::
48934905
Compressed non-temporal locality hint, innermost private
48944906

4907+
Assembly::
4908+
c.ntl.p1
4909+
48954910
Encoding::
48964911
[wavedrom, ,svg,subs='attributes',width="100%"]
48974912
....
@@ -4925,6 +4940,9 @@ Included in::
49254940
Synopsis::
49264941
Compressed non-temporal locality hint, all private
49274942

4943+
Assembly::
4944+
c.ntl.pall
4945+
49284946
Encoding::
49294947
[wavedrom, ,svg,subs='attributes',width="100%"]
49304948
....
@@ -4958,6 +4976,9 @@ Included in::
49584976
Synopsis::
49594977
Compressed non-temporal locality hint, innermost shared
49604978

4979+
Assembly::
4980+
c.ntl.s1
4981+
49614982
Encoding::
49624983
[wavedrom, ,svg,subs='attributes',width="100%"]
49634984
....
@@ -7278,6 +7299,9 @@ Included in::
72787299
Synopsis::
72797300
No synopsis available
72807301

7302+
Assembly::
7303+
dret
7304+
72817305
Encoding::
72827306
[wavedrom, ,svg,subs='attributes',width="100%"]
72837307
....
@@ -7307,6 +7331,9 @@ Included in::
73077331
Synopsis::
73087332
Breakpoint exception
73097333

7334+
Assembly::
7335+
ebreak
7336+
73107337
Encoding::
73117338
[wavedrom, ,svg,subs='attributes',width="100%"]
73127339
....
@@ -7347,6 +7374,9 @@ Included in::
73477374
Synopsis::
73487375
Environment call
73497376

7377+
Assembly::
7378+
ecall
7379+
73507380
Encoding::
73517381
[wavedrom, ,svg,subs='attributes',width="100%"]
73527382
....
@@ -9992,6 +10022,9 @@ Included in::
999210022
Synopsis::
999310023
Instruction fence
999410024

10025+
Assembly::
10026+
fence.i
10027+
999510028
Encoding::
999610029
[wavedrom, ,svg,subs='attributes',width="100%"]
999710030
....
@@ -10053,6 +10086,9 @@ Included in::
1005310086
Synopsis::
1005410087
Memory ordering fence, total store ordering
1005510088

10089+
Assembly::
10090+
fence.tso
10091+
1005610092
Encoding::
1005710093
[wavedrom, ,svg,subs='attributes',width="100%"]
1005810094
....
@@ -15977,6 +16013,9 @@ Included in::
1597716013
Synopsis::
1597816014
Machine mode resume from the RNMI or Double Trap handler
1597916015

16016+
Assembly::
16017+
mnret
16018+
1598016019
Encoding::
1598116020
[wavedrom, ,svg,subs='attributes',width="100%"]
1598216021
....
@@ -16132,6 +16171,9 @@ Included in::
1613216171
Synopsis::
1613316172
Machine-mode Return from Trap
1613416173

16174+
Assembly::
16175+
mret
16176+
1613516177
Encoding::
1613616178
[wavedrom, ,svg,subs='attributes',width="100%"]
1613716179
....
@@ -16410,6 +16452,9 @@ Included in::
1641016452
Synopsis::
1641116453
Non-temporal locality hint, all
1641216454

16455+
Assembly::
16456+
ntl.all
16457+
1641316458
Encoding::
1641416459
[wavedrom, ,svg,subs='attributes',width="100%"]
1641516460
....
@@ -16441,6 +16486,9 @@ Included in::
1644116486
Synopsis::
1644216487
Non-temporal locality hint, innermost private
1644316488

16489+
Assembly::
16490+
ntl.p1
16491+
1644416492
Encoding::
1644516493
[wavedrom, ,svg,subs='attributes',width="100%"]
1644616494
....
@@ -16472,6 +16520,9 @@ Included in::
1647216520
Synopsis::
1647316521
Non-temporal locality hint, all private
1647416522

16523+
Assembly::
16524+
ntl.pall
16525+
1647516526
Encoding::
1647616527
[wavedrom, ,svg,subs='attributes',width="100%"]
1647716528
....
@@ -16503,6 +16554,9 @@ Included in::
1650316554
Synopsis::
1650416555
Non-temporal locality hint, innermost shared
1650516556

16557+
Assembly::
16558+
ntl.s1
16559+
1650616560
Encoding::
1650716561
[wavedrom, ,svg,subs='attributes',width="100%"]
1650816562
....
@@ -17767,6 +17821,9 @@ Included in::
1776717821
Synopsis::
1776817822
No synopsis available
1776917823

17824+
Assembly::
17825+
sctrclr
17826+
1777017827
Encoding::
1777117828
[wavedrom, ,svg,subs='attributes',width="100%"]
1777217829
....
@@ -17975,6 +18032,9 @@ Included in::
1797518032
Synopsis::
1797618033
Order implicit page table reads after invalidation
1797718034

18035+
Assembly::
18036+
sfence.inval.ir
18037+
1797818038
Encoding::
1797918039
[wavedrom, ,svg,subs='attributes',width="100%"]
1798018040
....
@@ -18243,6 +18303,9 @@ Included in::
1824318303
Synopsis::
1824418304
Order writes before sfence
1824518305

18306+
Assembly::
18307+
sfence.w.inval
18308+
1824618309
Encoding::
1824718310
[wavedrom, ,svg,subs='attributes',width="100%"]
1824818311
....
@@ -19854,6 +19917,9 @@ Included in::
1985419917
Synopsis::
1985519918
Supervisor Mode Return from Trap
1985619919

19920+
Assembly::
19921+
sret
19922+
1985719923
Encoding::
1985819924
[wavedrom, ,svg,subs='attributes',width="100%"]
1985919925
....
@@ -46468,6 +46534,9 @@ Included in::
4646846534
Synopsis::
4646946535
Wait for interrupt
4647046536

46537+
Assembly::
46538+
wfi
46539+
4647146540
Encoding::
4647246541
[wavedrom, ,svg,subs='attributes',width="100%"]
4647346542
....
@@ -46535,6 +46604,9 @@ Included in::
4653546604
Synopsis::
4653646605
Wait-on-Reservation-Set-with-No-Timeout
4653746606

46607+
Assembly::
46608+
wrs.nto
46609+
4653846610
Encoding::
4653946611
[wavedrom, ,svg,subs='attributes',width="100%"]
4654046612
....
@@ -46594,6 +46666,9 @@ Included in::
4659446666
Synopsis::
4659546667
Wait-on-Reservation-Set-with-Short-Timeout
4659646668

46669+
Assembly::
46670+
wrs.sto
46671+
4659746672
Encoding::
4659846673
[wavedrom, ,svg,subs='attributes',width="100%"]
4659946674
....

backends/instructions_appendix/templates/instructions.adoc.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
Synopsis::
1111
<%= inst.long_name %>
1212

13-
<%- if inst.assembly.to_s.strip != "" -%>
1413
Assembly::
15-
<%= inst.fix_entities("#{inst.name.downcase} #{inst.assembly}") %>
14+
<%= inst.fix_entities("#{inst.name.downcase}#{inst.assembly.to_s.strip == '' ? '' : ' ' + inst.assembly}") %>
1615

17-
<%- end -%>
1816
Encoding::
1917
<%- if inst.multi_encoding? -%>
2018
[NOTE]

0 commit comments

Comments
 (0)