diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2013-05-18 19:52:05 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2013-05-19 10:57:52 +0300 |
| commit | 1c1dd120b41b93dc63587929c48c2b7d215eb2dc (patch) | |
| tree | da4821016522894adc224f946d07b24acbafa3f1 | |
| parent | 47259c45e369bf0c9a338e1f31dea22b0139e9b6 (diff) | |
| download | sparse-dev-1c1dd120b41b93dc63587929c48c2b7d215eb2dc.tar.gz | |
sparse, llvm: de-duplicate load/store address calculation code
Cc: Christopher Li <sparse@chrisli.org>
Cc: Jeff Garzik <jgarzik@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
| -rw-r--r-- | sparse-llvm.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/sparse-llvm.c b/sparse-llvm.c index 9b768b54..8ac3a440 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -541,10 +541,10 @@ static void output_op_ret(struct function *fn, struct instruction *insn) LLVMBuildRetVoid(fn->builder); } -static void output_op_load(struct function *fn, struct instruction *insn) +static LLVMValueRef calc_memop_addr(struct function *fn, struct instruction *insn) { LLVMTypeRef int_type; - LLVMValueRef src_p, src_i, ofs_i, addr_i, addr, target; + LLVMValueRef src_p, src_i, ofs_i, addr_i, addr; /* int type large enough to hold a pointer */ int_type = LLVMIntType(bits_in_pointer); @@ -560,6 +560,16 @@ static void output_op_load(struct function *fn, struct instruction *insn) addr = LLVMBuildIntToPtr(fn->builder, addr_i, LLVMTypeOf(src_p), "addr"); + return addr; +} + + +static void output_op_load(struct function *fn, struct instruction *insn) +{ + LLVMValueRef addr, target; + + addr = calc_memop_addr(fn, insn); + /* perform load */ target = LLVMBuildLoad(fn->builder, addr, "load_target"); @@ -568,22 +578,9 @@ static void output_op_load(struct function *fn, struct instruction *insn) static void output_op_store(struct function *fn, struct instruction *insn) { - LLVMTypeRef int_type; - LLVMValueRef src_p, src_i, ofs_i, addr_i, addr, target, target_in; - - /* int type large enough to hold a pointer */ - int_type = LLVMIntType(bits_in_pointer); - - /* convert to integer, add src + offset */ - src_p = pseudo_to_value(fn, insn, insn->src); - src_i = LLVMBuildPtrToInt(fn->builder, src_p, int_type, "src_i"); + LLVMValueRef addr, target, target_in; - ofs_i = LLVMConstInt(int_type, insn->offset, 0); - addr_i = LLVMBuildAdd(fn->builder, src_i, ofs_i, "addr_i"); - - /* convert address back to pointer */ - addr = LLVMBuildIntToPtr(fn->builder, addr_i, - LLVMTypeOf(src_p), "addr"); + addr = calc_memop_addr(fn, insn); target_in = pseudo_to_value(fn, insn, insn->target); |