Skip to content

Commit

Permalink
spec: scalar adoc work around wavedrom issue.
Browse files Browse the repository at this point in the history
- replace encoding fields with a '0' string since they were just showing
  up empty before. Need to investigate for next release

 On branch master
 Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	modified:   doc/scalar/insns/aes32dsi.adoc
	modified:   doc/scalar/insns/aes32dsmi.adoc
	modified:   doc/scalar/insns/aes32esi.adoc
	modified:   doc/scalar/insns/aes32esmi.adoc
	modified:   doc/scalar/insns/aes64ds.adoc
	modified:   doc/scalar/insns/aes64dsm.adoc
	modified:   doc/scalar/insns/aes64es.adoc
	modified:   doc/scalar/insns/aes64esm.adoc
	modified:   doc/scalar/insns/aes64im.adoc
	modified:   doc/scalar/insns/aes64ks1i.adoc
	modified:   doc/scalar/insns/aes64ks2.adoc
	modified:   doc/scalar/insns/sha256sig0.adoc
	modified:   doc/scalar/insns/sha256sig1.adoc
	modified:   doc/scalar/insns/sha256sum0.adoc
	modified:   doc/scalar/insns/sha256sum1.adoc
	modified:   doc/scalar/insns/sha512sig0.adoc
	modified:   doc/scalar/insns/sha512sig0h.adoc
	modified:   doc/scalar/insns/sha512sig0l.adoc
	modified:   doc/scalar/insns/sha512sig1.adoc
	modified:   doc/scalar/insns/sha512sig1h.adoc
	modified:   doc/scalar/insns/sha512sig1l.adoc
	modified:   doc/scalar/insns/sha512sum0.adoc
	modified:   doc/scalar/insns/sha512sum0r.adoc
	modified:   doc/scalar/insns/sha512sum1.adoc
	modified:   doc/scalar/insns/sha512sum1r.adoc
	modified:   doc/scalar/insns/sm3p0.adoc
	modified:   doc/scalar/insns/sm3p1.adoc
	modified:   doc/scalar/insns/sm4ed.adoc
	modified:   doc/scalar/insns/sm4ks.adoc

 Changes not staged for commit:
	modified:   extern/riscv-gnu-toolchain (modified content)
	modified:   extern/riscv-isa-sim (untracked content)
	modified:   extern/riscv-opcodes (modified content)
	modified:   extern/sail-riscv (untracked content)
  • Loading branch information
ben-marshall committed Jun 3, 2021
1 parent 5216ffa commit e203307
Show file tree
Hide file tree
Showing 29 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes32dsi.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1d},
Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes32dsmi.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1f},
Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes32esi.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1b},
Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes32esmi.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1b},
Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes64ds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1d},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes64dsm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1f},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes64es.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x19},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes64esm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1b},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/aes64im.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Encoding::
{bits: 5, name: 'rd'},
{bits: 3, name: 0x1},
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x0},
{bits: 5, name: '0'},
{bits: 5, name: 0x18},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/aes64ks1i.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Encoding::
{bits: 4, name: 'rcon'},
{bits: 1, name: 0x1},
{bits: 5, name: 0x18},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/aes64ks2.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1f},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha256sig0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x2},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha256sig1.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x3},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/sha256sum0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Encoding::
{bits: 5, name: 'rd'},
{bits: 3, name: 0x1},
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x0},
{bits: 5, name: '0'},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha256sum1.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x1},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x6},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig0h.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0xe},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig0l.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0xa},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig1.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x7},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig1h.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0xf},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sig1l.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0xb},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sum0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x4},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sum0r.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x8},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sum1.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x5},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sha512sum1r.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding::
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 'rd'},
{bits: 3, name: 0x0},
{bits: 3, name: '0'},
{bits: 5, name: 'rs1'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x9},
Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sm3p0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x8},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
2 changes: 1 addition & 1 deletion doc/scalar/insns/sm3p1.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Encoding::
{bits: 5, name: 'rs1'},
{bits: 5, name: 0x9},
{bits: 5, name: 0x8},
{bits: 2, name: 0x0},
{bits: 2, name: '0'},
]}
....

Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/sm4ed.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x18},
Expand Down
4 changes: 2 additions & 2 deletions doc/scalar/insns/sm4ks.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Encoding::
....
{reg:[
{bits: 7, name: 0x33},
{bits: 5, name: 0x0},
{bits: 3, name: 0x0},
{bits: 5, name: '0'},
{bits: 3, name: '0'},
{bits: 5, name: 'rt'},
{bits: 5, name: 'rs2'},
{bits: 5, name: 0x1a},
Expand Down

0 comments on commit e203307

Please sign in to comment.