From 49c62ee828fc052aabd9b7fc41c893dfa5aa9c58 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Tue, 23 Jun 2020 15:26:17 -0700
Subject: [PATCH] make the missing memory error value configurable

---
 crates/wasi/src/lib.rs                     |  4 ++-
 crates/wiggle/wasmtime/macro/src/config.rs | 33 +++++++++++++++++++++-
 crates/wiggle/wasmtime/macro/src/lib.rs    | 15 ++++++++--
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/crates/wasi/src/lib.rs b/crates/wasi/src/lib.rs
index f281b84e2a..5d29cce913 100644
--- a/crates/wasi/src/lib.rs
+++ b/crates/wasi/src/lib.rs
@@ -24,7 +24,9 @@ wasm modules. This structure exports all that various fields of the
 wasi instance as fields which can be used to implement your own
 instantiation logic, if necessary. Additionally [`Wasi::get_export`]
 can be used to do name-based resolution."
-    }
+    },
+    // Error to return when caller module is missing memory export:
+    missing_memory: { wasi_common::wasi::Errno::Inval },
 });
 
 pub fn is_wasi_module(name: &str) -> bool {
diff --git a/crates/wiggle/wasmtime/macro/src/config.rs b/crates/wiggle/wasmtime/macro/src/config.rs
index f42f4121a0..b3d44d4492 100644
--- a/crates/wiggle/wasmtime/macro/src/config.rs
+++ b/crates/wiggle/wasmtime/macro/src/config.rs
@@ -1,5 +1,5 @@
 use {
-    proc_macro2::Span,
+    proc_macro2::{Span, TokenStream},
     syn::{
         braced,
         parse::{Parse, ParseStream},
@@ -15,6 +15,7 @@ pub struct Config {
     pub witx: WitxConf,
     pub ctx: CtxConf,
     pub instance: InstanceConf,
+    pub missing_memory: MissingMemoryConf,
 }
 
 #[derive(Debug, Clone)]
@@ -23,6 +24,7 @@ pub enum ConfigField {
     Witx(WitxConf),
     Ctx(CtxConf),
     Instance(InstanceConf),
+    MissingMemory(MissingMemoryConf),
 }
 
 mod kw {
@@ -33,6 +35,7 @@ mod kw {
     syn::custom_keyword!(instance);
     syn::custom_keyword!(name);
     syn::custom_keyword!(docs);
+    syn::custom_keyword!(missing_memory);
 }
 
 impl Parse for ConfigField {
@@ -58,6 +61,10 @@ impl Parse for ConfigField {
             input.parse::<kw::instance>()?;
             input.parse::<Token![:]>()?;
             Ok(ConfigField::Instance(input.parse()?))
+        } else if lookahead.peek(kw::missing_memory) {
+            input.parse::<kw::missing_memory>()?;
+            input.parse::<Token![:]>()?;
+            Ok(ConfigField::MissingMemory(input.parse()?))
         } else {
             Err(lookahead.error())
         }
@@ -70,6 +77,7 @@ impl Config {
         let mut witx = None;
         let mut ctx = None;
         let mut instance = None;
+        let mut missing_memory = None;
         for f in fields {
             match f {
                 ConfigField::Target(c) => {
@@ -96,6 +104,12 @@ impl Config {
                     }
                     instance = Some(c);
                 }
+                ConfigField::MissingMemory(c) => {
+                    if missing_memory.is_some() {
+                        return Err(Error::new(err_loc, "duplicate `missing_memory` field"));
+                    }
+                    missing_memory = Some(c);
+                }
             }
         }
         Ok(Config {
@@ -111,6 +125,9 @@ impl Config {
             instance: instance
                 .take()
                 .ok_or_else(|| Error::new(err_loc, "`instance` field required"))?,
+            missing_memory: missing_memory
+                .take()
+                .ok_or_else(|| Error::new(err_loc, "`missing_memory` field required"))?,
         })
     }
 
@@ -214,3 +231,17 @@ impl Parse for InstanceConf {
         Ok(InstanceConf::build(fields.into_iter(), input.span())?)
     }
 }
+
+#[derive(Debug, Clone)]
+pub struct MissingMemoryConf {
+    pub err: TokenStream,
+}
+impl Parse for MissingMemoryConf {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let contents;
+        let _lbrace = braced!(contents in input);
+        Ok(MissingMemoryConf {
+            err: contents.parse()?,
+        })
+    }
+}
diff --git a/crates/wiggle/wasmtime/macro/src/lib.rs b/crates/wiggle/wasmtime/macro/src/lib.rs
index 9aa3c300f5..543d8bbe18 100644
--- a/crates/wiggle/wasmtime/macro/src/lib.rs
+++ b/crates/wiggle/wasmtime/macro/src/lib.rs
@@ -6,7 +6,7 @@ use wiggle_generate::Names;
 
 mod config;
 
-use config::{InstanceConf, TargetConf};
+use config::{InstanceConf, MissingMemoryConf, TargetConf};
 
 #[proc_macro]
 pub fn define_wasmtime_integration(args: TokenStream) -> TokenStream {
@@ -17,7 +17,14 @@ pub fn define_wasmtime_integration(args: TokenStream) -> TokenStream {
     let doc = config.load_document();
     let names = Names::new(&config.ctx.name, quote!(wasmtime_wiggle));
 
-    generate(&doc, &names, &config.target, &config.instance).into()
+    generate(
+        &doc,
+        &names,
+        &config.target,
+        &config.instance,
+        &config.missing_memory,
+    )
+    .into()
 }
 
 enum Abi {
@@ -32,6 +39,7 @@ fn generate(
     names: &Names,
     target_conf: &TargetConf,
     instance_conf: &InstanceConf,
+    missing_mem_conf: &MissingMemoryConf,
 ) -> TokenStream2 {
     let mut fields = Vec::new();
     let mut get_exports = Vec::new();
@@ -41,6 +49,7 @@ fn generate(
 
     let runtime = names.runtime_mod();
     let target_path = &target_conf.path;
+    let missing_mem_err = &missing_mem_conf.err;
 
     for module in doc.modules() {
         let module_name = module.name.as_str();
@@ -205,7 +214,7 @@ fn generate(
                                 Some(wasmtime::Extern::Memory(m)) => m,
                                 _ => {
                                     log::warn!("callee does not export a memory as \"memory\"");
-                                    let e = wasi_common::wasi::Errno::Inval;
+                                    let e = { #missing_mem_err };
                                     #handle_early_error
                                 }
                             };