From 367b46f1a7f1477e008d1a31a9ae97786039cbcb Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 27 Mar 2021 09:37:54 +0000 Subject: [PATCH] extract used variables --- coredsl | 2 +- generate.sh | 7 ++++--- tgfs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coredsl b/coredsl index bc3afbe..5f74673 160000 --- a/coredsl +++ b/coredsl @@ -1 +1 @@ -Subproject commit bc3afbec5cf633d09c1dc39580450732e65c4fd8 +Subproject commit 5f7467341686eab0b79fad3158a976c6692a5dc0 diff --git a/generate.sh b/generate.sh index 3eaabda..cf314a9 100644 --- a/generate.sh +++ b/generate.sh @@ -8,15 +8,16 @@ GENERATOR="java $JAVA_OPTS -jar coredsl/com.minres.coredsl.generator.repository/ CORE_NAME=$1 BACKEND=$2 +CORE_NAME_LC=`echo $CORE_NAME | tr '[:upper:]' '[:lower:]' ` INPUT_FILE=tgfs/gen_input/TGFS.core_desc REPO_DIR=tgfs/gen_input/CoreDSL-Instruction-Set-Description TMPL_DIR=tgfs/gen_input/templates/interp MAPPING="" -MAPPING="$MAPPING -m ${TMPL_DIR}/CORENAME.h.gtl:tgfs/incl/iss/arch/${CORE_NAME}.h" -MAPPING="$MAPPING -m ${TMPL_DIR}/CORENAME.cpp.gtl:tgfs/src/iss/${CORE_NAME}.cpp" -MAPPING="$MAPPING -m ${TMPL_DIR}/vm_CORENAME.cpp.gtl:tgfs/src/vm/${BACKEND}/vm_${CORE_NAME}.cpp" +MAPPING="$MAPPING -m ${TMPL_DIR}/CORENAME.h.gtl:tgfs/incl/iss/arch/${CORE_NAME_LC}.h" +MAPPING="$MAPPING -m ${TMPL_DIR}/CORENAME.cpp.gtl:tgfs/src/iss/${CORE_NAME_LC}.cpp" +MAPPING="$MAPPING -m ${TMPL_DIR}/vm_CORENAME.cpp.gtl:tgfs/src/vm/${BACKEND}/vm_${CORE_NAME_LC}.cpp" [ -f coredsl/com.minres.coredsl.generator.repository/target/com.minres.coredsl.generator-2.0.0-SNAPSHOT.jar ] || (cd coredsl; mvn package) diff --git a/tgfs b/tgfs index 4e0f20e..32e4aa8 160000 --- a/tgfs +++ b/tgfs @@ -1 +1 @@ -Subproject commit 4e0f20eba0ac9436c1e6dc2d2973a2d5fbf6994c +Subproject commit 32e4aa83b8827aa0e95fc7fef73948af2d8e0ea3