diff --git a/src/llvm_backend_expr.cpp b/src/llvm_backend_expr.cpp index 214da9e10..6737c97bc 100644 --- a/src/llvm_backend_expr.cpp +++ b/src/llvm_backend_expr.cpp @@ -2510,11 +2510,7 @@ lbValue lb_build_expr(lbProcedure *p, Ast *expr) { } LLVMTypeRef func_type = LLVMGetElementType(lb_type(p->module, t)); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)asm_string.text, cast(size_t)asm_string.len, - cast(char *)constraints_string.text, cast(size_t)constraints_string.len, - ia->has_side_effects, ia->is_align_stack, dialect - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, asm_string, constraints_string, ia->has_side_effects, ia->has_side_effects, dialect); GB_ASSERT(the_asm != nullptr); return {the_asm, t}; case_end; diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index e577dc248..a36762afb 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -1335,22 +1335,12 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, if (build_context.metrics.arch == TargetArch_386 || build_context.metrics.arch == TargetArch_amd64) { LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)"pause", 5, - cast(char *)"", 0, - /*HasSideEffects*/true, /*IsAlignStack*/false, - LLVMInlineAsmDialectATT - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("pause"), {}); GB_ASSERT(the_asm != nullptr); LLVMBuildCall2(p->builder, func_type, the_asm, nullptr, 0, ""); } else if (build_context.metrics.arch == TargetArch_arm64) { LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)"yield", 5, - cast(char *)"", 0, - /*HasSideEffects*/true, /*IsAlignStack*/false, - LLVMInlineAsmDialectATT - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("yield"), {}); GB_ASSERT(the_asm != nullptr); LLVMBuildCall2(p->builder, func_type, the_asm, nullptr, 0, ""); } @@ -1961,10 +1951,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, regs[i]); constraints = gb_string_appendc(constraints, "}"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; case TargetArch_386: @@ -1995,10 +1983,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, ",rm"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; case TargetArch_arm64: @@ -2021,10 +2006,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, regs[i]); constraints = gb_string_appendc(constraints, "}"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; default: diff --git a/src/llvm_backend_utility.cpp b/src/llvm_backend_utility.cpp index 0531c62bb..948180f30 100644 --- a/src/llvm_backend_utility.cpp +++ b/src/llvm_backend_utility.cpp @@ -1379,3 +1379,16 @@ lbValue lb_soa_struct_cap(lbProcedure *p, lbValue value) { } return lb_emit_struct_ev(p, value, cast(i32)n); } + +LLVMValueRef llvm_get_inline_asm(LLVMTypeRef func_type, String const &str, String const &clobbers, bool has_side_effects=true, bool is_align_stack=false, LLVMInlineAsmDialect dialect=LLVMInlineAsmDialectATT) { + return LLVMGetInlineAsm(func_type, + cast(char *)str.text, cast(size_t)str.len, + cast(char *)clobbers.text, cast(size_t)clobbers.len, + /*HasSideEffects*/true, /*IsAlignStack*/false, + dialect + #if LLVM_VERSION_MAJOR >= 13 + , /*CanThrow*/false + #endif + ); +} +