@micro-os-plus/architecture-riscv 4.1.0 → 5.1.0

package/meson.build

@@ -1,46 +1,106 @@
 # -----------------------------------------------------------------------------
+# DO NOT EDIT! Automatically generated from template file:
+# xcdl-package.jsonc
 #
-# This file is part of the µOS++ distribution.
-#   (https://github.com/micro-os-plus/)
-# Copyright (c) 2022 Liviu Ionescu
+# This file is part of the µOS++ project (https://micro-os-plus.github.io/).
+# Copyright (c) 2022-2026 Liviu Ionescu. All rights reserved.
 #
-# Permission to use, copy, modify, and/or distribute this software
-# for any purpose is hereby granted, under the terms of the MIT license.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose is hereby granted, under the terms of the MIT license.
 #
-# If a copy of the license was not distributed with this file, it can
-# be obtained from https://opensource.org/licenses/MIT/.
+# If a copy of the license was not distributed with this file, it can be
+# obtained from https://opensource.org/licenses/mit.
 #
 # -----------------------------------------------------------------------------
 
-# This file is intended to be consumed by applications with:
+# This file is intended to be used by applications via:
 #
-# `subdir('xpacks/micro-os-plus-architecture-riscv')`
+# `subdir('xpacks/@micro-os-plus/architecture-riscv')`
 #
-# The result is a dependency that can be referred as:
+# This creates dependencies that can be linked to a target with:
 #
-# `dependencies: [micro_os_plus_architecture_dependency],`
+# `dependencies: [micro_os_plus_architectures_riscv_dependency],`
 
-# Note: the meson configuration is provided only as a proof of concept,
+# Note: the Meson configuration is provided only as a proof of concept;
 # for production it might need some refinements.
 
 # -----------------------------------------------------------------------------
 
-message('Processing xPack @micro-os-plus/architecture-riscv...')
+# A source code library with the µOS++ RISC-V architecture port.
+message('Processing xpm package @micro-os-plus/architecture-riscv...')
+
+# -----------------------------------------------------------------------------
+
+# Meson's DSL does not provide introspection methods on dependency objects
+# to retrieve their properties after creation. The `_local_*` variables
+# therefore serve a dual purpose: populating the dependency object and
+# iterating over its components for the `message()` calls at the end.
+
+_local_compile_args = [] # Common C/C++ args.
+_local_compile_c_args = [] # C only args.
+_local_compile_cpp_args = [] # C++ only args.
+_local_include_directories = []
+_local_sources = []
+_local_compile_definitions = []
+_local_dependencies = []
+_local_link_args = []
+_local_link_with = []
+
+_local_include_directories += [
+  'include',
+]
+
+_local_sources += [
+  'src/semihosting.cpp',
+  'src/show-cpuid.cpp',
+]
 
 # https://mesonbuild.com/Reference-manual_functions.html#declare_dependency
+micro_os_plus_architectures_riscv_dependency = declare_dependency(
+  include_directories: include_directories(_local_include_directories),
+  compile_args: _local_compile_args,
+  sources: files(_local_sources),
+  dependencies: _local_dependencies,
+  link_args: _local_link_args,
+  link_with: _local_link_with,
+)
+
+# Meson dependencies cannot differentiate between C and C++ compile args;
+# they are therefore exposed as separate variables alongside the dependency.
+micro_os_plus_architectures_riscv_dependency_compile_c_args = _local_compile_c_args
+micro_os_plus_architectures_riscv_dependency_compile_cpp_args = _local_compile_cpp_args
+
+foreach name : _local_include_directories
+  message('+ -I ' + name)
+endforeach
+foreach name : _local_sources + _local_compile_definitions + _local_compile_args + _local_compile_c_args + _local_compile_cpp_args
+  message('+ ' + name)
+endforeach
+message('> micro_os_plus_architectures_riscv_dependency')
+
+# -----------------------------------------------------------------------------
+# Alias.
+
 micro_os_plus_architecture_dependency = declare_dependency(
-  include_directories: include_directories(
-    'include',
-  ),
-  sources: files(
-  ),
-  compile_args: [
-  ],
-  dependencies: [
-  ]
+  include_directories: include_directories(_local_include_directories),
+  compile_args: _local_compile_args,
+  sources: files(_local_sources),
+  dependencies: _local_dependencies,
+  link_args: _local_link_args,
+  link_with: _local_link_with,
 )
 
