Skip to content

Commit 2d60dd0

Browse files
kylo5abykylo5aby
committed
update doc to state support for export/import mut globals
Signed-off-by: zhenweijin <zhenwei.jin@intel.com>
1 parent cbb6d03 commit 2d60dd0

File tree

3 files changed

+37
-36
lines changed

3 files changed

+37
-36
lines changed

‎build-scripts/config_common.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -727,28 +727,28 @@ endif ()
727727
message (
728728
"-- About Wasm Proposals:\n"
729729
" Always-on:\n"
730+
" \"Import/Export of Mutable Globals\"\n"
730731
" \"Multi-value\"\n"
731-
" \"Non-trapping float-to-int conversions\"\n"
732-
" \"Sign-extension operators\"\n"
732+
" \"Non-trapping float-to-int Conversions\"\n"
733+
" \"Sign-extension Operators\"\n"
733734
" \"WebAssembly C and C++ API\"\n"
734735
" Configurable. 0 is OFF. 1 is ON:\n"
735736
" \"Bulk Memory Operation\" via WAMR_BUILD_BULK_MEMORY: ${WAMR_BUILD_BULK_MEMORY}\n"
736737
" \"Extended Constant Expressions\" via WAMR_BUILD_EXTENDED_CONST_EXPR: ${WAMR_BUILD_EXTENDED_CONST_EXPR}\n"
737738
" \"Fixed-width SIMD\" via WAMR_BUILD_SIMD: ${WAMR_BUILD_SIMD}\n"
738-
" \"Garbage collection\" via WAMR_BUILD_GC: ${WAMR_BUILD_GC}\n"
739-
" \"Legacy Exception handling\" via WAMR_BUILD_EXCE_HANDLING: ${WAMR_BUILD_EXCE_HANDLING}\n"
739+
" \"Garbage Collection\" via WAMR_BUILD_GC: ${WAMR_BUILD_GC}\n"
740+
" \"Legacy Exception Handling\" via WAMR_BUILD_EXCE_HANDLING: ${WAMR_BUILD_EXCE_HANDLING}\n"
740741
" \"Memory64\" via WAMR_BUILD_MEMORY64: ${WAMR_BUILD_MEMORY64}\n"
741-
" \"Multiple memories\" via WAMR_BUILD_MULTI_MEMORY: ${WAMR_BUILD_MULTI_MEMORY}\n"
742+
" \"Multiple Memories\" via WAMR_BUILD_MULTI_MEMORY: ${WAMR_BUILD_MULTI_MEMORY}\n"
742743
" \"Reference Types\" via WAMR_BUILD_REF_TYPES: ${WAMR_BUILD_REF_TYPES}\n"
743744
" \"Reference-Typed Strings\" via WAMR_BUILD_STRINGREF: ${WAMR_BUILD_STRINGREF}\n"
744-
" \"Tail call\" via WAMR_BUILD_TAIL_CALL: ${WAMR_BUILD_TAIL_CALL}\n"
745+
" \"Tail Call\" via WAMR_BUILD_TAIL_CALL: ${WAMR_BUILD_TAIL_CALL}\n"
745746
" \"Threads\" via WAMR_BUILD_SHARED_MEMORY: ${WAMR_BUILD_SHARED_MEMORY}\n"
746747
" \"Typed Function References\" via WAMR_BUILD_GC: ${WAMR_BUILD_GC}\n"
747748
" Unsupported (>= Phase4):\n"
748749
" \"Branch Hinting\"\n"
749750
" \"Custom Annotation Syntax in the Text Format\"\n"
750-
" \"Exception handling\"\n"
751-
" \"Import/Export of Mutable Globals\"\n"
751+
" \"Exception Handling\"\n"
752752
" \"JS String Builtins\"\n"
753753
" \"Relaxed SIMD\"\n"
754754
)

‎doc/stability_wasm_proposals.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,53 @@ Users can turn those features on or off by using compilation options. If a relev
1414

1515
| Proposal | >= Phase 4 | Compilation Option |
1616
| ------------------------------------- | ---------- | ------------------------ |
17-
| Bulk memory operations | Yes | `WAMR_BUILD_BULK_MEMORY` |
17+
| Bulk Memory Operations | Yes | `WAMR_BUILD_BULK_MEMORY` |
1818
| Fixed-width SIMD[^1] | Yes | `WAMR_BUILD_SIMD` |
19+
| Import/Export of Mutable Globals[^2] | Yes | N/A |
1920
| Multi-value | Yes | N/A |
20-
| Non-trapping float-to-int conversions | Yes | N/A |
21+
| Non-trapping float-to-int Conversions | Yes | N/A |
2122
| Reference Types | Yes | `WAMR_BUILD_REF_TYPES` |
22-
| Sign-extension operators | Yes | N/A |
23+
| Sign-extension Operators | Yes | N/A |
2324
| WebAssembly C and C++ API | No | N/A |
2425

2526
[^1]: llvm-jit and aot only.
2627

28+
[^2]: in WAMR's implementation, if a mutable global shared by serveral wasm instances, each instance maintains its own copy of the global rather than sharing it.
29+
2730
## Off-by-default Wasm Proposals
2831

