Add typed functions and weird type parameter things

lib/emscripten/src/process.rs

@@ -3,20 +3,20 @@ use libc::{abort, c_char, c_int, exit, pid_t, EAGAIN};
 use std::ffi::CStr;
 use wasmer_runtime_core::vm::Ctx;
 
-pub extern "C" fn abort_with_message(message: &str, ctx: &mut Ctx) {
+pub fn abort_with_message(message: &str, ctx: &mut Ctx) {
     debug!("emscripten::abort_with_message");
     println!("{}", message);
     _abort(ctx);
 }
 
-pub extern "C" fn _abort(_ctx: &mut Ctx) {
+pub fn _abort(_ctx: &mut Ctx) {
     debug!("emscripten::_abort");
     unsafe {
         abort();
     }
 }
 
-pub extern "C" fn _fork(_ctx: &mut Ctx) -> pid_t {
+pub fn _fork(_ctx: &mut Ctx) -> pid_t {
     debug!("emscripten::_fork");
     // unsafe {
     //     fork()
@@ -24,23 +24,23 @@ pub extern "C" fn _fork(_ctx: &mut Ctx) -> pid_t {
     -1
 }
 
-pub extern "C" fn _endgrent(_ctx: &mut Ctx) {
+pub fn _endgrent(_ctx: &mut Ctx) {
     debug!("emscripten::_endgrent");
 }
 
-pub extern "C" fn _execve(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _execve(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_execve");
     -1
 }
 
 #[allow(unreachable_code)]
-pub extern "C" fn _exit(status: c_int, _ctx: &mut Ctx) {
+pub fn _exit(status: c_int, _ctx: &mut Ctx) {
     // -> !
     debug!("emscripten::_exit {}", status);
     unsafe { exit(status) }
 }
 
-pub extern "C" fn em_abort(message: u32, ctx: &mut Ctx) {
+pub fn em_abort(message: u32, ctx: &mut Ctx) {
     debug!("emscripten::em_abort {}", message);
     let message_addr = emscripten_memory_pointer!(ctx.memory(0), message) as *mut c_char;
     unsafe {
@@ -52,65 +52,65 @@ pub extern "C" fn em_abort(message: u32, ctx: &mut Ctx) {
     }
 }
 
-pub extern "C" fn _kill(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _kill(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_kill");
     -1
 }
 
-pub extern "C" fn _llvm_stackrestore(_one: i32, _ctx: &mut Ctx) {
+pub fn _llvm_stackrestore(_one: i32, _ctx: &mut Ctx) {
     debug!("emscripten::_llvm_stackrestore");
 }
 
-pub extern "C" fn _raise(_one: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _raise(_one: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_raise");
     -1
 }
 
-pub extern "C" fn _sem_init(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _sem_init(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_sem_init");
     -1
 }
 
-pub extern "C" fn _sem_post(_one: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _sem_post(_one: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_sem_post");
     -1
 }
 
-pub extern "C" fn _sem_wait(_one: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _sem_wait(_one: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_sem_post");
     -1
 }
 
-pub extern "C" fn _setgrent(_ctx: &mut Ctx) {
+pub fn _setgrent(_ctx: &mut Ctx) {
     debug!("emscripten::_setgrent");
 }
 
-pub extern "C" fn _setgroups(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _setgroups(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_setgroups");
     -1
 }
 
-pub extern "C" fn _setitimer(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _setitimer(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_setitimer");
     -1
 }
 
-pub extern "C" fn _usleep(_one: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _usleep(_one: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_usleep");
     -1
 }
 
-pub extern "C" fn _utimes(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _utimes(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_utimes");
     -1
 }
 
-pub extern "C" fn _waitpid(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
+pub fn _waitpid(_one: i32, _two: i32, _three: i32, _ctx: &mut Ctx) -> i32 {
     debug!("emscripten::_waitpid");
     -1
 }
 
-pub extern "C" fn abort_stack_overflow(_what: c_int, ctx: &mut Ctx) {
+pub fn abort_stack_overflow(_what: c_int, ctx: &mut Ctx) {
     debug!("emscripten::abort_stack_overflow");
     // TODO: Message incomplete. Need to finish em runtime data first
     abort_with_message(
@@ -119,19 +119,19 @@ pub extern "C" fn abort_stack_overflow(_what: c_int, ctx: &mut Ctx) {
     );
 }
 
-pub extern "C" fn _llvm_trap(ctx: &mut Ctx) {
+pub fn _llvm_trap(ctx: &mut Ctx) {
     debug!("emscripten::_llvm_trap");
     abort_with_message("abort!", ctx);
 }
 
-pub extern "C" fn _system(_one: i32, _ctx: &mut Ctx) -> c_int {
+pub fn _system(_one: i32, _ctx: &mut Ctx) -> c_int {
     debug!("emscripten::_system");
     // TODO: May need to change this Em impl to a working version
     eprintln!("Can't call external programs");
     return EAGAIN;
 }
 
-pub extern "C" fn _popen(_one: i32, _two: i32, _ctx: &mut Ctx) -> c_int {
+pub fn _popen(_one: i32, _two: i32, _ctx: &mut Ctx) -> c_int {
     debug!("emscripten::_popen");
     // TODO: May need to change this Em impl to a working version
     eprintln!("Missing function: popen");