aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Izraelevitz2016-07-27 14:10:27 -0700
committerGitHub2016-07-27 14:10:27 -0700
commit07149ac70cd4e3b5d5cc33a19736d34fcb3e6478 (patch)
tree59f013f53dcc6d2fd3d95b15a9e60bdf0fc5cf43
parent486cdb5ea4a3450c81231f09488b5b166c363133 (diff)
parent41a5d441079d518e91d7c9d80b3504c0560deb0a (diff)
Merge pull request #204 from ucb-bar/fix-spec
Fixed reg concrete syntax. #197.
-rw-r--r--spec/spec.pdfbin244552 -> 244959 bytes
-rw-r--r--spec/spec.tex2
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec.pdf b/spec/spec.pdf
index 2657bd51..bf5e4d23 100644
--- a/spec/spec.pdf
+++ b/spec/spec.pdf
Binary files differ
diff --git a/spec/spec.tex b/spec/spec.tex
index 72caadd0..406f8c5e 100644
--- a/spec/spec.tex
+++ b/spec/spec.tex
@@ -1754,7 +1754,7 @@ The concrete syntax of FIRRTL is defined in section \ref{syntax_tree}. Productio
&\pipe &\pd{type}\vv{[}\pd{int}\vv{]} &\text{Vector}\\
\pd{field} &= &\opt{\vv{flip}} \pd{id} \vv{:} \pd{type} &\text{Bundle Field}\\
\pd{stmt} &= &\opt{\pd{info}} \vv{wire} \pd{id} \vv{:} \pd{type} &\text{Wire}\\
- &\pipe &\opt{\pd{info}} \vv{reg} \pd{id} \vv{:} \pd{type}, \pd{exp} \opt{\pd{exp}, \pd{exp}} &\text{Register}\\
+ &\pipe &\opt{\pd{info}} \vv{reg} \pd{id} \vv{:} \pd{type} \opt{\vv{(with:} \vv{\{reset => (}\pd{exp}, \pd{exp}\vv{)\})}} &\text{Register}\\
&\pipe &\opt{\pd{info}} \vv{mem} \pd{id} \vv{:} \vv{(} &\text{Memory}\\
&& \verb| |\vv{data-type =>} \pd{type}\\
&& \verb| |\vv{depth =>} \pd{int}\\