Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
Hdlmake
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
15
Issues
15
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Hdlmake
Commits
187e97e8
Commit
187e97e8
authored
Mar 27, 2015
by
Adrian Fiergolski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug 1073.
Deep modifications of the VHDL parser.
parent
66d11884
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
117 additions
and
170 deletions
+117
-170
vhdl_parser.py
hdlmake/vhdl_parser.py
+74
-131
Makefile
tests/questa_uvm_sv/sim/tests/Makefile
+43
-39
No files found.
hdlmake/vhdl_parser.py
View file @
187e97e8
This diff is collapsed.
Click to expand it.
tests/questa_uvm_sv/sim/tests/Makefile
View file @
187e97e8
...
@@ -6,65 +6,79 @@
...
@@ -6,65 +6,79 @@
## variables #############################
## variables #############################
PWD
:=
$(
shell
pwd
)
PWD
:=
$(
shell
pwd
)
MODELSIM_INI_PATH
:=
/opt/questa_sv_afv_10.
3c_1
/questasim//bin/..
MODELSIM_INI_PATH
:=
/opt/questa_sv_afv_10.
4
/questasim//bin/..
VCOM_FLAGS
:=
-quiet
-modelsimini
modelsim.ini
VCOM_FLAGS
:=
-quiet
-modelsimini
modelsim.ini
VSIM_FLAGS
:=
VSIM_FLAGS
:=
VLOG_FLAGS
:=
-quiet
-modelsimini
modelsim.ini
VLOG_FLAGS
:=
-quiet
-modelsimini
modelsim.ini
VERILOG_SRC
:=
src/genericTest.sv
\
VERILOG_SRC
:=
../../ipcores/ipcore/ipcore.sv
\
../../rtl/RTLTopModuleVerilogSimulationModel.vo
\
../../rtl/RTL_SVPackage.sv
\
../../rtl/RTL_SVPackage.sv
\
../../rtl/RTLTopModuleSV.sv
\
src/genericTest.sv
\
../../rtl/RTLTopModuleVerilogSimulationModel.vo
\
../../rtl/include/includeModuleSV.sv
\
../../rtl/include/includeModuleSV.sv
\
../../
ipcores/ipcore/ipcore
.sv
\
../../
rtl/RTLTopModuleSV
.sv
\
VERILOG_OBJ
:=
work/genericTest/.genericTest_sv
\
VERILOG_OBJ
:=
work/ipcore/.ipcore_sv
\
work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo
\
work/RTL_SVPackage/.RTL_SVPackage_sv
\
work/RTL_SVPackage/.RTL_SVPackage_sv
\
work/RTLTopModuleSV/.RTLTopModuleSV_sv
\
work/genericTest/.genericTest_sv
\
work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo
\
work/includeModuleSV/.includeModuleSV_sv
\
work/includeModuleSV/.includeModuleSV_sv
\
work/
ipcore/.ipcore
_sv
\
work/
RTLTopModuleSV/.RTLTopModuleSV
_sv
\
VHDL_SRC
:=
../../rtl/include/includeModuleVHDL.vhdl
\
VHDL_SRC
:=
../../rtl/include/includeModuleBVHDL.vhdl
\
../../rtl/include/includeModuleVHDL.vhdl
\
../../rtl/include/includeModuleAVHDL.vhdl
\
../../rtl/include/includeModuleAVHDL.vhdl
\
../../rtl/include/includeModuleBVHDL.vhdl
\
../../rtl/RTLTopModuleVHDL.vhdl
\
../../rtl/RTLTopModuleVHDL.vhdl
\
VHDL_OBJ
:=
work/includeModuleVHDL/.includeModuleVHDL_vhdl
\
VHDL_OBJ
:=
work/includeModuleBVHDL/.includeModuleBVHDL_vhdl
\
work/includeModuleVHDL/.includeModuleVHDL_vhdl
\
work/includeModuleAVHDL/.includeModuleAVHDL_vhdl
\
work/includeModuleAVHDL/.includeModuleAVHDL_vhdl
\
work/includeModuleBVHDL/.includeModuleBVHDL_vhdl
\
work/RTLTopModuleVHDL/.RTLTopModuleVHDL_vhdl
\
work/RTLTopModuleVHDL/.RTLTopModuleVHDL_vhdl
\
LIBS
:=
work
LIBS
:=
work
LIB_IND
:=
work/.work
LIB_IND
:=
work/.work
## rules #################################
## rules #################################
sim
:
sim_pre_cmd modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
local
:
sim_pre_cmd simulation sim_post_cmd
simulation
:
modelsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ)
:
modelsim.ini
$(VERILOG_OBJ)
:
modelsim.ini
$(VHDL_OBJ)
:
$(LIB_IND) modelsim.ini
$(VHDL_OBJ)
:
$(LIB_IND) modelsim.ini
sim_pre_cmd
:
sim_pre_cmd
:
sim_post_cmd
:
sim
sim_post_cmd
:
modelsim.ini
:
$(MODELSIM_INI_PATH)/modelsim.ini
modelsim.ini
:
$(MODELSIM_INI_PATH)/modelsim.ini
cp
$<
.
2>&1
cp
$<
.
2>&1
clean
:
clean
:
rm
-rf
./modelsim.ini
$(LIBS)
transcript
*
.vcd
*
.wlf
rm
-rf
./modelsim.ini
$(LIBS)
transcript
*
.vcd
*
.wlf
.PHONY
:
clean sim_pre_cmd sim_post_cmd
.PHONY
:
clean sim_pre_cmd sim_post_cmd
simulation
work/.work
:
work/.work
:
(
vlib work
&&
vmap
-modelsimini
modelsim.ini work
&&
touch
work/.work
)||
rm
-rf
work
(
vlib work
&&
vmap
-modelsimini
modelsim.ini work
&&
touch
work/.work
)||
rm
-rf
work
work/ipcore/.ipcore_sv
:
../../ipcores/ipcore/ipcore.sv
\
../../ipcores/ipcore/include/ipcoreInclude.sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../ipcores/ipcore/include+../../ipcores/ipcore
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/RTL_SVPackage/.RTL_SVPackage_sv
:
../../rtl/RTL_SVPackage.sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/genericTest/.genericTest_sv
:
src/genericTest.sv
\
work/genericTest/.genericTest_sv
:
src/genericTest.sv
\
../environment/env.sv
\
../environment/env.sv
\
../sequences/sequence.sv
\
work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo
\
work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo
\
../environment/Env_pkg.sv
\
src/FullTest_pkg.sv
\
src/FullTest_pkg.sv
\
../environment/top.sv
\
work/RTLTopModuleSV/.RTLTopModuleSV_sv
\
work/RTLTopModuleSV/.RTLTopModuleSV_sv
\
../sequences/sequence.sv
../environment/top.sv
\
../environment/Env_pkg.sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../environment+../sequences+src +incdir+../../mvc//questa_mvc_src/sv+../../mvc/questa_mvc_src/sv/mvc_base+../../mvc/include+../../uvm-1.1d/src
$<
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../environment+../sequences+src +incdir+../../mvc//questa_mvc_src/sv+../../mvc/questa_mvc_src/sv/mvc_base+../../mvc/include+../../uvm-1.1d/src
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
...
@@ -74,49 +88,39 @@ work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo:
...
@@ -74,49 +88,39 @@ work/RTLTopModuleVerilogSimulationModel/.RTLTopModuleVerilogSimulationModel_vo:
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/RTL_SVPackage/.RTL_SVPackage_sv
:
../../rtl/RTL_SVPackage.sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/RTLTopModuleSV/.RTLTopModuleSV_sv
:
../../rtl/RTLTopModuleSV.sv
\
work/RTL_SVPackage/.RTL_SVPackage_sv
\
work/ipcore/.ipcore_sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/includeModuleSV/.includeModuleSV_sv
:
../../rtl/include/includeModuleSV.sv
work/includeModuleSV/.includeModuleSV_sv
:
../../rtl/include/includeModuleSV.sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl/include
$<
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl/include
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/ipcore/.ipcore_sv
:
../../ipcores/ipcore/ipcore.sv
\
work/RTLTopModuleSV/.RTLTopModuleSV_sv
:
../../rtl/RTLTopModuleSV.sv
\
../../ipcores/ipcore/include/ipcoreInclude.sv
work/ipcore/.ipcore_sv
\
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../ipcores/ipcore/include+../../ipcores/ipcore
$<
work/includeModuleSV/.includeModuleSV_sv
\
work/RTL_SVPackage/.RTL_SVPackage_sv
vlog
-work
work
$(VLOG_FLAGS)
-sv
+incdir+../../rtl/include+../../rtl
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/includeModule
VHDL/.includeModuleVHDL_vhdl
:
../../rtl/include/includeModule
VHDL.vhdl
work/includeModule
BVHDL/.includeModuleBVHDL_vhdl
:
../../rtl/include/includeModuleB
VHDL.vhdl
vcom
$(VCOM_FLAGS)
-work
work
$<
vcom
$(VCOM_FLAGS)
-work
work
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/includeModule
AVHDL/.includeModuleAVHDL_vhdl
:
../../rtl/include/includeModuleA
VHDL.vhdl
work/includeModule
VHDL/.includeModuleVHDL_vhdl
:
../../rtl/include/includeModule
VHDL.vhdl
vcom
$(VCOM_FLAGS)
-work
work
$<
vcom
$(VCOM_FLAGS)
-work
work
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/includeModule
BVHDL/.includeModuleBVHDL_vhdl
:
../../rtl/include/includeModuleB
VHDL.vhdl
work/includeModule
AVHDL/.includeModuleAVHDL_vhdl
:
../../rtl/include/includeModuleA
VHDL.vhdl
vcom
$(VCOM_FLAGS)
-work
work
$<
vcom
$(VCOM_FLAGS)
-work
work
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
work/RTLTopModuleVHDL/.RTLTopModuleVHDL_vhdl
:
../../rtl/RTLTopModuleVHDL.vhdl
\
work/RTLTopModuleVHDL/.RTLTopModuleVHDL_vhdl
:
../../rtl/RTLTopModuleVHDL.vhdl
\
work/includeModuleBVHDL/.includeModuleBVHDL_vhdl
\
work/includeModuleVHDL/.includeModuleVHDL_vhdl
\
work/includeModuleVHDL/.includeModuleVHDL_vhdl
\
work/includeModuleAVHDL/.includeModuleAVHDL_vhdl
\
work/includeModuleAVHDL/.includeModuleAVHDL_vhdl
work/includeModuleBVHDL/.includeModuleBVHDL_vhdl
vcom
$(VCOM_FLAGS)
-work
work
$<
vcom
$(VCOM_FLAGS)
-work
work
$<
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
@
mkdir
-p
$
(
dir
$@
)
&&
touch
$@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment