Tools/RDL-Editor
9
0
Fork 0
mirror of https://github.com/Minres/RDL-Editor.git synced 2025-07-12 18:53:27 +02:00
Code Issues 1 Packages Releases Wiki Activity

Compare commits

base: Tools:1.4.0
Branches Tags
Tools:master Tools:gh-pages Tools:develop
Tools:1.4.1 Tools:offest_propagation Tools:1.4.0 Tools:1.3.0 Tools:1_2_0 Tools:1_1_1 Tools:1_1_0 Tools:1_0_0
..
compare: Tools:master
Branches Tags
Tools:gh-pages Tools:master Tools:develop
Tools:1.4.1 Tools:offest_propagation Tools:1.4.0 Tools:1.3.0 Tools:1_2_0 Tools:1_1_1 Tools:1_1_0 Tools:1_0_0

7 Commits
1.4.0 ... master

Author SHA1 Message Date
Eyck Jentzsch
52c0c1d9a6 adds more fixes for #7 2023-01-08 18:56:49 +01:00
Eyck Jentzsch
80ebbbea0f fixes #7 2023-01-08 18:35:16 +01:00
Eyck Jentzsch
f7c2614e8a Merge branch 'release/1.4.1' 2023-01-05 16:18:00 +01:00
Eyck Jentzsch
35a4e7f5cf updates version number 2023-01-05 16:17:49 +01:00
Eyck Jentzsch
d657ab45b7 Merge branch 'hotfix/offest_propagation' 2023-01-05 14:28:32 +01:00
Eyck Jentzsch
e2d7a0f180 Merge branch 'hotfix/offest_propagation' into develop 2023-01-05 14:28:32 +01:00
Eyck Jentzsch
13594cf149 adds offset to registerResources() function for simple regs (#6) 2023-01-05 14:28:23 +01:00
30 changed files with 36 additions and 44 deletions
Expand all files Collapse all files

8
Modulefile
View File

@ -13,11 +13,11 @@ proc ModulesHelp { } {
# puts stderr "Don't forget to execute 'scl enable devtoolset-7 bash'"
#}
if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/] != 1} {
puts stderr "Please install java via 'sdk install java 11.0.9.hs-adpt'!"
prereq java/11.0.9
if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/17.0.2-open/] != 1} {
puts stderr "Please install java via 'sdk install java 17.0.2-open'!"
prereq java/17.0.2
} else {
prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin
prepend-path PATH $::env(HOME)/.sdkman/candidates/java/17.0.2-open/bin
}
setenv PROJECT RDL-Editor

2
com.minres.rdl.parent/com.minres.rdl.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.minres.rdl.feature"
label="RDL Feature "
version="1.4.0"
version="1.4.1"
provider-name="MINRES Technologies GmbH">
<plugin

2
com.minres.rdl.parent/com.minres.rdl.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ide
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ide
Bundle-Vendor: My Company
Bundle-Version: 1.4.0
Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.ide/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.ide</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.minres.rdl.platform.feature"
label="Xtext Platform Feature"
version="1.4.0"
version="1.4.1"
provider-name="MINRES Technologies GmbH">
<description url="http://www.example.com/description">

2
com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.platform.feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.minres.rdl.product.feature"
label="RDL Feature "
version="1.4.0"
version="1.4.1"
provider-name="MINRES Technologies GmbH">
<requires>

2
com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.product.feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml
View File

@ -7,7 +7,7 @@
<name>RDL Editor</name>
<parent>
<version>1.4.0</version>
<version>1.4.1</version>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
</parent>

2
com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF
View File

@ -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.4.0
Bundle-Version: 1.4.1
Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"

2
com.minres.rdl.parent/com.minres.rdl.product/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.product</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.repository/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.repository</artifactId>
<packaging>eclipse-repository</packaging>

2
com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>com.minres.rdl.parent</artifactId>
<groupId>com.minres.rdl</groupId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.standalone</artifactId>

2
com.minres.rdl.parent/com.minres.rdl.target/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.target</artifactId>
<packaging>eclipse-target-definition</packaging>

