From 844df9579f158568a03e47cbe008c4431bf67b1b Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 6 Feb 2021 14:50:00 +0000
Subject: [PATCH] generate working ISS from CoreDSL 2.0

---
 .cproject      | 7 +++++--
 .project       | 6 ++++++
 CMakeLists.txt | 1 +
 Modulefile     | 2 +-
 coredsl        | 2 +-
 tgfs           | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.cproject b/.cproject
index 1463a0b..a933a18 100644
--- a/.cproject
+++ b/.cproject
@@ -16,7 +16,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1336041151.1615713914" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1297474963" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1141103737" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder buildPath="/TGFS-ISS/build/Debug" id="de.marw.cdt.cmake.core.genscriptbuilder.1100382234" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="false" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
+							<builder buildPath="/TGFS-ISS/build/Debug" id="de.marw.cdt.cmake.core.genscriptbuilder.1100382234" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.740869785" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1934077203" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.17118862" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -41,7 +41,10 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule buildDir="build/${ConfigName}" moduleId="de.marw.cdt.cmake.core.settings">
 				<options/>
-				<defs/>
+				<defs>
+					<def name="ENABLE_CODEGEN" type="BOOL" val="ON"/>
+					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
+				</defs>
 				<undefs/>
 			</storageModule>
 		</cconfiguration>
diff --git a/.project b/.project
index bccc870..8902d29 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
@@ -23,5 +28,6 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 927d8c5..8987396 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,3 +61,4 @@ gen_coredsl(TGF_C ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/TGFS.core_desc inte
 add_subdirectory(dbt-core)
 add_subdirectory(scc)
 add_subdirectory(tgfs)
+
diff --git a/Modulefile b/Modulefile
index 425c37f..f4576a5 100644
--- a/Modulefile
+++ b/Modulefile
@@ -27,7 +27,7 @@ if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidate
     prepend-path PATH $::env(HOME)/.sdkman/candidates/sbt/1.4.4/bin
 }
 
-module load tools/cmake
+module load tools/cmake  tools/gcc-riscv64/9.2.0
 
 setenv PROJECT TGFS-ISS
 
diff --git a/coredsl b/coredsl
index ff947c9..54262d2 160000
--- a/coredsl
+++ b/coredsl
@@ -1 +1 @@
-Subproject commit ff947c9d4864bfc801e23e422533f14f9c222def
+Subproject commit 54262d2a4d8672cd9c7e41d368037c5e37fc18f5
diff --git a/tgfs b/tgfs
index da7e29f..34bb8e6 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit da7e29fbb7f6aed3b35a09af1d829dad0d2d684b
+Subproject commit 34bb8e62aeed221741d186e019778f97e42e6d12