Skip to content

Commit a201b86

Browse files
committed
Merge branch 'rc-1.1.3'
2 parents 07c7f0a + 240473f commit a201b86

File tree

5 files changed

+313
-331
lines changed

5 files changed

+313
-331
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: python
33
sudo: false
44

55
python:
6-
- 2.7
76
- 3.6
87

98
addons:

README.md

+24-27
Original file line numberDiff line numberDiff line change
@@ -59,46 +59,43 @@ Installation
5959
Requirements
6060
--------------------
6161

62-
- Python: 2.7, 3.4 or later
62+
- Python3: 3.6 or later
6363

64-
Python3 is recommended.
64+
- Icarus Verilog: 10.1 or later
6565

66-
- Icarus Verilog: 0.9.7 or later
67-
68-
Install on your platform. For exmple, on Ubuntu:
69-
70-
sudo apt-get install iverilog
71-
72-
- Jinja2: 2.8 or later
66+
```
67+
sudo apt install iverilog
68+
```
7369

74-
Install on your python environment by using pip.
70+
- Jinja2: 2.10 or later
71+
- pytest: 3.2 or later
72+
- pytest-pythonpath: 0.7 or later
7573

76-
pip install jinja2
74+
```
75+
pip3 install jinja2 pytest pytest-pythonpath
76+
```
7777

7878
Options
7979
--------------------
8080

81-
- pytest: 2.8.2 or later
82-
- pytest-pythonpath: 0.7 or later
83-
84-
These softwares are required for running the tests in tests and examples.
85-
86-
pip install pytest pytest-pythonpath
87-
8881
- Graphviz: 2.38.0 or later
8982
- Pygraphviz: 1.3.1 or later
9083

9184
These softwares are required for graph visualization by dataflow/graphgen.py and controlflow/controlflow_analyzer.py.
9285

93-
sudo apt-get install graphviz
94-
pip install pygraphviz
86+
```
87+
sudo apt install graphviz
88+
pip3 install pygraphviz
89+
```
9590

9691
Install
9792
--------------------
9893

99-
Install Pyverilog.
94+
Install Pyverilog:
10095

101-
python setup.py install
96+
```
97+
python3 setup.py install
98+
```
10299

103100

104101
Tools
@@ -154,7 +151,7 @@ Code parser
154151
Let's try syntax analysis. Please type the command as below.
155152

156153
```
157-
python pyverilog/examples/example_parser.py test.v
154+
python3 pyverilog/examples/example_parser.py test.v
158155
```
159156

160157
Then you got the result as below. The result of syntax analysis is displayed.
@@ -265,7 +262,7 @@ Dataflow analyzer
265262
Let's try dataflow analysis. Please type the command as below.
266263

267264
```
268-
python pyverilog/examples/example_dataflow_analyzer.py -t top test.v
265+
python3 pyverilog/examples/example_dataflow_analyzer.py -t top test.v
269266
```
270267

271268
Then you got the result as below. The result of each signal definition and each signal assignment are displayed.
@@ -291,7 +288,7 @@ Bind:
291288
Let's view the result of dataflow analysis as a picture file. Now we select 'led' as the target. Please type the command as below. In this example, Graphviz and Pygraphviz are installed.
292289

293290
```
294-
python pyverilog/examples/example_graphgen.py -t top -s top.led test.v
291+
python3 pyverilog/examples/example_graphgen.py -t top -s top.led test.v
295292
```
296293

297294
Then you got a png file (out.png). The picture shows that the definition of 'led' is a part-selection of 'count' from 23-bit to 16-bit.
@@ -304,7 +301,7 @@ Control-flow analyzer
304301
Let's try control-flow analysis. Please type the command as below. In this example, Graphviz and Pygraphviz are installed. If don't use Graphviz, please append "--nograph" option.
305302

306303
```
307-
python pyverilog/examples/example_controlflow_analyzer.py -t top test.v
304+
python3 pyverilog/examples/example_controlflow_analyzer.py -t top test.v
308305
```
309306

310307
Then you got the result as below. The result shows that the state machine structure and transition conditions to the next state in the state machine.
@@ -400,7 +397,7 @@ if __name__ == '__main__':
400397
Please type the command as below at the same directory with Pyverilog.
401398

402399
```
403-
python test.py
400+
python3 test.py
404401
```
405402

406403
Then Verilog HDL code generated from the AST instances is displayed.

0 commit comments

Comments
 (0)