Skip to content

Commit 8bf791e

Browse files
committed
Merge branch 'dev/checkpoint_and_restore' into main
1 parent 7cc3839 commit 8bf791e

12 files changed

+256
-61
lines changed

ATTRIBUTIONS.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ WAMR project reused some components from other open source project:
1818
- **NuttX ELF headers**: used in core/iwasm/aot/debug/elf_parser.c
1919
- **Dhrystone**: for the test benchmakr dhrystone
2020

21-
The WAMR fast interpreter is a clean room development. We would acknowledge the inspirations by [WASM3](https://github.com/wasm3/wasm3) open source project for the approach of pre-calculated oprand stack location.
21+
The WAMR fast interpreter is a clean room development. We would acknowledge the inspirations by [WASM3](https://github.com/wasm3/wasm3) open source project for the approach of pre-calculated operand stack location.
2222

2323
| third party components | version number | latest release | vendor pages | CVE details |
2424
| --- | --- | --- | --- | --- |
@@ -37,6 +37,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
3737
| zydis | unspecified | e14a07895136182a5b53e181eec3b1c6e0b434de | https://github.com/zyantific/zydis | |
3838
| NuttX ELF headers | 72313301e23f9c2de969fb64b9a0f67bb4c284df | 10.3.0 | https://github.com/apache/incubator-nuttx | |
3939
| Dhrystone | 2.1 | 2.1 | https://fossies.org/linux/privat/old/ | |
40+
| yalantinglibs | v0.3.2 | v0.3.2 | https://github.com/alibaba/yalantinglibs | |
4041

4142
## Licenses
4243

@@ -103,3 +104,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
103104
### Dhrystone
104105

105106
[LICENSE](./tests/benchmarks/dhrystone/LICENSE)
107+
108+
### yalantinglibs
109+
110+
[LICENSE](./core/iwasm/libraries/ckpt-restore/LICENSE_YALANTINGLIBS)

core/iwasm/aot/aot_runtime.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,8 @@ memories_instantiate(AOTModuleInstance *module_inst, AOTModuleInstance *parent,
10551055

10561056
#if WASM_ENABLE_SHARED_MEMORY != 0
10571057
/* Currently we have only one memory instance */
1058-
bool is_shared_memory = module->memories[0].memory_flags & 0x02 ? true : false;
1058+
bool is_shared_memory =
1059+
module->memories[0].memory_flags & 0x02 ? true : false;
10591060
if (is_shared_memory && parent != NULL) {
10601061
/* Ignore setting memory init data if the memory has been initialized */
10611062
return true;

core/iwasm/common/wasm_runtime_common.h

+6
Original file line numberDiff line numberDiff line change
@@ -1216,6 +1216,12 @@ wasm_runtime_checkpoint(wasm_module_inst_t module_inst, char *file);
12161216
bool
12171217
wasm_runtime_restore(wasm_module_inst_t module_inst, char *file, char *file1);
12181218
#endif
1219+
WASM_RUNTIME_API_EXTERN bool
1220+
wasm_runtime_detect_native_stack_overflow(WASMExecEnv *exec_env);
1221+
1222+
WASM_RUNTIME_API_EXTERN bool
1223+
wasm_runtime_detect_native_stack_overflow_size(WASMExecEnv *exec_env,
1224+
uint32 requested_size);
12191225

12201226
#if WASM_ENABLE_LINUX_PERF != 0
12211227
bool

core/iwasm/compilation/aot_compiler.c

-4
Original file line numberDiff line numberDiff line change
@@ -487,10 +487,6 @@ fake_aot_gen_commit_value(AOTCompFrame *frame, bool reset_dirty_bit,
487487
case VALUE_TYPE_FUNCREF:
488488
case VALUE_TYPE_EXTERNREF:
489489
break;
490-
break;
491-
492-
break;
493-
494490
case VALUE_TYPE_I64:
495491
if (reset_dirty_bit)
496492
((*p) + 1)->dirty = 0;

core/iwasm/include/wasm_export.h

+7-33
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ wasm_runtime_set_wasi_ns_lookup_pool(wasm_module_t module,
611611
*/
612612
WASM_RUNTIME_API_EXTERN wasm_module_inst_t
613613
wasm_runtime_instantiate(const wasm_module_t module,
614-
<<<<<<< HEAD
615614
uint32_t default_stack_size,
616615
uint32_t host_managed_heap_size, char *error_buf,
617616
uint32_t error_buf_size);
@@ -626,14 +625,6 @@ WASM_RUNTIME_API_EXTERN wasm_module_inst_t
626625
wasm_runtime_instantiate_ex(const wasm_module_t module,
627626
const InstantiationArgs *args, char *error_buf,
628627
uint32_t error_buf_size);
629-
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
630-
uint32_t default_stack_size, uint32_t host_managed_heap_size,
631-
char *error_buf, uint32_t error_buf_size);
632-
=======
633-
uint32_t default_stack_size,
634-
uint32_t host_managed_heap_size, char *error_buf,
635-
uint32_t error_buf_size);
636-
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
637628

638629
/**
639630
* Instantiate a WASM module, with specified instantiation arguments
@@ -649,12 +640,13 @@ wasm_runtime_instantiate_ex(const wasm_module_t module,
649640
/**
650641
* Instantiate a WASM module, with specified instantiation arguments
651642
*
652-
* Same as wasm_runtime_instantiate, but it also allows overwriting maximum memory
643+
* Same as wasm_runtime_instantiate, but it also allows overwriting maximum
644+
* memory
653645
*/
654646
WASM_RUNTIME_API_EXTERN wasm_module_inst_t
655647
wasm_runtime_instantiate_ex(const wasm_module_t module,
656-
const InstantiationArgs *args,
657-
char *error_buf, uint32_t error_buf_size);
648+
const InstantiationArgs *args, char *error_buf,
649+
uint32_t error_buf_size);
658650

659651
/**
660652
* Set the running mode of a WASM module instance, override the
@@ -1531,16 +1523,8 @@ WASM_RUNTIME_API_EXTERN double
15311523
wasm_runtime_sum_wasm_exec_time(wasm_module_inst_t module_inst);
15321524

15331525
/**
1534-
<<<<<<< HEAD
15351526
* Return execution time in ms of a given wasm function with
15361527
* func_name. If the function is not found, return 0.
1537-
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
1538-
* Return execution time in ms of a given wasm funciton with
1539-
* func_name. If the function is not found, return 0.
1540-
=======
1541-
* Return execution time in ms of a given wasm funciton with
1542-
* func_name. If the function is not found, return 0.
1543-
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
15441528
*
15451529
* @param module_inst the WASM module instance to profile
15461530
* @param func_name could be an export name or a name in the
@@ -1762,16 +1746,8 @@ wasm_runtime_is_import_func_linked(const char *module_name,
17621746
const char *func_name);
17631747

17641748
/**
1765-
<<<<<<< HEAD
17661749
* Check whether an import global `(import <module_name> <global_name>
17671750
* (global ...))` is linked or not with runtime registered native globals
1768-
||||||| parent of d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
1769-
* Check whether an import global `(import <module_name> <global_name> (global ...))`
1770-
* is linked or not with runtime registered natvie globals
1771-
=======
1772-
* Check whether an import global `(import <module_name> <global_name>
1773-
* (global ...))` is linked or not with runtime registered natvie globals
1774-
>>>>>>> d8948a72 (Update version number to 2.0.0 and update release notes (#3327))
17751751
*/
17761752
WASM_RUNTIME_API_EXTERN bool
17771753
wasm_runtime_is_import_global_linked(const char *module_name,
@@ -1980,7 +1956,7 @@ wasm_runtime_is_underlying_binary_freeable(const wasm_module_t module);
19801956
/*
19811957
* wasm_runtime_checkpoint/wasm_runtime_restore
19821958
*
1983-
* These APIs are intended to be used by the host to register the current
1959+
* These APIs are intended to be used by the host to register the current
19841960
* state of the WASM module instance to a file and restore the state from
19851961
* file
19861962
* eg.
@@ -1993,11 +1969,9 @@ wasm_runtime_is_underlying_binary_freeable(const wasm_module_t module);
19931969
* }
19941970
*/
19951971
WASM_RUNTIME_API_EXTERN bool
1996-
wasm_runtime_checkpoint(wasm_module_inst_t module_inst,
1997-
char *file);
1972+
wasm_runtime_checkpoint(wasm_module_inst_t module_inst, char *file);
19981973
WASM_RUNTIME_API_EXTERN bool
1999-
wasm_runtime_restore(wasm_module_inst_t module_inst,
2000-
char *file, char *file1);
1974+
wasm_runtime_restore(wasm_module_inst_t module_inst, char *file, char *file1);
20011975
#endif
20021976

20031977
WASM_RUNTIME_API_EXTERN bool

core/iwasm/interpreter/wasm_interp_classic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
15041504
uint8 value_type;
15051505
#if WASM_ENABLE_CHECKPOINT_RESTORE != 0
15061506
if (exec_env->is_restore) {
1507-
// WASMFunction *cur_wasm_func = cur_func->u.func;
1507+
WASMFunction *cur_wasm_func = cur_func->u.func;
15081508
frame = exec_env->cur_frame;
15091509
UPDATE_ALL_FROM_FRAME();
15101510
frame_ip_end = wasm_get_func_code_end(cur_func);

core/iwasm/interpreter/wasm_mini_loader.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4269,7 +4269,7 @@ wasm_loader_pop_frame_ref(WASMLoaderContext *ctx, uint8 type, char *error_buf,
42694269
ctx->frame_ref--;
42704270
ctx->stack_cell_num--;
42714271

4272-
if (is_32bit_type(type) || *ctx->frame_ref == VALUE_TYPE_ANY)
4272+
if (is_32bit_type(type))
42734273
return true;
42744274

42754275
ctx->frame_ref--;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

0 commit comments

Comments
 (0)