From 587fb92de66bb80bfd03147af4a387d6ee2c7ed4 Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Fri, 23 Nov 2018 00:13:01 -0500
Subject: [PATCH 1/2] Add VarArgs type

---
 src/apis/emscripten/mod.rs      |  1 +
 src/apis/emscripten/syscalls.rs | 42 ++++++++++++---------------------
 src/apis/emscripten/varargs.rs  | 15 ++++++++++++
 3 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 src/apis/emscripten/varargs.rs

diff --git a/src/apis/emscripten/mod.rs b/src/apis/emscripten/mod.rs
index 54c8a0a244d..14c0b67b1d5 100644
--- a/src/apis/emscripten/mod.rs
+++ b/src/apis/emscripten/mod.rs
@@ -7,6 +7,7 @@ mod memory;
 mod process;
 mod syscalls;
 mod utils;
+mod varargs;
 
 // SYSCALLS
 pub use self::utils::is_emscripten_module;
diff --git a/src/apis/emscripten/syscalls.rs b/src/apis/emscripten/syscalls.rs
index 62c40bf6ac9..976232e58fe 100644
--- a/src/apis/emscripten/syscalls.rs
+++ b/src/apis/emscripten/syscalls.rs
@@ -3,59 +3,47 @@
 use libc::{c_int, c_void, ssize_t, write};
 
 use crate::webassembly::Instance;
-
-// A macro to retrieve variadic arguments given a varargs offset
-macro_rules! vararg {
-    ($name:ident, $type:ident, $instance:ident, $varargs:ident) => (
-        let ($name, $varargs) = unsafe {
-            use std::ptr;
-            let ptr = $instance.memory_offset_addr(0, $varargs as usize);
-            let ret = ptr::read(ptr as *const $type);
-            (ret, $varargs + 4)
-        };
-    )
-}
+use super::varargs::VarArgs;
 
 /// sys_read
-pub extern "C" fn ___syscall3(_which: c_int, _varargs: c_int, _instance: &mut Instance) -> ssize_t {
+pub extern "C" fn ___syscall3(_which: c_int, mut _varargs: VarArgs, _instance: &mut Instance) -> ssize_t {
     debug!("emscripten::___syscall3");
     0
 }
 
 /// sys_write
-pub extern "C" fn ___syscall4(_which: c_int, varargs: c_int, instance: &mut Instance) -> c_int {
-    debug!("emscripten::___syscall4");
-    vararg!(fd, i32, instance, varargs);
-    vararg!(buf_ptr, u32, instance, varargs);
-    vararg!(count, u32, instance, varargs);
+pub extern "C" fn ___syscall4(_which: c_int, mut varargs: VarArgs, instance: &mut Instance) -> c_int {
+    let fd: i32 = varargs.get(instance);
+    let buf_ptr: u32 = varargs.get(instance);
+    let count: u32 = varargs.get(instance);
     debug!("fd: {}, buf_ptr: {}, count: {}", fd, buf_ptr, count);
     let buf = instance.memory_offset_addr(0, buf_ptr as usize) as *const c_void;
     unsafe { write(fd, buf, count as usize) as i32 }
 }
 
 /// sys_open
-pub extern "C" fn ___syscall5(_which: c_int, varargs: c_int, instance: &mut Instance) -> c_int {
+pub extern "C" fn ___syscall5(_which: c_int, mut varargs: VarArgs, instance: &mut Instance) -> c_int {
     debug!("emscripten::___syscall5");
-    vararg!(pathname, u32, instance, varargs);
-    vararg!(flags, u32, instance, varargs);
-    vararg!(mode, u32, instance, varargs);
+    let pathname: u32 = varargs.get(instance);
+    let flags: u32 = varargs.get(instance);
+    let mode: u32 = varargs.get(instance);
     debug!("pathname: {}, flags: {}, mode: {}", pathname, flags, mode);
     -2
 }
 
 // sys_ioctl
-pub extern "C" fn ___syscall54(_which: c_int, varargs: c_int, instance: &mut Instance) -> c_int {
+pub extern "C" fn ___syscall54(_which: c_int, mut varargs: VarArgs, instance: &mut Instance) -> c_int {
     debug!("emscripten::___syscall54");
-    vararg!(stream, u32, instance, varargs);
-    vararg!(op, u32, instance, varargs);
+    let stream: u32 = varargs.get(instance);
+    let op: u32 = varargs.get(instance);
     debug!("stream: {}, op: {}", stream, op);
     0
 }
 
 // sys_newuname
-pub extern "C" fn ___syscall122(_which: c_int, varargs: c_int, instance: &mut Instance) -> c_int {
+pub extern "C" fn ___syscall122(_which: c_int, mut varargs: VarArgs, instance: &mut Instance) -> c_int {
     debug!("emscripten::___syscall122");
-    vararg!(buf, u32, instance, varargs);
+    let buf: u32 = varargs.get(instance);
     debug!("buf: {}", buf);
     0
 }
diff --git a/src/apis/emscripten/varargs.rs b/src/apis/emscripten/varargs.rs
new file mode 100644
index 00000000000..7f5cf357737
--- /dev/null
+++ b/src/apis/emscripten/varargs.rs
@@ -0,0 +1,15 @@
+use crate::webassembly::Instance;
+use std::mem;
+
+#[repr(transparent)]
+pub struct VarArgs {
+    pointer: u32, // assuming 32bit wasm
+}
+
+impl VarArgs {
+    pub fn get<T: Copy>(&mut self, instance: &mut Instance) -> T {
+        let ptr = instance.memory_offset_addr(0, self.pointer as usize);
+        self.pointer += mem::size_of::<T>() as u32;
+        unsafe { (ptr as *const T).read() }
+    }
+}
\ No newline at end of file

From 61213706566195eb5b1ff94c15021354dc3e6d9b Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Fri, 23 Nov 2018 00:13:20 -0500
Subject: [PATCH 2/2] Fix debug macro warnings

---
 src/macros.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/macros.rs b/src/macros.rs
index a792a006348..94f7dfe611a 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -24,16 +24,8 @@ macro_rules! include_wast2wasm_bytes {
     }};
 }
 
-#[cfg(debug_assertions)]
 #[macro_export]
 macro_rules! debug {
-    ($fmt:expr) => (println!(concat!("Wasmer::", $fmt)));
-    ($fmt:expr, $($arg:tt)*) => (println!(concat!("Wasmer::", $fmt, "\n"), $($arg)*));
-}
-
-#[cfg(not(debug_assertions))]
-#[macro_export]
-macro_rules! debug {
-    ($fmt:expr) => {};
-    ($fmt:expr, $($arg:tt)*) => {};
-}
+    ($fmt:expr) => (if cfg!(debug_assertions) { println!(concat!("Wasmer::", $fmt)) });
+    ($fmt:expr, $($arg:tt)*) => (if cfg!(debug_assertions) { println!(concat!("Wasmer::", $fmt, "\n"), $($arg)*) });
+}
\ No newline at end of file