Remove the preview1 component adapter

Author: catamorphism

Makefile

@@ -1058,7 +1058,7 @@ bindings: $(BINDING_WORK_DIR)/wasi-cli $(BINDING_WORK_DIR)/wit-bindgen
 			--autodrop-borrows yes \
 			--rename-world wasip2 \
 			--type-section-suffix __wasi_libc \
-			--world wasi:cli/imports@0.2.0 \
+			--world wasi:cli/command@0.2.0 \
 			--rename wasi:clocks/[email protected]=monotonic_clock \
 			--rename wasi:clocks/[email protected]=wall_clock \
 			--rename wasi:filesystem/[email protected]=filesystem_preopens \

expected/wasm32-wasip2/defined-symbols.txt

@@ -392,6 +392,7 @@ __wasilibc_tell
 __wasilibc_unlinkat
 __wasilibc_utimens
 __wasm_call_dtors
+__wasm_export_exports_wasi_cli_run_run
 __wcscoll_l
 __wcsftime_l
 __wcsxfrm_l
@@ -612,6 +613,8 @@ explicit_bzero
 expm1
 expm1f
 expm1l
+exports_wasi_cli_run_result_void_void_free
+exports_wasi_cli_run_run
 fabs
 fabsf
 fabsl

expected/wasm32-wasip2/undefined-symbols.txt

@@ -65,8 +65,6 @@ __subtf3
 __trunctfdf2
 __trunctfsf2
 __unordtf2
-__wasi_preview1_adapter_close_badfd
-__wasi_preview1_adapter_open_badfd
 __wasm_call_ctors
 __wasm_import_environment_get_arguments
 __wasm_import_environment_get_environment

libc-bottom-half/headers/public/wasi/wasip2.h

@@ -1066,6 +1066,10 @@ typedef struct {
   uint64_t f1;
 } wasip2_tuple2_u64_u64_t;
 
+typedef struct {
+  bool is_err;
+} exports_wasi_cli_run_result_void_void_t;
+
 // Imported Functions from `wasi:cli/[email protected]`
 // Get the POSIX-style environment variables.
 // 
@@ -2251,6 +2255,9 @@ extern uint64_t random_insecure_get_insecure_random_u64(void);
 // protection.
 extern void random_insecure_seed_insecure_seed(wasip2_tuple2_u64_u64_t *ret);
 
+// Exported Functions from `wasi:cli/[email protected]`
+bool exports_wasi_cli_run_run(void);
+
 // Helper Functions
 
 void wasip2_tuple2_string_string_free(wasip2_tuple2_string_string_t *ptr);
