language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

repl: rename FromWasm32Memory -> FromWasmerMemory

Browse source
This commit is contained in:
Brian Carroll 2022-02-06 08:50:41 +00:00
parent e9871947d3
commit 1783fa8009
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
compiler/test_gen/src/helpers/from_wasm32_memory.rs → compiler/test_gen/src/helpers/from_wasmer_memory.rs
View file

@ -1,7 +1,7 @@
use roc_gen_wasm::wasm32_sized::Wasm32Sized; use roc_gen_wasm::wasm32_sized::Wasm32Sized;
use roc_std::{RocDec, RocList, RocOrder, RocStr}; use roc_std::{RocDec, RocList, RocOrder, RocStr};
pub trait FromWasm32Memory: Wasm32Sized { pub trait FromWasmerMemory: Wasm32Sized {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self; fn decode(memory: &wasmer::Memory, offset: u32) -> Self;
} }
@ -31,7 +31,7 @@ macro_rules! from_wasm_memory_primitive_decode {
macro_rules! from_wasm_memory_primitive { macro_rules! from_wasm_memory_primitive {
($($type_name:ident ,)+) => { ($($type_name:ident ,)+) => {
$( $(
impl FromWasm32Memory for $type_name { impl FromWasmerMemory for $type_name {
from_wasm_memory_primitive_decode!($type_name); from_wasm_memory_primitive_decode!($type_name);
} }
)* )*
@ -42,13 +42,13 @@ from_wasm_memory_primitive!(
u8, i8, u16, i16, u32, i32, u64, i64, u128, i128, f32, f64, bool, RocDec, RocOrder, u8, i8, u16, i16, u32, i32, u64, i64, u128, i128, f32, f64, bool, RocDec, RocOrder,
); );
impl FromWasm32Memory for () { impl FromWasmerMemory for () {
fn decode(_: &wasmer::Memory, _: u32) -> Self {} fn decode(_: &wasmer::Memory, _: u32) -> Self {}
} }
impl FromWasm32Memory for RocStr { impl FromWasmerMemory for RocStr {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
let bytes = <u64 as FromWasm32Memory>::decode(memory, offset); let bytes = <u64 as FromWasmerMemory>::decode(memory, offset);
let length = (bytes >> 32) as u32; let length = (bytes >> 32) as u32;
let elements = bytes as u32; let elements = bytes as u32;
@ -73,9 +73,9 @@ impl FromWasm32Memory for RocStr {
} }
} }
impl<T: FromWasm32Memory + Clone> FromWasm32Memory for RocList<T> { impl<T: FromWasmerMemory + Clone> FromWasmerMemory for RocList<T> {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
let bytes = <u64 as FromWasm32Memory>::decode(memory, offset); let bytes = <u64 as FromWasmerMemory>::decode(memory, offset);
let length = (bytes >> 32) as u32; let length = (bytes >> 32) as u32;
let elements = bytes as u32; let elements = bytes as u32;
@ -83,7 +83,7 @@ impl<T: FromWasm32Memory + Clone> FromWasm32Memory for RocList<T> {
let mut items = Vec::with_capacity(length as usize); let mut items = Vec::with_capacity(length as usize);
for i in 0..length { for i in 0..length {
let item = <T as FromWasm32Memory>::decode( let item = <T as FromWasmerMemory>::decode(
memory, memory,
elements + i * <T as Wasm32Sized>::SIZE_OF_WASM as u32, elements + i * <T as Wasm32Sized>::SIZE_OF_WASM as u32,
); );
@ -94,11 +94,11 @@ impl<T: FromWasm32Memory + Clone> FromWasm32Memory for RocList<T> {
} }
} }
impl<T: FromWasm32Memory> FromWasm32Memory for &'_ T { impl<T: FromWasmerMemory> FromWasmerMemory for &'_ T {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
let elements = <u32 as FromWasm32Memory>::decode(memory, offset); let elements = <u32 as FromWasmerMemory>::decode(memory, offset);
let actual = <T as FromWasm32Memory>::decode(memory, elements); let actual = <T as FromWasmerMemory>::decode(memory, elements);
let b = Box::new(actual); let b = Box::new(actual);
@ -106,7 +106,7 @@ impl<T: FromWasm32Memory> FromWasm32Memory for &'_ T {
} }
} }
impl<T: FromWasm32Memory + Clone, const N: usize> FromWasm32Memory for [T; N] { impl<T: FromWasmerMemory + Clone, const N: usize> FromWasmerMemory for [T; N] {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
let ptr: wasmer::WasmPtr<u8, wasmer::Array> = wasmer::WasmPtr::new(offset); let ptr: wasmer::WasmPtr<u8, wasmer::Array> = wasmer::WasmPtr::new(offset);
let width = <T as Wasm32Sized>::SIZE_OF_WASM as u32 * N as u32; let width = <T as Wasm32Sized>::SIZE_OF_WASM as u32 * N as u32;
@ -117,28 +117,28 @@ impl<T: FromWasm32Memory + Clone, const N: usize> FromWasm32Memory for [T; N] {
} }
} }
impl FromWasm32Memory for usize { impl FromWasmerMemory for usize {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
<u32 as FromWasm32Memory>::decode(memory, offset) as usize <u32 as FromWasmerMemory>::decode(memory, offset) as usize
} }
} }
impl<T: FromWasm32Memory, U: FromWasm32Memory> FromWasm32Memory for (T, U) { impl<T: FromWasmerMemory, U: FromWasmerMemory> FromWasmerMemory for (T, U) {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
debug_assert!( debug_assert!(
T::ALIGN_OF_WASM >= U::ALIGN_OF_WASM, T::ALIGN_OF_WASM >= U::ALIGN_OF_WASM,
"this function does not handle alignment" "this function does not handle alignment"
); );
let t = <T as FromWasm32Memory>::decode(memory, offset); let t = <T as FromWasmerMemory>::decode(memory, offset);
let u = <U as FromWasm32Memory>::decode(memory, offset + T::ACTUAL_WIDTH as u32); let u = <U as FromWasmerMemory>::decode(memory, offset + T::ACTUAL_WIDTH as u32);
(t, u) (t, u)
} }
} }
impl<T: FromWasm32Memory, U: FromWasm32Memory, V: FromWasm32Memory> FromWasm32Memory for (T, U, V) { impl<T: FromWasmerMemory, U: FromWasmerMemory, V: FromWasmerMemory> FromWasmerMemory for (T, U, V) {
fn decode(memory: &wasmer::Memory, offset: u32) -> Self { fn decode(memory: &wasmer::Memory, offset: u32) -> Self {
debug_assert!( debug_assert!(
T::ALIGN_OF_WASM >= U::ALIGN_OF_WASM, T::ALIGN_OF_WASM >= U::ALIGN_OF_WASM,
@ -150,11 +150,11 @@ impl<T: FromWasm32Memory, U: FromWasm32Memory, V: FromWasm32Memory> FromWasm32Me
"this function does not handle alignment" "this function does not handle alignment"
); );
let t = <T as FromWasm32Memory>::decode(memory, offset); let t = <T as FromWasmerMemory>::decode(memory, offset);
let u = <U as FromWasm32Memory>::decode(memory, offset + T::ACTUAL_WIDTH as u32); let u = <U as FromWasmerMemory>::decode(memory, offset + T::ACTUAL_WIDTH as u32);
let v = <V as FromWasm32Memory>::decode( let v = <V as FromWasmerMemory>::decode(
memory, memory,
offset + T::ACTUAL_WIDTH as u32 + U::ACTUAL_WIDTH as u32, offset + T::ACTUAL_WIDTH as u32 + U::ACTUAL_WIDTH as u32,
); );

2
compiler/test_gen/src/helpers/mod.rs
View file

@ -2,7 +2,7 @@ extern crate bumpalo;
#[cfg(feature = "gen-dev")] #[cfg(feature = "gen-dev")]
pub mod dev; pub mod dev;
pub mod from_wasm32_memory; pub mod from_wasmer_memory;
#[cfg(feature = "gen-llvm")] #[cfg(feature = "gen-llvm")]
pub mod llvm; pub mod llvm;
#[cfg(feature = "gen-wasm")] #[cfg(feature = "gen-wasm")]

8
compiler/test_gen/src/helpers/wasm.rs
View file

@ -6,7 +6,7 @@ use std::marker::PhantomData;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use wasmer::{Memory, WasmPtr}; use wasmer::{Memory, WasmPtr};
use crate::helpers::from_wasm32_memory::FromWasm32Memory; use crate::helpers::from_wasmer_memory::FromWasmerMemory;
use roc_can::builtins::builtin_defs_map; use roc_can::builtins::builtin_defs_map;
use roc_collections::all::{MutMap, MutSet}; use roc_collections::all::{MutMap, MutSet};
use roc_gen_wasm::wasm32_test_result::Wasm32TestResult; use roc_gen_wasm::wasm32_test_result::Wasm32TestResult;
@ -193,7 +193,7 @@ fn load_bytes_into_runtime(bytes: Vec<u8>) -> wasmer::Instance {
#[allow(dead_code)] #[allow(dead_code)]
pub fn assert_wasm_evals_to_help<T>(src: &str, phantom: PhantomData<T>) -> Result<T, String> pub fn assert_wasm_evals_to_help<T>(src: &str, phantom: PhantomData<T>) -> Result<T, String>
where where
T: FromWasm32Memory + Wasm32TestResult, T: FromWasmerMemory + Wasm32TestResult,
{ {
let arena = bumpalo::Bump::new(); let arena = bumpalo::Bump::new();
@ -225,7 +225,7 @@ where
// Manually provide address and size based on printf in wasm_test_platform.c // Manually provide address and size based on printf in wasm_test_platform.c
crate::helpers::wasm::debug_memory_hex(memory, 0x11440, 24); crate::helpers::wasm::debug_memory_hex(memory, 0x11440, 24);
} }
let output = <T as FromWasm32Memory>::decode(memory, address as u32); let output = <T as FromWasmerMemory>::decode(memory, address as u32);
Ok(output) Ok(output)
} }
@ -239,7 +239,7 @@ pub fn assert_wasm_refcounts_help<T>(
num_refcounts: usize, num_refcounts: usize,
) -> Result<Vec<u32>, String> ) -> Result<Vec<u32>, String>
where where
T: FromWasm32Memory + Wasm32TestResult, T: FromWasmerMemory + Wasm32TestResult,
{ {
let arena = bumpalo::Bump::new(); let arena = bumpalo::Bump::new();