- refactored

git-svn-id: http://moon:8086/svn/vhdl/trunk@1541 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
2021-03-28 10:27:33 +00:00
parent d0433ac19d
commit 06feba8f63
47 changed files with 255 additions and 357 deletions
+4 -1
View File
@@ -1,3 +1,6 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
include jcpu_core.inc
SRCS += $(JCPU_CORE_SRCS)
@@ -10,5 +13,5 @@ TARGET := cpu_embedded
ENTITY := tb_cpu_embedded
WITH_GHW := y
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
+6 -3
View File
@@ -1,8 +1,11 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
include jcpu_core.inc
SRCS += $(JCPU_CORE_SRCS)
SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.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/itest_irom.vhdl
SRCS += ../src/tb_cpu_itest.vhd
@@ -11,5 +14,5 @@ TARGET := cpu_itest
ENTITY := tb_cpu
WITH_GHW := y
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
+13 -21
View File
@@ -1,28 +1,20 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
PKG_NAME := JCPU_CORE
ROOT_PATH := ../../../..
LIB_PATH := $(ROOT_PATH)/lib
CUR_PATH := $(shell dirname $(lastword $(MAKEFILE_LIST)))
SRC_PATH := $(LIB_PATH)/CPUs/JCpu/src/core
# -----------------------------------------------------------
SRCS := $(SRC_PATH)/cpu_pkg.vhd
SRCS += $(SRC_PATH)/cpu.vhd
SRCS += $(SRC_PATH)/alu.vhd
SRCS += $(SRC_PATH)/chipram.vhd
SRCS += $(SRC_PATH)/chipreg.vhd
SRCS += $(SRC_PATH)/dpath_ctrl.vhd
SRCS += $(SRC_PATH)/int_ctrl.vhd
SRCS += $(SRC_PATH)/pc.vhd
SRCS += $(SRC_PATH)/reg_dual.vhd
SRCS += $(SRC_PATH)/stack_ctrl.vhd
MOD_PATH := $(LIB_PATH)/CPUs/JCpu/src/core
$(PKG_NAME)_SRCS += $(MOD_PATH)/cpu_pkg.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/cpu.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/alu.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/chipram.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/chipreg.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/dpath_ctrl.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/int_ctrl.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/pc.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/reg_dual.vhd
$(PKG_NAME)_SRCS += $(MOD_PATH)/stack_ctrl.vhd
# -----------------------------------------------------------
$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
SRCS :=
CUR_PATH :=
SRC_PATH :=
ROOT_PATH :=
LIB_PATH :=
+4 -1
View File
@@ -1,3 +1,6 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
include jcpu_core.inc
SRCS += $(JCPU_CORE_SRCS)
@@ -10,5 +13,5 @@ TARGET := mul8x8
ENTITY := tb_cpu_embedded
WITH_GHW := y
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk
+6 -3
View File
@@ -1,8 +1,11 @@
# -----------------------------------------------------------
include $(VHDL_HOME)/make/defs.mk
# -----------------------------------------------------------
include jcpu_core.inc
SRCS += $(JCPU_CORE_SRCS)
SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993.vhd
SRCS += ../../../PCK_FIO-2002.7/PCK_FIO_1993_BODY.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/reti_issue_irom.vhdl
SRCS += ../src/tb_cpu_itest.vhd
@@ -11,5 +14,5 @@ TARGET := reti_issue
ENTITY := tb_cpu
WITH_GHW := y
include ../../../../Common/make/ghdl.mk
include $(VHDL_HOME)/make/ghdl.mk