portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

misc API updates

Browse source
This commit is contained in:
Chris Fallin 2023-02-07 15:54:24 -08:00
parent eaa1f76ba0
commit fd748dd493
3 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ir/display.rs
View file

@ -190,14 +190,10 @@ impl<'a> Display for ModuleDisplay<'a> {
for seg in &memory_data.segments {
writeln!(
f,
" {} offset {}: [{}]",
" {} offset {}: # {} bytes",
memory,
seg.offset,
seg.data
.iter()
.map(|&byte| format!("0x{:02x}", byte))
.collect::<Vec<_>>()
.join(", ")
seg.data.len()
)?;
}
}

22
src/ir/func.rs
View file

@ -31,6 +31,28 @@ impl<'a> FuncDecl<'a> {
}
}
pub fn optimize(&mut self) {
match self {
FuncDecl::Body(_, body) => {
let cfg = crate::cfg::CFGInfo::new(body);
crate::passes::basic_opt::gvn(body, &cfg);
crate::passes::resolve_aliases::run(body);
crate::passes::empty_blocks::run(body);
}
_ => {}
}
}
pub fn convert_to_max_ssa(&mut self) {
match self {
FuncDecl::Body(_, body) => {
let cfg = crate::cfg::CFGInfo::new(body);
crate::passes::maxssa::run(body, &cfg);
}
_ => {}
}
}
pub fn body(&self) -> Option<&FunctionBody> {
match self {
FuncDecl::Body(_, body) => Some(body),

20
src/ir/module.rs
View file

@ -236,14 +236,14 @@ impl<'a> Module<'a> {
}
}
pub fn expand_func<'b>(&'b mut self, id: Func) -> Result<&'b FuncDecl<'a>> {
pub fn expand_func<'b>(&'b mut self, id: Func) -> Result<&'b mut FuncDecl<'a>> {
if let FuncDecl::Lazy(..) = self.funcs[id] {
// End the borrow. This is cheap (a slice copy).
let mut func = self.funcs[id].clone();
func.parse(self)?;
self.funcs[id] = func;
}
Ok(&self.funcs[id])
Ok(&mut self.funcs[id])
}
pub fn expand_all_funcs(&mut self) -> Result<()> {
@ -254,22 +254,6 @@ impl<'a> Module<'a> {
Ok(())
}
pub fn optimize(&mut self) {
self.per_func_body(|body| {
let cfg = crate::cfg::CFGInfo::new(body);
crate::passes::basic_opt::gvn(body, &cfg);
crate::passes::resolve_aliases::run(body);
crate::passes::empty_blocks::run(body);
});
}
pub fn convert_to_max_ssa(&mut self) {
self.per_func_body(|body| {
let cfg = crate::cfg::CFGInfo::new(body);
crate::passes::maxssa::run(body, &cfg);
});
}
pub fn display<'b>(&'b self) -> ModuleDisplay<'b>
where
'b: 'a,