From ab015c3d88e9dcd4dd63d1441ad67e39ca687bbe Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 13 Nov 2022 09:03:45 +0100
Subject: [PATCH 1/3] extends standalone help output

---
 .../src/com/minres/rdl/generator/Main.xtend       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
index 0e1da98..87beb18 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
@@ -24,7 +24,20 @@ import java.io.File
 class Main {
 
     val USAGE_STR = '''
-    RDL2code [-h] [-v] [-f] [-fw] [-sc [-n <namespace>]] [-I <RDL include dir] [-o <output dir>] <input file> <input file>
+    RDL2code [-h] [-v] [-f] [-I <RDL include dir>] [-o <output dir>] [-sc [-n <namespace>] [-sc-dir <dir modifier>]] [-fw [-fw-dir <dir modifier>]] <input file> <input file>
+        The following switches are supported:
+        -h                              prints help page
+        -v                              verbose output
+        -f                              force overwrite existing files
+        -I <RDL include dir>            include directory to search included RDL files
+        -o <output dir>                 output directory of generated files
+        -fw                             generate FW include files. The following sub 
+                                        switches are supported:
+            -fw-dir <dir modifier>      set the directory modifier (relative path to output dir
+        -sc                             generate SystemC stubs. The following sub switches
+                                        are supported
+            -n <namespace>              the namespace to use for the generated SystemC component
+            -sc-dir <dir modifier>      set the directory modifier (relative path to output dir
     '''
 
     def static main(String[] args) {

From 262100d648e2d13fb3d4b4cbdd7afdf54065055a Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 13 Nov 2022 09:05:00 +0100
Subject: [PATCH 2/3] updates build setup

---
 .../com.minres.rdl.platform.feature/feature.xml               | 2 +-
 com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml | 3 +--
 .../com.minres.rdl.product.feature/feature.xml                | 2 +-
 com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml  | 2 +-
 .../com.minres.rdl.product.product                            | 3 +--
 .../com.minres.rdl.product/META-INF/MANIFEST.MF               | 2 +-
 com.minres.rdl.parent/com.minres.rdl.product/pom.xml          | 3 +--
 com.minres.rdl.parent/pom.xml                                 | 4 ++++
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
index 6ed890d..0850f29 100644
--- a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.minres.rdl.platform.feature"
       label="Xtext Platform Feature"
-      version="1.1.0.qualifier"
+      version="1.4.0"
       provider-name="MINRES Technologies GmbH">
 
    <description url="http://www.example.com/description">
diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml
index cea05ae..4e24f9a 100644
--- a/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml
@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 	<artifactId>com.minres.rdl.platform.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>1.1.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml
index ff890d4..64981a6 100644
--- a/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.minres.rdl.product.feature"
       label="RDL Feature "
-      version="1.0.0.qualifier"
+      version="1.4.0"
       provider-name="MINRES Technologies GmbH">
 
    <requires>
diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml
index 96178d2..b5372af 100644
--- a/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 	<artifactId>com.minres.rdl.product.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product b/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product
index 9d6f2d9..9fff66e 100644
--- a/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product
+++ b/com.minres.rdl.parent/com.minres.rdl.product.releng/com.minres.rdl.product.product
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RDL Editor" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true">
-
+<product name="RDL Editor" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF
index 6c347d6..eb8593b 100644
--- a/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RDL Editor
 Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"
diff --git a/com.minres.rdl.parent/com.minres.rdl.product/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml
index ee8aa59..0a06a59 100644
--- a/com.minres.rdl.parent/com.minres.rdl.product/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml
@@ -4,9 +4,8 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 	<artifactId>com.minres.rdl.product</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.1.1-SNAPSHOT</version>
 </project>
diff --git a/com.minres.rdl.parent/pom.xml b/com.minres.rdl.parent/pom.xml
index 2057021..64a8a68 100644
--- a/com.minres.rdl.parent/pom.xml
+++ b/com.minres.rdl.parent/pom.xml
@@ -33,6 +33,10 @@
 		<module>com.minres.rdl.tests</module>
 		<module>com.minres.rdl.ui.tests</module>
 		<module>com.minres.rdl.standalone</module>
+		<module>com.minres.rdl.platform.feature</module>
+		<module>com.minres.rdl.product</module>
+		<module>com.minres.rdl.product.feature</module>
+		<module>com.minres.rdl.product.releng</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>

From 13594cf1493ee6b2db4fc76d3c993abc5831350a Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 5 Jan 2023 14:28:23 +0100
Subject: [PATCH 3/3] adds offset to registerResources() function for simple
 regs (#6)

---
 .../src/com/minres/rdl/generator/RegfileGenerator.xtend         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
index b5c833f..4080308 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
@@ -157,7 +157,7 @@ class RegfileGenerator extends RdlBaseGenerator{
                     «IF instantiation.componentDefinition.type == ComponentDefinitionType.REGFILE»
                         i_«instance.name».registerResources(target, «instance.addressValue»UL+offset);
                     «ELSEIF instantiation.componentDefinition.type == ComponentDefinitionType.REG»
-                        target.addResource(«instance.name», «instance.addressValue»UL);
+                        target.addResource(«instance.name», «instance.addressValue»UL+offset);
                     «ENDIF»                    
                 «ENDFOR»
             «ENDFOR»