edg-l/edlang
1
1
Fork 0
mirror of https://github.com/edg-l/edlang.git synced 2024-09-19 17:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Edgar 2023-06-12 14:26:29 +02:00
parent 53f6f9e36d
commit 912419fe23
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/codegen.rs
View file

@ -9,9 +9,7 @@ use inkwell::{
builder::Builder, builder::Builder,
context::Context, context::Context,
module::Module, module::Module,
targets::{ targets::{CodeModel, InitializationConfig, RelocMode, Target, TargetMachine},
CodeModel, InitializationConfig, RelocMode, Target, TargetData, TargetMachine, TargetTriple,
},
types::{BasicMetadataTypeEnum, BasicType, BasicTypeEnum, StructType}, types::{BasicMetadataTypeEnum, BasicType, BasicTypeEnum, StructType},
values::{BasicMetadataValueEnum, BasicValue, BasicValueEnum, FunctionValue}, values::{BasicMetadataValueEnum, BasicValue, BasicValueEnum, FunctionValue},
IntPredicate, OptimizationLevel, IntPredicate, OptimizationLevel,
@ -57,7 +55,6 @@ pub struct Variable<'ctx> {
} }
pub type Variables<'ctx> = HashMap<String, Variable<'ctx>>; pub type Variables<'ctx> = HashMap<String, Variable<'ctx>>;
// pub type TypeStorage<'ctx> = HashMap<TypeExp, BasicTypeEnum<'ctx>>;
/// Holds the struct type and maps fields to types and the location within the struct. /// Holds the struct type and maps fields to types and the location within the struct.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@ -96,6 +93,9 @@ impl<'ctx> CodeGen<'ctx> {
) )
.unwrap(); .unwrap();
module.set_data_layout(&target_machine.get_target_data().get_data_layout());
module.set_triple(&triple);
let codegen = CodeGen { let codegen = CodeGen {
context, context,
module, module,
@ -119,7 +119,7 @@ impl<'ctx> CodeGen<'ctx> {
let target_data = self.target_machine.get_target_data(); let target_data = self.target_machine.get_target_data();
// create types // create struct types
for statement in &self.ast.statements { for statement in &self.ast.statements {
if let Statement::Struct(s) = &statement.value { if let Statement::Struct(s) = &statement.value {
let mut fields = HashMap::new(); let mut fields = HashMap::new();
@ -129,7 +129,7 @@ impl<'ctx> CodeGen<'ctx> {
// todo: this doesnt handle out of order structs well // todo: this doesnt handle out of order structs well
let ty = self.get_llvm_type(&field.field_type.value)?; let ty = self.get_llvm_type(&field.field_type.value)?;
field_types.push((ty, Some(i))); field_types.push((ty, Some(i)));
// todo: ensure alignment and padding here
fields.insert( fields.insert(
field.ident.value.clone(), field.ident.value.clone(),
(i, field.field_type.value.clone()), (i, field.field_type.value.clone()),
@ -201,6 +201,12 @@ impl<'ctx> CodeGen<'ctx> {
if let Err(err) = self.module.verify() { if let Err(err) = self.module.verify() {
eprintln!("error:\n{}", err); eprintln!("error:\n{}", err);
} }
// compile:
//let buffer = self.target_machine.write_to_memory_buffer(&self.module, FileType::Assembly).unwrap();
//let mut x = buffer.as_slice();
//let mut what = String::new();
//x.read_to_string(&mut what);
//println!("{}", what);
self.module.print_to_string().to_str().unwrap().to_string() self.module.print_to_string().to_str().unwrap().to_string()
} }