move a few functions from exec.h to exec_context.h

yamt · Aug 7, 2024 · a4e6a66 · a4e6a66
1 parent 1bf7f40
commit a4e6a66
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 15 deletions.
diff --git a/lib/exec.h b/lib/exec.h
@@ -52,13 +52,6 @@ void rewind_stack(struct exec_context *ctx, uint32_t height, uint32_t arity);
 int invoke(struct funcinst *finst, const struct resulttype *paramtype,
            const struct resulttype *resulttype, struct exec_context *ctx);
 
-int check_interrupt(struct exec_context *ctx);
-int check_interrupt_interval_ms(struct exec_context *ctx);
-
-int vtrap(struct exec_context *ctx, enum trapid id, const char *fmt,
-          va_list ap);
-int trap_with_id(struct exec_context *ctx, enum trapid id, const char *fmt,
-                 ...) __attribute__((__format__(__printf__, 3, 4)));
 int memory_getptr(struct exec_context *ctx, uint32_t memidx, uint32_t ptr,
                   uint32_t offset, uint32_t size, void **pp);
 int memory_getptr2(struct exec_context *ctx, uint32_t memidx, uint32_t ptr,

diff --git a/lib/exec_context.h b/lib/exec_context.h
@@ -346,4 +346,12 @@ int exec_push_vals(struct exec_context *ctx, const struct resulttype *rt,
 void exec_pop_vals(struct exec_context *ctx, const struct resulttype *rt,
                    struct val *results);
 
+int check_interrupt(struct exec_context *ctx);
+int check_interrupt_interval_ms(struct exec_context *ctx);
+
+int vtrap(struct exec_context *ctx, enum trapid id, const char *fmt,
+          va_list ap);
+int trap_with_id(struct exec_context *ctx, enum trapid id, const char *fmt,
+                 ...) __attribute__((__format__(__printf__, 3, 4)));
+
 __END_EXTERN_C
diff --git a/libwasi/wasi_abi_path.c b/libwasi/wasi_abi_path.c
@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include "endian.h"
-#include "exec.h"
 #include "nbio.h"
 #include "wasi_impl.h"
 #include "wasi_path_subr.h"

diff --git a/libwasi/wasi_abi_poll.c b/libwasi/wasi_abi_poll.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "endian.h"
-#include "exec.h"
+#include "exec_context.h"
 #include "restart.h"
 #include "wasi_impl.h"
 #include "wasi_poll_subr.h"

diff --git a/libwasi/wasi_abi_proc.c b/libwasi/wasi_abi_proc.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "exec.h"
+#include "exec_context.h"
 #include "wasi_impl.h"
 
 #include "wasi_hostfuncs.h"

diff --git a/libwasi/wasi_abi_random.c b/libwasi/wasi_abi_random.c
@@ -13,7 +13,6 @@
 #endif
 
 #include "endian.h"
-#include "exec.h"
 #include "wasi_impl.h"
 #include "xlog.h"
 

diff --git a/libwasi/wasi_poll_subr.c b/libwasi/wasi_poll_subr.c
@@ -4,7 +4,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "exec.h"
+#include "exec_context.h"
 #include "nbio.h"
 #include "restart.h"
 #include "wasi_host_subr.h"

diff --git a/libwasi/wasi_subr.c b/libwasi/wasi_subr.c
@@ -8,7 +8,6 @@
 #include <string.h>
 
 #include "endian.h"
-#include "exec.h"
 #include "host_instance.h"
 #include "wasi_abi.h"
 #include "wasi_subr.h"

diff --git a/libwasi/wasi_table.c b/libwasi/wasi_table.c
@@ -3,7 +3,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include "exec.h"
+#include "exec_context.h"
 #include "timeutil.h"
 #include "wasi_impl.h"
 #include "xlog.h"

diff --git a/libwasi_threads/wasi_threads.c b/libwasi_threads/wasi_threads.c
@@ -13,7 +13,7 @@
 
 #include "cluster.h"
 #include "endian.h"
-#include "exec.h"
+#include "exec_context.h"
 #include "host_instance.h"
 #include "idalloc.h"
 #include "instance.h"