From 41ee308fd4f21096212e3bcaf55255b9cc0f53b7 Mon Sep 17 00:00:00 2001 From: servostar Date: Tue, 11 Jun 2024 16:41:21 +0200 Subject: [PATCH] fixed: out parameter not receiving pointer --- src/llvm/llvm-ir/expr.c | 44 ++++++++++++++++++++++------------------- src/llvm/llvm-ir/expr.h | 1 + src/llvm/llvm-ir/stmt.c | 25 +++++++++++------------ 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/llvm/llvm-ir/expr.c b/src/llvm/llvm-ir/expr.c index ebdd8d5..9c13729 100644 --- a/src/llvm/llvm-ir/expr.c +++ b/src/llvm/llvm-ir/expr.c @@ -19,14 +19,14 @@ BackendError impl_bitwise_operation(LLVMBackendCompileUnit *unit, if (operation->impl.arithmetic == BitwiseNot) { // single operand rhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } else { // two operands lhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, lhs, &llvm_lhs); + impl_expr(unit, scope, builder, lhs, FALSE, &llvm_lhs); rhs = g_array_index(operation->operands, Expression*, 1); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } switch (operation->impl.bitwise) { @@ -78,14 +78,14 @@ BackendError impl_logical_operation(LLVMBackendCompileUnit *unit, if (operation->impl.logical == LogicalNot) { // single operand rhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } else { // two operands lhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, lhs, &llvm_lhs); + impl_expr(unit, scope, builder, lhs, FALSE, &llvm_lhs); rhs = g_array_index(operation->operands, Expression*, 1); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } switch (operation->impl.logical) { @@ -142,10 +142,10 @@ BackendError impl_relational_operation(LLVMBackendCompileUnit *unit, // two operands lhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, lhs, &llvm_lhs); + impl_expr(unit, scope, builder, lhs, FALSE, &llvm_lhs); rhs = g_array_index(operation->operands, Expression*, 1); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); if (is_integral(rhs->result)) { // integral type @@ -204,14 +204,14 @@ BackendError impl_arithmetic_operation(LLVMBackendCompileUnit *unit, if (operation->impl.arithmetic == Negate) { // single operand rhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } else { // two operands lhs = g_array_index(operation->operands, Expression*, 0); - impl_expr(unit, scope, builder, lhs, &llvm_lhs); + impl_expr(unit, scope, builder, lhs, FALSE, &llvm_lhs); rhs = g_array_index(operation->operands, Expression*, 1); - impl_expr(unit, scope, builder, rhs, &llvm_rhs); + impl_expr(unit, scope, builder, rhs, FALSE, &llvm_rhs); } if (is_integral(rhs->result)) { @@ -295,7 +295,7 @@ BackendError impl_transmute(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, LLVMValueRef *llvm_result) { LLVMValueRef operand = NULL; - impl_expr(unit, scope, builder, transmute->operand, &operand); + impl_expr(unit, scope, builder, transmute->operand, FALSE, &operand); LLVMTypeRef target_type = NULL; BackendError err = get_type_impl(unit, scope->func_scope->global_scope, @@ -324,7 +324,7 @@ BackendError impl_typecast(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, LLVMBuilderRef builder, TypeCast *typecast, LLVMValueRef *llvm_result) { LLVMValueRef operand = NULL; - impl_expr(unit, scope, builder, typecast->operand, &operand); + impl_expr(unit, scope, builder, typecast->operand, FALSE, &operand); LLVMTypeRef target_type = NULL; BackendError err = get_type_impl(unit, scope->func_scope->global_scope, @@ -346,6 +346,7 @@ BackendError impl_typecast(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, BackendError impl_variable_load(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, LLVMBuilderRef builder, Variable *variable, + LLVMBool reference, LLVMValueRef *llvm_result) { LLVMValueRef llvm_variable = get_variable(scope, variable->name); @@ -354,7 +355,13 @@ BackendError impl_variable_load(LLVMBackendCompileUnit *unit, LLVMLocalScope *sc return new_backend_impl_error(Implementation, NULL, "Variable not found"); } - if (LLVMGetTypeKind(LLVMTypeOf(llvm_variable)) == LLVMPointerTypeKind) { + if (reference) { + // only reference wanted + + *llvm_result = llvm_variable; + + } else { + // no referencing, load value Type* type; LLVMTypeRef llvm_type; @@ -368,8 +375,6 @@ BackendError impl_variable_load(LLVMBackendCompileUnit *unit, LLVMLocalScope *sc get_type_impl(unit, scope->func_scope->global_scope, type, &llvm_type); *llvm_result = LLVMBuildLoad2(builder, llvm_type, llvm_variable, ""); - } else { - *llvm_result = llvm_variable; } return SUCCESS; @@ -380,20 +385,18 @@ BackendError impl_address_of(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope LLVMValueRef *llvm_result) { LLVMValueRef llvm_variable = NULL; - BackendError err = impl_expr(unit, scope, builder, addressOf->variable, &llvm_variable); + BackendError err = impl_expr(unit, scope, builder, addressOf->variable, FALSE, llvm_result); if (err.kind != Success) { return err; } - LLVMValueRef zero = LLVMConstInt(LLVMInt32Type(), 0, 0); - *llvm_result = LLVMBuildGEP2(builder, LLVMTypeOf(llvm_variable), llvm_variable, &zero, 1, "address of"); - return SUCCESS; } BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, LLVMBuilderRef builder, Expression *expr, + LLVMBool reference, LLVMValueRef *llvm_result) { DEBUG("implementing expression: %ld", expr->kind); BackendError err = SUCCESS; @@ -417,6 +420,7 @@ BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, break; case ExpressionKindVariable: err = impl_variable_load(unit, scope, builder, expr->impl.variable, + reference, llvm_result); break; case ExpressionKindAddressOf: diff --git a/src/llvm/llvm-ir/expr.h b/src/llvm/llvm-ir/expr.h index 15df434..354fa16 100644 --- a/src/llvm/llvm-ir/expr.h +++ b/src/llvm/llvm-ir/expr.h @@ -12,6 +12,7 @@ BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, LLVMBuilderRef builder, Expression *expr, + LLVMBool reference, LLVMValueRef *llvm_result); #endif // LLVM_BACKEND_EXPR_H diff --git a/src/llvm/llvm-ir/stmt.c b/src/llvm/llvm-ir/stmt.c index 6c09651..54f499a 100644 --- a/src/llvm/llvm-ir/stmt.c +++ b/src/llvm/llvm-ir/stmt.c @@ -23,7 +23,7 @@ BackendError impl_assign_stmt( DEBUG("implementing assignment for variable: %s", assignment->variable->name); LLVMValueRef llvm_value = NULL; - err = impl_expr(unit, scope, builder, assignment->value, &llvm_value); + err = impl_expr(unit, scope, builder, assignment->value, FALSE, &llvm_value); if (err.kind != Success) { return err; } @@ -100,7 +100,7 @@ BackendError impl_while(LLVMBackendCompileUnit *unit, LLVMPositionBuilderAtEnd(builder, while_cond_block); // Resolve condition in block to a variable LLVMValueRef cond_result = NULL; - err = impl_expr(unit, scope, builder, (Expression *) while_stmt->conditon, &cond_result); + err = impl_expr(unit, scope, builder, (Expression *) while_stmt->conditon, FALSE, &cond_result); if (err.kind != Success) { return err; } @@ -155,12 +155,6 @@ BackendError impl_func_call(LLVMBackendCompileUnit *unit, for (size_t i = 0; i < call->expressions->len; i++) { Expression *arg = g_array_index(call->expressions, Expression*, i); - LLVMValueRef llvm_arg = NULL; - err = impl_expr(unit, scope, builder, arg, &llvm_arg); - if (err.kind != Success) { - break; - } - GArray* param_list; if (call->function->kind == FunctionDeclarationKind) { param_list = call->function->impl.definition.parameter; @@ -168,11 +162,16 @@ BackendError impl_func_call(LLVMBackendCompileUnit *unit, param_list = call->function->impl.declaration.parameter; } + LLVMBool reference = FALSE; Parameter parameter = g_array_index(param_list, Parameter, i); - if (is_parameter_out(¶meter)) { - LLVMValueRef zero = LLVMConstInt(LLVMInt32TypeInContext(unit->context), 0, 0); - llvm_arg = LLVMBuildGEP2(builder, LLVMTypeOf(llvm_arg), llvm_arg, &zero, 1, ""); + reference = TRUE; + } + + LLVMValueRef llvm_arg = NULL; + err = impl_expr(unit, scope, builder, arg, reference, &llvm_arg); + if (err.kind != Success) { + break; } arguments[i] = llvm_arg; @@ -200,7 +199,7 @@ impl_cond_block(LLVMBackendCompileUnit *unit, LLVMBuilderRef builder, LLVMLocalS "stmt.branch.cond"); LLVMPositionBuilderAtEnd(builder, *cond_block); // Resolve condition in block to a variable - err = impl_expr(unit, scope, builder, cond, llvm_cond); + err = impl_expr(unit, scope, builder, cond, FALSE, llvm_cond); if (err.kind == Success) { // build body of loop err = impl_basic_block(unit, builder, scope, block, start_body_block, end_body_block); @@ -350,7 +349,7 @@ BackendError impl_def(LLVMBackendCompileUnit *unit, } LLVMValueRef initial_value = NULL; - err = impl_expr(unit, scope, builder, def->initializer, &initial_value); + err = impl_expr(unit, scope, builder, def->initializer, FALSE, &initial_value); if (err.kind != Success) { return err; }