diff options
author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-11-22 17:08:06 +0100 |
---|---|---|
committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-11-22 17:15:32 +0100 |
commit | 4f10206cc4dcbe28d712a82497fc582585d4d2c7 (patch) | |
tree | 4114587473ce19aacd5c503825d1f8994e3e7498 | |
parent | 80777740bcb17ee8aacb78ebd2dd9c0f84945474 (diff) | |
parent | 15bea3b0bbe7bab1d081aae9262e867366aff324 (diff) | |
download | sparse-4f10206cc4dcbe28d712a82497fc582585d4d2c7.tar.gz |
Merge branch 'cleanup' into next
-rw-r--r-- | flow.c | 3 | ||||
-rw-r--r-- | flow.h | 1 | ||||
-rw-r--r-- | simplify.c | 25 |
3 files changed, 8 insertions, 21 deletions
@@ -457,7 +457,6 @@ void convert_load_instruction(struct instruction *insn, pseudo_t src) { convert_instruction_target(insn, src); kill_instruction(insn); - repeat_phase |= REPEAT_SYMBOL_CLEANUP; } static int overlapping_memop(struct instruction *a, struct instruction *b) @@ -559,7 +558,7 @@ complex_phi: insn->phi_list = dominators; end: - repeat_phase |= REPEAT_SYMBOL_CLEANUP; + repeat_phase |= REPEAT_CSE; } /* Kill a pseudo that is dead on exit from the bb */ @@ -6,7 +6,6 @@ extern unsigned long bb_generation; #define REPEAT_CSE (1 << 0) -#define REPEAT_SYMBOL_CLEANUP (1 << 1) #define REPEAT_CFG_CLEANUP (1 << 2) struct entrypoint; @@ -259,8 +259,6 @@ out: static inline void rem_usage(pseudo_t p, pseudo_t *usep, int kill) { if (has_use_list(p)) { - if (p->type == PSEUDO_SYM) - repeat_phase |= REPEAT_SYMBOL_CLEANUP; delete_pseudo_user_list_entry(&p->users, usep, 1); if (kill && !p->users) kill_instruction(p->def); @@ -326,25 +324,16 @@ int kill_insn(struct instruction *insn, int force) case OP_UNOP ... OP_UNOP_END: case OP_SLICE: - kill_use(&insn->src1); - break; - - case OP_PHI: - kill_use_list(insn->phi_list); - break; case OP_PHISOURCE: - kill_use(&insn->phi_src); - break; - case OP_SYMADDR: - kill_use(&insn->src); - repeat_phase |= REPEAT_SYMBOL_CLEANUP; - break; - case OP_CBR: case OP_SWITCH: case OP_COMPUTEDGOTO: - kill_use(&insn->cond); + kill_use(&insn->src1); + break; + + case OP_PHI: + kill_use_list(insn->phi_list); break; case OP_CALL: @@ -1716,7 +1705,7 @@ static int simplify_one_memop(struct instruction *insn, pseudo_t orig) if (def->opcode == OP_SYMADDR && def->src) { kill_use(&insn->src); use_pseudo(insn, def->src, &insn->src); - return REPEAT_CSE | REPEAT_SYMBOL_CLEANUP; + return REPEAT_CSE; } if (def->opcode == OP_ADD) { new = def->src1; @@ -1752,7 +1741,7 @@ offset: } insn->offset += off->value; replace_pseudo(insn, &insn->src, new); - return REPEAT_CSE | REPEAT_SYMBOL_CLEANUP; + return REPEAT_CSE; } /// |