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

Convert the Branch and Jump instruction formats to value_list.

Browse Source 
The Branch format also stores its fixed argument in the value list. This
requires the value pool to be passed to a few more functions.

Note that this actually makes the Branch and Jump variants of
InstructionData identical. The instruction format hashing does not yet
understand that all value operands are stored in the value list. We'll
fix that in a later patch.

Also convert IndirectCall, noting that Call and IndirectCall remain
separate instruction formats because they have different immediate
fields.
This commit is contained in:
Jakob Stoklund Olesen
2017-03-09 14:53:31 -08:00
parent 364b8e5f0a
commit 1135a89af9
9 changed files with 88 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/cretonne/src/write.rs
View File

@@ -225,6 +225,7 @@ fn write_instruction(w: &mut Write,
}
// Then the operands, depending on format.
let pool = &func.dfg.value_lists;
use ir::instructions::InstructionData::*;
match func.dfg[inst] {
Nullary { .. } => writeln!(w, ""),
@@ -244,8 +245,28 @@ fn write_instruction(w: &mut Write,
ExtractLane { lane, arg, .. } => writeln!(w, " {}, {}", arg, lane),
IntCompare { cond, args, .. } => writeln!(w, " {}, {}, {}", cond, args[0], args[1]),
FloatCompare { cond, args, .. } => writeln!(w, " {}, {}, {}", cond, args[0], args[1]),
Jump { ref data, .. } => writeln!(w, " {}", data),
Branch { ref data, .. } => writeln!(w, " {}", data),
Jump { destination, ref args, .. } => {
if args.is_empty() {
writeln!(w, " {}", destination)
} else {
writeln!(w,
" {}({})",
destination,
DisplayValues(args.as_slice(pool)))
}
}
Branch { destination, ref args, .. } => {
let args = args.as_slice(pool);
if args.len() == 1 {
writeln!(w, " {}, {}", args[0], destination)
} else {
writeln!(w,
" {}, {}({})",
args[0],
destination,
DisplayValues(&args[1..]))
}
}
BranchTable { arg, table, .. } => writeln!(w, " {}, {}", arg, table),
Call { func_ref, ref args, .. } => {
writeln!(w,
@@ -253,8 +274,13 @@ fn write_instruction(w: &mut Write,
func_ref,
DisplayValues(args.as_slice(&func.dfg.value_lists)))
}
IndirectCall { ref data, .. } => {
writeln!(w, " {}, {}({})", data.sig_ref, data.arg, data.varargs)
IndirectCall { sig_ref, ref args, .. } => {
let args = args.as_slice(pool);
writeln!(w,
" {}, {}({})",
sig_ref,
args[0],
DisplayValues(&args[1..]))
}
Return { ref data, .. } => {
if data.varargs.is_empty() {