29-
| Proposal | >= Phase 4 | Compilation Option |
30-
| ----------------------------- | ---------- | -------------------------- |
31-
| Garbage collection | Yes | `WAMR_BUILD_GC` |
32-
| Legacy Exception handling[^2] | No | `WAMR_BUILD_EXCE_HANDLING` |
33-
| Memory64 | Yes | `WAMR_BUILD_MEMORY64` |
34-
| Multiple memories[^3] | Yes | `WAMR_BUILD_MULTI_MEMORY` |
35-
| Reference-Typed Strings | No | `WAMR_BUILD_STRINGREF` |
36-
| Tail call | Yes | `WAMR_BUILD_TAIL_CALL` |
37-
| Threads[^4] | Yes | `WAMR_BUILD_SHARED_MEMORY` |
38-
| Typed Function References | Yes | `WAMR_BUILD_GC` |
39-
40-
[^2]:
32+
| Proposal | >= Phase 4 | Compilation Option |
33+
| ----------------------------- | ---------- | ---------------------------------|
34+
| Extended Constant Expressions | Yes | `WAMR_BUILD_EXTENDED_CONST_EXPR` |
35+
| Garbage Collection | Yes | `WAMR_BUILD_GC` |
36+
| Legacy Exception Handling[^3] | No | `WAMR_BUILD_EXCE_HANDLING` |
37+
| Memory64 | Yes | `WAMR_BUILD_MEMORY64` |
38+
| Multiple Memories[^4] | Yes | `WAMR_BUILD_MULTI_MEMORY` |
39+
| Reference-Typed Strings | No | `WAMR_BUILD_STRINGREF` |
40+
| Tail Call | Yes | `WAMR_BUILD_TAIL_CALL` |
41+
| Threads[^5] | Yes | `WAMR_BUILD_SHARED_MEMORY` |
42+
| Typed Function References | Yes | `WAMR_BUILD_GC` |
43+
44+
[^3]:
4145
interpreter only. [a legacy version](https://github.com/WebAssembly/exception-handling/blob/main/proposals/exception-handling/legacy/Exceptions.md).
4246
This proposal is currently also known as the "legacy proposal" and still
4347
supported in the web, but can be deprecated in future and the use of
4448
this proposal is discouraged.
4549

46-
[^3]: interpreter only
47-
[^4]: `WAMR_BUILD_LIB_PTHREAD` can also be used to enable
50+
[^4]: interpreter only
51+
[^5]: `WAMR_BUILD_LIB_PTHREAD` can also be used to enable
4852

4953
## Unimplemented Wasm Proposals
5054

5155
| Proposal | >= Phase 4 |
5256
| ------------------------------------------- | ---------- |
5357
| Branch Hinting | Yes |
5458
| Custom Annotation Syntax in the Text Format | Yes |
55-
| Exception handling[^5] | Yes |
56-
| Extended Constant Expressions | Yes |
57-
| Import/Export of Mutable Globals | Yes |
59+
| Exception Handling[^6] | Yes |
5860
| JS String Builtins | Yes |
5961
| Relaxed SIMD | Yes |
6062

61-
[^5]: [up-to-date version](https://github.com/WebAssembly/exception-handling/blob/main/proposals/exception-handling/Exceptions.md)
63+
[^6]: [up-to-date version](https://github.com/WebAssembly/exception-handling/blob/main/proposals/exception-handling/Exceptions.md)
6264

6365
## On-by-default WASI Proposals
6466

‎product-mini/platforms/common/wasm_proposal.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,23 @@ wasm_proposal_print_status(void)
1212
{
1313
printf("About Wasm Proposals:\n");
1414
printf(" Always-on:\n");
15+
printf(" - Import/Export of Mutable Globals\n");
1516
printf(" - Multi-value\n");
16-
printf(" - Non-trapping float-to-int conversions\n");
17-
printf(" - Sign-extension operators\n");
17+
printf(" - Non-trapping float-to-int Conversions\n");
18+
printf(" - Sign-extension Operators\n");
1819
printf(" - WebAssembly C and C++ API\n");
1920
printf(" Compilation Configurable. 0 is OFF. 1 is ON:\n");
2021
printf(" - Bulk Memory Operation via WASM_ENABLE_BULK_MEMORY: %u\n",
2122
WASM_ENABLE_BULK_MEMORY);
22-
printf(" - Fixed-Width SIMD via WASM_ENABLE_SIMD: %u\n",
23+
printf(" - Fixed-width SIMD via WASM_ENABLE_SIMD: %u\n",
2324
WASM_ENABLE_SIMD);
2425
printf(" - Garbage Collection via WASM_ENABLE_GC: %u\n", WASM_ENABLE_GC);
2526
printf(
2627
" - Legacy Exception Handling via WASM_ENABLE_EXCE_HANDLING: %u\n",
2728
WASM_ENABLE_EXCE_HANDLING);
2829
printf(" - Memory64 via WASM_ENABLE_MEMORY64: %u\n",
2930
WASM_ENABLE_MEMORY64);
30-
printf(" - Multiple Memory via WASM_ENABLE_MULTI_MEMORY: %u\n",
31+
printf(" - Multiple Memories via WASM_ENABLE_MULTI_MEMORY: %u\n",
3132
WASM_ENABLE_MULTI_MEMORY);
3233
printf(" - Reference Types via WASM_ENABLE_REF_TYPES: %u\n",
3334
WASM_ENABLE_REF_TYPES);
@@ -42,9 +43,7 @@ wasm_proposal_print_status(void)
4243
printf(" Unsupported (>= Phase4):\n");
4344
printf(" - Branch Hinting\n");
4445
printf(" - Custom Annotation Syntax in the Text Format\n");
45-
printf(" - Exception handling\n");
46-
printf(" - Extended Constant Expressions\n");
47-
printf(" - Import/Export of Mutable Globals\n");
46+
printf(" - Exception Handling\n");
4847
printf(" - JS String Builtins\n");
4948
printf(" - Relaxed SIMD\n");
5049
}

0 commit comments

Comments
 (0)