fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-29 14:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Renamed VarUint8 to Uint8, which makes since since it's not variable-length

Browse Source 
Also fixed a couple other small parts I missed.
This commit is contained in:
Simon Heath
2018-01-17 13:52:13 -05:00
parent 5b19c5fb94
commit f390d9a8e4
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/elements/ops.rs
View File

@ -1,7 +1,7 @@
use std::{io, fmt};
use super::{
Serialize, Deserialize, Error, VarUint7,
VarUint8, VarUint32, CountedList, BlockType,
Serialize, Deserialize, Error,
Uint8, VarUint32, CountedList, BlockType,
Uint32, Uint64, CountedListWriter,
VarInt32, VarInt64,
};
@ -319,7 +319,7 @@ impl Deserialize for Opcode {
fn deserialize<R: io::Read>(reader: &mut R) -> Result<Self, Self::Error> {
use self::Opcode::*;
let val: u8 = VarUint7::deserialize(reader)?.into();
let val: u8 = Uint8::deserialize(reader)?.into();
Ok(
match val {
@ -346,7 +346,7 @@ impl Deserialize for Opcode {
0x10 => Call(VarUint32::deserialize(reader)?.into()),
0x11 => CallIndirect(
VarUint32::deserialize(reader)?.into(),
VarUint8::deserialize(reader)?.into()),
Uint8::deserialize(reader)?.into()),
0x1a => Drop,
0x1b => Select,
@ -449,8 +449,8 @@ impl Deserialize for Opcode {
VarUint32::deserialize(reader)?.into()),
0x3f => CurrentMemory(VarUint8::deserialize(reader)?.into()),
0x40 => GrowMemory(VarUint8::deserialize(reader)?.into()),
0x3f => CurrentMemory(Uint8::deserialize(reader)?.into()),
0x40 => GrowMemory(Uint8::deserialize(reader)?.into()),
0x41 => I32Const(VarInt32::deserialize(reader)?.into()),
0x42 => I64Const(VarInt64::deserialize(reader)?.into()),
@ -644,7 +644,7 @@ impl Serialize for Opcode {
}),
CallIndirect(index, reserved) => op!(writer, 0x11, {
VarUint32::from(index).serialize(writer)?;
VarUint7::from(reserved).serialize(writer)?;
Uint8::from(reserved).serialize(writer)?;
}),
Drop => op!(writer, 0x1a),
Select => op!(writer, 0x1b),
@ -756,10 +756,10 @@ impl Serialize for Opcode {
VarUint32::from(offset).serialize(writer)?;
}),
CurrentMemory(flag) => op!(writer, 0x3f, {
VarUint7::from(flag).serialize(writer)?;
Uint8::from(flag).serialize(writer)?;
}),
GrowMemory(flag) => op!(writer, 0x40, {
VarUint7::from(flag).serialize(writer)?;
Uint8::from(flag).serialize(writer)?;
}),
I32Const(def) => op!(writer, 0x41, {
VarInt32::from(def).serialize(writer)?;