T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a convenience function for displaying a BlockCall (#5677)

Browse Source 
Add a display method to BlockCall that returns a std::fmt::Displayable result. Rework the display code in the write module of cranelift-codegen to use this method instead.
This commit is contained in:
Trevor Elliott
2023-01-31 14:26:10 -08:00
committed by GitHub
parent 253e28ca4f
commit e82995f03c
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cranelift/codegen/src/write.rs
View File

@@ -415,18 +415,15 @@ pub fn write_operands(w: &mut dyn Write, dfg: &DataFlowGraph, inst: Inst) -> fmt
IntAddTrap { args, code, .. } => write!(w, " {}, {}, {}", args[0], args[1], code),
FloatCompare { cond, args, .. } => write!(w, " {} {}, {}", cond, args[0], args[1]),
Jump { destination, .. } => {
write!(w, " {}", destination.block(pool))?;
write_block_args(w, destination.args_slice(pool))
write!(w, " {}", destination.display(pool))
}
Brif {
arg,
blocks: [block_then, block_else],
..
} => {
write!(w, " {}, {}", arg, block_then.block(pool))?;
write_block_args(w, block_then.args_slice(pool))?;
write!(w, ", {}", block_else.block(pool))?;
write_block_args(w, block_else.args_slice(pool))
write!(w, " {}, {}", arg, block_then.display(pool))?;
write!(w, ", {}", block_else.display(pool))
}
BranchTable {
arg,
@@ -500,15 +497,6 @@ pub fn write_operands(w: &mut dyn Write, dfg: &DataFlowGraph, inst: Inst) -> fmt
Ok(())
}
/// Write block args using optional parantheses.
fn write_block_args(w: &mut dyn Write, args: &[Value]) -> fmt::Result {
if args.is_empty() {
Ok(())
} else {
write!(w, "({})", DisplayValues(args))
}
}
/// Displayable slice of values.
struct DisplayValues<'a>(&'a [Value]);