2
com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.tests
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.tests
Bundle-Vendor: My Company
Bundle-Version: 1.4.0
Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.tests/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui.tests
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ui.tests
Bundle-Vendor: My Company
Bundle-Version: 1.4.0
Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl.ui,

2
com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ui
Bundle-Vendor: MINRES Technologies GmbH
Bundle-Version: 1.4.0
Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.ui/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.ui</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.web/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl.web</artifactId>
<packaging>war</packaging>

2
com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl
Bundle-Vendor: MINRES Technologies GmbH
Bundle-Version: 1.4.0
Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,

2
com.minres.rdl.parent/com.minres.rdl/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>com.minres.rdl</artifactId>
<packaging>eclipse-plugin</packaging>

4
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
View File

@ -20,7 +20,7 @@ class AddrmapGenerator extends RdlBaseGenerator {
override generateHeader(String namespace) {'''
/*
* Copyright (c) 2019 -2022 MINRES Technologies GmbH
* Copyright (c) 2023 MINRES Technologies GmbH
*
* SPDX-License-Identifier: Apache-2.0
*
@ -39,8 +39,6 @@ class AddrmapGenerator extends RdlBaseGenerator {
«ENDFOR»
«ENDFOR»
}};
#endif /* _«componentDefinition.effectiveName.toUpperCase»_MAP_H_ */
'''
}

2
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend
View File

@ -22,7 +22,7 @@ class FwAddrmapGenerator extends RdlBaseGenerator {
override generateHeader(String namespace) {'''
/*
* Copyright (c) 2019 -2022 MINRES Technologies GmbH
* Copyright (c) 2023 MINRES Technologies GmbH
*
* SPDX-License-Identifier: Apache-2.0
*

4
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend
View File

@ -23,7 +23,7 @@ class FwRegfileGenerator extends RdlBaseGenerator{
override String generateHeader(String namespace)'''
/*
* Copyright (c) 2019 -2022 MINRES Technologies GmbH
* Copyright (c) 2023 MINRES Technologies GmbH
*
* SPDX-License-Identifier: Apache-2.0
*
@ -91,8 +91,6 @@ class FwRegfileGenerator extends RdlBaseGenerator{
«ENDFOR»
«ENDFOR»
};
#endif // _«componentDefinition.name.toUpperCase»_H_
'''
override generateSource(String namespace) {

4
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend
View File

@ -30,7 +30,7 @@ class ModuleGenerator extends RdlBaseGenerator {
// if(addrMaps.size==0) return ''
'''
/*
* Copyright (c) 2019 -2022 MINRES Technologies GmbH
* Copyright (c) 2023 MINRES Technologies GmbH
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -63,8 +63,6 @@ class ModuleGenerator extends RdlBaseGenerator {
«FOR ns : namespace.split('::').reverse»
} // namespace «ns»
«ENDFOR»
#endif /* _«namespace.toUpperCase»_«componentDefinition.effectiveName.toUpperCase»_H_ */
'''
}

6
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
View File

@ -23,7 +23,7 @@ class RegfileGenerator extends RdlBaseGenerator{
override String generateHeader(String namespace)'''
/*
* Copyright (c) 2019 -2022 MINRES Technologies GmbH
* Copyright (c) 2023 MINRES Technologies GmbH
*
* SPDX-License-Identifier: Apache-2.0
*
@ -157,13 +157,11 @@ 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»
}
#endif // _«namespace.toUpperCase»_GEN_«componentDefinition.effectiveName.toUpperCase»_H_
'''
override generateSource(String namespace) {

4
com.minres.rdl.parent/pom.xml
View File

@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.minres.rdl</groupId>
<version>1.4.0</version>
<version>1.4.1</version>
<artifactId>com.minres.rdl.parent</artifactId>
<packaging>pom</packaging>
@ -108,7 +108,7 @@
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.target</artifactId>
<!-- <version>${project.version}</version> -->
<version>1.4.0</version>
<version>1.4.1</version>
</artifact>
</target>
<environments>