DHBW
/
gemstone
mirror of https://github.com/Servostar/gemstone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed: out parameter not receiving pointer

This commit is contained in:
Sven Vogel 2024-06-11 16:41:21 +02:00
parent 158a9797ca
commit 41ee308fd4
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/llvm/llvm-ir/expr.c
View File

@ -19,14 +19,14 @@ BackendError impl_bitwise_operation(LLVMBackendCompileUnit *unit,
if (operation->impl.arithmetic == BitwiseNot) { if (operation->impl.arithmetic == BitwiseNot) {
// single operand // single operand
rhs = g_array_index(operation->operands, Expression*, 0); 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 { } else {
// two operands // two operands
lhs = g_array_index(operation->operands, Expression*, 0); 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); 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) { switch (operation->impl.bitwise) {
@ -78,14 +78,14 @@ BackendError impl_logical_operation(LLVMBackendCompileUnit *unit,
if (operation->impl.logical == LogicalNot) { if (operation->impl.logical == LogicalNot) {
// single operand // single operand
rhs = g_array_index(operation->operands, Expression*, 0); 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 { } else {
// two operands // two operands
lhs = g_array_index(operation->operands, Expression*, 0); 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); 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) { switch (operation->impl.logical) {
@ -142,10 +142,10 @@ BackendError impl_relational_operation(LLVMBackendCompileUnit *unit,
// two operands // two operands
lhs = g_array_index(operation->operands, Expression*, 0); 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); 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)) { if (is_integral(rhs->result)) {
// integral type // integral type
@ -204,14 +204,14 @@ BackendError impl_arithmetic_operation(LLVMBackendCompileUnit *unit,
if (operation->impl.arithmetic == Negate) { if (operation->impl.arithmetic == Negate) {
// single operand // single operand
rhs = g_array_index(operation->operands, Expression*, 0); 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 { } else {
// two operands // two operands
lhs = g_array_index(operation->operands, Expression*, 0); 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); 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)) { if (is_integral(rhs->result)) {
@ -295,7 +295,7 @@ BackendError impl_transmute(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
LLVMValueRef *llvm_result) { LLVMValueRef *llvm_result) {
LLVMValueRef operand = NULL; LLVMValueRef operand = NULL;
impl_expr(unit, scope, builder, transmute->operand, &operand); impl_expr(unit, scope, builder, transmute->operand, FALSE, &operand);
LLVMTypeRef target_type = NULL; LLVMTypeRef target_type = NULL;
BackendError err = get_type_impl(unit, scope->func_scope->global_scope, 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, LLVMBuilderRef builder, TypeCast *typecast,
LLVMValueRef *llvm_result) { LLVMValueRef *llvm_result) {
LLVMValueRef operand = NULL; LLVMValueRef operand = NULL;
impl_expr(unit, scope, builder, typecast->operand, &operand); impl_expr(unit, scope, builder, typecast->operand, FALSE, &operand);
LLVMTypeRef target_type = NULL; LLVMTypeRef target_type = NULL;
BackendError err = get_type_impl(unit, scope->func_scope->global_scope, 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, BackendError impl_variable_load(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
LLVMBuilderRef builder, Variable *variable, LLVMBuilderRef builder, Variable *variable,
LLVMBool reference,
LLVMValueRef *llvm_result) { LLVMValueRef *llvm_result) {
LLVMValueRef llvm_variable = get_variable(scope, variable->name); 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"); 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; Type* type;
LLVMTypeRef llvm_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); get_type_impl(unit, scope->func_scope->global_scope, type, &llvm_type);
*llvm_result = LLVMBuildLoad2(builder, llvm_type, llvm_variable, ""); *llvm_result = LLVMBuildLoad2(builder, llvm_type, llvm_variable, "");
} else {
*llvm_result = llvm_variable;
} }
return SUCCESS; return SUCCESS;
@ -380,20 +385,18 @@ BackendError impl_address_of(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope
LLVMValueRef *llvm_result) { LLVMValueRef *llvm_result) {
LLVMValueRef llvm_variable = NULL; 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) { if (err.kind != Success) {
return err; return err;
} }
LLVMValueRef zero = LLVMConstInt(LLVMInt32Type(), 0, 0);
*llvm_result = LLVMBuildGEP2(builder, LLVMTypeOf(llvm_variable), llvm_variable, &zero, 1, "address of");
return SUCCESS; return SUCCESS;
} }
BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
LLVMBuilderRef builder, Expression *expr, LLVMBuilderRef builder, Expression *expr,
LLVMBool reference,
LLVMValueRef *llvm_result) { LLVMValueRef *llvm_result) {
DEBUG("implementing expression: %ld", expr->kind); DEBUG("implementing expression: %ld", expr->kind);
BackendError err = SUCCESS; BackendError err = SUCCESS;
@ -417,6 +420,7 @@ BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
break; break;
case ExpressionKindVariable: case ExpressionKindVariable:
err = impl_variable_load(unit, scope, builder, expr->impl.variable, err = impl_variable_load(unit, scope, builder, expr->impl.variable,
reference,
llvm_result); llvm_result);
break; break;
case ExpressionKindAddressOf: case ExpressionKindAddressOf:

1
src/llvm/llvm-ir/expr.h
View File

@ -12,6 +12,7 @@
BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope, BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
LLVMBuilderRef builder, Expression *expr, LLVMBuilderRef builder, Expression *expr,
LLVMBool reference,
LLVMValueRef *llvm_result); LLVMValueRef *llvm_result);
#endif // LLVM_BACKEND_EXPR_H #endif // LLVM_BACKEND_EXPR_H

25
src/llvm/llvm-ir/stmt.c
View File

@ -23,7 +23,7 @@ BackendError impl_assign_stmt(
DEBUG("implementing assignment for variable: %s", assignment->variable->name); DEBUG("implementing assignment for variable: %s", assignment->variable->name);
LLVMValueRef llvm_value = NULL; 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) { if (err.kind != Success) {
return err; return err;
} }
@ -100,7 +100,7 @@ BackendError impl_while(LLVMBackendCompileUnit *unit,
LLVMPositionBuilderAtEnd(builder, while_cond_block); LLVMPositionBuilderAtEnd(builder, while_cond_block);
// Resolve condition in block to a variable // Resolve condition in block to a variable
LLVMValueRef cond_result = NULL; 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) { if (err.kind != Success) {
return err; return err;
} }
@ -155,12 +155,6 @@ BackendError impl_func_call(LLVMBackendCompileUnit *unit,
for (size_t i = 0; i < call->expressions->len; i++) { for (size_t i = 0; i < call->expressions->len; i++) {
Expression *arg = g_array_index(call->expressions, Expression*, 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; GArray* param_list;
if (call->function->kind == FunctionDeclarationKind) { if (call->function->kind == FunctionDeclarationKind) {
param_list = call->function->impl.definition.parameter; param_list = call->function->impl.definition.parameter;
@ -168,11 +162,16 @@ BackendError impl_func_call(LLVMBackendCompileUnit *unit,
param_list = call->function->impl.declaration.parameter; param_list = call->function->impl.declaration.parameter;
} }
LLVMBool reference = FALSE;
Parameter parameter = g_array_index(param_list, Parameter, i); Parameter parameter = g_array_index(param_list, Parameter, i);
if (is_parameter_out(&parameter)) { if (is_parameter_out(&parameter)) {
LLVMValueRef zero = LLVMConstInt(LLVMInt32TypeInContext(unit->context), 0, 0); reference = TRUE;
llvm_arg = LLVMBuildGEP2(builder, LLVMTypeOf(llvm_arg), llvm_arg, &zero, 1, ""); }
LLVMValueRef llvm_arg = NULL;
err = impl_expr(unit, scope, builder, arg, reference, &llvm_arg);
if (err.kind != Success) {
break;
} }
arguments[i] = llvm_arg; arguments[i] = llvm_arg;
@ -200,7 +199,7 @@ impl_cond_block(LLVMBackendCompileUnit *unit, LLVMBuilderRef builder, LLVMLocalS
"stmt.branch.cond"); "stmt.branch.cond");
LLVMPositionBuilderAtEnd(builder, *cond_block); LLVMPositionBuilderAtEnd(builder, *cond_block);
// Resolve condition in block to a variable // 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) { if (err.kind == Success) {
// build body of loop // build body of loop
err = impl_basic_block(unit, builder, scope, block, start_body_block, end_body_block); 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; 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) { if (err.kind != Success) {
return err; return err;
} }