Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
V
VME64x core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
VME64x core
Commits
9174e0e7
Commit
9174e0e7
authored
Nov 27, 2017
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address issues in vme64x_pkg.
parent
593dbebd
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
64 additions
and
93 deletions
+64
-93
GD-vme64x-core-review.txt
doc/review-2017-11-13/GD-vme64x-core-review.txt
+3
-3
vme64x_pkg.vhd
hdl/rtl/vme64x_pkg.vhd
+53
-83
vme_funct_match.vhd
hdl/rtl/vme_funct_match.vhd
+5
-5
xvme64x_core.vhd
hdl/rtl/xvme64x_core.vhd
+2
-1
top_tb.vhd
hdl/testbench/simple_tb/top_tb.vhd
+1
-1
No files found.
doc/review-2017-11-13/GD-vme64x-core-review.txt
View file @
9174e0e7
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
'Detail'.
'Detail'.
- how about using t_vme64x_in and t_vme64x_out types inside the design to make
- how about using t_vme64x_in and t_vme64x_out types inside the design to make
the core more compact and having only an std_logic wrapper for simulations?
the core more compact and having only an std_logic wrapper for simulations?
Good convention to be adopted.
Done.
Good convention to be adopted.
- vme64x_pack.vhd and xvme64x_core_pkg.vhd should be merged into one package
- vme64x_pack.vhd and xvme64x_core_pkg.vhd should be merged into one package
Done.
Done.
...
@@ -34,9 +34,9 @@
...
@@ -34,9 +34,9 @@
Done. Default removed.
Done. Default removed.
- line 55:
- line 55:
c_ADEM_M is a type not a constant, rename it to t_ADEM_M
c_ADEM_M is a type not a constant, rename it to t_ADEM_M
Add a comment
.
Done
.
- cleanup, remove types that are not used e.g. c_ADER_C_XAM or c_ADER_C_AM
- cleanup, remove types that are not used e.g. c_ADER_C_XAM or c_ADER_C_AM
Add a comment
as unused.
Done. Commented
as unused.
------------------------
------------------------
-- VME64xCore_Top.vhd --
-- VME64xCore_Top.vhd --
...
...
hdl/rtl/vme64x_pkg.vhd
View file @
9174e0e7
This diff is collapsed.
Click to expand it.
hdl/rtl/vme_funct_match.vhd
View file @
9174e0e7
...
@@ -78,14 +78,14 @@ begin
...
@@ -78,14 +78,14 @@ begin
gen_match_loop
:
for
i
in
0
to
7
generate
gen_match_loop
:
for
i
in
0
to
7
generate
-- True in case of match
-- True in case of match
s_function
(
i
)
<=
s_function
(
i
)
<=
'1'
when
(((
addr_i
(
c_ADEM_M
)
and
g_ADEM
(
i
)(
c
_ADEM_M
))
'1'
when
(((
addr_i
(
t_ADEM_M
)
and
g_ADEM
(
i
)(
t
_ADEM_M
))
=
ader_i
(
i
)(
c
_ADEM_M
))
=
ader_i
(
i
)(
t
_ADEM_M
))
and
((
am_i
=
ader_i
(
i
)(
c
_ADER_AM
))
and
((
am_i
=
ader_i
(
i
)(
t
_ADER_AM
))
or
not
g_DECODE_AM
))
or
not
g_DECODE_AM
))
else
'0'
;
else
'0'
;
-- True if the AM part of ADER is enabled by AMCAP
-- True if the AM part of ADER is enabled by AMCAP
s_ader_am_valid
(
i
)
<=
s_ader_am_valid
(
i
)
<=
g_AMCAP
(
i
)(
to_integer
(
unsigned
(
ader_i
(
i
)(
c
_ADER_AM
))));
g_AMCAP
(
i
)(
to_integer
(
unsigned
(
ader_i
(
i
)(
t
_ADER_AM
))));
end
generate
;
end
generate
;
------------------------------------------------------------------------------
------------------------------------------------------------------------------
...
@@ -130,7 +130,7 @@ begin
...
@@ -130,7 +130,7 @@ begin
if
s_function_sel_valid
=
'1'
then
if
s_function_sel_valid
=
'1'
then
mask
:
=
(
others
=>
'0'
);
mask
:
=
(
others
=>
'0'
);
mask
(
c_ADEM_M
)
:
=
g_ADEM
(
s_function_sel
)(
c
_ADEM_M
);
mask
(
t_ADEM_M
)
:
=
g_ADEM
(
s_function_sel
)(
t
_ADEM_M
);
addr_o
<=
addr_i
and
not
mask
;
addr_o
<=
addr_i
and
not
mask
;
decode_sel_o
<=
'1'
;
decode_sel_o
<=
'1'
;
else
else
...
...
hdl/rtl/xvme64x_core.vhd
View file @
9174e0e7
...
@@ -109,7 +109,8 @@ use work.vme64x_pkg.all;
...
@@ -109,7 +109,8 @@ use work.vme64x_pkg.all;
entity
xvme64x_core
is
entity
xvme64x_core
is
generic
(
generic
(
-- Clock period (ns). Used for DS synchronization.
-- Clock period (ns). Used for DS synchronization. The default value
-- will genrate an assertion failure.
g_CLOCK_PERIOD
:
integer
:
=
-1
;
g_CLOCK_PERIOD
:
integer
:
=
-1
;
-- Consider AM field of ADER to decode addresses. This is what the VME64x
-- Consider AM field of ADER to decode addresses. This is what the VME64x
...
...
hdl/testbench/simple_tb/top_tb.vhd
View file @
9174e0e7
...
@@ -268,7 +268,7 @@ begin
...
@@ -268,7 +268,7 @@ begin
g_MANUFACTURER_ID
=>
c_CERN_ID
,
g_MANUFACTURER_ID
=>
c_CERN_ID
,
g_BOARD_ID
=>
c_SVEC_ID
,
g_BOARD_ID
=>
c_SVEC_ID
,
g_REVISION_ID
=>
c_SVEC_REVISION_ID
,
g_REVISION_ID
=>
c_SVEC_REVISION_ID
,
g_PROGRAM_ID
=>
c_PROGRAM_ID
,
g_PROGRAM_ID
=>
c_
SVEC_
PROGRAM_ID
,
g_ASCII_PTR
=>
x"000000"
,
g_ASCII_PTR
=>
x"000000"
,
g_BEG_USER_CR
=>
x"000000"
,
g_BEG_USER_CR
=>
x"000000"
,
...
...
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