Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
e1c3f670
Commit
e1c3f670
authored
Jul 28, 2015
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modified files similar to x353 ones
parent
25997816
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
33 deletions
+31
-33
xdct393.v
compressor_jp/xdct393.v
+23
-12
rs232_rcv393.v
logger/rs232_rcv393.v
+1
-1
dly01_16.v
util_modules/dly01_16.v
+7
-20
No files found.
compressor_jp/xdct393.v
View file @
e1c3f670
...
@@ -204,8 +204,8 @@ This value divided by 2raised to 8 is equivalent to ignoring the 8 lsb bits of t
...
@@ -204,8 +204,8 @@ This value divided by 2raised to 8 is equivalent to ignoring the 8 lsb bits of t
reg
[
9
:
0
]
xa0_in
,
xa1_in
,
xa2_in
,
xa3_in
,
xa4_in
,
xa5_in
,
xa6_in
,
xa7_in
;
reg
[
9
:
0
]
xa0_in
,
xa1_in
,
xa2_in
,
xa3_in
,
xa4_in
,
xa5_in
,
xa6_in
,
xa7_in
;
reg
[
9
:
0
]
xa0_reg
,
xa1_reg
,
xa2_reg
,
xa3_reg
,
xa4_reg
,
xa5_reg
,
xa6_reg
,
xa7_reg
;
reg
[
9
:
0
]
xa0_reg
,
xa1_reg
,
xa2_reg
,
xa3_reg
,
xa4_reg
,
xa5_reg
,
xa6_reg
,
xa7_reg
;
//
reg [ 9:0] addsub1a_comp, addsub2a_comp, addsub3a_comp, addsub4a_comp;
reg
[
9
:
0
]
addsub1a_comp
,
addsub2a_comp
,
addsub3a_comp
,
addsub4a_comp
;
reg
[
10
:
0
]
addsub1a_comp
,
addsub2a_comp
,
addsub3a_comp
,
addsub4a_comp
;
// AF2015: increasing width - was limiting
//
reg [10:0] addsub1a_comp, addsub2a_comp, addsub3a_comp, addsub4a_comp; // AF2015: increasing width - was limiting
reg
[
10
:
0
]
add_sub1a
,
add_sub2a
,
add_sub3a
,
add_sub4a
;
reg
[
10
:
0
]
add_sub1a
,
add_sub2a
,
add_sub3a
,
add_sub4a
;
reg
save_sign1a
,
save_sign2a
,
save_sign3a
,
save_sign4a
;
reg
save_sign1a
,
save_sign2a
,
save_sign3a
,
save_sign4a
;
...
@@ -358,15 +358,22 @@ This value divided by 2raised to 8 is equivalent to ignoring the 8 lsb bits of t
...
@@ -358,15 +358,22 @@ This value divided by 2raised to 8 is equivalent to ignoring the 8 lsb bits of t
// 9th clk for registering shifted input and 10th clk for add_sub
// 9th clk for registering shifted input and 10th clk for add_sub
// to synchronize the i value to the add_sub value, i value is incremented
// to synchronize the i value to the add_sub value, i value is incremented
// only after 10 clks
// only after 10 clks
// Adding these wires to get rid of the MSB that is always 0
wire
[
10
:
0
]
addsub1a_comp_w
=
add_sub1a
[
10
]
?
(
-
add_sub1a
)
:
add_sub1a
;
wire
[
10
:
0
]
addsub2a_comp_w
=
add_sub2a
[
10
]
?
(
-
add_sub2a
)
:
add_sub2a
;
wire
[
10
:
0
]
addsub3a_comp_w
=
add_sub3a
[
10
]
?
(
-
add_sub3a
)
:
add_sub3a
;
wire
[
10
:
0
]
addsub4a_comp_w
=
add_sub4a
[
10
]
?
(
-
add_sub4a
)
:
add_sub4a
;
always
@
(
posedge
nclk
)
begin
always
@
(
posedge
nclk
)
begin
save_sign1a
<=
add_sub1a
[
10
]
;
save_sign1a
<=
add_sub1a
[
10
]
;
save_sign2a
<=
add_sub2a
[
10
]
;
save_sign2a
<=
add_sub2a
[
10
]
;
save_sign3a
<=
add_sub3a
[
10
]
;
save_sign3a
<=
add_sub3a
[
10
]
;
save_sign4a
<=
add_sub4a
[
10
]
;
save_sign4a
<=
add_sub4a
[
10
]
;
addsub1a_comp
<=
add_sub1a
[
10
]
?
(
-
add_sub1a
)
:
add_sub1a
;
addsub1a_comp
<=
addsub1a_comp_w
[
9
:
0
]
;
//
add_sub1a[10]? (-add_sub1a) : add_sub1a;
addsub2a_comp
<=
add_sub2a
[
10
]
?
(
-
add_sub2a
)
:
add_sub2a
;
addsub2a_comp
<=
addsub2a_comp_w
[
9
:
0
]
;
//
add_sub2a[10]? (-add_sub2a) : add_sub2a;
addsub3a_comp
<=
add_sub3a
[
10
]
?
(
-
add_sub3a
)
:
add_sub3a
;
addsub3a_comp
<=
addsub3a_comp_w
[
9
:
0
]
;
//
add_sub3a[10]? (-add_sub3a) : add_sub3a;
addsub4a_comp
<=
add_sub4a
[
10
]
?
(
-
add_sub4a
)
:
add_sub4a
;
addsub4a_comp
<=
addsub4a_comp_w
[
9
:
0
]
;
//
add_sub4a[10]? (-add_sub4a) : add_sub4a;
end
end
assign
p1a_all
=
addsub1a_comp
*
memory1a
;
//[15:0]; // TODO: Check - memory is [16:0] !
assign
p1a_all
=
addsub1a_comp
*
memory1a
;
//[15:0]; // TODO: Check - memory is [16:0] !
...
@@ -432,8 +439,7 @@ module dct393_stage2 (
...
@@ -432,8 +439,7 @@ module dct393_stage2 (
reg
[
15
:
0
]
xb0_in
,
xb1_in
,
xb2_in
,
xb3_in
,
xb4_in
,
xb5_in
,
xb6_in
,
xb7_in
;
reg
[
15
:
0
]
xb0_in
,
xb1_in
,
xb2_in
,
xb3_in
,
xb4_in
,
xb5_in
,
xb6_in
,
xb7_in
;
reg
[
15
:
0
]
xb0_reg
,
xb1_reg
,
xb2_reg
,
xb3_reg
,
xb4_reg
,
xb5_reg
,
xb6_reg
,
xb7_reg
;
reg
[
15
:
0
]
xb0_reg
,
xb1_reg
,
xb2_reg
,
xb3_reg
,
xb4_reg
,
xb5_reg
,
xb6_reg
,
xb7_reg
;
reg
[
16
:
0
]
add_sub1b
,
add_sub2b
,
add_sub3b
,
add_sub4b
;
reg
[
16
:
0
]
add_sub1b
,
add_sub2b
,
add_sub3b
,
add_sub4b
;
// reg [15:0] addsub1b_comp, addsub2b_comp, addsub3b_comp, addsub4b_comp;
reg
[
15
:
0
]
addsub1b_comp
,
addsub2b_comp
,
addsub3b_comp
,
addsub4b_comp
;
reg
[
16
:
0
]
addsub1b_comp
,
addsub2b_comp
,
addsub3b_comp
,
addsub4b_comp
;
// AF2015: increased to match result
reg
save_sign1b
,
save_sign2b
,
save_sign3b
,
save_sign4b
;
reg
save_sign1b
,
save_sign2b
,
save_sign3b
,
save_sign4b
;
reg
[
18
:
0
]
p1b
,
p2b
,
p3b
,
p4b
;
reg
[
18
:
0
]
p1b
,
p2b
,
p3b
,
p4b
;
wire
[
35
:
0
]
p1b_all
,
p2b_all
,
p3b_all
,
p4b_all
;
wire
[
35
:
0
]
p1b_all
,
p2b_all
,
p3b_all
,
p4b_all
;
...
@@ -571,16 +577,21 @@ module dct393_stage2 (
...
@@ -571,16 +577,21 @@ module dct393_stage2 (
add_sub3b
<=
{
xb5_reg
[
15
]
,
xb5_reg
[
15
:
0
]
}
-
{
xb2_reg
[
15
]
,
xb2_reg
[
15
:
0
]
};
add_sub3b
<=
{
xb5_reg
[
15
]
,
xb5_reg
[
15
:
0
]
}
-
{
xb2_reg
[
15
]
,
xb2_reg
[
15
:
0
]
};
add_sub4b
<=
{
xb4_reg
[
15
]
,
xb4_reg
[
15
:
0
]
}
-
{
xb3_reg
[
15
]
,
xb3_reg
[
15
:
0
]
};
add_sub4b
<=
{
xb4_reg
[
15
]
,
xb4_reg
[
15
:
0
]
}
-
{
xb3_reg
[
15
]
,
xb3_reg
[
15
:
0
]
};
end
end
// Adding these wires to get rid of the MSB that is always 0
wire
[
16
:
0
]
addsub1b_comp_w
=
add_sub1b
[
16
]
?
(
-
add_sub1b
)
:
add_sub1b
;
wire
[
16
:
0
]
addsub2b_comp_w
=
add_sub2b
[
16
]
?
(
-
add_sub2b
)
:
add_sub2b
;
wire
[
16
:
0
]
addsub3b_comp_w
=
add_sub3b
[
16
]
?
(
-
add_sub3b
)
:
add_sub3b
;
wire
[
16
:
0
]
addsub4b_comp_w
=
add_sub4b
[
16
]
?
(
-
add_sub4b
)
:
add_sub4b
;
always
@
(
posedge
clk
)
begin
always
@
(
posedge
clk
)
begin
save_sign1b
<=
add_sub1b
[
16
]
;
save_sign1b
<=
add_sub1b
[
16
]
;
save_sign2b
<=
add_sub2b
[
16
]
;
save_sign2b
<=
add_sub2b
[
16
]
;
save_sign3b
<=
add_sub3b
[
16
]
;
save_sign3b
<=
add_sub3b
[
16
]
;
save_sign4b
<=
add_sub4b
[
16
]
;
save_sign4b
<=
add_sub4b
[
16
]
;
addsub1b_comp
<=
add_sub1b
[
16
]
?
(
-
add_sub1b
)
:
add_sub1b
;
addsub1b_comp
<=
addsub1b_comp_w
[
15
:
0
]
;
//
add_sub1b[16]? (-add_sub1b) : add_sub1b;
addsub2b_comp
<=
add_sub2b
[
16
]
?
(
-
add_sub2b
)
:
add_sub2b
;
addsub2b_comp
<=
addsub2b_comp_w
[
15
:
0
]
;
//
add_sub2b[16]? (-add_sub2b) : add_sub2b;
addsub3b_comp
<=
add_sub3b
[
16
]
?
(
-
add_sub3b
)
:
add_sub3b
;
addsub3b_comp
<=
addsub3b_comp_w
[
15
:
0
]
;
//
add_sub3b[16]? (-add_sub3b) : add_sub3b;
addsub4b_comp
<=
add_sub4b
[
16
]
?
(
-
add_sub4b
)
:
add_sub4b
;
addsub4b_comp
<=
addsub4b_comp_w
[
15
:
0
]
;
//
add_sub4b[16]? (-add_sub4b) : add_sub4b;
end
end
// assign p1b_all = addsub1b_comp[15:0] * memory1a[15:0]; // TODO: Check - memory is 16:0
// assign p1b_all = addsub1b_comp[15:0] * memory1a[15:0]; // TODO: Check - memory is 16:0
...
...
logger/rs232_rcv393.v
View file @
e1c3f670
...
@@ -106,6 +106,6 @@ module rs232_rcv393(
...
@@ -106,6 +106,6 @@ module rs232_rcv393(
ser_do_stb
<=
sample_bit
;
ser_do_stb
<=
sample_bit
;
// if (ser_rst) debug0[4:0] <=5'b0;
// if (ser_rst) debug0[4:0] <=5'b0;
// else debug0[4:0] <= debug | {ts_stb_r,start_r,error,ser_di_d
,~ser_di_d
};
// else debug0[4:0] <= debug | {ts_stb_r,start_r,error,ser_di_d
[0],~ser_di_d[0]
};
end
end
endmodule
endmodule
util_modules/dly01_16.v
View file @
e1c3f670
...
@@ -25,7 +25,7 @@ module dly01_16(
...
@@ -25,7 +25,7 @@ module dly01_16(
input
rst
,
input
rst
,
input
[
3
:
0
]
dly
,
input
[
3
:
0
]
dly
,
input
din
,
input
din
,
output
reg
dout
output
dout
)
;
)
;
reg
[
15
:
0
]
sr
=
0
;
reg
[
15
:
0
]
sr
=
0
;
`ifdef
SHREG_SEQUENTIAL_RESET
`ifdef
SHREG_SEQUENTIAL_RESET
...
@@ -38,24 +38,11 @@ module dly01_16(
...
@@ -38,24 +38,11 @@ module dly01_16(
if
(
rst
)
sr
<=
0
;
if
(
rst
)
sr
<=
0
;
else
sr
<=
{
sr
[
14
:
0
]
,
din
};
else
sr
<=
{
sr
[
14
:
0
]
,
din
};
end
end
`endif
`endif
always
@
(
sr
or
dly
)
case
(
dly
)
`ifdef
SIMULATION
4'h0
:
dout
<=
sr
[
0
]
;
assign
dout
=
(
|
sr
)
?
((
&
sr
)
?
1'b1
:
sr
[
dly
])
:
1'b0
;
4'h1
:
dout
<=
sr
[
1
]
;
`else
4'h2
:
dout
<=
sr
[
2
]
;
assign
dout
=
sr
[
dly
]
;
4'h3
:
dout
<=
sr
[
3
]
;
`endif
4'h4
:
dout
<=
sr
[
4
]
;
4'h5
:
dout
<=
sr
[
5
]
;
4'h6
:
dout
<=
sr
[
6
]
;
4'h7
:
dout
<=
sr
[
7
]
;
4'h8
:
dout
<=
sr
[
8
]
;
4'h9
:
dout
<=
sr
[
9
]
;
4'ha
:
dout
<=
sr
[
10
]
;
4'hb
:
dout
<=
sr
[
11
]
;
4'hc
:
dout
<=
sr
[
12
]
;
4'hd
:
dout
<=
sr
[
13
]
;
4'he
:
dout
<=
sr
[
14
]
;
4'hf
:
dout
<=
sr
[
15
]
;
endcase
endmodule
endmodule
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