teascade/reid-llvm
1
0
Fork 0
Code Issues Pull Requests Packages Releases 4 Wiki Activity

Fix params not being pointers

Browse Source
This commit is contained in:
Sofia 2025-07-20 20:13:47 +03:00
parent 158ddc58c8
commit 848f4118bf
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reid-llvm-lib/src/builder.rs
View File

@ -365,6 +365,7 @@ impl Builder {
}
Instr::FunctionCall(fun, params) => {
let param_types = self.function_data(&fun).params;
dbg!(&param_types, &params);
if param_types.len() != params.len() {
return Err(()); // TODO error: invalid amount of params
}
@ -413,7 +414,6 @@ impl Builder {
Instr::ArrayAlloca(_, _) => Ok(()),
Instr::GetElemPtr(ptr_val, _) => {
let ptr_ty = ptr_val.get_type(&self)?;
dbg!(&ptr_ty);
match ptr_ty {
Type::Ptr(_) => Ok(()),
_ => Err(()),

24
reid/src/codegen.rs
View File

@ -353,7 +353,10 @@ impl mir::Module {
entry.build(Instr::Store(alloca, param)).unwrap();
stack_values.insert(
p_name.clone(),
StackValue(StackValueKind::Immutable(alloca), p_ty.clone()),
StackValue(
StackValueKind::Immutable(alloca),
TypeKind::Ptr(Box::new(p_ty.clone())),
),
);
// Generate debug info
@ -585,7 +588,7 @@ impl mir::Expression {
*inner.clone(),
)
} else {
v.clone()
panic!("Variable was not a pointer?!?")
}
} else {
v.clone()
@ -636,12 +639,13 @@ impl mir::Expression {
let params = call
.parameters
.iter()
.map(|e| e.codegen(scope, state).unwrap().instr())
.map(|e| e.codegen(scope, &mut state.load(true)).unwrap().instr())
.collect();
let callee = scope
.functions
.get(&call.name)
.expect("function not found!");
dbg!(&self, &callee.ir.value());
Some(StackValue(
StackValueKind::Immutable(
scope
@ -1069,11 +1073,7 @@ impl TypeKind {
),
size_bits: self.size_of(),
}),
TypeKind::Array(type_kind, len) => {
let elem_ty = match **type_kind {
TypeKind::CustomType(_) => TypeKind::Ptr(Box::new(*type_kind.clone())),
_ => *type_kind.clone(),
};
TypeKind::Array(elem_ty, len) => {
let elem_ty = elem_ty.clone().get_debug_type_hard(
scope,
debug_info,
@ -1097,17 +1097,13 @@ impl TypeKind {
let mut fields = Vec::new();
let mut size_bits = 0;
for field in &struct_type.0 {
let ty = match &field.1 {
TypeKind::Array(elem_ty, len) => field.1.clone(),
_ => field.1.clone(),
};
fields.push(DebugFieldType {
name: field.0.clone(),
location: field.2.into_debug(tokens).unwrap(),
size_bits: ty.size_of(),
size_bits: field.1.size_of(),
offset: size_bits,
flags: DwarfFlags,
ty: ty.get_debug_type_hard(
ty: field.1.get_debug_type_hard(
scope,
debug_info,
debug_types,

8
reid/src/mir/linker.rs
View File

@ -103,10 +103,10 @@ impl<'map> Pass for LinkerPass<'map> {
modules.insert(module.name.clone(), Rc::new(RefCell::new((module, tokens))));
}
// modules.insert(
// "std".to_owned(),
// Rc::new(RefCell::new(compile_std(&mut self.module_map)?)),
// );
modules.insert(
"std".to_owned(),
Rc::new(RefCell::new(compile_std(&mut self.module_map)?)),
);
let mut modules_to_process: Vec<Rc<RefCell<(Module, Vec<FullToken>)>>> =
modules.values().cloned().collect();