From 75f8ddd3401f2617cb25cbdb1188f90b67a82fa2 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Tue, 30 Dec 2008 05:35:51 +0000 Subject: [PATCH] - uses ieee_proposed.fixed_pkg git-svn-id: http://moon:8086/svn/vhdl/trunk@171 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/radio/nco/sim/tb_mix_cordic.fdo | 3 ++- lib/radio/nco/sim/tb_nco_cordic.fdo | 3 ++- lib/radio/nco/sim/tb_nco_lut.fdo | 3 ++- lib/radio/nco/src/nco_lut.vhd | 7 ++++++- lib/radio/nco/src/nco_lut_dbg.vhd | 7 ++++++- lib/radio/nco/src/nco_pkg.vhd | 7 ++++++- lib/radio/nco/src/tb_mix_cordic.vhd | 5 ++++- lib/radio/nco/src/tb_nco_cordic.vhd | 5 ++++- lib/radio/nco/src/tb_nco_lut.vhd | 5 ++++- lib/radio/nco/src/wavelut.vhd | 11 ++++++++--- lib/radio/nco/src/waverom_dual.vhd | 9 +++++++-- 11 files changed, 51 insertions(+), 14 deletions(-) diff --git a/lib/radio/nco/sim/tb_mix_cordic.fdo b/lib/radio/nco/sim/tb_mix_cordic.fdo index 47b313d..3bd3ff4 100644 --- a/lib/radio/nco/sim/tb_mix_cordic.fdo +++ b/lib/radio/nco/sim/tb_mix_cordic.fdo @@ -1,5 +1,6 @@ +vmap ieee_proposed ../../../../Common/sim/ieee_proposed + vlib work -vcom -explicit -93 "../../../fixed/fixed_pkg_c.vhd" vcom -explicit -93 "../../../fixed/fixed_util_pkg.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd" diff --git a/lib/radio/nco/sim/tb_nco_cordic.fdo b/lib/radio/nco/sim/tb_nco_cordic.fdo index 89603a7..5c5e619 100644 --- a/lib/radio/nco/sim/tb_nco_cordic.fdo +++ b/lib/radio/nco/sim/tb_nco_cordic.fdo @@ -1,5 +1,6 @@ +vmap ieee_proposed ../../../../Common/sim/ieee_proposed + vlib work -vcom -explicit -93 "../../../fixed/fixed_pkg_c.vhd" vcom -explicit -93 "../../../fixed/fixed_util_pkg.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd" diff --git a/lib/radio/nco/sim/tb_nco_lut.fdo b/lib/radio/nco/sim/tb_nco_lut.fdo index 3f7e99c..12f120e 100644 --- a/lib/radio/nco/sim/tb_nco_lut.fdo +++ b/lib/radio/nco/sim/tb_nco_lut.fdo @@ -1,5 +1,6 @@ +vmap ieee_proposed ../../../../Common/sim/ieee_proposed + vlib work -vcom -explicit -93 "../../../fixed/fixed_pkg_c.vhd" vcom -explicit -93 "../../../fixed/fixed_util_pkg.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd" vcom -explicit -93 "../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd" diff --git a/lib/radio/nco/src/nco_lut.vhd b/lib/radio/nco/src/nco_lut.vhd index 268ce87..09e1e87 100644 --- a/lib/radio/nco/src/nco_lut.vhd +++ b/lib/radio/nco/src/nco_lut.vhd @@ -21,7 +21,12 @@ library IEEE; use IEEE.STD_LOGIC_1164.ALL; use IEEE.MATH_REAL.ALL; USE ieee.numeric_std.ALL; -use work.fixed_pkg.all; + +library ieee_proposed; +use ieee_proposed.math_utility_pkg.all; +use ieee_proposed.fixed_pkg.all; + +library work; use work.fixed_util_pkg.all; use work.nco_pkg.all; diff --git a/lib/radio/nco/src/nco_lut_dbg.vhd b/lib/radio/nco/src/nco_lut_dbg.vhd index 533f185..a766e7d 100644 --- a/lib/radio/nco/src/nco_lut_dbg.vhd +++ b/lib/radio/nco/src/nco_lut_dbg.vhd @@ -21,7 +21,12 @@ library IEEE; use IEEE.STD_LOGIC_1164.ALL; use IEEE.MATH_REAL.ALL; USE ieee.numeric_std.ALL; -use work.fixed_pkg.all; + +library ieee_proposed; +use ieee_proposed.math_utility_pkg.all; +use ieee_proposed.fixed_pkg.all; + +library work; use work.fixed_util_pkg.all; use work.nco_pkg.all; diff --git a/lib/radio/nco/src/nco_pkg.vhd b/lib/radio/nco/src/nco_pkg.vhd index c8d3f42..d64b23a 100644 --- a/lib/radio/nco/src/nco_pkg.vhd +++ b/lib/radio/nco/src/nco_pkg.vhd @@ -3,7 +3,12 @@ library IEEE; use IEEE.STD_LOGIC_1164.ALL; use ieee.numeric_std.all; use IEEE.MATH_REAL.ALL; -use work.fixed_pkg.all; + +library ieee_proposed; +use ieee_proposed.math_utility_pkg.all; +use ieee_proposed.fixed_pkg.all; + +library work; use work.fixed_util_pkg.all; ------------------------------------------------------------------------------- diff --git a/lib/radio/nco/src/tb_mix_cordic.vhd b/lib/radio/nco/src/tb_mix_cordic.vhd index 67d5f12..335c619 100644 --- a/lib/radio/nco/src/tb_mix_cordic.vhd +++ b/lib/radio/nco/src/tb_mix_cordic.vhd @@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL; 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_pkg.all; + library work; -use work.fixed_pkg.all; use work.fixed_util_pkg.all; use work.cordic_pkg.all; use work.PCK_FIO.all; diff --git a/lib/radio/nco/src/tb_nco_cordic.vhd b/lib/radio/nco/src/tb_nco_cordic.vhd index 5b7672f..0bcfd93 100644 --- a/lib/radio/nco/src/tb_nco_cordic.vhd +++ b/lib/radio/nco/src/tb_nco_cordic.vhd @@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL; 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_pkg.all; + library work; -use work.fixed_pkg.all; use work.fixed_util_pkg.all; use work.PCK_FIO.all; diff --git a/lib/radio/nco/src/tb_nco_lut.vhd b/lib/radio/nco/src/tb_nco_lut.vhd index 956b144..53a480d 100644 --- a/lib/radio/nco/src/tb_nco_lut.vhd +++ b/lib/radio/nco/src/tb_nco_lut.vhd @@ -17,8 +17,11 @@ use IEEE.MATH_REAL.ALL; 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_pkg.all; + library work; -use work.fixed_pkg.all; use work.fixed_util_pkg.all; use work.nco_pkg.all; use work.PCK_FIO.all; diff --git a/lib/radio/nco/src/wavelut.vhd b/lib/radio/nco/src/wavelut.vhd index c792e8b..6f8eaed 100644 --- a/lib/radio/nco/src/wavelut.vhd +++ b/lib/radio/nco/src/wavelut.vhd @@ -21,7 +21,12 @@ library IEEE; use IEEE.STD_LOGIC_1164.ALL; use IEEE.MATH_REAL.ALL; USE ieee.numeric_std.ALL; -use work.fixed_pkg.all; + +library ieee_proposed; +use ieee_proposed.math_utility_pkg.all; +use ieee_proposed.fixed_pkg.all; + +library work; use work.fixed_util_pkg.all; use work.nco_pkg.all; @@ -188,7 +193,7 @@ proc_out_i: process(clk, wave_i, inv_i, zero_i) if z = '0' then w := wave_i; if inv = '1' then - w := resize(-wave_i, w, fixed_truncate, fixed_wrap); + w := resize(-wave_i, w, fixed_wrap, fixed_truncate); end if; end if; @@ -217,7 +222,7 @@ proc_out_q: process(clk, wave_q, inv_q, zero_q) if z = '0' then w := wave_q; if inv = '1' then - w := resize(-wave_q, w, fixed_truncate, fixed_wrap); + w := resize(-wave_q, w, fixed_wrap, fixed_truncate); end if; end if; diff --git a/lib/radio/nco/src/waverom_dual.vhd b/lib/radio/nco/src/waverom_dual.vhd index 125179f..b39e2a7 100644 --- a/lib/radio/nco/src/waverom_dual.vhd +++ b/lib/radio/nco/src/waverom_dual.vhd @@ -21,7 +21,12 @@ library IEEE; use IEEE.STD_LOGIC_1164.ALL; use IEEE.MATH_REAL.ALL; USE ieee.numeric_std.ALL; -use work.fixed_pkg.all; + +library ieee_proposed; +use ieee_proposed.math_utility_pkg.all; +use ieee_proposed.fixed_pkg.all; + +library work; use work.fixed_util_pkg.all; use work.nco_pkg.all; @@ -60,7 +65,7 @@ function to_wave_mem(wave_real : real_array_t; len : integer; proto : sfixed) re variable res : wave_mem_t; begin for i in 0 to len-1 loop - res(i) := to_sfixed(wave_real(i), proto, fixed_round, fixed_saturate); + res(i) := to_sfixed(wave_real(i), proto, fixed_saturate, fixed_round); end loop; return res;