cconv_default_memory: add an explicit instance argument

to be consistent with cconv_deref_func_ptr
yamt · Aug 10, 2024 · 5b55cdf · 5b55cdf
1 parent e080df1
commit 5b55cdf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/cconv.c b/lib/cconv.c
@@ -63,9 +63,10 @@ cconv_deref_func_ptr(struct exec_context *ctx, const struct instance *inst,
 }
 
 int
-cconv_default_memory(struct exec_context *ctx, uint32_t *memidxp)
+cconv_default_memory(struct exec_context *ctx, const struct instance *inst,
+                     uint32_t *memidxp)
 {
-        const struct module *m = ctx->instance->module;
+        const struct module *m = inst->module;
         int ret;
         /*
          * XXX searching exports on each call can be too slow.

diff --git a/lib/cconv.h b/lib/cconv.h
@@ -13,6 +13,7 @@ int cconv_deref_func_ptr(struct exec_context *ctx, const struct instance *inst,
                          uint32_t wasmfuncptr, const struct functype *ft,
                          const struct funcinst **fip);
 
-int cconv_default_memory(struct exec_context *ctx, uint32_t *memidxp);
+int cconv_default_memory(struct exec_context *ctx, const struct instance *inst,
+                         uint32_t *memidxp);
 
 __END_EXTERN_C
diff --git a/lib/host_instance.c b/lib/host_instance.c
@@ -204,7 +204,7 @@ host_func_getptr2(struct exec_context *ctx, uint32_t ptr, uint32_t offset,
                   uint32_t size, void **pp, bool *movedp)
 {
         uint32_t memidx;
-        int ret = cconv_default_memory(ctx, &memidx);
+        int ret = cconv_default_memory(ctx, ctx->instance, &memidx);
         if (ret != 0) {
                 return ret;
         }