mirror of
https://github.com/fluencelabs/parity-wasm
synced 2025-06-29 22:51:56 +00:00
proper offset display
This commit is contained in:
NikVolf
@ -917,7 +917,7 @@ macro_rules! fmt_op {
|
|||||||
write!($f, "{} {}", $mnemonic, $immediate)
|
write!($f, "{} {}", $mnemonic, $immediate)
|
||||||
});
|
});
|
||||||
($f: expr, $mnemonic: expr, $immediate1: expr, $immediate2: expr) => ({
|
($f: expr, $mnemonic: expr, $immediate1: expr, $immediate2: expr) => ({
|
||||||
write!($f, "{} {}", $mnemonic, $immediate1, $immediate2)
|
write!($f, "{} {} {}", $mnemonic, $immediate1, $immediate2)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -936,157 +936,99 @@ impl fmt::Display for Opcode {
|
|||||||
If(BlockType::NoResult) => fmt_op!(f, "if"),
|
If(BlockType::NoResult) => fmt_op!(f, "if"),
|
||||||
If(BlockType::Value(value_type)) => fmt_op!(f, "if", value_type),
|
If(BlockType::Value(value_type)) => fmt_op!(f, "if", value_type),
|
||||||
Else => fmt_op!(f, "else"),
|
Else => fmt_op!(f, "else"),
|
||||||
/*End => op!(writer, 0x0b),
|
End => fmt_op!(f, "end"),
|
||||||
Br(idx) => op!(writer, 0x0c, {
|
Br(idx) => fmt_op!(f, "br", idx),
|
||||||
VarUint32::from(idx).serialize(writer)?;
|
BrIf(idx) => fmt_op!(f, "br_if", idx),
|
||||||
}),
|
BrTable(_, default) => fmt_op!(f, "br_table", default),
|
||||||
BrIf(idx) => op!(writer, 0x0d, {
|
Return => fmt_op!(f, "return"),
|
||||||
VarUint32::from(idx).serialize(writer)?;
|
Call(index) => fmt_op!(f, "call", index),
|
||||||
}),
|
CallIndirect(index, _) => fmt_op!(f, "call_indirect", index),
|
||||||
BrTable(table, default) => op!(writer, 0x0e, {
|
Drop => fmt_op!(f, "drop"),
|
||||||
let list_writer = CountedListWriter::<VarUint32, _>(
|
Select => fmt_op!(f, "select"),
|
||||||
table.len(),
|
GetLocal(index) => fmt_op!(f, "get_local", index),
|
||||||
table.into_iter().map(Into::into),
|
SetLocal(index) => fmt_op!(f, "set_local", index),
|
||||||
);
|
TeeLocal(index) => fmt_op!(f, "tee_local", index),
|
||||||
list_writer.serialize(writer)?;
|
GetGlobal(index) => fmt_op!(f, "get_global", index),
|
||||||
VarUint32::from(default).serialize(writer)?;
|
SetGlobal(index) => fmt_op!(f, "set_global", index),
|
||||||
}),
|
|
||||||
Return => op!(writer, 0x0f),
|
I32Load(_, 0) => write!(f, "i32.load"),
|
||||||
Call(index) => op!(writer, 0x10, {
|
I32Load(_, offset) => write!(f, "i32.load offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I64Load(_, 0) => write!(f, "i64.load"),
|
||||||
CallIndirect(index, reserved) => op!(writer, 0x11, {
|
I64Load(_, offset) => write!(f, "i64.load offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
VarUint1::from(reserved).serialize(writer)?;
|
F32Load(_, 0) => write!(f, "f32.load"),
|
||||||
}),
|
F32Load(_, offset) => write!(f, "f32.load offset={}", offset),
|
||||||
Drop => op!(writer, 0x1a),
|
|
||||||
Select => op!(writer, 0x1b),
|
F64Load(_, 0) => write!(f, "f64.load"),
|
||||||
GetLocal(index) => op!(writer, 0x20, {
|
F64Load(_, offset) => write!(f, "f64.load offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I32Load8S(_, 0) => write!(f, "i32.load8_s"),
|
||||||
SetLocal(index) => op!(writer, 0x21, {
|
I32Load8S(_, offset) => write!(f, "i32.load8_s offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I32Load8U(_, 0) => write!(f, "i32.load8_u"),
|
||||||
TeeLocal(index) => op!(writer, 0x22, {
|
I32Load8U(_, offset) => write!(f, "i32.load8_u offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I32Load16S(_, 0) => write!(f, "i32.load16_s"),
|
||||||
GetGlobal(index) => op!(writer, 0x23, {
|
I32Load16S(_, offset) => write!(f, "i32.load16_s offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I32Load16U(_, 0) => write!(f, "i32.load16_u"),
|
||||||
SetGlobal(index) => op!(writer, 0x24, {
|
I32Load16U(_, offset) => write!(f, "i32.load16_u offset={}", offset),
|
||||||
VarUint32::from(index).serialize(writer)?;
|
|
||||||
}),
|
I64Load8S(_, 0) => write!(f, "i64.load8_s"),
|
||||||
I32Load(flags, offset) => op!(writer, 0x28, {
|
I64Load8S(_, offset) => write!(f, "i64.load8_s offset={}", offset),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I64Load8U(_, 0) => write!(f, "i64.load8_u"),
|
||||||
}),
|
I64Load8U(_, offset) => write!(f, "i64.load8_u offset={}", offset),
|
||||||
I64Load(flags, offset) => op!(writer, 0x29, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I64Load16S(_, 0) => write!(f, "i64.load16_s"),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I64Load16S(_, offset) => write!(f, "i64.load16_s offset={}", offset),
|
||||||
}),
|
|
||||||
F32Load(flags, offset) => op!(writer, 0x2a, {
|
I64Load16U(_, 0) => write!(f, "i64.load16_u"),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I64Load16U(_, offset) => write!(f, "i64.load16_u offset={}", offset),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
I64Load32S(_, 0) => write!(f, "i64.load32_s"),
|
||||||
F64Load(flags, offset) => op!(writer, 0x2b, {
|
I64Load32S(_, offset) => write!(f, "i64.load32_s offset={}", offset),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I64Load32U(_, 0) => write!(f, "i64.load32_u"),
|
||||||
}),
|
I64Load32U(_, offset) => write!(f, "i64.load32_u offset={}", offset),
|
||||||
I32Load8S(flags, offset) => op!(writer, 0x2c, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I32Store(_, 0) => write!(f, "i32.store"),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I32Store(_, offset) => write!(f, "i32.store offset={}", offset),
|
||||||
}),
|
|
||||||
I32Load8U(flags, offset) => op!(writer, 0x2d, {
|
I64Store(_, 0) => write!(f, "i64.store"),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I64Store(_, offset) => write!(f, "i64.store offset={}", offset),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
F32Store(_, 0) => write!(f, "f32.store"),
|
||||||
I32Load16S(flags, offset) => op!(writer, 0x2e, {
|
F32Store(_, offset) => write!(f, "f32.store offset={}", offset),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
F64Store(_, 0) => write!(f, "f64.store"),
|
||||||
}),
|
F64Store(_, offset) => write!(f, "f64.store offset={}", offset),
|
||||||
I32Load16U(flags, offset) => op!(writer, 0x2f, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I32Store8(_, 0) => write!(f, "i32.store8"),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I32Store8(_, offset) => write!(f, "i32.store8 offset={}", offset),
|
||||||
}),
|
|
||||||
I64Load8S(flags, offset) => op!(writer, 0x30, {
|
I32Store16(_, 0) => write!(f, "i32.store16"),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I32Store16(_, offset) => write!(f, "i32.store16 offset={}", offset),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
I64Store8(_, 0) => write!(f, "i64.store8"),
|
||||||
I64Load8U(flags, offset) => op!(writer, 0x31, {
|
I64Store8(_, offset) => write!(f, "i64.store8 offset={}", offset),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I64Store16(_, 0) => write!(f, "i64.store16"),
|
||||||
}),
|
I64Store16(_, offset) => write!(f, "i64.store16 offset={}", offset),
|
||||||
I64Load16S(flags, offset) => op!(writer, 0x32, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
I64Store32(_, 0) => write!(f, "i64.store32"),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
I64Store32(_, offset) => write!(f, "i64.store32 offset={}", offset),
|
||||||
}),
|
|
||||||
I64Load16U(flags, offset) => op!(writer, 0x33, {
|
CurrentMemory(_) => fmt_op!(f, "current_memory"),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
GrowMemory(_) => fmt_op!(f, "grow_memory"),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
I32Const(def) => fmt_op!(f, "i32.const", def),
|
||||||
I64Load32S(flags, offset) => op!(writer, 0x34, {
|
I64Const(def) => fmt_op!(f, "i64.const", def),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
F32Const(def) => fmt_op!(f, "f32.const", def),
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
F64Const(def) => fmt_op!(f, "f64.const", def),
|
||||||
}),
|
|
||||||
I64Load32U(flags, offset) => op!(writer, 0x35, {
|
/*I32Eqz => op!(writer, 0x45),
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I32Store(flags, offset) => op!(writer, 0x36, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I64Store(flags, offset) => op!(writer, 0x37, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
F32Store(flags, offset) => op!(writer, 0x38, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
F64Store(flags, offset) => op!(writer, 0x39, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I32Store8(flags, offset) => op!(writer, 0x3a, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I32Store16(flags, offset) => op!(writer, 0x3b, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I64Store8(flags, offset) => op!(writer, 0x3c, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I64Store16(flags, offset) => op!(writer, 0x3d, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I64Store32(flags, offset) => op!(writer, 0x3e, {
|
|
||||||
VarUint32::from(flags).serialize(writer)?;
|
|
||||||
VarUint32::from(offset).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
CurrentMemory(flag) => op!(writer, 0x3f, {
|
|
||||||
VarUint1::from(flag).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
GrowMemory(flag) => op!(writer, 0x40, {
|
|
||||||
VarUint1::from(flag).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I32Const(def) => op!(writer, 0x41, {
|
|
||||||
VarInt32::from(def).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I64Const(def) => op!(writer, 0x42, {
|
|
||||||
VarInt64::from(def).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
F32Const(def) => op!(writer, 0x43, {
|
|
||||||
Uint32::from(def).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
F64Const(def) => op!(writer, 0x44, {
|
|
||||||
Uint64::from(def).serialize(writer)?;
|
|
||||||
}),
|
|
||||||
I32Eqz => op!(writer, 0x45),
|
|
||||||
I32Eq => op!(writer, 0x46),
|
I32Eq => op!(writer, 0x46),
|
||||||
I32Ne => op!(writer, 0x47),
|
I32Ne => op!(writer, 0x47),
|
||||||
I32LtS => op!(writer, 0x48),
|
I32LtS => op!(writer, 0x48),
|
||||||
|
|||||||
Reference in New Issue
Block a user