Merge branch 'debug'

* do not call simplify_instruction() on removed instruction
* add debug helpers: show_insn_bb() & show_insn_entry()

3 files changed, 20 insertions, 3 deletions

diff --git a/linearize.c b/linearize.c
index d3c009b3..ab91113d 100644
--- a/linearize.c
+++ b/linearize.c
@@ -563,6 +563,15 @@ void show_bb(struct basic_block *bb)
 		printf("\tEND\n");
 }
 
+///
+// show BB of non-removed instruction
+void show_insn_bb(struct instruction *insn)
+{
+	if (!insn || !insn->bb)
+		return;
+	show_bb(insn->bb);
+}
+
 static void show_symbol_usage(pseudo_t pseudo)
 {
 	struct pseudo_user *pu;
@@ -610,6 +619,15 @@ void show_entry(struct entrypoint *ep)
 	printf("\n");
 }
 
+///
+// show the function containing the instruction but only if not already removed.
+void show_insn_entry(struct instruction *insn)
+{
+	if (!insn || !insn->bb || !insn->bb->ep)
+		return;
+	show_entry(insn->bb->ep);
+}
+
 static void bind_label(struct symbol *label, struct basic_block *bb, struct position pos)
 {
 	if (label->bb_target)
diff --git a/optimize.c b/optimize.c
index 31d94e61..bfab74c0 100644
--- a/optimize.c
+++ b/optimize.c
@@ -34,6 +34,8 @@ static void clean_up_insns(struct entrypoint *ep)
 	FOR_EACH_PTR(ep->bbs, bb) {
 		struct instruction *insn;
 		FOR_EACH_PTR(bb->insns, insn) {
+			if (!insn->bb)
+				continue;
 			repeat_phase |= simplify_instruction(insn);
 			if (!insn->bb)
 				continue;
diff --git a/simplify.c b/simplify.c
index 895e5f48..e58fb6cf 100644
--- a/simplify.c
+++ b/simplify.c
@@ -2117,9 +2117,6 @@ int simplify_instruction(struct instruction *insn)
 	unsigned flags;
 	int changed = 0;
 
-	if (!insn->bb)
-		return 0;
-
 	flags = opcode_table[insn->opcode].flags;
 	if (flags & OPF_TARGET) {
 		if (!has_users(insn->target))