fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 14:25:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/runtime-upgrade

Browse Source
This commit is contained in:
Syrus Akbary 2018-12-14 17:41:03 -08:00 committed by GitHub
commit 81fb2fbd0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -15,7 +15,7 @@ include = [
"Cargo.toml", "Cargo.toml",
"LICENSE", "LICENSE",
"Makefile", "Makefile",
"README.md", "/README.md",
"rustfmt.toml" "rustfmt.toml"
] ]

2
src/apis/emscripten/storage.rs
View File

@ -1,4 +1,4 @@
use crate::webassembly::LinearMemory; // use crate::webassembly::LinearMemory;
pub fn align_memory(ptr: u32) -> u32 { pub fn align_memory(ptr: u32) -> u32 {
(ptr + 15) & !15 (ptr + 15) & !15

1
src/apis/emscripten/time.rs
View File

@ -1,7 +1,6 @@
use super::utils::{copy_cstr_into_wasm, write_to_buf}; use super::utils::{copy_cstr_into_wasm, write_to_buf};
use libc::{ use libc::{
c_int, c_int,
c_long,
clock_gettime as libc_clock_gettime, clock_gettime as libc_clock_gettime,
localtime, localtime,
localtime_r, localtime_r,

6
src/apis/emscripten/utils.rs
View File

@ -20,10 +20,8 @@ pub fn is_emscripten_module(module: &Module) -> bool {
pub unsafe fn write_to_buf(string: *const c_char, buf: u32, max: u32, instance: &Instance) -> u32 { pub unsafe fn write_to_buf(string: *const c_char, buf: u32, max: u32, instance: &Instance) -> u32 {
let buf_addr = instance.memory_offset_addr(0, buf as _) as *mut c_char; let buf_addr = instance.memory_offset_addr(0, buf as _) as *mut c_char;
unsafe { for i in 0..max {
for i in 0..max { *buf_addr.add(i as _) = *string.add(i as _);
*buf_addr.add(i as _) = *string.add(i as _);
}
} }
buf buf