Start using instruction sizes properly.

We should drop symbol types by now, and base things on just raw
sizes. Anything else just doesn't work from a CSE standpoint.

Some things may care about actual types later, notably the type-
based alias analysis. Those types still exist in the cast nodes.

Also, make the printout be more readable.

1 files changed, 3 insertions, 1 deletions

diff --git a/cse.c b/cse.c
index 91e4c7b..4de950d 100644
--- a/cse.c
+++ b/cse.c
@@ -45,7 +45,7 @@ static void clean_up_one_instruction(struct basic_block *bb, struct instruction
 		return;
 	assert(insn->bb == bb);
 	repeat_phase |= simplify_instruction(insn);
-	hash = insn->opcode;
+	hash = (insn->opcode << 3) + (insn->size >> 3);
 	switch (insn->opcode) {	
 
 	/* Binary arithmetic */
@@ -218,6 +218,8 @@ static int insn_compare(const void *_i1, const void *_i2)
 	default:
 		warning(i1->bb->pos, "bad instruction on hash chain");
 	}
+	if (i1->size != i2->size)
+		return i1->size < i2->size ? -1 : 1;
 	return 0;
 }