- fixed paths after refactoring

git-svn-id: http://moon:8086/svn/vhdl/trunk@1533 cc03376c-175c-47c8-b038-4cd826a8556b

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 += $(LIB_PATH)/rams/sim/src/dpram_2w2r2c_ra.vhd
-SRCS += $(SRC_PATH)/mips_instr.vhd
+SRCS += $(LIB_PATH)/rams/sim/src/dpram_1w1r2c_ra.vhd
-SRCS += $(SRC_PATH)/mips_alu.vhd
+SRCS += $(MOD_PATH)/mips_types.vhd
-SRCS += $(SRC_PATH)/mips_bcu.vhd
+SRCS += $(MOD_PATH)/mips_instr.vhd
-SRCS += $(SRC_PATH)/mips_biu.vhd
+SRCS += $(MOD_PATH)/mips_alu.vhd
-SRCS += $(SRC_PATH)/mips_cop.vhd
+SRCS += $(MOD_PATH)/mips_bcu.vhd
-SRCS += $(SRC_PATH)/mips_dcache.vhd
+SRCS += $(MOD_PATH)/mips_biu.vhd
-SRCS += $(SRC_PATH)/mips_icache.vhd
+SRCS += $(MOD_PATH)/mips_cop.vhd
-SRCS += $(SRC_PATH)/mips_muldiv.vhd
+SRCS += $(MOD_PATH)/mips_dcache.vhd
-SRCS += $(SRC_PATH)/mips_pipeline.vhd
+SRCS += $(MOD_PATH)/mips_icache.vhd
-SRCS += $(SRC_PATH)/mips_reg.vhd
+SRCS += $(MOD_PATH)/mips_muldiv.vhd
-SRCS += $(SRC_PATH)/mips_shifter.vhd
+SRCS += $(MOD_PATH)/mips_pipeline.vhd
-SRCS += $(SRC_PATH)/mips_top.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 := 
 

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)

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

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

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
 

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

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

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