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
47b3bddc
Commit
47b3bddc
authored
Aug 02, 2016
by
Javier D. Garcia-Lasheras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor how the tool_info is stored in their Classes
parent
ef068159
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
187 additions
and
207 deletions
+187
-207
simulation.py
hdlmake/action/simulation.py
+1
-1
synthesis.py
hdlmake/action/synthesis.py
+2
-2
env.py
hdlmake/env.py
+1
-1
active_hdl.py
hdlmake/tools/active_hdl.py
+7
-9
diamond.py
hdlmake/tools/diamond.py
+7
-10
ghdl.py
hdlmake/tools/ghdl.py
+8
-10
ise.py
hdlmake/tools/ise.py
+107
-92
isim.py
hdlmake/tools/isim.py
+6
-9
iverilog.py
hdlmake/tools/iverilog.py
+6
-9
libero.py
hdlmake/tools/libero.py
+7
-10
modelsim.py
hdlmake/tools/modelsim.py
+7
-8
planahead.py
hdlmake/tools/planahead.py
+7
-10
quartus.py
hdlmake/tools/quartus.py
+7
-10
riviera.py
hdlmake/tools/riviera.py
+6
-8
sim_makefile_support.py
hdlmake/tools/sim_makefile_support.py
+0
-8
vivado.py
hdlmake/tools/vivado.py
+8
-10
No files found.
hdlmake/action/simulation.py
View file @
47b3bddc
...
...
@@ -71,7 +71,7 @@ class ActionSimulation(
elif
tool_name
is
"ghdl"
:
tool_object
=
ToolGHDL
()
tool_info
=
tool_object
.
get_keys
()
tool_info
=
tool_object
.
TOOL_INFO
if
sys
.
platform
==
'cygwin'
:
bin_name
=
tool_info
[
'windows_bin'
]
else
:
...
...
hdlmake/action/synthesis.py
View file @
47b3bddc
...
...
@@ -79,7 +79,7 @@ class ActionSynthesis(
self
.
_check_synthesis_makefile
()
tool_object
=
self
.
_load_synthesis_tool
()
tool_info
=
tool_object
.
get_keys
()
tool_info
=
tool_object
.
TOOL_INFO
path_key
=
tool_info
[
'id'
]
+
'_path'
name
=
tool_info
[
'name'
]
...
...
@@ -202,7 +202,7 @@ end sdb_meta_pkg;""")
self
.
_check_synthesis_project
()
tool_object
=
self
.
_load_synthesis_tool
()
tool_info
=
tool_object
.
get_keys
()
tool_info
=
tool_object
.
TOOL_INFO
path_key
=
tool_info
[
'id'
]
+
'_path'
version_key
=
tool_info
[
'id'
]
+
'_version'
name
=
tool_info
[
'name'
]
...
...
hdlmake/env.py
View file @
47b3bddc
...
...
@@ -123,7 +123,7 @@ class Env(dict):
def
check_tool
(
self
,
info_class
):
tool_info
=
info_class
.
get_keys
()
tool_info
=
info_class
.
TOOL_INFO
if
sys
.
platform
==
'cygwin'
:
bin_name
=
tool_info
[
'windows_bin'
]
else
:
...
...
hdlmake/tools/active_hdl.py
View file @
47b3bddc
...
...
@@ -28,21 +28,19 @@ from hdlmake.action import ActionMakefile
class
ToolActiveHDL
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'Aldec Active-HDL'
,
'id'
:
'aldec'
,
'windows_bin'
:
'vsimsa'
,
'linux_bin'
:
None
}
def
__init__
(
self
):
super
(
ToolActiveHDL
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
pass
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Aldec Active-HDL'
,
'id'
:
'aldec'
,
'windows_bin'
:
'vsimsa'
,
'linux_bin'
:
None
}
return
tool_info
def
get_standard_libraries
(
self
):
ALDEC_STANDARD_LIBS
=
[
'ieee'
,
'std'
]
return
ALDEC_STANDARD_LIBS
...
...
hdlmake/tools/diamond.py
View file @
47b3bddc
...
...
@@ -34,22 +34,19 @@ DIAMOND_STANDARD_LIBS = ['ieee', 'std']
class
ToolDiamond
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'Diamond'
,
'id'
:
'diamond'
,
'windows_bin'
:
'pnmainc'
,
'linux_bin'
:
'diamondc'
,
'project_ext'
:
'ldf'
}
def
__init__
(
self
):
super
(
ToolDiamond
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
return
'unknown'
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Diamond'
,
'id'
:
'diamond'
,
'windows_bin'
:
'pnmainc'
,
'linux_bin'
:
'diamondc'
,
'project_ext'
:
'ldf'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
DIAMOND_STANDARD_LIBS
...
...
hdlmake/tools/ghdl.py
View file @
47b3bddc
...
...
@@ -27,21 +27,18 @@ from hdlmake.action import ActionMakefile
class
ToolGHDL
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'GHDL'
,
'id'
:
'ghdl'
,
'windows_bin'
:
'ghdl'
,
'linux_bin'
:
'ghdl'
}
def
__init__
(
self
):
super
(
ToolGHDL
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
pass
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'GHDL'
,
'id'
:
'ghdl'
,
'windows_bin'
:
'ghdl'
,
'linux_bin'
:
'ghdl'
}
return
tool_info
def
get_standard_libraries
(
self
):
GHDL_STANDARD_LIBS
=
[
'ieee'
,
'std'
]
return
GHDL_STANDARD_LIBS
...
...
@@ -66,10 +63,11 @@ class ToolGHDL(ActionMakefile):
self
.
writeln
(
"""
\
#target for cleaning all intermediate stuff
clean:
\t\t
rm -rf *.cf
\t\t
rm -rf *.cf
*.o $(TOP_MODULE)
#target for cleaning final files
mrproper: clean
\t\t
rm -r *.vcd
"""
)
...
...
hdlmake/tools/ise.py
View file @
47b3bddc
This diff is collapsed.
Click to expand it.
hdlmake/tools/isim.py
View file @
47b3bddc
...
...
@@ -44,18 +44,15 @@ ISIM_STANDARD_LIBS = ['std', 'ieee', 'ieee_proposed', 'vl', 'synopsys',
class
ToolISim
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'ISim'
,
'id'
:
'isim'
,
'windows_bin'
:
'isimgui'
,
'linux_bin'
:
'isimgui'
}
def
__init__
(
self
):
super
(
ToolISim
,
self
)
.
__init__
()
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'ISim'
,
'id'
:
'isim'
,
'windows_bin'
:
'isimgui'
,
'linux_bin'
:
'isimgui'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
ISIM_STANDARD_LIBS
...
...
hdlmake/tools/iverilog.py
View file @
47b3bddc
...
...
@@ -40,18 +40,15 @@ IVERILOG_STANDARD_LIBS = ['std', 'ieee', 'ieee_proposed', 'vl', 'synopsys',
class
ToolIVerilog
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'Icarus Verilog'
,
'id'
:
'iverilog'
,
'windows_bin'
:
'iverilog'
,
'linux_bin'
:
'iverilog'
}
def
__init__
(
self
):
super
(
ToolIVerilog
,
self
)
.
__init__
()
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Icarus Verilog'
,
'id'
:
'iverilog'
,
'windows_bin'
:
'iverilog'
,
'linux_bin'
:
'iverilog'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
IVERILOG_STANDARD_LIBS
...
...
hdlmake/tools/libero.py
View file @
47b3bddc
...
...
@@ -35,22 +35,19 @@ LIBERO_STANDARD_LIBS = ['ieee', 'std']
class
ToolLibero
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'Libero'
,
'id'
:
'libero'
,
'windows_bin'
:
'libero'
,
'linux_bin'
:
'libero'
,
'project_ext'
:
'prjx'
}
def
__init__
(
self
):
super
(
ToolLibero
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
return
'unknown'
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Libero'
,
'id'
:
'libero'
,
'windows_bin'
:
'libero'
,
'linux_bin'
:
'libero'
,
'project_ext'
:
'prjx'
# older projects are prj
}
return
tool_info
def
get_standard_libraries
(
self
):
return
LIBERO_STANDARD_LIBS
...
...
hdlmake/tools/modelsim.py
View file @
47b3bddc
...
...
@@ -34,6 +34,13 @@ MODELSIM_STANDARD_LIBS = ['ieee', 'std', 'altera_mf']
class
ToolModelsim
(
VsimMakefileWriter
):
TOOL_INFO
=
{
'name'
:
'Modelsim'
,
'id'
:
'modelsim'
,
'windows_bin'
:
'vsim'
,
'linux_bin'
:
'vsim'
}
def
__init__
(
self
):
super
(
ToolModelsim
,
self
)
.
__init__
()
self
.
vcom_flags
.
extend
([
"-modelsimini"
,
"modelsim.ini"
])
...
...
@@ -49,14 +56,6 @@ class ToolModelsim(VsimMakefileWriter):
def
detect_version
(
self
,
path
):
pass
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Modelsim'
,
'id'
:
'modelsim'
,
}
tool_info
.
update
(
super
(
ToolModelsim
,
self
)
.
get_keys
())
return
tool_info
def
get_standard_libraries
(
self
):
return
MODELSIM_STANDARD_LIBS
...
...
hdlmake/tools/planahead.py
View file @
47b3bddc
...
...
@@ -36,22 +36,19 @@ PLANAHEAD_STANDARD_LIBS = ['ieee', 'std']
class
ToolPlanAhead
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'PlanAhead'
,
'id'
:
'planahead'
,
'windows_bin'
:
'planAhead'
,
'linux_bin'
:
'planAhead'
,
'project_ext'
:
'ppr'
}
def
__init__
(
self
):
super
(
ToolPlanAhead
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
return
'unknown'
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'PlanAhead'
,
'id'
:
'planahead'
,
'windows_bin'
:
'planAhead'
,
'linux_bin'
:
'planAhead'
,
'project_ext'
:
'ppr'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
PLANAHEAD_STANDARD_LIBS
...
...
hdlmake/tools/quartus.py
View file @
47b3bddc
...
...
@@ -37,6 +37,13 @@ QUARTUS_STANDARD_LIBS = ['altera', 'altera_mf', 'lpm', 'ieee', 'std']
class
ToolQuartus
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'Quartus'
,
'id'
:
'quartus'
,
'windows_bin'
:
'quartus'
,
'linux_bin'
:
'quartus'
,
'project_ext'
:
'qsf'
}
def
__init__
(
self
):
self
.
_preflow
=
None
self
.
_postmodule
=
None
...
...
@@ -46,16 +53,6 @@ class ToolQuartus(ActionMakefile):
def
detect_version
(
self
,
path
):
return
'unknown'
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Quartus'
,
'id'
:
'quartus'
,
'windows_bin'
:
'quartus'
,
'linux_bin'
:
'quartus'
,
'project_ext'
:
'qsf'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
QUARTUS_STANDARD_LIBS
...
...
hdlmake/tools/riviera.py
View file @
47b3bddc
...
...
@@ -62,6 +62,12 @@ RIVIERA_STANDARD_LIBS.extend(RIVIERA_XILINX_VLOG_LIBRARIES)
class
ToolRiviera
(
VsimMakefileWriter
):
TOOL_INFO
=
{
'name'
:
'Riviera'
,
'id'
:
'riviera'
,
'windows_bin'
:
'vsim'
,
'linux_bin'
:
'vsim'
}
def
__init__
(
self
):
super
(
ToolRiviera
,
self
)
.
__init__
()
self
.
vcom_flags
.
append
(
"-2008"
)
...
...
@@ -70,14 +76,6 @@ class ToolRiviera(VsimMakefileWriter):
def
detect_version
(
self
,
path
):
pass
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'Riviera'
,
'id'
:
'riviera'
,
}
tool_info
.
update
(
super
(
ToolRiviera
,
self
)
.
get_keys
())
return
tool_info
def
get_standard_libraries
(
self
):
return
RIVIERA_STANDARD_LIBS
...
...
hdlmake/tools/sim_makefile_support.py
View file @
47b3bddc
...
...
@@ -61,14 +61,6 @@ class VsimMakefileWriter(ActionMakefile):
super
(
VsimMakefileWriter
,
self
)
.
__init__
()
def
get_keys
(
self
):
tool_info
=
{
'windows_bin'
:
'vsim'
,
'linux_bin'
:
'vsim'
}
return
tool_info
def
_print_sim_options
(
self
,
top_module
):
self
.
vlog_flags
.
append
(
self
.
__get_rid_of_vsim_incdirs
(
top_module
.
manifest_dict
[
"vlog_opt"
]))
...
...
hdlmake/tools/vivado.py
View file @
47b3bddc
...
...
@@ -35,22 +35,20 @@ VIVADO_STANDARD_LIBS = ['ieee', 'std']
class
ToolVivado
(
ActionMakefile
):
TOOL_INFO
=
{
'name'
:
'vivado'
,
'id'
:
'vivado'
,
'windows_bin'
:
'vivado'
,
'linux_bin'
:
'vivado'
,
'project_ext'
:
'xpr'
}
def
__init__
(
self
):
super
(
ToolVivado
,
self
)
.
__init__
()
def
detect_version
(
self
,
path
):
return
'unknown'
def
get_keys
(
self
):
tool_info
=
{
'name'
:
'vivado'
,
'id'
:
'vivado'
,
'windows_bin'
:
'vivado'
,
'linux_bin'
:
'vivado'
,
'project_ext'
:
'xpr'
}
return
tool_info
def
get_standard_libraries
(
self
):
return
VIVADO_STANDARD_LIBS
...
...
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