Skip to content

Port _Exit() to use wasip2 method #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 13, 2025
Merged

Port _Exit() to use wasip2 method #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa676d
Port _Exit() to use wasip2 method
catamorphism Aug 11, 2025
58c47bc
Add comments to generated files warning about manual edit
catamorphism Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions libc-bottom-half/cloudlibc/src/libc/stdlib/_Exit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@
//
// SPDX-License-Identifier: BSD-2-Clause

#ifdef __wasilibc_use_wasip2
#include <wasi/wasip2.h>
#else
#include <wasi/api.h>
#endif
#include <_/cdefs.h>
#include <stdnoreturn.h>
#include <unistd.h>

noreturn void _Exit(int status) {
#ifdef __wasilibc_use_wasip2
exit_result_void_void_t exit_status = { .is_err = status != 0 };
exit_exit(&exit_status);
#else
__wasi_proc_exit(status);
#endif
}

__strong_reference(_Exit, _exit);
11 changes: 11 additions & 0 deletions libc-bottom-half/crt/crt1-command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
#include <stdatomic.h>
extern void __wasi_init_tp(void);
#endif
#ifdef __wasilibc_use_wasip2
#include <wasi/wasip2.h>
#else
#include <wasi/api.h>
#endif
extern void __wasm_call_ctors(void);
extern int __main_void(void);
extern void __wasm_call_dtors(void);
Expand Down Expand Up @@ -47,7 +51,14 @@ void _start(void) {

// If main exited successfully, just return, otherwise call
// `__wasi_proc_exit`.
#ifdef __wasilibc_use_wasip2
if (r != 0) {
exit_result_void_void_t status = { .is_err = true };
exit_exit(&status);
}
#else
if (r != 0) {
__wasi_proc_exit(r);
}
#endif
}
5 changes: 4 additions & 1 deletion libc-bottom-half/headers/public/wasi/wasip2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,10 @@ extern bool environment_initial_cwd(wasip2_string_t *ret);

// Imported Functions from `wasi:cli/[email protected]`
// Exit the current instance and any linked instances.
extern void exit_exit(exit_result_void_void_t *status);
// NOTE: This file has been manually edited to add the _Noreturn
// annotation on exit_exit(). If the file is re-generated, this
// annotation will have to be re-added.
_Noreturn extern void exit_exit(exit_result_void_void_t *status);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since editing these files is unexpected, but I agree necessary in this case, please add to the comment here noting this signature has been edited from the generated code. I'm not sure if anyone will ever read the comment, but it might make it stick out more in a git diff if the files get regenerated in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 58c47bc


// Imported Functions from `wasi:io/[email protected]`
// Returns a string that is suitable to assist humans in debugging
Expand Down
7 changes: 5 additions & 2 deletions libc-bottom-half/sources/wasip2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ extern void __wasm_import_environment_get_arguments(int32_t);
__attribute__((__import_module__("wasi:cli/[email protected]"), __import_name__("initial-cwd")))
extern void __wasm_import_environment_initial_cwd(int32_t);

// NOTE: This file has been manually edited to add the _Noreturn
// annotation on __wasm_import_exit_exit(). If the file is re-generated, this
// annotation will have to be re-added.
__attribute__((__import_module__("wasi:cli/[email protected]"), __import_name__("exit")))
extern void __wasm_import_exit_exit(int32_t);
_Noreturn extern void __wasm_import_exit_exit(int32_t);

__attribute__((__import_module__("wasi:io/[email protected]"), __import_name__("[method]error.to-debug-string")))
extern void __wasm_import_io_error_method_error_to_debug_string(int32_t, int32_t);
Expand Down Expand Up @@ -1068,7 +1071,7 @@ bool environment_initial_cwd(wasip2_string_t *ret) {
return option.is_some;
}

void exit_exit(exit_result_void_void_t *status) {
_Noreturn void exit_exit(exit_result_void_void_t *status) {
int32_t result;
if ((*status).is_err) {
result = 1;
Expand Down
Loading