Moved ctx to be the first argument in emscripten

lib/emscripten/src/syscalls/mod.rs

@@ -70,7 +70,7 @@ use libc::SO_NOSIGPIPE;
 const SO_NOSIGPIPE: c_int = 0;
 
 /// exit
-pub fn ___syscall1(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) {
+pub fn ___syscall1(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) {
     debug!("emscripten::___syscall1 (exit) {}", which);
     let status: i32 = varargs.get(ctx);
     unsafe {
@@ -79,7 +79,7 @@ pub fn ___syscall1(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) {
 }
 
 /// read
-pub fn ___syscall3(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
+pub fn ___syscall3(ctx: &mut Ctx, which: i32, mut varargs: VarArgs) -> i32 {
     // -> ssize_t
     debug!("emscripten::___syscall3 (read) {}", which);
     let fd: i32 = varargs.get(ctx);
@@ -93,7 +93,7 @@ pub fn ___syscall3(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
 }
 
 /// write
-pub fn ___syscall4(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall4(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall4 (write) {}", which);
     let fd: i32 = varargs.get(ctx);
     let buf: u32 = varargs.get(ctx);
@@ -104,7 +104,7 @@ pub fn ___syscall4(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
 }
 
 /// open
-pub fn ___syscall5(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall5(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall5 (open) {}", which);
     let pathname: u32 = varargs.get(ctx);
     let flags: i32 = varargs.get(ctx);
@@ -120,7 +120,7 @@ pub fn ___syscall5(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
 }
 
 /// close
-pub fn ___syscall6(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall6(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall6 (close) {}", which);
     let fd: i32 = varargs.get(ctx);
     debug!("fd: {}", fd);
@@ -128,7 +128,7 @@ pub fn ___syscall6(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
 }
 
 // chdir
-pub fn ___syscall12(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall12(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall12 (chdir) {}", which);
     let path_addr: i32 = varargs.get(ctx);
     unsafe {
@@ -140,42 +140,42 @@ pub fn ___syscall12(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
     }
 }
 
-pub fn ___syscall10(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall10(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall10");
     -1
 }
 
-pub fn ___syscall15(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall15(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall15");
     -1
 }
 
 // getpid
-pub fn ___syscall20(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall20(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall20 (getpid)");
     unsafe { getpid() }
 }
 
-pub fn ___syscall38(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall38(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall38");
     -1
 }
 
 // rmdir
-pub fn ___syscall40(_which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall40(ctx: &mut Ctx, _which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall40 (rmdir)");
     let pathname: u32 = varargs.get(ctx);
     let pathname_addr = emscripten_memory_pointer!(ctx.memory(0), pathname) as *const i8;
     unsafe { rmdir(pathname_addr) }
 }
 
-pub fn ___syscall60(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall60(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall60");
     -1
 }
 
 // dup2
-pub fn ___syscall63(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall63(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall63 (dup2) {}", which);
 
     let src: i32 = varargs.get(ctx);
@@ -185,43 +185,43 @@ pub fn ___syscall63(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
 }
 
 // getppid
-pub fn ___syscall64(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall64(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall64 (getppid)");
     unsafe { getpid() }
 }
 
-pub fn ___syscall66(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall66(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall66");
     -1
 }
 
-pub fn ___syscall75(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall75(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall75");
     -1
 }
 
-pub fn ___syscall85(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall85(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall85");
     -1
 }
 
-pub fn ___syscall91(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall91(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall91");
     -1
 }
 
-pub fn ___syscall97(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall97(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall97");
     -1
 }
 
-pub fn ___syscall110(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall110(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall110");
     -1
 }
 
 // mmap2
-pub fn ___syscall192(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall192(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall192 (mmap2) {}", which);
     let addr: i32 = varargs.get(ctx);
     let len: u32 = varargs.get(ctx);
@@ -235,11 +235,11 @@ pub fn ___syscall192(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
     );
 
     if fd == -1 {
-        let ptr = env::call_memalign(16384, len, ctx);
+        let ptr = env::call_memalign(ctx, 16384, len);
         if ptr == 0 {
             return -1;
         }
-        env::call_memset(ptr, 0, len, ctx);
+        env::call_memset(ctx, ptr, 0, len);
         ptr as _
     } else {
         -1
@@ -247,7 +247,7 @@ pub fn ___syscall192(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
 }
 
 /// lseek
-pub fn ___syscall140(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
+pub fn ___syscall140(ctx: &mut Ctx, which: i32, mut varargs: VarArgs) -> i32 {
     // -> c_int
     debug!("emscripten::___syscall140 (lseek) {}", which);
     let fd: i32 = varargs.get(ctx);
@@ -259,7 +259,7 @@ pub fn ___syscall140(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
 
 /// readv
 #[allow(clippy::cast_ptr_alignment)]
-pub fn ___syscall145(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
+pub fn ___syscall145(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> i32 {
     // -> ssize_t
     debug!("emscripten::___syscall145 (readv) {}", which);
     // let fd: i32 = varargs.get(ctx);
@@ -302,7 +302,7 @@ pub fn ___syscall145(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
 
 // writev
 #[allow(clippy::cast_ptr_alignment)]
-pub fn ___syscall146(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
+pub fn ___syscall146(ctx: &mut Ctx, which: i32, mut varargs: VarArgs) -> i32 {
     // -> ssize_t
     debug!("emscripten::___syscall146 (writev) {}", which);
     let fd: i32 = varargs.get(ctx);
@@ -336,33 +336,33 @@ pub fn ___syscall146(which: i32, mut varargs: VarArgs, ctx: &mut Ctx) -> i32 {
     }
 }
 
-pub fn ___syscall168(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall168(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall168");
     -1
 }
 
-pub fn ___syscall191(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall191(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall191 - stub");
     -1
 }
 
-pub fn ___syscall194(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall194(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall194 - stub");
     -1
 }
 
-pub fn ___syscall196(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall196(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall194 - stub");
     -1
 }
 
-pub fn ___syscall199(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall199(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall199 - stub");
     -1
 }
 
 // stat64
-pub fn ___syscall195(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall195(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall195 (stat64) {}", which);
     let pathname: u32 = varargs.get(ctx);
     let buf: u32 = varargs.get(ctx);
@@ -382,7 +382,7 @@ pub fn ___syscall195(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
 }
 
 // fstat64
-pub fn ___syscall197(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall197(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall197 (fstat64) {}", which);
     let fd: c_int = varargs.get(ctx);
     let buf: u32 = varargs.get(ctx);
@@ -400,13 +400,13 @@ pub fn ___syscall197(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
     0
 }
 
-pub fn ___syscall220(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall220(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall220");
     -1
 }
 
 // fcntl64
-pub fn ___syscall221(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall221(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall221 (fcntl64) {}", which);
     // fcntl64
     let _fd: i32 = varargs.get(ctx);
@@ -417,33 +417,33 @@ pub fn ___syscall221(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int
     }
 }
 
-pub fn ___syscall268(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall268(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall268");
     -1
 }
 
-pub fn ___syscall272(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall272(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall272");
     -1
 }
 
-pub fn ___syscall295(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall295(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall295");
     -1
 }
 
-pub fn ___syscall300(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall300(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall300");
     -1
 }
 
-pub fn ___syscall334(_one: i32, _two: i32, _ctx: &mut Ctx) -> i32 {
+pub fn ___syscall334(_ctx: &mut Ctx, _one: i32, _two: i32) -> i32 {
     debug!("emscripten::___syscall334");
     -1
 }
 
 // prlimit64
-pub fn ___syscall340(which: c_int, mut varargs: VarArgs, ctx: &mut Ctx) -> c_int {
+pub fn ___syscall340(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
     debug!("emscripten::___syscall340 (prlimit64), {}", which);
     // NOTE: Doesn't really matter. Wasm modules cannot exceed WASM_PAGE_SIZE anyway.
     let _pid: i32 = varargs.get(ctx);