-
Notifications
You must be signed in to change notification settings - Fork 630
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate immediates into separate wavedrom files. (#1631)
* Separate immediates into separate wavedrom files. This separates the immediates into separate wavedrom files which allows us to add the caption to the last immediate on the page (j-immediate) which puts it after the grouping of wavedroms correctly. * Remove page break --------- Co-authored-by: Andrew Waterman <andrew@sifive.com>
- Loading branch information
1 parent
39e1fcc
commit 4a4efdc
Showing
7 changed files
with
73 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
//#### B-immediate | ||
|
||
[wavedrom, ,svg] | ||
.... | ||
{reg: [ | ||
{bits: 1, name: '0'}, | ||
{bits: 4, name: 'inst[11:8]'}, | ||
{bits: 6, name: 'inst[30:25]'}, | ||
{bits: 1, name: '[7]'}, | ||
{bits: 20, name: '— inst[31] —'}, | ||
], config:{fontsize: 12, label:{right: 'B-immediate'}}} | ||
.... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
//### Figure 2.4 | ||
//Types of immediate produced by RISC-V instructions. The fields are labeled with the instruction bits used to construct their value. Sign extension always uses inst[31]. | ||
//#### I-immediate | ||
|
||
[wavedrom, ,svg] | ||
.... | ||
{reg: [ | ||
{bits: 1, name: '[20]'}, | ||
{bits: 4, name: 'inst[24:21]'}, | ||
{bits: 6, name: 'inst[30:25]'}, | ||
{bits: 21, name: '— inst[31] —'}, | ||
], config:{fontsize: 12, label:{right: 'I-immediate'}}} | ||
.... | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
//#### J-immediate | ||
|
||
[wavedrom, ,svg] | ||
.... | ||
{reg: [ | ||
{bits: 1, name: '0'}, | ||
{bits: 4, name: 'inst[24:21]'}, | ||
{bits: 6, name: 'inst[30:25]'}, | ||
{bits: 1, name: '[20]'}, | ||
{bits: 8, name: 'inst[19:12]'}, | ||
{bits: 12, name: '— inst[31] —'}, | ||
], config:{fontsize: 12, label:{right: 'J-immediate'}}} | ||
.... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
//#### S-immediate | ||
|
||
[wavedrom, ,svg] | ||
.... | ||
{reg: [ | ||
{bits: 1, name: '[7]'}, | ||
{bits: 4, name: 'inst[11:8]'}, | ||
{bits: 6, name: 'inst[30:25]'}, | ||
{bits: 21, name: '— inst[31] —'}, | ||
], config:{fontsize: 12, label:{right: 'S-immediate'}}} | ||
.... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
//#### U-immediate | ||
|
||
[wavedrom, ,svg] | ||
.... | ||
{reg: [ | ||
{bits: 12, name: '0'}, | ||
{bits: 8, name: 'inst[19:12]'}, | ||
{bits: 11, name: 'inst[30:20]'}, | ||
{bits: 1, name: '[31]'}, | ||
], config:{fontsize: 12, label:{right: 'U-immediate'}}} | ||
.... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters