Merge pull request #364 from riscv-software-src/fixes

Fix pre-commit issues with layout files, fix do with devcontainer
riscv-software-src · Dec 18, 2024 · bc5ec90 · bc5ec90
2 parents 52eb36b + 579d8db
commit bc5ec90
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 40 deletions.
diff --git a/arch/csr/Zihpm/mhpmcounterNh.layout b/arch/csr/Zihpm/mhpmcounterNh.layout
@@ -19,8 +19,8 @@ fields:
     alias: mhpmcounter.COUNT<%= hpm_num %>[63:32]
     description: |
       Upper bits of counter.
-    type(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;'
-    reset_value(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;'
+    type(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;"
+    reset_value(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;"
 sw_read(): |
   if (HPM_COUNTER_EN[<%= hpm_num %>]) {
     return read_hpm_counter(<%= hpm_num %>)[63:32];

diff --git a/arch/csr/Zihpm/mhpmevent10.yaml b/arch/csr/Zihpm/mhpmevent10.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent11.yaml b/arch/csr/Zihpm/mhpmevent11.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent12.yaml b/arch/csr/Zihpm/mhpmevent12.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent13.yaml b/arch/csr/Zihpm/mhpmevent13.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent14.yaml b/arch/csr/Zihpm/mhpmevent14.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent15.yaml b/arch/csr/Zihpm/mhpmevent15.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent16.yaml b/arch/csr/Zihpm/mhpmevent16.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent17.yaml b/arch/csr/Zihpm/mhpmevent17.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent18.yaml b/arch/csr/Zihpm/mhpmevent18.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent19.yaml b/arch/csr/Zihpm/mhpmevent19.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent20.yaml b/arch/csr/Zihpm/mhpmevent20.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent21.yaml b/arch/csr/Zihpm/mhpmevent21.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent22.yaml b/arch/csr/Zihpm/mhpmevent22.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent23.yaml b/arch/csr/Zihpm/mhpmevent23.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent24.yaml b/arch/csr/Zihpm/mhpmevent24.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent25.yaml b/arch/csr/Zihpm/mhpmevent25.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent26.yaml b/arch/csr/Zihpm/mhpmevent26.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent27.yaml b/arch/csr/Zihpm/mhpmevent27.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent28.yaml b/arch/csr/Zihpm/mhpmevent28.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent29.yaml b/arch/csr/Zihpm/mhpmevent29.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent3.yaml b/arch/csr/Zihpm/mhpmevent3.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent30.yaml b/arch/csr/Zihpm/mhpmevent30.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent31.yaml b/arch/csr/Zihpm/mhpmevent31.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent4.yaml b/arch/csr/Zihpm/mhpmevent4.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent5.yaml b/arch/csr/Zihpm/mhpmevent5.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent6.yaml b/arch/csr/Zihpm/mhpmevent6.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent7.yaml b/arch/csr/Zihpm/mhpmevent7.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent8.yaml b/arch/csr/Zihpm/mhpmevent8.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmevent9.yaml b/arch/csr/Zihpm/mhpmevent9.yaml
@@ -1,4 +1,6 @@
-# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
+# yaml-language-server: $schema=../../../schemas/csr_schema.json
+
+# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout
 
 $schema: csr_schema.json#
 kind: csr

diff --git a/arch/csr/Zihpm/mhpmeventN.layout b/arch/csr/Zihpm/mhpmeventN.layout
@@ -1,4 +1,3 @@
-
 # yaml-language-server: $schema=../../../schemas/csr_schema.json
 
 <%- raise "'hpm_num' must be defined" if hpm_num.nil? -%>

diff --git a/do b/do
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 ROOT=$(dirname $(realpath $BASH_SOURCE[0]))
-if [ -v DEVCONTAINER_ENV ]; then
-  BUNDLE=bundle
-else
-  source $ROOT/bin/setup
-fi
 
 if [ "$1" == "clean" ]; then
   ${ROOT}/bin/clean
-else
-  # really long way of invoking rake, but renamed to 'do'
-  $BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
+  exit $?
 fi
+
+source $ROOT/bin/setup
+
+
+# really long way of invoking rake, but renamed to 'do'
+$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		# yaml-language-server: $schema=../../../schemas/csr_schema.json

		<%- raise "'hpm_num' must be defined" if hpm_num.nil? -%>
Expand Down