diff options
Diffstat (limited to 'sparse-llvm.c')
-rw-r--r-- | sparse-llvm.c | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/sparse-llvm.c b/sparse-llvm.c index 9ceb19a9..0b826ce0 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -29,9 +29,25 @@ static LLVMTypeRef symbol_type(struct symbol *sym); static LLVMTypeRef func_return_type(struct symbol *sym) { + if (sym->type == SYM_NODE) + sym = sym->ctype.base_type; return symbol_type(sym->ctype.base_type); } +#if LLVM_VERSION_MAJOR > 14 +// A call can be done either with a SYM_FN or a SYM_PTR (pointing to a SYM_FN). +// Return the type corresponding to the SYM_FN. +static LLVMTypeRef func_full_type(struct symbol *type) +{ + if (type->type == SYM_NODE) { + struct symbol *btype = type->ctype.base_type; + if (btype->type == SYM_PTR) + type = btype->ctype.base_type; + } + return symbol_type(type); +} +#endif + static LLVMTypeRef sym_func_type(struct symbol *sym) { int n_arg = symbol_list_size(sym->arguments); @@ -294,15 +310,20 @@ static LLVMValueRef get_sym_value(LLVMModuleRef module, struct symbol *sym) switch (expr->type) { case EXPR_STRING: { const char *s = expr->string->data; + size_t len = expr->string->length; LLVMValueRef indices[] = { LLVMConstInt(LLVMInt64Type(), 0, 0), LLVMConstInt(LLVMInt64Type(), 0, 0) }; LLVMValueRef data; - data = LLVMAddGlobal(module, LLVMArrayType(LLVMInt8Type(), strlen(s) + 1), ".str"); + data = LLVMAddGlobal(module, LLVMArrayType(LLVMInt8Type(), len), ".str"); LLVMSetLinkage(data, LLVMPrivateLinkage); LLVMSetGlobalConstant(data, 1); - LLVMSetInitializer(data, LLVMConstString(strdup(s), strlen(s) + 1, true)); + LLVMSetInitializer(data, LLVMConstString(s, len, true)); +#if LLVM_VERSION_MAJOR > 14 + result = LLVMConstGEP2(LLVMTypeOf(data), data, indices, ARRAY_SIZE(indices)); +#else result = LLVMConstGEP(data, indices, ARRAY_SIZE(indices)); +#endif return result; } default: @@ -485,7 +506,11 @@ static LLVMValueRef calc_gep(LLVMBuilderRef builder, LLVMValueRef base, LLVMValu /* convert base to char* type */ base = LLVMBuildPointerCast(builder, base, bytep, name); /* addr = base + off */ +#if LLVM_VERSION_MAJOR > 14 + addr = LLVMBuildInBoundsGEP2(builder, LLVMTypeOf(base), base, &off, 1, name); +#else addr = LLVMBuildInBoundsGEP(builder, base, &off, 1, name); +#endif /* convert back to the actual pointer type */ addr = LLVMBuildPointerCast(builder, addr, type, name); return addr; @@ -711,7 +736,11 @@ static void output_op_load(struct function *fn, struct instruction *insn) /* perform load */ pseudo_name(insn->target, name); +#if LLVM_VERSION_MAJOR > 14 + target = LLVMBuildLoad2(fn->builder, symbol_type(insn->type), addr, name); +#else target = LLVMBuildLoad(fn->builder, addr, name); +#endif insn->target->priv = target; } @@ -797,6 +826,7 @@ static void output_op_switch(struct function *fn, struct instruction *insn) static void output_op_call(struct function *fn, struct instruction *insn) { LLVMValueRef target, func; + struct symbol *fntype; struct symbol *ctype; int n_arg = 0, i; struct pseudo *arg; @@ -812,14 +842,20 @@ static void output_op_call(struct function *fn, struct instruction *insn) else func = pseudo_to_value(fn, ctype, insn->func); i = 0; + fntype = ctype; // first symbol in the list is the function 'true' type FOR_EACH_PTR(insn->arguments, arg) { - NEXT_PTR_LIST(ctype); + NEXT_PTR_LIST(ctype); // the remaining ones are the arguments' type args[i++] = pseudo_to_rvalue(fn, ctype, arg); } END_FOR_EACH_PTR(arg); FINISH_PTR_LIST(ctype); pseudo_name(insn->target, name); +#if LLVM_VERSION_MAJOR > 14 + target = LLVMBuildCall2(fn->builder, func_full_type(fntype), func, args, n_arg, name); +#else + (void) fntype; target = LLVMBuildCall(fn->builder, func, args, n_arg, name); +#endif insn->target->priv = target; } @@ -1212,8 +1248,9 @@ static LLVMValueRef output_data(LLVMModuleRef module, struct symbol *sym) } case EXPR_STRING: { const char *s = initializer->string->data; + size_t len = initializer->string->length; - initial_value = LLVMConstString(strdup(s), strlen(s) + 1, true); + initial_value = LLVMConstString(s, len, true); break; } default: |