From a4e6a667a53908397b2b161606a6398bd23d6076 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <imuwoto@gmail.com>
Date: Thu, 8 Aug 2024 00:46:07 +0900
Subject: [PATCH] move a few functions from exec.h to exec_context.h

---
 lib/exec.h                     | 7 -------
 lib/exec_context.h             | 8 ++++++++
 libwasi/wasi_abi_path.c        | 1 -
 libwasi/wasi_abi_poll.c        | 2 +-
 libwasi/wasi_abi_proc.c        | 2 +-
 libwasi/wasi_abi_random.c      | 1 -
 libwasi/wasi_poll_subr.c       | 2 +-
 libwasi/wasi_subr.c            | 1 -
 libwasi/wasi_table.c           | 2 +-
 libwasi_threads/wasi_threads.c | 2 +-
 10 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/exec.h b/lib/exec.h
index bc0bb8f8..9237adeb 100644
--- 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
index 94f4553c..6d841ef2 100644
--- 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
index 9c59d799..540ea804 100644
--- 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
index ee83273a..c80c35e1 100644
--- 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
index ffc5f957..27942809 100644
--- 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
index 112a56ef..5894afd5 100644
--- 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
index 9dcfbfb1..578df173 100644
--- 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
index 41fc4136..bb80ecdc 100644
--- 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
index 8f1f67c1..f0a5cbd9 100644
--- 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
index 6eb6bbfd..a3bacc36 100644
--- 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"