diff --git a/crates/it-lilo-utils/src/lib.rs b/crates/it-lilo-utils/src/lib.rs index dc1801f..c52d71a 100644 --- a/crates/it-lilo-utils/src/lib.rs +++ b/crates/it-lilo-utils/src/lib.rs @@ -37,7 +37,6 @@ pub fn ser_type_size(ty: &IType) -> usize { // Vec-like types are passed by pointer and size IType::String | IType::ByteArray | IType::Array(_) => 2 * WASM_POINTER_SIZE, IType::S64 | IType::U64 | IType::I64 | IType::F64 => 8, - IType::U128 => 16, } } @@ -48,7 +47,6 @@ pub fn ser_value_size(value: &IValue) -> usize { IValue::S16(_) | IValue::U16(_) => 2, IValue::S32(_) | IValue::U32(_) | IValue::F32(_) | IValue::I32(_) => 4, IValue::S64(_) | IValue::U64(_) | IValue::F64(_) | IValue::I64(_) => 8, - IValue::U128(_) => 16, IValue::String(_) | IValue::ByteArray(_) | IValue::Array(_) => 2 * 4, IValue::Record(_) => 4, } @@ -72,7 +70,6 @@ pub fn type_tag_form_itype(itype: &IType) -> u32 { IType::U16 => 2, // u16 IType::U32 => 3, // u32 IType::U64 => 4, // u64 - IType::U128 => 5, // u128 IType::S8 => 6, // i8 IType::S16 => 7, // i16 IType::S32 | IType::I32 => 8, // i32 @@ -92,7 +89,6 @@ pub fn type_tag_form_ivalue(itype: &IValue) -> u32 { IValue::U16(_) => 2, // u16 IValue::U32(_) => 3, // u32 IValue::U64(_) => 4, // u64 - IValue::U128(_) => 5, // u128 IValue::S8(_) => 6, // i8 IValue::S16(_) => 7, // i16 IValue::S32(_) | IValue::I32(_) => 8, // i32 diff --git a/crates/it-lilo-utils/src/memory_reader.rs b/crates/it-lilo-utils/src/memory_reader.rs index d567137..5065ee2 100644 --- a/crates/it-lilo-utils/src/memory_reader.rs +++ b/crates/it-lilo-utils/src/memory_reader.rs @@ -103,7 +103,6 @@ impl<'m> MemoryReader<'m> { read_array_ty!(read_s64_array, i64, S64); read_array_ty!(read_i64_array, i64, I64); read_array_ty!(read_f64_array, f64, F64); - read_array_ty!(read_u128_array, u128, U128); } impl<'r, 'm> SequentialReader<'r, 'm> { @@ -130,5 +129,4 @@ impl<'r, 'm> SequentialReader<'r, 'm> { read_ty!(read_u64, u64, 8); read_ty!(read_i64, i64, 8); read_ty!(read_f64, f64, 8); - read_ty!(read_u128, u128, 16); } diff --git a/crates/it-types/src/impls/types.rs b/crates/it-types/src/impls/types.rs index 310bf8a..afc9b86 100644 --- a/crates/it-types/src/impls/types.rs +++ b/crates/it-types/src/impls/types.rs @@ -29,7 +29,6 @@ where IType::U64 => 0x07_u8.to_bytes(writer), IType::F32 => 0x08_u8.to_bytes(writer), IType::F64 => 0x09_u8.to_bytes(writer), - IType::U128 => 0x46_u8.to_bytes(writer), IType::String => 0x0a_u8.to_bytes(writer), IType::ByteArray => 0x3C_u8.to_bytes(writer), IType::Array(ty) => { @@ -88,7 +87,6 @@ mod keyword { custom_keyword!(u16); custom_keyword!(u32); custom_keyword!(u64); - custom_keyword!(u128); custom_keyword!(string); custom_keyword!(array); } @@ -140,10 +138,6 @@ impl Parse<'_> for IType { parser.parse::()?; Ok(IType::F64) - } else if lookahead.peek::() { - parser.parse::()?; - - Ok(IType::U128) } else if lookahead.peek::() { parser.parse::()?; diff --git a/crates/it-types/src/impls/values.rs b/crates/it-types/src/impls/values.rs index 3d2c12e..b872fa2 100644 --- a/crates/it-types/src/impls/values.rs +++ b/crates/it-types/src/impls/values.rs @@ -48,6 +48,5 @@ native!(u32, U32); native!(u64, U64); native!(f32, F32); native!(f64, F64); -native!(u128, U128); native!(String, String); native!(Vec, ByteArray); diff --git a/crates/it-types/src/types.rs b/crates/it-types/src/types.rs index a6ceae0..362cd6f 100644 --- a/crates/it-types/src/types.rs +++ b/crates/it-types/src/types.rs @@ -41,9 +41,6 @@ pub enum IType { /// A 64-bits float. F64, - /// A 128-bit unsigned integer. - U128, - /// A string. String, @@ -115,7 +112,6 @@ impl ToString for &IType { IType::U64 => "u64".to_string(), IType::F32 => "f32".to_string(), IType::F64 => "f64".to_string(), - IType::U128 => "u128".to_string(), IType::String => "string".to_string(), IType::ByteArray => "array (u8)".to_string(), IType::Array(ty) => format!("array ({})", ty.as_ref().to_string()), diff --git a/crates/it-types/src/values.rs b/crates/it-types/src/values.rs index de743bd..b3a8f3a 100644 --- a/crates/it-types/src/values.rs +++ b/crates/it-types/src/values.rs @@ -37,10 +37,7 @@ pub enum IValue { /// A 64-bits float. F64(f64), - - /// A 128-bits integer. - U128(u128), - + /// A string. String(String), diff --git a/wasmer-it/src/interpreter/instructions/arrays/lift_array.rs b/wasmer-it/src/interpreter/instructions/arrays/lift_array.rs index 15db5d4..88239a8 100644 --- a/wasmer-it/src/interpreter/instructions/arrays/lift_array.rs +++ b/wasmer-it/src/interpreter/instructions/arrays/lift_array.rs @@ -30,7 +30,6 @@ pub(crate) fn array_lift_memory_impl( IType::U16 => reader.read_u16_array(offset, elements_count)?, IType::U32 => reader.read_u32_array(offset, elements_count)?, IType::U64 => reader.read_u64_array(offset, elements_count)?, - IType::U128 => reader.read_u128_array(offset, elements_count)?, IType::F32 => reader.read_f32_array(offset, elements_count)?, IType::F64 => reader.read_f64_array(offset, elements_count)?, IType::String => read_string_array(li_helper, offset, elements_count)?, diff --git a/wasmer-it/src/interpreter/instructions/arrays/lower_array.rs b/wasmer-it/src/interpreter/instructions/arrays/lower_array.rs index 2f07af4..db2a78d 100644 --- a/wasmer-it/src/interpreter/instructions/arrays/lower_array.rs +++ b/wasmer-it/src/interpreter/instructions/arrays/lower_array.rs @@ -40,7 +40,6 @@ pub(crate) fn array_lower_memory_impl( IValue::U16(value) => seq_writer.write_array(value.to_le_bytes()), IValue::U32(value) => seq_writer.write_array(value.to_le_bytes()), IValue::U64(value) => seq_writer.write_array(value.to_le_bytes()), - IValue::U128(value) => seq_writer.write_array(value.to_le_bytes()), IValue::I32(value) => seq_writer.write_array(value.to_le_bytes()), IValue::I64(value) => seq_writer.write_array(value.to_le_bytes()), IValue::F32(value) => seq_writer.write_array(value.to_le_bytes()), diff --git a/wasmer-it/src/interpreter/instructions/records/lift_record.rs b/wasmer-it/src/interpreter/instructions/records/lift_record.rs index 6e6429e..b52ab43 100644 --- a/wasmer-it/src/interpreter/instructions/records/lift_record.rs +++ b/wasmer-it/src/interpreter/instructions/records/lift_record.rs @@ -33,7 +33,6 @@ pub(crate) fn record_lift_memory_impl( IType::U16 => values.push(IValue::U16(seq_reader.read_u16())), IType::U32 => values.push(IValue::U32(seq_reader.read_u32())), IType::U64 => values.push(IValue::U64(seq_reader.read_u64())), - IType::U128 => values.push(IValue::U128(seq_reader.read_u128())), IType::F32 => values.push(IValue::F32(seq_reader.read_f32())), IType::F64 => values.push(IValue::F64(seq_reader.read_f64())), IType::String => values.push(IValue::String(read_string(reader, &seq_reader)?)), diff --git a/wasmer-it/src/interpreter/instructions/records/lower_record.rs b/wasmer-it/src/interpreter/instructions/records/lower_record.rs index 616e777..f32e1d6 100644 --- a/wasmer-it/src/interpreter/instructions/records/lower_record.rs +++ b/wasmer-it/src/interpreter/instructions/records/lower_record.rs @@ -21,7 +21,6 @@ pub(crate) fn record_lower_memory_impl( IValue::U16(value) => result.extend_from_slice(&value.to_le_bytes()), IValue::U32(value) => result.extend_from_slice(&value.to_le_bytes()), IValue::U64(value) => result.extend_from_slice(&value.to_le_bytes()), - IValue::U128(value) => result.extend_from_slice(&value.to_le_bytes()), IValue::I32(value) => result.extend_from_slice(&value.to_le_bytes()), IValue::I64(value) => result.extend_from_slice(&value.to_le_bytes()), IValue::F32(value) => result.extend_from_slice(&value.to_le_bytes()), diff --git a/wasmer-it/src/serde/de.rs b/wasmer-it/src/serde/de.rs index ff23894..0527523 100644 --- a/wasmer-it/src/serde/de.rs +++ b/wasmer-it/src/serde/de.rs @@ -215,7 +215,6 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> { Some(IValue::U16(_)) => self.deserialize_u16(visitor), Some(IValue::U32(_)) => self.deserialize_u32(visitor), Some(IValue::U64(_)) => self.deserialize_u64(visitor), - Some(IValue::U128(_)) => self.deserialize_u64(visitor), Some(IValue::F32(_)) => self.deserialize_f32(visitor), Some(IValue::F64(_)) => self.deserialize_f64(visitor), Some(IValue::String(_)) => self.deserialize_string(visitor),