-message('+ -I include')
+# Meson dependencies cannot differentiate between C and C++ compile args;
+# they are therefore exposed as separate variables alongside the dependency.
+micro_os_plus_architecture_dependency_compile_c_args = _local_compile_c_args
+micro_os_plus_architecture_dependency_compile_cpp_args = _local_compile_cpp_args
+
+foreach name : _local_include_directories
+  message('+ -I ' + name)
+endforeach
+foreach name : _local_sources + _local_compile_definitions + _local_compile_args + _local_compile_c_args + _local_compile_cpp_args
+  message('+ ' + name)
+endforeach
 message('> micro_os_plus_architecture_dependency')
 
 # -----------------------------------------------------------------------------

package/package.json

@@ -1,20 +1,7 @@
 {
   "name": "@micro-os-plus/architecture-riscv",
-  "version": "4.1.0",
-  "description": "A source library xPack with the µOS++ RISC-V architecture port",
-  "main": "",
-  "scripts": {
-    "npm-install": "npm install",
-    "pack": "npm pack",
-    "version-patch": "npm version patch",
-    "version-minor": "npm version minor",
-    "postversion": "git push origin --all && git push origin --tags",
-    "git-log": "git log --pretty='%cd * %h %s' --date=short"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/micro-os-plus/architecture-riscv-xpack.git/"
-  },
+  "version": "5.1.0",
+  "description": "A source code library with the µOS++ RISC-V architecture port",
   "keywords": [
     "xpack",
     "c++",
@@ -22,16 +9,64 @@
     "risc-v",
     "architecture"
   ],
-  "homepage": "https://github.com/micro-os-plus/architecture-riscv-xpack/",
+  "license": "MIT",
   "author": {
     "name": "Liviu Ionescu",
     "email": "ilg@livius.net",
-    "url": "https://github.com/ilg-ul/"
+    "url": "https://github.com/ilg-ul"
   },
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/micro-os-plus/architecture-riscv-xpack.git"
+  },
+  "homepage": "https://micro-os-plus.github.io/architecture-riscv-xpack/",
   "bugs": {
-    "url": "https://github.com/micro-os-plus/architecture-riscv-xpack/issues/"
+    "url": "https://github.com/micro-os-plus/architecture-riscv-xpack/issues"
+  },
+  "$dependenciesUrls": {
+    "del-cli": "https://www.npmjs.com/package/del-cli",
+    "json": "https://www.npmjs.com/package/json",
+    "liquidjs": "https://www.npmjs.com/package/liquidjs",
+    "glob": "https://www.npmjs.com/package/glob",
+    "json5": "https://www.npmjs.com/package/json5",
+    "jsonc-parser": "https://www.npmjs.com/package/jsonc-parser"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@xpack/npm-packages-helper": "github:xpack/npm-packages-helper",
+    "del-cli": "^7.0.0",
+    "json": "^11.0.0",
+    "liquidjs": "^10.25.0",
+    "glob": "^13.0.6",
+    "json5": "^2.2.3",
+    "jsonc-parser": "^3.3.1"
+  },
+  "scripts": {
+    "generate-top-commons": "node node_modules/@xpack/npm-packages-helper/maintenance-scripts/generate-top-commons.mjs --micro-os-plus",
+    "npm-install": "npm install",
+    "npm-link-helpers": "npm link @xpack/npm-packages-helper",
+    "npm-outdated": "npm outdated",
+    "npm-ci": "npm ci",
+    "npm-pack": "npm pack",
+    "npm-link": "npm link",
+    "git-log": "git log --pretty='%cd * %h %s' --date=short",
+    "git-pull-helper": "git -C ${HOME}/Work/micro-os-plus/build-helper-xpack.git pull",
+    "deep-clean": "del-cli node_modules package-lock.json *.tgz",
+    "postversion": "git push origin --all && git push origin --tags"
+  },
+  "xpack": {
+    "minimumXpmRequired": "0.20.8",
+    "devDependencies": {
+      "@xpack-dev-tools/clang": "21.1.8-1.1"
+    },
+    "actions": {
+      "clang-format": "node scripts/clang-format.mjs",
+      "cmake-format": "node scripts/cmake-format.mjs",
+      "jsonc-format": "node scripts/jsonc-format.mjs",
+      "xcdl-export": "node scripts/xcdl-export.mjs xcdl-package.json*"
+    }
   },
