Split OP_SETVAL into OP_SETVAL (fp expressions and labels) and OP_SYMADDR

(symbol addresses).

They are pretty different. Symbol addresses have special meaning during
various phases, from symbol simplification to CSE.

1 files changed, 5 insertions, 10 deletions

diff --git a/flow.c b/flow.c
index c523efc..9d2f0fb 100644
--- a/flow.c
+++ b/flow.c
@@ -53,15 +53,10 @@ static int pseudo_truth_value(pseudo_t pseudo)
 
 	case PSEUDO_REG: {
 		struct instruction *insn = pseudo->def;
-		if (insn->opcode == OP_SETVAL && insn->target == pseudo) {
-			struct expression *expr = insn->val;
-
-			/* A symbol address is always considered true.. */
-			if (!expr)
-				return 1;
-			if (expr->type == EXPR_VALUE)
-				return !!expr->value;
-		}
+
+		/* A symbol address is always considered true.. */
+		if (insn->opcode == OP_SYMADDR && insn->target == pseudo)
+			return 1;
 	}
 		/* Fall through */
 	default:
@@ -614,7 +609,7 @@ static void simplify_one_symbol(struct entrypoint *ep, struct symbol *sym)
 			break;
 		case OP_LOAD:
 			break;
-		case OP_SETVAL:
+		case OP_SYMADDR:
 			if (!insn->bb)
 				continue;
 			mod |= MOD_ADDRESSABLE;