diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2017-11-20 17:38:10 +0100 |
|---|---|---|
| committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2018-03-01 09:07:45 +0100 |
| commit | 39c697538115e7c402ab890f6d8755b2c1ddf826 (patch) | |
| tree | 64825784b4fc2b651dc20f408aec555e68e69654 | |
| parent | 5e7e4bdd97fc0f363762847fced34583ba47c9d0 (diff) | |
| download | sparse-dev-39c697538115e7c402ab890f6d8755b2c1ddf826.tar.gz | |
IR: let .cond unionize with .src and not .target
In struct instruction, .target is normally used to hold
the result. Its value is thus produced/defined by instructions.
On the contrary, .cond is used as an input value and is
thus used by instructions.
However, these two fields belong to the same union. This
creates slight complications for code, like liveness analysis
which care about which fields are used and which are defined
by the instructions.
Change this by unionizing .cond with .src, .src1 & friends instead
of with .target.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
| -rw-r--r-- | Documentation/IR.md | 2 | ||||
| -rw-r--r-- | linearize.h | 7 | ||||
| -rw-r--r-- | sparse-llvm.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/IR.md b/Documentation/IR.md index b9749dff..7bbeda8f 100644 --- a/Documentation/IR.md +++ b/Documentation/IR.md @@ -12,7 +12,7 @@ The common ones are: - .src: (pseudo_t) operand of unary ops (alias for .src1). - .target: (pseudo_t) result of unary, binary & ternary ops, is sometimes used otherwise by some others instructions. -- .cond: (pseudo_t) input operands for condition (alias .target!) +- .cond: (pseudo_t) input operands for condition (alias .src/.src1) - .type: (symbol*) usually the type of .result, sometimes of the operands ### Terminators diff --git a/linearize.h b/linearize.h index 5162e6c2..840b29c8 100644 --- a/linearize.h +++ b/linearize.h @@ -73,18 +73,17 @@ struct instruction { struct basic_block *bb; struct position pos; struct symbol *type; - union { - pseudo_t target; - pseudo_t cond; /* for branch and switch */ - }; + pseudo_t target; union { struct /* entrypoint */ { struct pseudo_list *arg_list; }; struct /* branch */ { + pseudo_t cond; struct basic_block *bb_true, *bb_false; }; struct /* switch */ { + pseudo_t _cond; struct multijmp_list *multijmp_list; }; struct /* phi_node */ { diff --git a/sparse-llvm.c b/sparse-llvm.c index a9475a84..b34decda 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -793,7 +793,7 @@ static void output_op_switch(struct function *fn, struct instruction *insn) def = jmp->target; } END_FOR_EACH_PTR(jmp); - sw_val = get_ioperand(fn, insn->type, insn->target); + sw_val = get_ioperand(fn, insn->type, insn->cond); target = LLVMBuildSwitch(fn->builder, sw_val, def ? def->priv : NULL, n_jmp); |