From be6962dd4661341dd70b2fab6541f2b978f51a30 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 30 Sep 2022 14:58:14 +0200 Subject: spec: Add types to macros --- spec/rtems/config/if/get-do-zero-of-workspace.yml | 2 +- spec/rtems/config/if/get-idle-task-stack-size.yml | 2 +- spec/rtems/config/if/get-idle-task.yml | 2 +- spec/rtems/config/if/get-interrupt-stack-size.yml | 2 +- spec/rtems/config/if/get-maximum-processors.yml | 2 +- spec/rtems/config/if/get-microseconds-per-tick.yml | 2 +- spec/rtems/config/if/get-milliseconds-per-tick.yml | 2 +- spec/rtems/config/if/get-nanoseconds-per-tick.yml | 2 +- spec/rtems/config/if/get-number-of-initial-extensions.yml | 2 +- spec/rtems/config/if/get-stack-allocate-for-idle-hook.yml | 2 +- spec/rtems/config/if/get-stack-allocate-hook.yml | 2 +- spec/rtems/config/if/get-stack-allocate-init-hook.yml | 2 +- .../config/if/get-stack-allocator-avoids-work-space.yml | 2 +- spec/rtems/config/if/get-stack-free-hook.yml | 2 +- spec/rtems/config/if/get-ticks-per-timeslice.yml | 2 +- spec/rtems/config/if/get-unified-work-area.yml | 2 +- spec/rtems/config/if/get-user-extension-table.yml | 2 +- spec/rtems/config/if/get-user-multiprocessing-table.yml | 4 ++-- spec/rtems/config/if/get-work-space-size.yml | 2 +- spec/rtems/config/if/resource-is-unlimited.yml | 2 +- spec/rtems/config/if/resource-maximum-per-allocation.yml | 2 +- spec/rtems/config/if/resource-unlimited.yml | 2 +- spec/rtems/intr/if/disable.yml | 5 +++-- spec/rtems/intr/if/enable.yml | 5 +++-- spec/rtems/intr/if/entry-initializer.yml | 7 +++++-- spec/rtems/intr/if/flash.yml | 5 +++-- spec/rtems/intr/if/is-in-progress.yml | 2 +- spec/rtems/intr/if/is-replace.yml | 5 +++-- spec/rtems/intr/if/is-shared.yml | 5 +++-- spec/rtems/intr/if/is-unique.yml | 5 +++-- spec/rtems/intr/if/local-disable.yml | 5 +++-- spec/rtems/intr/if/local-enable.yml | 5 +++-- spec/rtems/intr/if/lock-acquire-isr.yml | 12 ++++++++---- spec/rtems/intr/if/lock-acquire.yml | 6 ++++-- spec/rtems/intr/if/lock-declare.yml | 4 +++- spec/rtems/intr/if/lock-define.yml | 5 ++++- spec/rtems/intr/if/lock-destroy.yml | 5 +++-- spec/rtems/intr/if/lock-initialize.yml | 6 ++++-- spec/rtems/intr/if/lock-initializer.yml | 3 ++- spec/rtems/intr/if/lock-isr-disable.yml | 5 +++-- spec/rtems/intr/if/lock-member.yml | 3 ++- spec/rtems/intr/if/lock-reference.yml | 4 +++- spec/rtems/intr/if/lock-release-isr.yml | 12 ++++++++---- spec/rtems/intr/if/lock-release.yml | 5 +++-- spec/rtems/message/if/buffer.yml | 3 ++- spec/rtems/object/if/id-initial.yml | 7 +++++-- spec/rtems/task/if/storage-size.yml | 12 ++++++++---- spec/spec/interface-function-role.yml | 3 +-- 48 files changed, 116 insertions(+), 74 deletions(-) diff --git a/spec/rtems/config/if/get-do-zero-of-workspace.yml b/spec/rtems/config/if/get-do-zero-of-workspace.yml index 6f832820..a2afe84a 100644 --- a/spec/rtems/config/if/get-do-zero-of-workspace.yml +++ b/spec/rtems/config/if/get-do-zero-of-workspace.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/memory/if/zero-before-use:/name} params: [] - return: null + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-idle-task-stack-size.yml b/spec/rtems/config/if/get-idle-task-stack-size.yml index 37574cb6..5d7058a4 100644 --- a/spec/rtems/config/if/get-idle-task-stack-size.yml +++ b/spec/rtems/config/if/get-idle-task-stack-size.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/thread/if/idle-stack-size:/name} params: [] - return: null + return: ${/c/if/size_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-idle-task.yml b/spec/rtems/config/if/get-idle-task.yml index 2aeed278..f03cdd25 100644 --- a/spec/rtems/config/if/get-idle-task.yml +++ b/spec/rtems/config/if/get-idle-task.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/thread/if/idle-body:/name} params: [] - return: null + return: void *( * )( ${/c/if/uintptr_t:/name} ) variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-interrupt-stack-size.yml b/spec/rtems/config/if/get-interrupt-stack-size.yml index 8145abab..4a73f25d 100644 --- a/spec/rtems/config/if/get-interrupt-stack-size.yml +++ b/spec/rtems/config/if/get-interrupt-stack-size.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ((${/c/if/size_t:/name}) ${/score/isr/if/stack-size:/name}) params: [] - return: null + return: ${/c/if/size_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-maximum-processors.yml b/spec/rtems/config/if/get-maximum-processors.yml index 57566db1..289ab87b 100644 --- a/spec/rtems/config/if/get-maximum-processors.yml +++ b/spec/rtems/config/if/get-maximum-processors.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/smp/if/processor-configured-maximum:/name} params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-microseconds-per-tick.yml b/spec/rtems/config/if/get-microseconds-per-tick.yml index 69902398..a41e8b70 100644 --- a/spec/rtems/config/if/get-microseconds-per-tick.yml +++ b/spec/rtems/config/if/get-microseconds-per-tick.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/watchdog/if/microseconds-per-tick:/name} params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-milliseconds-per-tick.yml b/spec/rtems/config/if/get-milliseconds-per-tick.yml index b9eb9fb9..01ce2f63 100644 --- a/spec/rtems/config/if/get-milliseconds-per-tick.yml +++ b/spec/rtems/config/if/get-milliseconds-per-tick.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ( ${/score/watchdog/if/microseconds-per-tick:/name} / 1000 ) params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-nanoseconds-per-tick.yml b/spec/rtems/config/if/get-nanoseconds-per-tick.yml index 70965eb7..71e779a7 100644 --- a/spec/rtems/config/if/get-nanoseconds-per-tick.yml +++ b/spec/rtems/config/if/get-nanoseconds-per-tick.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/watchdog/if/nanoseconds-per-tick:/name} params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-number-of-initial-extensions.yml b/spec/rtems/config/if/get-number-of-initial-extensions.yml index 0b5c9737..d33b35d0 100644 --- a/spec/rtems/config/if/get-number-of-initial-extensions.yml +++ b/spec/rtems/config/if/get-number-of-initial-extensions.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ((${/c/if/uint32_t:/name}) ${/score/userext/if/initial-count:/name}) params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-stack-allocate-for-idle-hook.yml b/spec/rtems/config/if/get-stack-allocate-for-idle-hook.yml index e82032e0..1ab43036 100644 --- a/spec/rtems/config/if/get-stack-allocate-for-idle-hook.yml +++ b/spec/rtems/config/if/get-stack-allocate-for-idle-hook.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/stack/if/allocator-allocate-for-idle:/name} params: [] - return: null + return: void *( * )( ${/c/if/uint32_t:/name}, ${/c/if/size_t:/name} * ) variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-stack-allocate-hook.yml b/spec/rtems/config/if/get-stack-allocate-hook.yml index fdb95dd3..18f27680 100644 --- a/spec/rtems/config/if/get-stack-allocate-hook.yml +++ b/spec/rtems/config/if/get-stack-allocate-hook.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/stack/if/allocator-allocate:/name} params: [] - return: null + return: void *( * )( ${/c/if/size_t:/name} ) variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-stack-allocate-init-hook.yml b/spec/rtems/config/if/get-stack-allocate-init-hook.yml index fdf1262c..808d7ac4 100644 --- a/spec/rtems/config/if/get-stack-allocate-init-hook.yml +++ b/spec/rtems/config/if/get-stack-allocate-init-hook.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/stack/if/allocator-initialize:/name} params: [] - return: null + return: void ( * )( ${/c/if/size_t:/name} ) variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-stack-allocator-avoids-work-space.yml b/spec/rtems/config/if/get-stack-allocator-avoids-work-space.yml index 36fec60e..ae0b0619 100644 --- a/spec/rtems/config/if/get-stack-allocator-avoids-work-space.yml +++ b/spec/rtems/config/if/get-stack-allocator-avoids-work-space.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/stack/if/allocator-avoids-workspace:/name} params: [] - return: null + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-stack-free-hook.yml b/spec/rtems/config/if/get-stack-free-hook.yml index 9145db92..f3cd15b0 100644 --- a/spec/rtems/config/if/get-stack-free-hook.yml +++ b/spec/rtems/config/if/get-stack-free-hook.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/stack/if/allocator-free:/name} params: [] - return: null + return: void ( * )( void * ) variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-ticks-per-timeslice.yml b/spec/rtems/config/if/get-ticks-per-timeslice.yml index 69edb65d..33a2db10 100644 --- a/spec/rtems/config/if/get-ticks-per-timeslice.yml +++ b/spec/rtems/config/if/get-ticks-per-timeslice.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/watchdog/if/ticks-per-timeslice:/name} params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-unified-work-area.yml b/spec/rtems/config/if/get-unified-work-area.yml index 3ac1390c..cb919f06 100644 --- a/spec/rtems/config/if/get-unified-work-area.yml +++ b/spec/rtems/config/if/get-unified-work-area.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/wkspace/if/is-unified:/name} params: [] - return: null + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-user-extension-table.yml b/spec/rtems/config/if/get-user-extension-table.yml index c6a5bcd7..b0fa22ad 100644 --- a/spec/rtems/config/if/get-user-extension-table.yml +++ b/spec/rtems/config/if/get-user-extension-table.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/userext/if/initial-extensions:/name} params: [] - return: null + return: const ${/rtems/userext/if/table:/name} * variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/get-user-multiprocessing-table.yml b/spec/rtems/config/if/get-user-multiprocessing-table.yml index 9ac3700b..a40d15f3 100644 --- a/spec/rtems/config/if/get-user-multiprocessing-table.yml +++ b/spec/rtems/config/if/get-user-multiprocessing-table.yml @@ -8,13 +8,13 @@ definition: attributes: null body: ${/c/if/null:/name} params: [] - return: null + return: const ${score/mpci/if/configuration-type:/name} * variants: - definition: attributes: null body: ( &${/score/mpci/if/configuration:/name} ) params: [] - return: null + return: const ${score/mpci/if/configuration-type:/name} * enabled-by: defined(${/build-options/if/multiprocessing:/name}) description: null enabled-by: true diff --git a/spec/rtems/config/if/get-work-space-size.yml b/spec/rtems/config/if/get-work-space-size.yml index f3e5f8a7..4da87bd3 100644 --- a/spec/rtems/config/if/get-work-space-size.yml +++ b/spec/rtems/config/if/get-work-space-size.yml @@ -11,7 +11,7 @@ definition: ( ${get-stack-allocator-avoids-work-space:/name}() ? 0 : ${get-stack-space-size:/name}() ) ) params: [] - return: null + return: ${/c/if/uintptr_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/resource-is-unlimited.yml b/spec/rtems/config/if/resource-is-unlimited.yml index f36fad76..b2adbf23 100644 --- a/spec/rtems/config/if/resource-is-unlimited.yml +++ b/spec/rtems/config/if/resource-is-unlimited.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ${/score/object/if/is-unlimited:/name}( ${.:/params[0]/name} ) params: [] - return: null + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/resource-maximum-per-allocation.yml b/spec/rtems/config/if/resource-maximum-per-allocation.yml index 03dce023..8613c126 100644 --- a/spec/rtems/config/if/resource-maximum-per-allocation.yml +++ b/spec/rtems/config/if/resource-maximum-per-allocation.yml @@ -9,7 +9,7 @@ definition: body: | ${/score/object/if/maximum-per-allocation:/name}( ${.:/params[0]/name} ) params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/config/if/resource-unlimited.yml b/spec/rtems/config/if/resource-unlimited.yml index 22134851..a573edc7 100644 --- a/spec/rtems/config/if/resource-unlimited.yml +++ b/spec/rtems/config/if/resource-unlimited.yml @@ -8,7 +8,7 @@ definition: attributes: null body: ( ( ${.:/params[0]/name} ) | ${unlimited-objects:/name} ) params: [] - return: null + return: ${/c/if/uint32_t:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/disable.yml b/spec/rtems/intr/if/disable.yml index bdfbc77f..a1a08cb6 100644 --- a/spec/rtems/intr/if/disable.yml +++ b/spec/rtems/intr/if/disable.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${level:/name} ${.:/params[0]/name} + return: void variants: [] description: | This directive disables all maskable interrupts on the current processor and diff --git a/spec/rtems/intr/if/enable.yml b/spec/rtems/intr/if/enable.yml index e1d3d45a..5334f262 100644 --- a/spec/rtems/intr/if/enable.yml +++ b/spec/rtems/intr/if/enable.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${level:/name} ${.:/params[0]/name} + return: void variants: [] description: | This directive restores the interrupt level specified by diff --git a/spec/rtems/intr/if/entry-initializer.yml b/spec/rtems/intr/if/entry-initializer.yml index 86fa327b..09b75573 100644 --- a/spec/rtems/intr/if/entry-initializer.yml +++ b/spec/rtems/intr/if/entry-initializer.yml @@ -7,8 +7,11 @@ definition: default: attributes: null body: | - { ${.:/params[0]/name}, ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} } - params: [] + { ${.:/params[0]/name}, ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} } + params: + - ${handler:/name} ${.:/params[0]/name} + - void *${.:/params[1]/name} + - const char *${.:/params[2]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/flash.yml b/spec/rtems/intr/if/flash.yml index e336ed4f..77d920ac 100644 --- a/spec/rtems/intr/if/flash.yml +++ b/spec/rtems/intr/if/flash.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/local-flash:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${level:/name} ${.:/params[0]/name} + return: void variants: [] description: | This directive is functionally equivalent to a calling ${enable:/name} diff --git a/spec/rtems/intr/if/is-in-progress.yml b/spec/rtems/intr/if/is-in-progress.yml index 3b36f8db..f34ca7f9 100644 --- a/spec/rtems/intr/if/is-in-progress.yml +++ b/spec/rtems/intr/if/is-in-progress.yml @@ -9,7 +9,7 @@ definition: attributes: null body: ${/score/isr/if/is-in-progress:/name}() params: [] - return: null + return: ${/c/if/bool:/name} variants: [] description: | This directive returns ``true``, if the current processor is currently diff --git a/spec/rtems/intr/if/is-replace.yml b/spec/rtems/intr/if/is-replace.yml index ade83ec8..14aa9d66 100644 --- a/spec/rtems/intr/if/is-replace.yml +++ b/spec/rtems/intr/if/is-replace.yml @@ -8,8 +8,9 @@ definition: attributes: null body: | ( ( ${.:/params[0]/name} ) & ${replace:/name} ) - params: [] - return: null + params: + - ${../../option/if/option:/name} ${.:/params[0]/name} + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/is-shared.yml b/spec/rtems/intr/if/is-shared.yml index be141e7d..0bb43002 100644 --- a/spec/rtems/intr/if/is-shared.yml +++ b/spec/rtems/intr/if/is-shared.yml @@ -8,8 +8,9 @@ definition: attributes: null body: | ( ( ${.:/params[0]/name} ) & ${shared:/name} ) - params: [] - return: null + params: + - ${../../option/if/option:/name} ${.:/params[0]/name} + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/is-unique.yml b/spec/rtems/intr/if/is-unique.yml index 424ed4b4..e74634e4 100644 --- a/spec/rtems/intr/if/is-unique.yml +++ b/spec/rtems/intr/if/is-unique.yml @@ -8,8 +8,9 @@ definition: attributes: null body: | ( ( ${.:/params[0]/name} ) & ${unique:/name} ) - params: [] - return: null + params: + - ${../../option/if/option:/name} ${.:/params[0]/name} + return: ${/c/if/bool:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/local-disable.yml b/spec/rtems/intr/if/local-disable.yml index f80cf874..7c6a8fbe 100644 --- a/spec/rtems/intr/if/local-disable.yml +++ b/spec/rtems/intr/if/local-disable.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${level:/name} ${.:/params[0]/name} + return: void variants: [] description: | This directive disables all maskable interrupts on the current processor and diff --git a/spec/rtems/intr/if/local-enable.yml b/spec/rtems/intr/if/local-enable.yml index 973562e2..c0568aff 100644 --- a/spec/rtems/intr/if/local-enable.yml +++ b/spec/rtems/intr/if/local-enable.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${level:/name} ${.:/params[0]/name} + return: void variants: [] description: | This directive restores the interrupt level specified by diff --git a/spec/rtems/intr/if/lock-acquire-isr.yml b/spec/rtems/intr/if/lock-acquire-isr.yml index ab6ac810..e74ea8fe 100644 --- a/spec/rtems/intr/if/lock-acquire-isr.yml +++ b/spec/rtems/intr/if/lock-acquire-isr.yml @@ -8,8 +8,10 @@ definition: default: attributes: null body: do { (void) ${.:/params[1]/name}; } while ( 0 ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - ${lock-context:/name} *${.:/params[1]/name} + return: void variants: - definition: attributes: null @@ -18,8 +20,10 @@ definition: &( ${.:/params[0]/name} )->Lock, &( ${.:/params[1]/name} )->Lock_context ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - ${lock-context:/name} *${.:/params[1]/name} + return: void enabled-by: defined(${/build-options/if/smp:/name}) description: | This directive acquires the ISR lock specified by ${.:/params[0]/name} using diff --git a/spec/rtems/intr/if/lock-acquire.yml b/spec/rtems/intr/if/lock-acquire.yml index df98ff05..d6b6ac19 100644 --- a/spec/rtems/intr/if/lock-acquire.yml +++ b/spec/rtems/intr/if/lock-acquire.yml @@ -9,8 +9,10 @@ definition: attributes: null body: | ${/score/isr/if/lock-isr-disable-acquire:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - ${lock-context:/name} *${.:/params[1]/name} + return: void variants: [] description: | This directive acquires the ISR lock specified by ${.:/params[0]/name} using diff --git a/spec/rtems/intr/if/lock-declare.yml b/spec/rtems/intr/if/lock-declare.yml index ceedc7c4..836b9b95 100644 --- a/spec/rtems/intr/if/lock-declare.yml +++ b/spec/rtems/intr/if/lock-declare.yml @@ -9,7 +9,9 @@ definition: attributes: null body: | ${/score/isr/if/lock-declare:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} ) - params: [] + params: + - ${.:/params[0]/name} + - ${.:/params[1]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/lock-define.yml b/spec/rtems/intr/if/lock-define.yml index 4f8cb2e6..9eb2db38 100644 --- a/spec/rtems/intr/if/lock-define.yml +++ b/spec/rtems/intr/if/lock-define.yml @@ -9,7 +9,10 @@ definition: attributes: null body: | ${/score/isr/if/lock-define:/name}( ${.:/params[0]/name}, ${.:/params[1]/name}, ${.:/params[2]/name} ) - params: [] + params: + - ${.:/params[0]/name} + - ${.:/params[1]/name} + - const char *${.:/params[2]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/lock-destroy.yml b/spec/rtems/intr/if/lock-destroy.yml index bb442030..8092fde0 100644 --- a/spec/rtems/intr/if/lock-destroy.yml +++ b/spec/rtems/intr/if/lock-destroy.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/lock-destroy:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + return: void variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/lock-initialize.yml b/spec/rtems/intr/if/lock-initialize.yml index e9fed290..f1bcaec1 100644 --- a/spec/rtems/intr/if/lock-initialize.yml +++ b/spec/rtems/intr/if/lock-initialize.yml @@ -9,8 +9,10 @@ definition: attributes: null body: | ${/score/isr/if/lock-initialize:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - const char *${.:/params[1]/name} + return: void variants: [] description: null enabled-by: true diff --git a/spec/rtems/intr/if/lock-initializer.yml b/spec/rtems/intr/if/lock-initializer.yml index 01bd8255..afd91643 100644 --- a/spec/rtems/intr/if/lock-initializer.yml +++ b/spec/rtems/intr/if/lock-initializer.yml @@ -8,7 +8,8 @@ definition: default: attributes: null body: ${/score/isr/if/lock-initializer:/name}( ${.:/params[0]/name} ) - params: [] + params: + - const char *${.:/params[0]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/lock-isr-disable.yml b/spec/rtems/intr/if/lock-isr-disable.yml index eb4b7801..6639baac 100644 --- a/spec/rtems/intr/if/lock-isr-disable.yml +++ b/spec/rtems/intr/if/lock-isr-disable.yml @@ -8,8 +8,9 @@ definition: default: attributes: null body: ${/score/isr/if/lock-isr-disable:/name}( ${.:/params[0]/name} ) - params: [] - return: null + params: + - ${lock-context:/name} *${.:/params[0]/name} + return: void variants: [] description: | This directive disables maskable interrupts on the current processor and diff --git a/spec/rtems/intr/if/lock-member.yml b/spec/rtems/intr/if/lock-member.yml index aa6a3cd1..1fb9208d 100644 --- a/spec/rtems/intr/if/lock-member.yml +++ b/spec/rtems/intr/if/lock-member.yml @@ -8,7 +8,8 @@ definition: default: attributes: null body: ${/score/isr/if/lock-member:/name}( ${.:/params[0]/name} ) - params: [] + params: + - ${.:/params[0]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/lock-reference.yml b/spec/rtems/intr/if/lock-reference.yml index 47e9b440..0cff6e9c 100644 --- a/spec/rtems/intr/if/lock-reference.yml +++ b/spec/rtems/intr/if/lock-reference.yml @@ -9,7 +9,9 @@ definition: attributes: null body: | ${/score/isr/if/lock-reference:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} ) - params: [] + params: + - ${.:/params[0]/name} + - ${lock:/name} *${.:/params[1]/name} return: null variants: [] description: null diff --git a/spec/rtems/intr/if/lock-release-isr.yml b/spec/rtems/intr/if/lock-release-isr.yml index 07f673ef..16374018 100644 --- a/spec/rtems/intr/if/lock-release-isr.yml +++ b/spec/rtems/intr/if/lock-release-isr.yml @@ -8,8 +8,10 @@ definition: default: attributes: null body: do { (void) ${.:/params[1]/name}; } while ( 0 ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - ${lock-context:/name} *${.:/params[1]/name} + return: void variants: - definition: attributes: null @@ -18,8 +20,10 @@ definition: &( ${.:/params[0]/name} )->Lock, &( ${.:/params[1]/name} )->Lock_context ) - params: [] - return: null + params: + - ${lock:/name} *${.:/params[0]/name} + - ${lock-context:/name} *${.:/params[1]/name} + return: void enabled-by: defined(${/build-options/if/smp:/name}) description: | This directive releases the ISR lock specified by ${.:/params[0]/name} using diff --git a/spec/rtems/intr/if/lock-release.yml b/spec/rtems/intr/if/lock-release.yml index cb43960b..7334f169 100644 --- a/spec/rtems/intr/if/lock-release.yml +++ b/spec/rtems/intr/if/lock-release.yml @@ -9,8 +9,9 @@ definition: attributes: null body: | ${/score/isr/if/lock-release-isr-enable:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} ) - params: [] - return: null + params: + - ${lock-context:/name} *${.:/params[0]/name} + return: void variants: [] description: | This directive releases the ISR lock specified by ${.:/params[0]/name} using diff --git a/spec/rtems/message/if/buffer.yml b/spec/rtems/message/if/buffer.yml index b465141f..72f83703 100644 --- a/spec/rtems/message/if/buffer.yml +++ b/spec/rtems/message/if/buffer.yml @@ -12,7 +12,8 @@ definition: ${/score/msgq/if/buffer:/name} _buffer; char _message[ ${.:/params[0]/name} ]; } - params: [] + params: + - ${/c/if/size_t:/name} ${.:/params[0]/name} return: null variants: [] description: null diff --git a/spec/rtems/object/if/id-initial.yml b/spec/rtems/object/if/id-initial.yml index f5185705..5a6c6a62 100644 --- a/spec/rtems/object/if/id-initial.yml +++ b/spec/rtems/object/if/id-initial.yml @@ -10,8 +10,11 @@ definition: attributes: null body: | ${/score/object/if/id-initial:/name}( ${.:/params[0]/name}, ${.:/params[1]/name}, ${.:/params[2]/name} ) - params: [] - return: null + params: + - ${/c/if/uint32_t:/name} ${.:/params[0]/name} + - ${/c/if/uint32_t:/name} ${.:/params[1]/name} + - ${/c/if/uint32_t:/name} ${.:/params[2]/name} + return: ${../../type/if/id:/name} variants: [] description: null enabled-by: true diff --git a/spec/rtems/task/if/storage-size.yml b/spec/rtems/task/if/storage-size.yml index e4d905e5..ba93498e 100644 --- a/spec/rtems/task/if/storage-size.yml +++ b/spec/rtems/task/if/storage-size.yml @@ -10,15 +10,19 @@ definition: ( ( ${.:/params[0]/name} ) + ( ( ( ${.:/params[1]/name} ) & ${../../attr/if/floating-point:/name} ) != 0 ? ${/score/context/if/fp-size:/name} : 0 ) ) - params: [] - return: null + params: + - ${/c/if/size_t:/name} ${.:/params[0]/name} + - ${../../attr/if/attribute:/name} ${.:/params[1]/name} + return: ${/c/if/size_t:/name} variants: - definition: attributes: null body: | ( ( ${.:/params[0]/name} ) + ${/score/context/if/fp-size:/name} ) - params: [] - return: null + params: + - ${/c/if/size_t:/name} ${.:/params[0]/name} + - ${../../attr/if/attribute:/name} ${.:/params[1]/name} + return: ${/c/if/size_t:/name} enabled-by: - ${/score/cpu/if/all-tasks-are-fp:/name} == ${../../basedefs/if/true:/name} description: null diff --git a/spec/spec/interface-function-role.yml b/spec/spec/interface-function-role.yml index bff51fad..f07648e9 100644 --- a/spec/spec/interface-function-role.yml +++ b/spec/spec/interface-function-role.yml @@ -17,8 +17,7 @@ spec-info: description: | It defines the interface function role of links. It is used to indicate that a ${requirement-action:/spec-name} item specifies functional - requirements of an ${interface-function:/spec-name} or - a ${interface-macro:/spec-name} item. + requirements of an ${interface-function:/spec-name} item. mandatory-attributes: all spec-name: Interface Function Link Role spec-type: interface-function-role -- cgit v1.2.3