-  "config": {},
-  "xpack": {}
+  "engines": {
+    "node": ">=20.0"
+  }
 }

package/src/semihosting.cpp

@@ -0,0 +1,58 @@
+/*
+ * This file is part of the µOS++ project (https://micro-os-plus.github.io/).
+ * Copyright (c) 2023-2026 Liviu Ionescu. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose is hereby granted, under the terms of the MIT license.
+ *
+ * If a copy of the license was not distributed with this file, it can be
+ * obtained from https://opensource.org/licenses/mit.
+ */
+
+// ----------------------------------------------------------------------------
+
+#include "micro-os-plus/architecture.h"
+#include "micro-os-plus/semihosting.h"
+
+// ----------------------------------------------------------------------------
+
+#if defined(MICRO_OS_PLUS_SEMIHOSTING_ENABLED)
+
+// ----------------------------------------------------------------------------
+
+micro_os_plus_semihosting_response_t
+micro_os_plus_semihosting_call_host (
+    int reason, micro_os_plus_semihosting_param_block_t* arg)
+{
+  micro_os_plus_semihosting_response_t value;
+
+  __asm__ volatile (
+
+      " mv a0, %[rsn] \n"
+      " mv a1, %[arg] \n"
+
+      " .balign 16 \n"
+      // Workaround for RISC-V lack of multiple EBREAKs.
+      " .option push \n"
+      " .option norvc \n"
+      " slli x0, x0, 0x1f \n"
+      " ebreak \n"
+      " srai x0, x0, %[swi] \n"
+      " .option pop \n"
+
+      " mv %[val], a0"
+
+      : [val] "=r"(value) /* Outputs */
+      : [rsn] "r"(reason), [arg] "r"(arg),
+        [swi] "i"(RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
+      : "a0", "a1", "a2", "a3", "a4", "a5", "memory" /* Clobbers */
+  );
+
+  return value;
+}
+
+// ----------------------------------------------------------------------------
+
+#endif // defined(MICRO_OS_PLUS_SEMIHOSTING_ENABLED)
+
+// ----------------------------------------------------------------------------

package/src/show-cpuid.cpp

@@ -0,0 +1,28 @@
+/*
+ * This file is part of the µOS++ project (https://micro-os-plus.github.io/).
+ * Copyright (c) 2023-2026 Liviu Ionescu. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose is hereby granted, under the terms of the MIT license.
+ *
+ * If a copy of the license was not distributed with this file, it can be
+ * obtained from https://opensource.org/licenses/mit.
+ */
+
+// ----------------------------------------------------------------------------
+
+#include "micro-os-plus/architecture.h"
+// #include "micro-os-plus/diag/trace.h"
+
+// ----------------------------------------------------------------------------
+
+using namespace micro_os_plus;
+
+// ----------------------------------------------------------------------------
+
+void
+micro_os_plus_architecture_show_cpuid (void)
+{
+}
+
+// ----------------------------------------------------------------------------

package/xcdl-package.jsonc

@@ -0,0 +1,33 @@
+{
+  "$schema": "https://xpack.github.io/xcdl/schemas/xcdl-2.0.0.json",
+  "minimumXcdlRequired": "2.0.0",
+  "license": "MIT",
+  "copyright": "Copyright (c) 2022-2026 Liviu Ionescu. All rights reserved.",
+  "cdlComponents": [
+    {
+      "id": "micro-os-plus.architectures.riscv",
+      "alias": "micro-os-plus.architecture",
+      "display": "RISC-V architecture",
+      "description": "The RISC-V architecture definitions",
+      "publicIncludeFolders": [
+        "include"
+      ],
+      "sourceFiles": [
+        "src/semihosting.cpp",
+        "src/show-cpuid.cpp"
+      ],
+      "dependencies": [
+        // This introduces a circular dependency.
+        // "micro-os-plus.semihosting"
+      ],
+      "implementedInterfaces": [
+        "micro-os-plus.architecture"
+      ],
+      "generatedFile": {
+        "type": "c-header",
+        "filePath": "{{buildFolderPath}}/generated/include/micro-os-plus/architecture-defines.h"
+      },
+      // "defaultDefine": "MICRO_OS_PLUS_INCLUDE_ARCHITECTURES_RISCV_ENABLED"
+    }
+  ]
+}

package/include/micro-os-plus/architecture-riscv/semihosting-inlines.h

@@ -1,79 +0,0 @@
-/*
- * This file is part of the µOS++ distribution.
- *   (https://github.com/micro-os-plus/)
- * Copyright (c) 2015 Liviu Ionescu.
- *
- * Permission to use, copy, modify, and/or distribute this software
- * for any purpose is hereby granted, under the terms of the MIT license.
- *
- * If a copy of the license was not distributed with this file, it can
- * be obtained from https://opensource.org/licenses/MIT/.
- */
-
-#ifndef MICRO_OS_PLUS_ARCHITECTURE_RISCV_ARCH_SEMIHOSTING_INLINES_H_
-#define MICRO_OS_PLUS_ARCHITECTURE_RISCV_ARCH_SEMIHOSTING_INLINES_H_
-
-// ----------------------------------------------------------------------------
-
-#if defined(__cplusplus)
-extern "C"
-{
-#endif // defined(__cplusplus)
-
-  // --------------------------------------------------------------------------
-
-// The hint that differentiates the semihosting call.
-#define RISCV_SEMIHOSTING_CALL_NUMBER 7
-
-  // --------------------------------------------------------------------------
-
-  // Type of each entry in a parameter block.
-  typedef micro_os_plus_architecture_register_t
-      micro_os_plus_semihosting_param_block_t;
-  // Type of result.
-  typedef micro_os_plus_architecture_signed_register_t
-      micro_os_plus_semihosting_response_t;
-
-  // --------------------------------------------------------------------------
-
-  static inline __attribute__ ((always_inline))
-  micro_os_plus_semihosting_response_t
-  micro_os_plus_semihosting_call_host (int reason, void* arg)
-  {
-    micro_os_plus_semihosting_response_t value;
-
-    __asm__ volatile(
-
-        " mv a0, %[rsn] \n"
-        " mv a1, %[arg] \n"
-
-        " .balign 16 \n"
-        // Workaround for RISC-V lack of multiple EBREAKs.
-        " .option push \n"
-        " .option norvc \n"
-        " slli x0, x0, 0x1f \n"
-        " ebreak \n"
-        " srai x0, x0, %[swi] \n"
-        " .option pop \n"
-        
-        " mv %[val], a0"
-
-        : [val] "=r"(value) /* Outputs */
-        : [rsn] "r"(reason), [arg] "r"(arg), [swi] "i"(RISCV_SEMIHOSTING_CALL_NUMBER) /* Inputs */
-        : "a0", "a1", "a2", "a3", "a4", "a5", "memory" /* Clobbers */
-    );
-
-    return value;
-  }
-
-  // --------------------------------------------------------------------------
-
-#if defined(__cplusplus)
-}
-#endif // defined(__cplusplus)
-
-// ----------------------------------------------------------------------------
-
-#endif // MICRO_OS_PLUS_ARCHITECTURE_RISCV_ARCH_SEMIHOSTING_INLINES_H_
-
-// ----------------------------------------------------------------------------

package/xpack.json

@@ -1,23 +0,0 @@
-{
-  "minimumXpmakeRequired": "0.0.0",
-  "license": "MIT",
-  "copyright": "Copyright (c) 2022 Liviu Ionescu",
-  "description": "Top architecture RISC-V components",
-  "cdlComponents": {
-    "architecture-riscv": {
-      "description": "The RISC-V architecture definitions.",
-      "parent": "micro-os-plus",
-      "compilerIncludeFolders": [
-        "include"
-      ],
-      "compilerSourceFiles": [],
-      "compilerDefinitions": [],
-      "compilerOptions": [],
-      "dependencies": [],
-      "generatedDefinition": "MICRO_OS_PLUS_INCLUDE_ARCHITECTURE_RISCV",
-      "implementedInterfaces": [
-        "architecture"
-      ]
-    }
-  }
-}