move schedule_call_from_hostfunc from an example to lib

yamt · Nov 23, 2023 · 117717e · 117717e
1 parent 9087f6f
commit 117717e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/examples/hostfunc/hostfunc.c b/examples/hostfunc/hostfunc.c
@@ -102,25 +102,6 @@ my_host_inst_load_call(struct exec_context *ctx, struct host_instance *hi,
         return host_ret;
 }
 
-int
-schedule_call_from_hostfunc(struct exec_context *ctx,
-                            struct restart_info *restart,
-                            const struct funcinst *func)
-{
-        restart->restart_type = RESTART_HOSTFUNC;
-        struct restart_hostfunc *hf = &restart->restart_u.hostfunc;
-        const struct functype *ft = funcinst_functype(func);
-        hf->func = ctx->event_u.call.func; /* caller hostfunc */
-        assert(hf->func->is_host);
-        hf->saved_bottom = ctx->bottom;
-        hf->stack_adj = resulttype_cellsize(&ft->result);
-        ctx->event_u.call.func = func;
-        ctx->event = EXEC_EVENT_CALL;
-        ctx->bottom = ctx->frames.lsize;
-        ctx->restarts.lsize++; /* make restart possibly nest */
-        return ETOYWASMRESTART;
-}
-
 static int
 my_host_inst_load_call_add(struct exec_context *ctx, struct host_instance *hi,
                            const struct functype *ft,

diff --git a/lib/host_instance.c b/lib/host_instance.c
@@ -182,3 +182,22 @@ host_func_copyout(struct exec_context *ctx, const void *hostaddr,
         memcpy(p, hostaddr, len);
         return 0;
 }
+
+int
+schedule_call_from_hostfunc(struct exec_context *ctx,
+                            struct restart_info *restart,
+                            const struct funcinst *func)
+{
+        restart->restart_type = RESTART_HOSTFUNC;
+        struct restart_hostfunc *hf = &restart->restart_u.hostfunc;
+        const struct functype *ft = funcinst_functype(func);
+        hf->func = ctx->event_u.call.func; /* caller hostfunc */
+        assert(hf->func->is_host);
+        hf->saved_bottom = ctx->bottom;
+        hf->stack_adj = resulttype_cellsize(&ft->result);
+        ctx->event_u.call.func = func;
+        ctx->event = EXEC_EVENT_CALL;
+        ctx->bottom = ctx->frames.lsize;
+        ctx->restarts.lsize++; /* make restart possibly nest */
+        return ETOYWASMRESTART;
+}
diff --git a/lib/host_instance.h b/lib/host_instance.h
@@ -57,3 +57,7 @@ int host_func_copyout(struct exec_context *ctx, const void *hostaddr,
                       uint32_t wasmaddr, size_t len, size_t align);
 int host_func_copyin(struct exec_context *ctx, void *hostaddr,
                      uint32_t wasmaddr, size_t len, size_t align);
+struct restart_info;
+int schedule_call_from_hostfunc(struct exec_context *ctx,
+                                struct restart_info *restart,
+                                const struct funcinst *func);