From cb6cb78ea238f60bad11088127357ac39c351a12 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Tue, 23 Mar 2021 18:47:15 +0000
Subject: [PATCH] - refactored

git-svn-id: http://moon:8086/svn/vhdl/trunk@1503 cc03376c-175c-47c8-b038-4cd826a8556b
---
 ...pu_embedded.Makefile => cpu_embedded.make} |  2 +-
 .../{cpu_itest.Makefile => cpu_itest.make}    |  4 +--
 lib/CPUs/JCpu/ghdl/jcpu_core.inc              | 28 +++++++++++++++++++
 .../ghdl/{mul8x8.Makefile => mul8x8.make}     |  2 +-
 .../{reti_issue.Makefile => reti_issue.make}  |  4 +--
 lib/CPUs/JCpu/src/core/jcpu_core.mk           | 19 -------------
 6 files changed, 34 insertions(+), 25 deletions(-)
 rename lib/CPUs/JCpu/ghdl/{cpu_embedded.Makefile => cpu_embedded.make} (87%)
 rename lib/CPUs/JCpu/ghdl/{cpu_itest.Makefile => cpu_itest.make} (90%)
 create mode 100644 lib/CPUs/JCpu/ghdl/jcpu_core.inc
 rename lib/CPUs/JCpu/ghdl/{mul8x8.Makefile => mul8x8.make} (87%)
 rename lib/CPUs/JCpu/ghdl/{reti_issue.Makefile => reti_issue.make} (90%)
 delete mode 100644 lib/CPUs/JCpu/src/core/jcpu_core.mk

diff --git a/lib/CPUs/JCpu/ghdl/cpu_embedded.Makefile b/lib/CPUs/JCpu/ghdl/cpu_embedded.make
similarity index 87%
rename from lib/CPUs/JCpu/ghdl/cpu_embedded.Makefile
rename to lib/CPUs/JCpu/ghdl/cpu_embedded.make
index 1213516..2cc5e05 100644
--- a/lib/CPUs/JCpu/ghdl/cpu_embedded.Makefile
+++ b/lib/CPUs/JCpu/ghdl/cpu_embedded.make
@@ -1,4 +1,4 @@
-include ../src/core/jcpu_core.mk
+include jcpu_core.inc
 
 SRCS += $(JCPU_CORE_SRCS)
 SRCS += ../src/itest_irom.vhdl
diff --git a/lib/CPUs/JCpu/ghdl/cpu_itest.Makefile b/lib/CPUs/JCpu/ghdl/cpu_itest.make
similarity index 90%
rename from lib/CPUs/JCpu/ghdl/cpu_itest.Makefile
rename to lib/CPUs/JCpu/ghdl/cpu_itest.make
index 69d53c3..6a66b98 100644
--- a/lib/CPUs/JCpu/ghdl/cpu_itest.Makefile
+++ b/lib/CPUs/JCpu/ghdl/cpu_itest.make
@@ -1,8 +1,8 @@
-include ../src/core/jcpu_core.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 += $(JCPU_CORE_SRCS)
 SRCS += ../src/itest_irom.vhdl
 SRCS += ../src/tb_cpu_itest.vhd
 
diff --git a/lib/CPUs/JCpu/ghdl/jcpu_core.inc b/lib/CPUs/JCpu/ghdl/jcpu_core.inc
new file mode 100644
index 0000000..960db0d
--- /dev/null
+++ b/lib/CPUs/JCpu/ghdl/jcpu_core.inc
@@ -0,0 +1,28 @@
+# -----------------------------------------------------------
+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
+
+# -----------------------------------------------------------
+$(PKG_NAME)_SRCS := $(addprefix $(CUR_PATH)/,$(SRCS))
+
+SRCS := 
+CUR_PATH :=
+SRC_PATH := 
+ROOT_PATH := 
+LIB_PATH := 
+
diff --git a/lib/CPUs/JCpu/ghdl/mul8x8.Makefile b/lib/CPUs/JCpu/ghdl/mul8x8.make
similarity index 87%
rename from lib/CPUs/JCpu/ghdl/mul8x8.Makefile
rename to lib/CPUs/JCpu/ghdl/mul8x8.make
index 62df935..28d6434 100644
--- a/lib/CPUs/JCpu/ghdl/mul8x8.Makefile
+++ b/lib/CPUs/JCpu/ghdl/mul8x8.make
@@ -1,4 +1,4 @@
-include ../src/core/jcpu_core.mk
+include jcpu_core.inc
 
 SRCS += $(JCPU_CORE_SRCS)
 SRCS += ../src/mul8x8_irom.vhdl
diff --git a/lib/CPUs/JCpu/ghdl/reti_issue.Makefile b/lib/CPUs/JCpu/ghdl/reti_issue.make
similarity index 90%
rename from lib/CPUs/JCpu/ghdl/reti_issue.Makefile
rename to lib/CPUs/JCpu/ghdl/reti_issue.make
index 3801f88..bbbaee2 100644
--- a/lib/CPUs/JCpu/ghdl/reti_issue.Makefile
+++ b/lib/CPUs/JCpu/ghdl/reti_issue.make
@@ -1,8 +1,8 @@
-include ../src/core/jcpu_core.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 += $(JCPU_CORE_SRCS)
 SRCS += ../src/reti_issue_irom.vhdl
 SRCS += ../src/tb_cpu_itest.vhd
 
diff --git a/lib/CPUs/JCpu/src/core/jcpu_core.mk b/lib/CPUs/JCpu/src/core/jcpu_core.mk
deleted file mode 100644
index 080850d..0000000
--- a/lib/CPUs/JCpu/src/core/jcpu_core.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-_PKG_NAME := JCPU_CORE
-
-_CURDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
-
-_SRC := cpu_pkg.vhd
-_SRC += cpu.vhd
-_SRC += alu.vhd
-_SRC += chipram.vhd
-_SRC += chipreg.vhd
-_SRC += dpath_ctrl.vhd
-_SRC += int_ctrl.vhd
-_SRC += pc.vhd
-_SRC += reg_dual.vhd
-_SRC += stack_ctrl.vhd
-
-$(_PKG_NAME)_SRCS := $(addprefix $(_CURDIR)/,$(_SRC))
-
-undefine $(_SRC)
-