From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Christopher Li <sparse@chrisli.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH v6 36/52] llvm: let pseudo_to_value() directly use the type
Date: Mon, 27 Mar 2017 23:24:00 +0200 [thread overview]
Message-ID: <20170327212416.18536-37-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20170327212416.18536-1-luc.vanoostenryck@gmail.com>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
sparse-llvm.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/sparse-llvm.c b/sparse-llvm.c
index 4be3e4358..29f0c079d 100644
--- a/sparse-llvm.c
+++ b/sparse-llvm.c
@@ -372,7 +372,7 @@ static LLVMValueRef val_to_value(unsigned long long val, struct symbol *ctype)
return constant_value(val, dtype);
}
-static LLVMValueRef pseudo_to_value(struct function *fn, struct instruction *insn, pseudo_t pseudo)
+static LLVMValueRef pseudo_to_value(struct function *fn, struct symbol *ctype, pseudo_t pseudo)
{
LLVMValueRef result = NULL;
@@ -384,7 +384,7 @@ static LLVMValueRef pseudo_to_value(struct function *fn, struct instruction *ins
result = get_sym_value(fn, pseudo->sym);
break;
case PSEUDO_VAL:
- result = val_to_value(pseudo->value, insn->type);
+ result = val_to_value(pseudo->value, ctype);
break;
case PSEUDO_ARG: {
result = LLVMGetParam(fn->fn, pseudo->nr - 1);
@@ -405,7 +405,7 @@ static LLVMValueRef pseudo_to_value(struct function *fn, struct instruction *ins
static LLVMValueRef pseudo_to_rvalue(struct function *fn, struct instruction *insn, pseudo_t pseudo)
{
- LLVMValueRef val = pseudo_to_value(fn, insn, pseudo);
+ LLVMValueRef val = pseudo_to_value(fn, insn->type, pseudo);
LLVMTypeRef dtype = symbol_type(insn->type);
char name[MAX_PSEUDO_NAME];
@@ -515,10 +515,10 @@ static void output_op_binary(struct function *fn, struct instruction *insn)
LLVMValueRef lhs, rhs, target;
char target_name[64];
- lhs = pseudo_to_value(fn, insn, insn->src1);
+ lhs = pseudo_to_value(fn, insn->type, insn->src1);
lhs = value_to_ivalue(fn, insn->type, lhs);
- rhs = pseudo_to_value(fn, insn, insn->src2);
+ rhs = pseudo_to_value(fn, insn->type, insn->src2);
rhs = value_to_ivalue(fn, insn->type, rhs);
pseudo_name(insn->target, target_name);
@@ -629,11 +629,11 @@ static void output_op_compare(struct function *fn, struct instruction *insn)
LLVMValueRef lhs, rhs, target;
char target_name[64];
- lhs = pseudo_to_value(fn, insn, insn->src1);
+ lhs = pseudo_to_value(fn, insn->type, insn->src1);
if (insn->src2->type == PSEUDO_VAL)
rhs = constant_value(insn->src2->value, LLVMTypeOf(lhs));
else
- rhs = pseudo_to_value(fn, insn, insn->src2);
+ rhs = pseudo_to_value(fn, insn->type, insn->src2);
pseudo_name(insn->target, target_name);
@@ -672,7 +672,7 @@ static void output_op_ret(struct function *fn, struct instruction *insn)
pseudo_t pseudo = insn->src;
if (pseudo && pseudo != VOID) {
- LLVMValueRef result = pseudo_to_value(fn, insn, pseudo);
+ LLVMValueRef result = pseudo_to_value(fn, insn->type, pseudo);
result = adjust_type(fn, insn->type, result);
LLVMBuildRet(fn->builder, result);
@@ -691,7 +691,7 @@ static LLVMValueRef calc_memop_addr(struct function *fn, struct instruction *ins
off = LLVMConstInt(int_type, insn->offset, 0);
/* convert src to the effective pointer type */
- src = pseudo_to_value(fn, insn, insn->src);
+ src = pseudo_to_value(fn, insn->type, insn->src);
as = LLVMGetPointerAddressSpace(LLVMTypeOf(src));
addr_type = LLVMPointerType(insn_symbol_type(insn), as);
src = LLVMBuildPointerCast(fn->builder, src, addr_type, LLVMGetValueName(src));
@@ -739,7 +739,7 @@ static LLVMValueRef bool_value(struct function *fn, LLVMValueRef value)
static void output_op_cbr(struct function *fn, struct instruction *br)
{
LLVMValueRef cond = bool_value(fn,
- pseudo_to_value(fn, br, br->cond));
+ pseudo_to_value(fn, br->type, br->cond));
LLVMBuildCondBr(fn->builder, cond,
br->bb_true->priv,
@@ -756,9 +756,9 @@ static void output_op_sel(struct function *fn, struct instruction *insn)
LLVMValueRef target, src1, src2, src3;
char name[MAX_PSEUDO_NAME];
- src1 = bool_value(fn, pseudo_to_value(fn, insn, insn->src1));
- src2 = pseudo_to_value(fn, insn, insn->src2);
- src3 = pseudo_to_value(fn, insn, insn->src3);
+ src1 = bool_value(fn, pseudo_to_value(fn, insn->type, insn->src1));
+ src2 = pseudo_to_value(fn, insn->type, insn->src2);
+ src3 = pseudo_to_value(fn, insn->type, insn->src3);
pseudo_name(insn->target, name);
target = LLVMBuildSelect(fn->builder, src1, src2, src3, name);
@@ -780,7 +780,7 @@ static void output_op_switch(struct function *fn, struct instruction *insn)
def = jmp->target;
} END_FOR_EACH_PTR(jmp);
- sw_val = pseudo_to_value(fn, insn, insn->target);
+ sw_val = pseudo_to_value(fn, insn->type, insn->target);
target = LLVMBuildSwitch(fn->builder, sw_val,
def ? def->priv : NULL, n_jmp);
@@ -811,7 +811,7 @@ static void output_op_call(struct function *fn, struct instruction *insn)
args[i++] = pseudo_to_rvalue(fn, arg, arg->src);
} END_FOR_EACH_PTR(arg);
- func = pseudo_to_value(fn, insn, insn->func);
+ func = pseudo_to_value(fn, insn->type, insn->func);
pseudo_name(insn->target, name);
target = LLVMBuildCall(fn->builder, func, args, n_arg, name);
@@ -826,7 +826,7 @@ static void output_op_phisrc(struct function *fn, struct instruction *insn)
assert(insn->target->priv == NULL);
/* target = src */
- v = pseudo_to_value(fn, insn, insn->phi_src);
+ v = pseudo_to_value(fn, insn->type, insn->phi_src);
FOR_EACH_PTR(insn->phi_users, phi) {
LLVMValueRef load, ptr;
@@ -862,7 +862,7 @@ static void output_op_ptrcast(struct function *fn, struct instruction *insn)
src = insn->src->priv;
if (!src)
- src = pseudo_to_value(fn, insn, insn->src);
+ src = pseudo_to_value(fn, insn->type, insn->src);
pseudo_name(insn->target, target_name);
@@ -896,7 +896,7 @@ static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOp
src = insn->src->priv;
if (!src)
- src = pseudo_to_value(fn, insn, insn->src);
+ src = pseudo_to_value(fn, insn->type, insn->src);
pseudo_name(insn->target, target_name);
@@ -1017,7 +1017,7 @@ static void output_insn(struct function *fn, struct instruction *insn)
LLVMValueRef src, target;
char target_name[64];
- src = pseudo_to_value(fn, insn, insn->src);
+ src = pseudo_to_value(fn, insn->type, insn->src);
pseudo_name(insn->target, target_name);
@@ -1030,7 +1030,7 @@ static void output_insn(struct function *fn, struct instruction *insn)
LLVMValueRef src, target;
char target_name[64];
- src = pseudo_to_value(fn, insn, insn->src);
+ src = pseudo_to_value(fn, insn->type, insn->src);
pseudo_name(insn->target, target_name);
--
2.12.0
next prev parent reply other threads:[~2017-03-27 21:27 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-27 21:23 [PATCH v6 00/52] LLVM fixes Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 01/52] llvm: remove unneeded arg 'module' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 02/52] llvm: remove unneeded 'generation' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 03/52] llvm: remove unneeded function::type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 04/52] llvm: reduce scope of 'bb_nr' Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 05/52] llvm: use pseudo_list_size() instead of open coding it Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 06/52] llvm: give arguments a name Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 07/52] llvm: give a name to call's return values Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 08/52] llvm: avoid useless temp variable Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 09/52] llvm: extract get_sym_value() from pseudo_to_value() Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 10/52] llvm: fix test of floating-point type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 11/52] llvm: fix translation of PSEUDO_VALs into a ValueRefs Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 12/52] llvm: fix output_op_store() which modify its operand Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 13/52] llvm: fix output_op_[ptr]cast() Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 14/52] llvm: take care of degenerated rvalues Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 15/52] llvm: add test cases for symbol's address Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 16/52] llvm: add test cases for pointers passed as argument Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 17/52] llvm: add test cases for arrays " Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 18/52] llvm: add test cases for degenerated pointers Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 19/52] llvm: add support for OP_NEG Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 20/52] llvm: add support for OP_SETVAL with floats Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 21/52] llvm: add support for OP_SETVAL with labels Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 22/52] llvm: ignore OP_INLINED_CALL Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 23/52] llvm: fix pointer/float mixup in comparisons Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 24/52] llvm: fix type in comparison with an address constant Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 25/52] llvm: give correct type to binops Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 26/52] llvm: adjust OP_RET's type Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 27/52] llvm: variadic functions are not being marked as such Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 28/52] llvm: fix type of switch constants Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 29/52] llvm: make pseudo_name() more flexible Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 30/52] llvm: give a name to all values Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 31/52] llvm: add support for OP_SWITCH with a range Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 32/52] llvm: fix OP_SWITCH has no target Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 33/52] llvm: make value_to_pvalue() more flexible Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 34/52] llvm: make value_to_ivalue() " Luc Van Oostenryck
2017-03-27 21:23 ` [PATCH v6 35/52] llvm: add test case pointer compare with cast Luc Van Oostenryck
2017-03-27 21:24 ` Luc Van Oostenryck [this message]
2017-03-27 21:24 ` [PATCH v6 37/52] llvm: remove unneeded pseudo_to_value() unneeded argument Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 38/52] llvm: introduce get_ioperand() Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 39/52] llvm: fix mutating function pointer Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 40/52] llvm: fix mutated OP_RET Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 41/52] llvm: fix mutated OP_SEL Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 42/52] llvm: fix mutated OP_SWITCH Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 43/52] llvm: fix mutated OP_PHISOURCE Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 44/52] llvm: fix mutated OP_[PTR]CAST Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 45/52] llvm: add support for restricted types Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 46/52] llvm: fix get value from initialized symbol Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 47/52] llvm: fix get value from non-anonymous symbol Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 48/52] llvm: fix type of bitfields Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 49/52] llvm: add support for OP_FPCAST Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 50/52] llvm: add support for cast from floats Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 51/52] llvm: cleanup of output_[ptr]cast() Luc Van Oostenryck
2017-03-27 21:24 ` [PATCH v6 52/52] llvm: fix creation of sparsec's tmp files Luc Van Oostenryck
2017-03-31 5:28 ` [PATCH v6 00/52] LLVM fixes Christopher Li
2017-03-31 5:32 ` Christopher Li
2017-03-31 8:56 ` Luc Van Oostenryck
2017-04-01 10:53 ` [GIT PULL v6] " Luc Van Oostenryck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170327212416.18536-37-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=linux-sparse@vger.kernel.org \
--cc=sparse@chrisli.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).