Merge branch 'main' into issue_563

Author: sudo-apt-abdullah

bin/setup

@@ -6,6 +6,34 @@ cd $ROOT
 
 CONTAINER_TAG=`cat ${ROOT}/bin/.container-tag`
 
+# Parse command line arguments
+PRESERVE_CONFIG=0
+
+# Only parse arguments if this script is being run directly (not sourced)
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+  for arg in "$@"; do
+    case $arg in
+      --preserve-config)
+        PRESERVE_CONFIG=1
+        shift
+        ;;
+      --help|-h)
+        echo "Usage: $0 [OPTIONS]"
+        echo ""
+        echo "Options:"
+        echo "  --preserve-config    Only create .bundle/config if missing (default: always recreate)"
+        echo "  --help, -h           Show this help message"
+        exit 0
+        ;;
+      *)
+        echo "Unknown option: $arg"
+        echo "Use --help for usage information"
+        exit 1
+        ;;
+    esac
+  done
+fi
+
 # Supported container types:
 #
 # = devcontainer
@@ -128,7 +156,10 @@ if [ ! -d $ROOT/.home ]; then
     mkdir $ROOT/.home
 fi
 
-if [ ! -f $ROOT/.bundle/config ]; then
+if [ $PRESERVE_CONFIG -eq 0 ] || [ ! -f $ROOT/.bundle/config ]; then
+    if [ -f $ROOT/.bundle/config ] && [ $PRESERVE_CONFIG -eq 0 ]; then
+        echo "Recreating bundle config..."
+    fi
     OLDDIR=$PWD
     cd $ROOT
     ${RUN} bundle config set --local path ${ROOT}/.home/.gems

cfgs/example_rv64_with_overlay.yaml

@@ -30,7 +30,7 @@ implemented_extensions:
   - [Sscofpmf, "1.0.0"]
   - [Ssaia, "1.0.0"]
   - [Ssccfg, "1.0.0"]
-  - [Sstc, "0.9.0"]
+  - [Sstc, "1.0.0"]
   - [Sv39, "1.12.0"]
   - [Sv48, "1.12.0"]
   - [Zicboz, "1.0.0"]

spec/schemas/proc_cert_class_schema.json

@@ -1,16 +1,13 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-
   "type": "object",
   "required": ["$schema", "kind", "name", "long_name", "introduction"],
   "additionalProperties": false,
   "properties": {
     "$schema": {
-      "type": "string",
       "const": "proc_cert_class_schema.json#"
     },
     "kind": {
-      "type": "string",
       "const": "processor certificate class"
     },
     "name": {
@@ -23,7 +20,6 @@
       "description": "Descriptive name of the class"
     },
     "processor_kind": {
-      "type": "string",
       "enum": ["Generic Unprivileged", "Microcontroller", "Apps Processor"],
       "description": "What kind of class is this?"
     },

spec/schemas/proc_cert_model_schema.json

@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-
   "type": "object",
   "required": ["$schema", "kind", "name", "long_name", "base"],
   "additionalProperties": false,
@@ -54,11 +53,9 @@
       ]
     },
     "$schema": {
-      "type": "string",
       "const": "proc_cert_model_schema.json#"
     },
     "kind": {
-      "type": "string",
       "const": "processor certificate model"
     },
     "name": {
@@ -96,7 +93,6 @@
       "description": "List of semantic versions within the model"
     },
     "base": {
-      "type": "integer",
       "enum": [32, 64],
       "description": "Base of the model"
     },
@@ -143,7 +139,6 @@
     "in_scope_priv_modes": {
       "type": "array",
       "items": {
-        "type": "string",
         "enum": ["M", "S", "U", "HS", "VS", "VU"]
       },
       "uniqueItems": true,

spec/schemas/profile_family_schema.json

@@ -1,19 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-
   "type": "object",
   "required": ["$schema", "kind", "name", "long_name"],
   "properties": {
     "$schema": {
-      "type": "string",
       "const": "profile_family_schema.json#"
     },
     "kind": {
-      "type": "string",
       "const": "profile family"
     },
     "processor_kind": {
-      "type": "string",
       "enum": ["Generic Unprivileged", "Microcontroller", "Apps Processor"],
       "description": "What kind of processor is this?"
     },

spec/schemas/profile_release_schema.json

@@ -1,15 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-
   "type": "object",
   "required": ["$schema", "kind", "name", "long_name", "description"],
   "properties": {
     "$schema": {
-      "type": "string",
       "const": "profile_release_schema.json#"
     },
     "kind": {
-      "type": "string",
       "const": "profile release"
     },
     "name": {

spec/schemas/profile_schema.json

@@ -1,15 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-
   "type": "object",
   "required": ["$schema", "kind", "name", "long_name", "base"],
   "properties": {
     "$schema": {
-      "type": "string",
       "const": "profile_schema.json#"
     },
     "kind": {
-      "type": "string",
       "const": "profile"
     },
     "name": {

spec/std/isa/ext/Sstc.yaml

@@ -10,7 +10,7 @@ long_name: Supervisor-mode timer interrupts
 description: Supervisor-mode timer interrupts
 type: privileged
 versions:
-  - version: "0.9.0"
+  - version: "1.0.0"
     state: ratified
     ratification_date: null
     url: https://drive.google.com/file/d/1m84Re2yK8m_vbW7TspvevCDR82MOBaSX/view?usp=drive_link