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

Clippy and warning clean-ups.

Browse Source
This commit is contained in:
Adam Wick
2023-03-24 11:09:55 -05:00
parent 662e954720
commit c3e1c90261
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/backend/into_crane.rs
View File

@@ -4,12 +4,12 @@ use crate::backend::runtime::RuntimeFunctions;
use crate::ir::{Expression, Primitive, Program, Statement, Value, ValueOrRef};
use cranelift_codegen::entity::EntityRef;
use cranelift_codegen::ir::{
entities, types, Function, GlobalValue, InstBuilder, Signature, UserFuncName, MemFlags,
entities, types, Function, GlobalValue, InstBuilder, MemFlags, Signature, UserFuncName,
};
use cranelift_codegen::isa::CallConv;
use cranelift_codegen::Context;
use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
use cranelift_module::{DataContext, FuncId, Linkage, Module, ModuleError, DataId};
use cranelift_module::{DataContext, DataId, FuncId, Linkage, Module, ModuleError};
use internment::ArcIntern;
use super::RuntimeFunctionError;
@@ -45,10 +45,13 @@ impl Program {
let mut variable_table = HashMap::new();
let mut next_var_num = 1;
let print_func_ref = rtfuns.include_runtime_function("print", module, &mut ctx.func)?;
let pre_defined_symbols: HashMap<String, GlobalValue> = pre_defined_symbols.iter().map(|(k, v)| {
let local_data = module.declare_data_in_func(*v, &mut ctx.func);
(k.clone(), local_data)
}).collect();
let pre_defined_symbols: HashMap<String, GlobalValue> = pre_defined_symbols
.iter()
.map(|(k, v)| {
let local_data = module.declare_data_in_func(*v, &mut ctx.func);
(k.clone(), local_data)
})
.collect();
let mut fctx = FunctionBuilderContext::new();
let mut builder = FunctionBuilder::new(&mut ctx.func, &mut fctx);
@@ -60,12 +63,16 @@ impl Program {
Statement::Print(ann, var) => {
let local_name_ref = string_table.get(&var).unwrap();
let name_ptr = builder.ins().symbol_value(types::I64, *local_name_ref);
let val = ValueOrRef::Ref(ann, var).into_cranelift(&mut builder, &variable_table, &pre_defined_symbols)?;
let val = ValueOrRef::Ref(ann, var).into_cranelift(
&mut builder,
&variable_table,
&pre_defined_symbols,
)?;
builder.ins().call(print_func_ref, &[name_ptr, val]);
}
Statement::Binding(_, var_name, value) => {
let val = match value {
let val = match value {
Expression::Value(_, Value::Number(_, v)) => {
builder.ins().iconst(types::I64, v)
}
@@ -76,14 +83,16 @@ impl Program {
}
Expression::Primitive(_, prim, mut vals) => {
let right = vals
.pop()
.unwrap()
.into_cranelift(&mut builder, &variable_table, &pre_defined_symbols)?;
let left = vals
.pop()
.unwrap()
.into_cranelift(&mut builder, &variable_table, &pre_defined_symbols)?;
let right = vals.pop().unwrap().into_cranelift(
&mut builder,
&variable_table,
&pre_defined_symbols,
)?;
let left = vals.pop().unwrap().into_cranelift(
&mut builder,
&variable_table,
&pre_defined_symbols,
)?;
match prim {
Primitive::Plus => builder.ins().iadd(left, right),
@@ -175,7 +184,7 @@ impl ValueOrRef {
if let Some(global_id) = global_variables.get(name.as_str()) {
let val_ptr = builder.ins().symbol_value(types::I64, *global_id);
return Ok(builder.ins().load(types::I64, MemFlags::new(), val_ptr, 0))
return Ok(builder.ins().load(types::I64, MemFlags::new(), val_ptr, 0));
}
Err(ModuleError::Undeclared(name.to_string()))