Commit c9aa611e authored by Christoph Mallon's avatar Christoph Mallon
Browse files

amd64: Replace AMD64_OP_UNOP_ADDR by AMD64_OP_ADDR.

parent b5bba164
......@@ -349,6 +349,8 @@ static void amd64_emit_am(const ir_node *const node, bool indirect_star)
return;
}
case AMD64_OP_ADDR:
if (indirect_star)
be_emit_char('*');
amd64_emit_addr(node, &attr->addr);
return;
case AMD64_OP_ADDR_REG: {
......@@ -371,11 +373,6 @@ static void amd64_emit_am(const ir_node *const node, bool indirect_star)
case AMD64_OP_UNOP_IMM32:
amd64_emit_immediate32(false, &attr->addr.immediate);
return;
case AMD64_OP_UNOP_ADDR:
if (indirect_star)
be_emit_char('*');
amd64_emit_addr(node, &attr->addr);
return;
case AMD64_OP_RAX_REG: {
const arch_register_t *reg = arch_get_irn_register_in(node, 1);
......
......@@ -45,7 +45,6 @@ static const char *get_op_mode_string(amd64_op_mode_t mode)
case AMD64_OP_REG: return "reg";
case AMD64_OP_SHIFT_IMM: return "shift_imm";
case AMD64_OP_SHIFT_REG: return "shift_reg";
case AMD64_OP_UNOP_ADDR: return "unop_addr";
case AMD64_OP_UNOP_IMM32: return "unop_imm32";
case AMD64_OP_UNOP_REG: return "unop_reg";
}
......
......@@ -41,7 +41,6 @@ static inline bool amd64_has_addr_attr(const ir_node *node)
return (amd64_has_binop_attr(node)
|| attr->op_mode == AMD64_OP_ADDR
|| attr->op_mode == AMD64_OP_REG
|| attr->op_mode == AMD64_OP_UNOP_ADDR
|| attr->op_mode == AMD64_OP_UNOP_IMM32
|| attr->op_mode == AMD64_OP_UNOP_REG
|| attr->op_mode == AMD64_OP_RAX_REG)
......
......@@ -53,7 +53,6 @@ typedef enum {
AMD64_OP_ADDR_IMM,
AMD64_OP_UNOP_REG,
AMD64_OP_UNOP_IMM32,
AMD64_OP_UNOP_ADDR,
AMD64_OP_SHIFT_REG,
AMD64_OP_SHIFT_IMM,
/** A binary operation with 1 operand being RAX (which is usually not
......
......@@ -1334,7 +1334,7 @@ static ir_node *gen_IJmp(ir_node *node)
in[mem_input] = new_mem;
addr.mem_input = mem_input;
op_mode = AMD64_OP_UNOP_ADDR;
op_mode = AMD64_OP_ADDR;
} else {
op_mode = AMD64_OP_UNOP_REG;
assert(arity == 0); // UNOP_REG always outputs the first input
......@@ -1592,7 +1592,7 @@ static ir_node *gen_Call(ir_node *node)
ir_node *new_load_mem = be_transform_node(load_mem);
sync_ins[sync_arity++] = new_load_mem;
op_mode = AMD64_OP_UNOP_ADDR;
op_mode = AMD64_OP_ADDR;
} else {
int input = in_arity++;
assert(input == 0); /* UNOP_REG is currently hardcoded to always
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment