fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-25 18:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed all warnings

Browse Source
This commit is contained in:
Syrus Akbary 2018-11-28 13:29:50 -08:00
parent 80ddc759a1
commit c9ae2f25b9
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/apis/emscripten/mod.rs
View File

@ -52,11 +52,13 @@ fn dynamictop_ptr(static_bump: u32) -> u32 {
pub fn emscripten_set_up_memory(memory: &mut LinearMemory) { pub fn emscripten_set_up_memory(memory: &mut LinearMemory) {
let dynamictop_ptr = dynamictop_ptr(STATIC_BUMP) as usize; let dynamictop_ptr = dynamictop_ptr(STATIC_BUMP) as usize;
// We avoid failures of setting the u32 let dynamictop_ptr_offset = dynamictop_ptr + mem::size_of::<u32>();
if (dynamictop_ptr > memory.len()) {
// We avoid failures of setting the u32 in our memory if it's out of bounds
if dynamictop_ptr_offset > memory.len() {
return; return;
} }
let mem = &mut memory[dynamictop_ptr..dynamictop_ptr + mem::size_of::<u32>()]; let mem = &mut memory[dynamictop_ptr..dynamictop_ptr_offset];
LittleEndian::write_u32(mem, dynamic_base(STATIC_BUMP)); LittleEndian::write_u32(mem, dynamic_base(STATIC_BUMP));
} }

4
src/apis/emscripten/signal.rs
View File

@ -1,7 +1,7 @@
// use super::varargs::VarArgs; // use super::varargs::VarArgs;
use crate::webassembly::Instance; use crate::webassembly::Instance;
pub extern "C" fn _sigemptyset(set: u32, instance: &mut Instance) -> i32 { pub extern "C" fn _sigemptyset(_set: u32, _instance: &mut Instance) -> i32 {
debug!("emscripten::_sigemptyset"); debug!("emscripten::_sigemptyset");
// let set_addr = instance.memory_offset_addr(0, set as _) as *mut u32; // let set_addr = instance.memory_offset_addr(0, set as _) as *mut u32;
// unsafe { // unsafe {
@ -10,7 +10,7 @@ pub extern "C" fn _sigemptyset(set: u32, instance: &mut Instance) -> i32 {
0 0
} }
pub extern "C" fn _sigaction(_signum: u32, act: u32, oldact: u32) -> i32 { pub extern "C" fn _sigaction(_signum: u32, _act: u32, _oldact: u32) -> i32 {
debug!("emscripten::_sigaction"); debug!("emscripten::_sigaction");
0 0
} }

4
src/apis/emscripten/syscalls.rs
View File

@ -128,7 +128,7 @@ pub extern "C" fn ___syscall12(
) -> c_int { ) -> c_int {
debug!("emscripten::___syscall12 (chdir)"); debug!("emscripten::___syscall12 (chdir)");
let path_addr: i32 = varargs.get(instance); let path_addr: i32 = varargs.get(instance);
let path = unsafe { let _path = unsafe {
let path_ptr = instance.memory_offset_addr(0, path_addr as usize) as *const i8; let path_ptr = instance.memory_offset_addr(0, path_addr as usize) as *const i8;
let path = std::ffi::CStr::from_ptr(path_ptr).to_str().unwrap(); let path = std::ffi::CStr::from_ptr(path_ptr).to_str().unwrap();
debug!("=> path: {}", path); debug!("=> path: {}", path);
@ -178,8 +178,6 @@ pub extern "C" fn ___syscall54(
0 0
} }
use std::mem::size_of;
// socketcall // socketcall
pub extern "C" fn ___syscall102( pub extern "C" fn ___syscall102(
_which: c_int, _which: c_int,

3
src/update.rs
View File

@ -1,5 +1,4 @@
//! When wasmer self-update is executed, this is what gets executed //! When wasmer self-update is executed, this is what gets executed
use std::io;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
pub fn self_update() { pub fn self_update() {
@ -18,5 +17,5 @@ pub fn self_update() {
.ok() .ok()
.expect("Failed to execute."); .expect("Failed to execute.");
the_process.wait(); the_process.wait().unwrap();
} }