From 17e88e276ca5baeda4867713871219ebdf925d33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Tue, 9 Aug 2016 12:23:41 +0200 Subject: [PATCH] gallivm: add create_builder_at_entry helper function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reduces code duplication. Reviewed-by: Roland Scheidegger Reviewed-by: Marek Olšák --- src/gallium/auxiliary/gallivm/lp_bld_flow.c | 45 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_flow.c b/src/gallium/auxiliary/gallivm/lp_bld_flow.c index f3b3eab..9183f45 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_flow.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_flow.c @@ -454,6 +454,26 @@ lp_build_endif(struct lp_build_if_state *ifthen) } +static LLVMBuilderRef +create_builder_at_entry(struct gallivm_state *gallivm) +{ + LLVMBuilderRef builder = gallivm->builder; + LLVMBasicBlockRef current_block = LLVMGetInsertBlock(builder); + LLVMValueRef function = LLVMGetBasicBlockParent(current_block); + LLVMBasicBlockRef first_block = LLVMGetEntryBasicBlock(function); + LLVMValueRef first_instr = LLVMGetFirstInstruction(first_block); + LLVMBuilderRef first_builder = LLVMCreateBuilderInContext(gallivm->context); + + if (first_instr) { + LLVMPositionBuilderBefore(first_builder, first_instr); + } else { + LLVMPositionBuilderAtEnd(first_builder, first_block); + } + + return first_builder; +} + + /** * Allocate a scalar (or vector) variable. * @@ -475,19 +495,9 @@ lp_build_alloca(struct gallivm_state *gallivm, const char *name) { LLVMBuilderRef builder = gallivm->builder; - LLVMBasicBlockRef current_block = LLVMGetInsertBlock(builder); - LLVMValueRef function = LLVMGetBasicBlockParent(current_block); - LLVMBasicBlockRef first_block = LLVMGetEntryBasicBlock(function); - LLVMValueRef first_instr = LLVMGetFirstInstruction(first_block); - LLVMBuilderRef first_builder = LLVMCreateBuilderInContext(gallivm->context); + LLVMBuilderRef first_builder = create_builder_at_entry(gallivm); LLVMValueRef res; - if (first_instr) { - LLVMPositionBuilderBefore(first_builder, first_instr); - } else { - LLVMPositionBuilderAtEnd(first_builder, first_block); - } - res = LLVMBuildAlloca(first_builder, type, name); LLVMBuildStore(builder, LLVMConstNull(type), res); @@ -517,20 +527,9 @@ lp_build_array_alloca(struct gallivm_state *gallivm, LLVMValueRef count, const char *name) { - LLVMBuilderRef builder = gallivm->builder; - LLVMBasicBlockRef current_block = LLVMGetInsertBlock(builder); - LLVMValueRef function = LLVMGetBasicBlockParent(current_block); - LLVMBasicBlockRef first_block = LLVMGetEntryBasicBlock(function); - LLVMValueRef first_instr = LLVMGetFirstInstruction(first_block); - LLVMBuilderRef first_builder = LLVMCreateBuilderInContext(gallivm->context); + LLVMBuilderRef first_builder = create_builder_at_entry(gallivm); LLVMValueRef res; - if (first_instr) { - LLVMPositionBuilderBefore(first_builder, first_instr); - } else { - LLVMPositionBuilderAtEnd(first_builder, first_block); - } - res = LLVMBuildArrayAlloca(first_builder, type, count, name); LLVMDisposeBuilder(first_builder); -- 2.7.4