diff --git a/lib/CPUs/MIPS/ghdl/mips_core.inc b/lib/CPUs/MIPS/ghdl/mips_core.inc index 6e00d2c..742824d 100644 --- a/lib/CPUs/MIPS/ghdl/mips_core.inc +++ b/lib/CPUs/MIPS/ghdl/mips_core.inc @@ -3,29 +3,31 @@ PKG_NAME := MIPS_CORE ROOT_PATH := ../../../.. LIB_PATH := $(ROOT_PATH)/lib CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) -SRC_PATH := $(LIB_PATH)/CPUs/MIPS/src/core +MOD_PATH := $(LIB_PATH)/CPUs/MIPS/src/core # ----------------------------------------------------------- -SRCS := $(SRC_PATH)/mips_types.vhd -SRCS += $(SRC_PATH)/mips_instr.vhd -SRCS += $(SRC_PATH)/mips_alu.vhd -SRCS += $(SRC_PATH)/mips_bcu.vhd -SRCS += $(SRC_PATH)/mips_biu.vhd -SRCS += $(SRC_PATH)/mips_cop.vhd -SRCS += $(SRC_PATH)/mips_dcache.vhd -SRCS += $(SRC_PATH)/mips_icache.vhd -SRCS += $(SRC_PATH)/mips_muldiv.vhd -SRCS += $(SRC_PATH)/mips_pipeline.vhd -SRCS += $(SRC_PATH)/mips_reg.vhd -SRCS += $(SRC_PATH)/mips_shifter.vhd -SRCS += $(SRC_PATH)/mips_top.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_2w2r2c_ra.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd +SRCS += $(MOD_PATH)/mips_types.vhd +SRCS += $(MOD_PATH)/mips_instr.vhd +SRCS += $(MOD_PATH)/mips_alu.vhd +SRCS += $(MOD_PATH)/mips_bcu.vhd +SRCS += $(MOD_PATH)/mips_biu.vhd +SRCS += $(MOD_PATH)/mips_cop.vhd +SRCS += $(MOD_PATH)/mips_dcache.vhd +SRCS += $(MOD_PATH)/mips_icache.vhd +SRCS += $(MOD_PATH)/mips_muldiv.vhd +SRCS += $(MOD_PATH)/mips_pipeline.vhd +SRCS += $(MOD_PATH)/mips_reg.vhd +SRCS += $(MOD_PATH)/mips_shifter.vhd +SRCS += $(MOD_PATH)/mips_top.vhd # ----------------------------------------------------------- $(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS)) SRCS := CUR_PATH := -SRC_PATH := +MOD_PATH := ROOT_PATH := LIB_PATH := diff --git a/lib/CPUs/MIPS/ghdl/tb_mips_top.make b/lib/CPUs/MIPS/ghdl/tb_mips_top.make index f9f52f1..7b71441 100644 --- a/lib/CPUs/MIPS/ghdl/tb_mips_top.make +++ b/lib/CPUs/MIPS/ghdl/tb_mips_top.make @@ -2,10 +2,6 @@ include mips_core.inc include ../../../../lib/FIFO/ghdl/fifo_sync.inc include ../../../../lib/FIFO/ghdl/fifo_async.inc -# RAMS -SRCS += ../../../rams/sim/dpram_2w2r2c_ra.vhd -SRCS += ../../../rams/sim/dpram_1w1r2c_ra.vhd - # FIFOS SRCS += $(FIFO_SYNC_SRCS) SRCS += $(FIFO_ASYNC_SRCS) diff --git a/lib/FIFO/ghdl/fifo_async.inc b/lib/FIFO/ghdl/fifo_async.inc index 2d05041..d5640fb 100644 --- a/lib/FIFO/ghdl/fifo_async.inc +++ b/lib/FIFO/ghdl/fifo_async.inc @@ -5,7 +5,7 @@ LIB_PATH := $(ROOT_PATH)/lib CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/rams/sim/dpram_1w1r2c_ra.vhd +SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd SRCS += $(LIB_PATH)/FIFO/src/gray_counter.vhd SRCS += $(LIB_PATH)/FIFO/src/fifo_async_ctrl.vhd diff --git a/lib/FIFO/ghdl/fifo_sync.inc b/lib/FIFO/ghdl/fifo_sync.inc index eab5106..37ca883 100644 --- a/lib/FIFO/ghdl/fifo_sync.inc +++ b/lib/FIFO/ghdl/fifo_sync.inc @@ -5,7 +5,7 @@ LIB_PATH := $(ROOT_PATH)/lib CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- -SRCS := $(LIB_PATH)/rams/sim/dpram_1w1r2c_ra.vhd +SRCS := $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd SRCS += $(LIB_PATH)/FIFO/src/fifo_ctrl_pkg.vhd SRCS += $(LIB_PATH)/FIFO/src/fifo_sync_ctrl.vhd SRCS += $(LIB_PATH)/FIFO/src/fifo_sync.vhd diff --git a/lib/JBUS/memory/ghdl/tb_ram_wb.make b/lib/JBUS/memory/ghdl/tb_ram_wb.make index 94c99a9..74d5f82 100644 --- a/lib/JBUS/memory/ghdl/tb_ram_wb.make +++ b/lib/JBUS/memory/ghdl/tb_ram_wb.make @@ -3,7 +3,7 @@ LIB_PATH := $(ROOT_PATH)/lib MOD_PATH := $(LIB_PATH)/JBUS/memory SRCS += $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r1c_ra.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r1c_ra.vhd SRCS += $(MOD_PATH)/src/ram_wb.vhd SRCS += $(MOD_PATH)/src/tb_ram_wb.vhd diff --git a/lib/emac/ghdl/emac_rx.inc b/lib/emac/ghdl/emac_rx.inc index 75e3d3b..a639674 100644 --- a/lib/emac/ghdl/emac_rx.inc +++ b/lib/emac/ghdl/emac_rx.inc @@ -8,7 +8,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- SRCS += $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd SRCS += $(FIFO_ASYNC_SRCS) SRCS += $(LIB_PATH)/emac/src/sipo.vhd SRCS += $(LIB_PATH)/emac/src/crc32.vhd diff --git a/lib/emac/ghdl/emac_tx.inc b/lib/emac/ghdl/emac_tx.inc index cba2d3f..2c99879 100644 --- a/lib/emac/ghdl/emac_tx.inc +++ b/lib/emac/ghdl/emac_tx.inc @@ -9,7 +9,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- SRCS += $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd SRCS += $(FIFO_SYNC_SRCS) SRCS += $(FIFO_ASYNC_SRCS) SRCS += $(LIB_PATH)/emac/src/piso.vhd diff --git a/lib/filter/ghdl/fir_semi_parallel.inc b/lib/filter/ghdl/fir_semi_parallel.inc index 4939e9b..160ec88 100644 --- a/lib/filter/ghdl/fir_semi_parallel.inc +++ b/lib/filter/ghdl/fir_semi_parallel.inc @@ -6,7 +6,7 @@ CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST))) # ----------------------------------------------------------- SRCS := $(LIB_PATH)/misc/utils_pkg.vhd -SRCS += $(LIB_PATH)/rams/sim/dpram_1w1r2c_ro.vhd +SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ro.vhd SRCS += $(LIB_PATH)/fixed/ieee_proposed/fixed_util_pkg.vhd SRCS += $(LIB_PATH)/filter/src/filter_pkg.vhd SRCS += $(LIB_PATH)/filter/src/fir_pkg.vhd diff --git a/lib/rams/altera/dpram_1w1r1c_ra.vhd b/lib/rams/altera/src/dpram_1w1r1c_ra.vhd similarity index 100% rename from lib/rams/altera/dpram_1w1r1c_ra.vhd rename to lib/rams/altera/src/dpram_1w1r1c_ra.vhd diff --git a/lib/rams/altera/dpram_1w1r2c_ra.vhd b/lib/rams/altera/src/dpram_1w1r2c_ra.vhd similarity index 100% rename from lib/rams/altera/dpram_1w1r2c_ra.vhd rename to lib/rams/altera/src/dpram_1w1r2c_ra.vhd diff --git a/lib/rams/altera/dpram_1w1r2c_ro.vhd b/lib/rams/altera/src/dpram_1w1r2c_ro.vhd similarity index 100% rename from lib/rams/altera/dpram_1w1r2c_ro.vhd rename to lib/rams/altera/src/dpram_1w1r2c_ro.vhd diff --git a/lib/rams/altera/dpram_2w2r2c_ra.vhd b/lib/rams/altera/src/dpram_2w2r2c_ra.vhd similarity index 100% rename from lib/rams/altera/dpram_2w2r2c_ra.vhd rename to lib/rams/altera/src/dpram_2w2r2c_ra.vhd diff --git a/lib/rams/sim/dpram_1w1r1c_ra.vhd b/lib/rams/sim/src/dpram_1w1r1c_ra.vhd similarity index 100% rename from lib/rams/sim/dpram_1w1r1c_ra.vhd rename to lib/rams/sim/src/dpram_1w1r1c_ra.vhd diff --git a/lib/rams/sim/dpram_1w1r2c_ra.vhd b/lib/rams/sim/src/dpram_1w1r2c_ra.vhd similarity index 100% rename from lib/rams/sim/dpram_1w1r2c_ra.vhd rename to lib/rams/sim/src/dpram_1w1r2c_ra.vhd diff --git a/lib/rams/sim/dpram_1w1r2c_ro.vhd b/lib/rams/sim/src/dpram_1w1r2c_ro.vhd similarity index 100% rename from lib/rams/sim/dpram_1w1r2c_ro.vhd rename to lib/rams/sim/src/dpram_1w1r2c_ro.vhd diff --git a/lib/rams/sim/dpram_2w2r2c_ra.vhd b/lib/rams/sim/src/dpram_2w2r2c_ra.vhd similarity index 100% rename from lib/rams/sim/dpram_2w2r2c_ra.vhd rename to lib/rams/sim/src/dpram_2w2r2c_ra.vhd diff --git a/lib/rams/sim/dpram_2w2r2c_ro.vhd b/lib/rams/sim/src/dpram_2w2r2c_ro.vhd similarity index 100% rename from lib/rams/sim/dpram_2w2r2c_ro.vhd rename to lib/rams/sim/src/dpram_2w2r2c_ro.vhd diff --git a/lib/rams/xilinx/dpram_1w1r2c_ra.vhd b/lib/rams/xilinx/src/dpram_1w1r2c_ra.vhd similarity index 100% rename from lib/rams/xilinx/dpram_1w1r2c_ra.vhd rename to lib/rams/xilinx/src/dpram_1w1r2c_ra.vhd diff --git a/lib/rams/xilinx/dpram_1w1r2c_ro.vhd b/lib/rams/xilinx/src/dpram_1w1r2c_ro.vhd similarity index 100% rename from lib/rams/xilinx/dpram_1w1r2c_ro.vhd rename to lib/rams/xilinx/src/dpram_1w1r2c_ro.vhd diff --git a/lib/rams/xilinx/dpram_2w2r2c_ra.vhd b/lib/rams/xilinx/src/dpram_2w2r2c_ra.vhd similarity index 100% rename from lib/rams/xilinx/dpram_2w2r2c_ra.vhd rename to lib/rams/xilinx/src/dpram_2w2r2c_ra.vhd diff --git a/lib/rams/xilinx/dpram_2w2r2c_ro.vhd b/lib/rams/xilinx/src/dpram_2w2r2c_ro.vhd similarity index 100% rename from lib/rams/xilinx/dpram_2w2r2c_ro.vhd rename to lib/rams/xilinx/src/dpram_2w2r2c_ro.vhd