From 9d4cef96a92863acedcc9b5885a452473c191af8 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 22 Jun 2023 07:20:19 +0200
Subject: [PATCH] updates to latest version of CoreDSL (2.0.9)

---
 .../com.minres.coredsl.json.target.target                  | 3 ++-
 .../minres/coredsl/json/tests/CoreDslGenerationTest.xtend  | 2 +-
 .../src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
index 0ff1395..4109b55 100644
--- a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
+++ b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
@@ -39,7 +39,8 @@
             <unit id="org.json" version="1.0.0.v201011060100"/>
         </location>
     	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.3"/>
+        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.9"/>
+	    	<unit id="com.minres.coredsl.feature.source.feature.group" version="0.0.0"/>
         	<unit id="com.minres.coredsl.feature.feature.group" version="0.0.0"/>
     	</location>
 	</locations>
diff --git a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend b/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend
index 8a13312..e9163f3 100644
--- a/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend
+++ b/com.minres.coredsl.json.tests/src/com/minres/coredsl/json/tests/CoreDslGenerationTest.xtend
@@ -87,7 +87,7 @@ Core RV32I {
         assertNotNull(result)
         assertEquals("RV32I", result.name)
         assertNull(result.superType)
-        assertEquals(9, result.declarations.size())
+        assertEquals(9, result.archStateBody.size())
         assertNotNull(result.instructions)
 
         assertEquals(5, result.instructions.size)
diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
index 435bbdd..039c9a0 100644
--- a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
+++ b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
@@ -18,7 +18,6 @@ import java.util.List
 import com.minres.coredsl.coreDsl.ISA
 import org.json.JSONObject
 import org.json.JSONArray
-import com.minres.coredsl.util.BigIntegerWithRadix
 import com.minres.coredsl.coreDsl.Statement
 import org.eclipse.xtext.resource.XtextResource
 
@@ -41,8 +40,8 @@ class CoreDslJsonGenerator extends AbstractGenerator {
 
 	def Boolean isHls(Instruction inst){
 		val instrSet = inst.eContainer as ISA;
-		!(inst.attributes.filter[it.type=='hls'].isEmpty && 
-		instrSet.commonInstructionAttributes.filter[it.type=='hls'].isEmpty)
+		!(inst.attributes.filter[it.attributeName=='hls'].isEmpty && 
+		instrSet.commonInstructionAttributes.filter[it.attributeName=='hls'].isEmpty)
 	}
 	def JSONArray compile(CoreDef coreDef) {
 		val insts = coreDef.allInstr
@@ -104,7 +103,7 @@ class CoreDslJsonGenerator extends AbstractGenerator {
     def dispatch asString(BitField i) '''«i.name»[«i.startIndex.value.intValue»:«i.endIndex.value.intValue»]'''
     
     def dispatch asString(BitValue i) {
-    	(i.value as BigIntegerWithRadix).toCString(2)
+    	i.value.toString(2)
 	}