jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed renamed package inclusion

Browse Source 
- fixed problems after fixed_pkg update: explicit set round and saturation mode in Cordic and CIC

git-svn-id: http://moon:8086/svn/vhdl/trunk@1325 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2015-10-24 16:14:54 +00:00
parent b291a9f5a5
commit 47e7daee7d
62 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/radio/decimator/CIC/src/cic_c_pipe.vhd
+4 -4
View File
@@ -22,7 +22,7 @@ USE IEEE.STD_LOGIC_1164.ALL;
USE IEEE.NUMERIC_STD.ALL;
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
@@ -72,7 +72,7 @@ delay_pipe_proc:
-- word_pipe(i) <= (shi(max_width, max_width_frac) downto slo(max_width, max_width_frac) => '0');
-- end loop;
elsif vld_in = '1' then
word_pipe(1) <= resize(din, word_pipe(1));
word_pipe(1) <= resize(din, word_pipe(1), fixed_wrap, fixed_truncate);
for i in 2 to max_diff_delay loop
word_pipe(i) <= word_pipe(i-1);
end loop;
@@ -88,13 +88,13 @@ comb_proc:
begin
if rising_edge(clk) then
vld_out <= '0';
x0 := resize(din, x0);
x0 := resize(din, x0, fixed_wrap, fixed_truncate);
x1 := word_pipe(diff_delay);
if rst = '1' then
dout <= (shi(max_width, max_width_frac) downto slo(max_width, max_width_frac) => '0');
elsif vld_in = '1' then
vld_out <= '1';
dout <= resize(x0 - x1, shi(max_width, max_width_frac), slo(max_width, max_width_frac));
dout <= resize(x0 - x1, shi(max_width, max_width_frac), slo(max_width, max_width_frac), fixed_wrap, fixed_truncate);
end if;
end if;
end process;
lib/radio/decimator/CIC/src/cic_decim_pipe.vhd
+3 -3
View File
@@ -17,7 +17,7 @@ use IEEE.MATH_REAL.ALL;
USE ieee.numeric_std.ALL;
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
@@ -125,7 +125,7 @@ input_scale:
variable xsi : sfixed(shi(integ_nbits, integ_nbits_frac) downto slo(integ_nbits, integ_nbits_frac));
begin
if rising_edge(clk) then
x := resize(din, x);
x := resize(din, x, fixed_wrap, fixed_truncate);
xs := x sra scale_nbits;
word_i_pipe(0) <= xs;
vld_i_pipe(0) <= vld_in;
@@ -198,6 +198,6 @@ resampler_proc:
end if;
end process;
dout <= resize(word_c_pipe(nstages), shi(out_width, out_width_frac), slo(out_width, out_width_frac));
dout <= resize(word_c_pipe(nstages), shi(out_width, out_width_frac), slo(out_width, out_width_frac), fixed_wrap, fixed_truncate);
END;
lib/radio/decimator/CIC/src/cic_decimvar_pipe.vhd
+4 -4
View File
@@ -17,7 +17,7 @@ use IEEE.MATH_REAL.ALL;
USE ieee.numeric_std.ALL;
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
@@ -131,7 +131,7 @@ input_scale:
variable xsi : sfixed(shi(integ_nbits, integ_nbits_frac) downto slo(integ_nbits, integ_nbits_frac));
begin
if rising_edge(clk) then
x := resize(din, x);
x := resize(din, x, fixed_wrap, fixed_truncate);
xs := x sra min_gain_bits;
-- xsi := xs sra shift_in;
word_i_pipe(0) <= xs;
@@ -159,7 +159,7 @@ input_scale:
);
end generate;
word_c_pipe(0) <= resize(word_i_pipe(nstages), word_c_pipe(0));
word_c_pipe(0) <= resize(word_i_pipe(nstages), word_c_pipe(0), fixed_wrap, fixed_truncate);
vld_c_pipe(0) <= resample_vld;
vld_c <= vld_c_pipe(nstages);
@@ -205,6 +205,6 @@ resampler_proc:
end if;
end process;
dout <= resize(word_c_pipe(nstages), shi(out_width, out_width_frac), slo(out_width, out_width_frac));
dout <= resize(word_c_pipe(nstages), shi(out_width, out_width_frac), slo(out_width, out_width_frac), fixed_wrap, fixed_truncate);
END;
lib/radio/decimator/CIC/src/cic_i_pipe.vhd
+4 -4
View File
@@ -22,7 +22,7 @@ USE IEEE.STD_LOGIC_1164.ALL;
USE IEEE.NUMERIC_STD.ALL;
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
@@ -57,7 +57,7 @@ signal accu : sfixed(shi(max_width, max_width_frac) downto slo(max_width, max_
------------------------------------------------------------
begin
dout <= resize(accu, shi(max_width, max_width_frac), slo(max_width, max_width_frac));
dout <= resize(accu, shi(max_width, max_width_frac), slo(max_width, max_width_frac), fixed_wrap, fixed_truncate);
------------------------------------------------------------
integ_proc:
@@ -70,8 +70,8 @@ integ_proc:
accu <= (shi(max_width, max_width_frac) downto slo(max_width, max_width_frac) => '0');
elsif vld_in = '1' then
vld_out <= '1';
x := resize(din, x);
accu <= resize(x + accu, accu);
x := resize(din, x, fixed_wrap, fixed_truncate);
accu <= resize(x + accu, accu, fixed_wrap, fixed_truncate);
end if;
end if;
end process;
lib/radio/decimator/CIC/src/syn_cic_c_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
lib/radio/decimator/CIC/src/syn_cic_i_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
lib/radio/decimator/CIC/src/tb_cic_c_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
lib/radio/decimator/CIC/src/tb_cic_decim_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
lib/radio/decimator/CIC/src/tb_cic_decimvar_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;
lib/radio/decimator/CIC/src/tb_cic_i_pipe.vhd
+1 -1
View File
@@ -18,7 +18,7 @@ USE ieee.numeric_std.ALL;
use std.textio.all; -- Imports the standard textio package.
library ieee_proposed;
use ieee_proposed.math_utility_pkg.all;
use ieee_proposed.fixed_float_types.all;
use ieee_proposed.fixed_pkg.all;
library work;