@@ -2469,6 +2476,8 @@ void ip_name_lookup_option_ip_address_free(ip_name_lookup_option_ip_address_t *p
 
 void ip_name_lookup_result_option_ip_address_error_code_free(ip_name_lookup_result_option_ip_address_error_code_t *ptr);
 
+void exports_wasi_cli_run_result_void_void_free(exports_wasi_cli_run_result_void_void_t *ptr);
+
 // Transfers ownership of `s` into the string `ret`
 void wasip2_string_set(wasip2_string_t *ret, char*s);
 

libc-bottom-half/sources/__main_void.c

@@ -1,5 +1,6 @@
 #ifdef __wasilibc_use_wasip2
 #include <wasi/wasip2.h>
+#include <wasi/libc-environ.h>
 #else
 #include <wasi/api.h>
 #endif
@@ -108,3 +109,11 @@ int __main_void(void) {
     return __main_argc_argv(argc, argv);
 #endif
 }
+
+#ifdef __wasilibc_use_wasip2
+bool exports_wasi_cli_run_run(void) {
+    // TODO: this is supposed to be unnecessary, but functional/env.c fails without it
+    __wasilibc_initialize_environ();
+    return __main_void() == 0;
+}
+#endif

libc-bottom-half/sources/descriptor_table.c

@@ -24,24 +24,6 @@
 
 #include <wasi/descriptor_table.h>
 
-__attribute__((__import_module__("wasi_snapshot_preview1"),
-	       __import_name__("adapter_open_badfd"))) extern int32_t
-	__wasi_preview1_adapter_open_badfd(int32_t);
-
-static bool wasi_preview1_adapter_open_badfd(int *fd)
-{
-	return __wasi_preview1_adapter_open_badfd((int32_t)fd) == 0;
-}
-
-__attribute__((__import_module__("wasi_snapshot_preview1"),
-	       __import_name__("adapter_close_badfd"))) extern int32_t
-	__wasi_preview1_adapter_close_badfd(int32_t);
-
-static bool wasi_preview1_adapter_close_badfd(int fd)
-{
-	return __wasi_preview1_adapter_close_badfd(fd) == 0;
-}
-
 /*
  * This hash table is based on the one in musl/src/search/hsearch.c, but uses
  * integer keys and supports a `remove` operation.  Note that I've switched from
@@ -69,6 +51,8 @@ static descriptor_table_t global_table = { .entries = NULL,
 					   .mask = 0,
 					   .used = 0 };
 
+static int next_fd = 3;
+
 static size_t keyhash(int key)
 {
 	// TODO: use a hash function here
@@ -223,19 +207,13 @@ static bool remove(int fd, descriptor_table_entry_t *entry,
 
 bool descriptor_table_insert(descriptor_table_entry_t entry, int *fd)
 {
-	if (wasi_preview1_adapter_open_badfd(fd)) {
-		if (insert(entry, *fd, &global_table, false)) {
-			return true;
-		} else {
-			if (!wasi_preview1_adapter_close_badfd(*fd)) {
-				abort();
-			}
-			*fd = -1;
-			return false;
-		}
-	} else {
-		return false;
-	}
+        *fd = ++next_fd;
+        if (insert(entry, *fd, &global_table, false)) {
+                return true;
+        } else {
+                *fd = -1;
+                return false;
+        }
 }
 
 bool descriptor_table_get_ref(int fd, descriptor_table_entry_t **entry)
@@ -260,12 +238,5 @@ bool descriptor_table_update(int fd, descriptor_table_entry_t entry) {
 
 bool descriptor_table_remove(int fd, descriptor_table_entry_t *entry)
 {
-	if (remove(fd, entry, &global_table)) {
-		if (!wasi_preview1_adapter_close_badfd(fd)) {
-			abort();
-		}
-		return true;
-	} else {
-		return false;
-	}
+        return remove(fd, entry, &global_table);
 }

libc-bottom-half/sources/wasip2.c

@@ -1010,6 +1010,11 @@ void ip_name_lookup_result_option_ip_address_error_code_free(ip_name_lookup_resu
   }
 }
 
+void exports_wasi_cli_run_result_void_void_free(exports_wasi_cli_run_result_void_void_t *ptr) {
+  if (!ptr->is_err) {
+  }
+}
+
 void wasip2_string_set(wasip2_string_t *ret, char*s) {
   ret->ptr = (uint8_t*) s;
   ret->len = strlen(s);
@@ -1068,7 +1073,7 @@ bool environment_initial_cwd(wasip2_string_t *ret) {
   return option.is_some;
 }
 
-_Noreturn void exit_exit(exit_result_void_void_t *status) {
+void exit_exit(exit_result_void_void_t *status) {
   int32_t result;
   if ((*status).is_err) {
     result = 1;
@@ -4320,6 +4325,19 @@ void random_insecure_seed_insecure_seed(wasip2_tuple2_u64_u64_t *ret) {
   };
 }
 
+__attribute__((__export_name__("wasi:cli/[email protected]#run")))
+int32_t __wasm_export_exports_wasi_cli_run_run(void) {
+  exports_wasi_cli_run_result_void_void_t ret;
+  ret.is_err = !exports_wasi_cli_run_run();
+  int32_t result;
+  if ((ret).is_err) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  return result;
+}
+
 extern void __component_type_object_force_link_wasip2(void);
 void __component_type_object_force_link_wasip2_public_use_in_this_compilation_unit(void) {
   __component_type_object_force_link_wasip2();

test/Makefile

@@ -171,7 +171,7 @@ $(OBJDIR)/%.core.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS) | $(BUILTINS_STAMP)
 # For wasip2, we include an additional step to wrap up the core module into
 # a component.
 $(OBJDIR)/%.component.wasm: $(OBJDIR)/%.core.wasm
-	$(WASM_TOOLS) component new --adapt $(ADAPTER) $< -o $@
+	$(WASM_TOOLS) component new $< -o $@
 
 # Compile each selected test using Clang. Note that failures here are likely
 # due to a missing `libclang_rt.builtins-wasm32.a` in the Clang lib directory.