acw/ngr
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
Adam Wick
2022-12-29 14:59:12 -08:00
committed by Adam Wick
parent a426a4754a
commit aa09a838b0
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin.rs
View File

@@ -9,6 +9,7 @@ use cranelift_object::{object, ObjectBuilder, ObjectModule};
use ngr::asts::lil; use ngr::asts::lil;
use ngr::passes::{run_front_end, BackendError}; use ngr::passes::{run_front_end, BackendError};
use ngr::runtime::RuntimeFunctions; use ngr::runtime::RuntimeFunctions;
use pretty::Arena;
use std::io; use std::io;
use target_lexicon::Triple; use target_lexicon::Triple;
use thiserror::Error; use thiserror::Error;
@@ -74,8 +75,21 @@ fn main() -> Result<(), MainError> {
} }
if let Some((hil_tree, variable_map)) = hil_conversion_result.result { if let Some((hil_tree, variable_map)) = hil_conversion_result.result {
//let arena = Arena::new(); let arena = Arena::new();
println!("HIL Tree:");
hil_tree
.pretty(&variable_map, &arena)
.into_doc()
.render_colored(72, StandardStream::stdout(ColorChoice::Auto))
.unwrap();
let lil_tree = lil::Program::convert(hil_tree, variable_map); let lil_tree = lil::Program::convert(hil_tree, variable_map);
println!("LIL Tree:");
lil_tree
.pretty(&arena)
.into_doc()
.render_colored(72, StandardStream::stdout(ColorChoice::Auto))
.unwrap();
let isa = isa::lookup(Triple::host())?.finish(settings::Flags::new(settings::builder()))?; let isa = isa::lookup(Triple::host())?.finish(settings::Flags::new(settings::builder()))?;
let object_builder = ObjectBuilder::new(isa, "example", default_libcall_names())?; let object_builder = ObjectBuilder::new(isa, "example", default_libcall_names())?;
@@ -84,17 +98,11 @@ fn main() -> Result<(), MainError> {
let _compiled = lil_tree.into_cranelift(&mut object_module, &rtfuns)?; let _compiled = lil_tree.into_cranelift(&mut object_module, &rtfuns)?;
// something? // somethingvar?
let bytes = object_module.finish().emit()?; let bytes = object_module.finish().emit()?;
std::fs::write("output.o", bytes)?; std::fs::write("output.o", bytes)?;
// lil_tree
// .pretty(&variable_map, &arena)
// .into_doc()
// .render_colored(72, StandardStream::stdout(ColorChoice::Auto))
// .unwrap()
} }
Ok(()) Ok(())

6
src/passes/hil_to_lil.rs
View File

@@ -79,7 +79,7 @@ impl<Annotation: Clone> lil::Statement<Annotation> {
lil::Statement::ResultBinding( lil::Statement::ResultBinding(
annotation, annotation,
var, var,
lil::Primitive::Plus(arg0, arg1), lil::Primitive::Minus(arg0, arg1),
) )
} }
hil::Primitive::Times => { hil::Primitive::Times => {
@@ -88,7 +88,7 @@ impl<Annotation: Clone> lil::Statement<Annotation> {
lil::Statement::ResultBinding( lil::Statement::ResultBinding(
annotation, annotation,
var, var,
lil::Primitive::Plus(arg0, arg1), lil::Primitive::Times(arg0, arg1),
) )
} }
hil::Primitive::Divide => { hil::Primitive::Divide => {
@@ -97,7 +97,7 @@ impl<Annotation: Clone> lil::Statement<Annotation> {
lil::Statement::ResultBinding( lil::Statement::ResultBinding(
annotation, annotation,
var, var,
lil::Primitive::Plus(arg0, arg1), lil::Primitive::Divide(arg0, arg1),
) )
} }
}; };