From cb7c7fd4759473df4ad303f68f39a76828f8b6b5 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Mon, 26 Nov 2018 12:02:29 -0800 Subject: [PATCH] Added _gettimeofday to emscripten --- src/apis/emscripten/mod.rs | 8 +++++++- src/webassembly/instance.rs | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/apis/emscripten/mod.rs b/src/apis/emscripten/mod.rs index 99e220d8f..88dca5edf 100644 --- a/src/apis/emscripten/mod.rs +++ b/src/apis/emscripten/mod.rs @@ -15,6 +15,7 @@ mod varargs; mod errno; mod storage; mod nullfunc; +mod time; pub use self::utils::is_emscripten_module; pub use self::storage::{align_memory, static_alloc}; @@ -284,6 +285,11 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> { "_getgrnam", ImportValue::Func(env::_getgrnam as _), ); + import_object.set( + "env", + "_gettimeofday", + ImportValue::Func(time::_gettimeofday as _), + ); mock_external!(import_object, _waitpid); mock_external!(import_object, _utimes); mock_external!(import_object, _usleep); @@ -310,7 +316,7 @@ pub fn generate_emscripten_env<'a, 'b>() -> ImportObject<&'a str, &'b str> { mock_external!(import_object, _llvm_stackrestore); mock_external!(import_object, _kill); mock_external!(import_object, _gmtime_r); - mock_external!(import_object, _gettimeofday); + // mock_external!(import_object, _gettimeofday); mock_external!(import_object, _getpagesize); mock_external!(import_object, _getgrent); mock_external!(import_object, _getaddrinfo); diff --git a/src/webassembly/instance.rs b/src/webassembly/instance.rs index 1c9667cc3..9ce8d79cc 100644 --- a/src/webassembly/instance.rs +++ b/src/webassembly/instance.rs @@ -140,6 +140,7 @@ pub struct InstanceOptions { } extern "C" fn mock_fn() -> i32 { + println!("CALLING MOCKED FUNC"); return 0; }