[v2,03/27] give a type to OP_SYMADDR

Commit Message

Luc Van Oostenryck March 11, 2017, 9:06 a.m. UTC

Currently, OP_SYMADDR are given a size but not a type.

There is no good reasons for that and it complicates
further correct processing or makes it impossible because
we've lost this type information.

Fix this by using alloc_typed_instruction() when creating
OP_SYMADDRs instructions.

Signed-off-by: Luc Van Oostenryck <[e-mail]>
---
 linearize.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/linearize.c b/linearize.c
index 9321cde21..ea4616f80 100644
--- a/linearize.c
+++ b/linearize.c
@@ -982,9 +982,10 @@  static pseudo_t add_setval(struct entrypoint *ep, struct symbol *ctype, struct e
 	return target;
 }
 
-static pseudo_t add_symbol_address(struct entrypoint *ep, struct symbol *sym)
+static pseudo_t add_symbol_address(struct entrypoint *ep, struct expression *expr)
 {
-	struct instruction *insn = alloc_instruction(OP_SYMADDR, bits_in_pointer);
+	struct instruction *insn = alloc_typed_instruction(OP_SYMADDR, expr->ctype);
+	struct symbol *sym = expr->symbol;
 	pseudo_t target = alloc_pseudo(insn);
 
 	insn->target = target;
@@ -1552,7 +1553,7 @@  pseudo_t linearize_expression(struct entrypoint *ep, struct expression *expr)
 	switch (expr->type) {
 	case EXPR_SYMBOL:
 		linearize_one_symbol(ep, expr->symbol);
-		return add_symbol_address(ep, expr->symbol);
+		return add_symbol_address(ep, expr);
 
 	case EXPR_VALUE:
 		return value_pseudo(expr->value);