From 19876a64f53d7071d3b6d59cde8a64de8734cbad Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Tue, 23 Mar 2021 13:29:16 +0000 Subject: [PATCH] - refactored git-svn-id: http://moon:8086/svn/vhdl/trunk@1485 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/radio/cordic/ghdl/cordic_iterative.inc | 23 +++++++++++++++++++ lib/radio/cordic/ghdl/cordic_pipe.inc | 22 ++++++++++++++++++ ....Makefile => tb_cordic_iterative_top.make} | 14 +++++------ ...e_top.Makefile => tb_cordic_pipe_top.make} | 13 +++++------ 4 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 lib/radio/cordic/ghdl/cordic_iterative.inc create mode 100644 lib/radio/cordic/ghdl/cordic_pipe.inc rename lib/radio/cordic/ghdl/{cordic_top.Makefile => tb_cordic_iterative_top.make} (75%) rename lib/radio/cordic/ghdl/{cordic_pipe_top.Makefile => tb_cordic_pipe_top.make} (76%) diff --git a/lib/radio/cordic/ghdl/cordic_iterative.inc b/lib/radio/cordic/ghdl/cordic_iterative.inc new file mode 100644 index 0000000..9931000 --- /dev/null +++ b/lib/radio/cordic/ghdl/cordic_iterative.inc @@ -0,0 +1,23 @@ +# ----------------------------------------------------------- +PKG_NAME := CORDIC_ITERATIVE +ROOT_PATH := ../../../.. +LIB_PATH := $(ROOT_PATH)/lib +CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) + +# ----------------------------------------------------------- +SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_rom.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_pre.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_stage_post.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_top.vhd + +# ----------------------------------------------------------- +$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) + +SRCS := +CUR_PATH := +ROOT_PATH := +LIB_PATH := + diff --git a/lib/radio/cordic/ghdl/cordic_pipe.inc b/lib/radio/cordic/ghdl/cordic_pipe.inc new file mode 100644 index 0000000..da2dfb0 --- /dev/null +++ b/lib/radio/cordic/ghdl/cordic_pipe.inc @@ -0,0 +1,22 @@ +# ----------------------------------------------------------- +PKG_NAME := CORDIC_PIPE +ROOT_PATH := ../../../.. +LIB_PATH := $(ROOT_PATH)/lib +CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) + +# ----------------------------------------------------------- +SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pkg.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_stage.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_pre.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_post.vhd +SRCS += $(LIB_PATH)/radio/cordic/src/cordic_pipe_top.vhd + +# ----------------------------------------------------------- +$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) + +SRCS := +CUR_PATH := +ROOT_PATH := +LIB_PATH := + diff --git a/lib/radio/cordic/ghdl/cordic_top.Makefile b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make similarity index 75% rename from lib/radio/cordic/ghdl/cordic_top.Makefile rename to lib/radio/cordic/ghdl/tb_cordic_iterative_top.make index 7aa8bac..7dbaddb 100644 --- a/lib/radio/cordic/ghdl/cordic_top.Makefile +++ b/lib/radio/cordic/ghdl/tb_cordic_iterative_top.make @@ -1,3 +1,6 @@ +# ------------------------------------------------- +include cordic_iterative.inc + # ------------------------------------------------- # Global options # ------------------------------------------------- @@ -13,17 +16,12 @@ LIB_PATH := ../../../../lib SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd -SRCS += ../src/cordic_pkg.vhd -SRCS += ../src/cordic_rom.vhd -SRCS += ../src/cordic_stage.vhd -SRCS += ../src/cordic_stage_pre.vhd -SRCS += ../src/cordic_stage_post.vhd -SRCS += ../src/cordic_top.vhd -SRCS += ../src/tb_cordic_top.vhd +SRCS += $(CORDIC_ITERATIVE_SRCS) +SRCS += $(LIB_PATH)/radio/cordic/src/tb_cordic_top.vhd # ------------------------------------------------- # Compile -TARGET := cordic_top +TARGET := tb_cordic_iterative_top ENTITY := tb_cordic_top WITH_VCD := y RUN_TIME := 300us diff --git a/lib/radio/cordic/ghdl/cordic_pipe_top.Makefile b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make similarity index 76% rename from lib/radio/cordic/ghdl/cordic_pipe_top.Makefile rename to lib/radio/cordic/ghdl/tb_cordic_pipe_top.make index feac5b0..dee42af 100644 --- a/lib/radio/cordic/ghdl/cordic_pipe_top.Makefile +++ b/lib/radio/cordic/ghdl/tb_cordic_pipe_top.make @@ -1,3 +1,6 @@ +# ------------------------------------------------- +include cordic_pipe.inc + # ------------------------------------------------- # Global options # ------------------------------------------------- @@ -13,16 +16,12 @@ LIB_PATH := ../../../../lib SRCS := $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993.vhd SRCS += $(LIB_PATH)/PCK_FIO-2002.7/PCK_FIO_1993_BODY.vhd -SRCS += ../src/cordic_pkg.vhd -SRCS += ../src/cordic_pipe_stage.vhd -SRCS += ../src/cordic_pipe_pre.vhd -SRCS += ../src/cordic_pipe_post.vhd -SRCS += ../src/cordic_pipe_top.vhd -SRCS += ../src/tb_cordic_pipe_top.vhd +SRCS += $(CORDIC_PIPE_SRCS) +SRCS += $(LIB_PATH)/radio/cordic/src/tb_cordic_pipe_top.vhd # ------------------------------------------------- # Compile -TARGET := cordic_pipe_top +TARGET := tb_cordic_pipe_top ENTITY := tb_cordic_pipe_top WITH_VCD := y RUN_TIME := 150us