Commit 387fce26 authored by Christoph Mallon's avatar Christoph Mallon
Browse files

amd64: Replace AMD64_OP_UNOP_IMM32 by AMD64_OP_IMM32.

parent 206d352e
...@@ -368,11 +368,10 @@ static void amd64_emit_am(const ir_node *const node, bool indirect_star) ...@@ -368,11 +368,10 @@ static void amd64_emit_am(const ir_node *const node, bool indirect_star)
emit_register_mode(reg, attr->insn_mode); emit_register_mode(reg, attr->insn_mode);
return; return;
} }
case AMD64_OP_UNOP_IMM32: case AMD64_OP_IMM32:
amd64_emit_immediate32(false, &attr->addr.immediate); amd64_emit_immediate32(false, &attr->addr.immediate);
return; return;
case AMD64_OP_IMM32:
case AMD64_OP_IMM64: case AMD64_OP_IMM64:
case AMD64_OP_NONE: case AMD64_OP_NONE:
case AMD64_OP_SHIFT_REG: case AMD64_OP_SHIFT_REG:
......
...@@ -44,7 +44,6 @@ static const char *get_op_mode_string(amd64_op_mode_t mode) ...@@ -44,7 +44,6 @@ static const char *get_op_mode_string(amd64_op_mode_t mode)
case AMD64_OP_REG: return "reg"; case AMD64_OP_REG: return "reg";
case AMD64_OP_SHIFT_IMM: return "shift_imm"; case AMD64_OP_SHIFT_IMM: return "shift_imm";
case AMD64_OP_SHIFT_REG: return "shift_reg"; case AMD64_OP_SHIFT_REG: return "shift_reg";
case AMD64_OP_UNOP_IMM32: return "unop_imm32";
} }
panic("invalid op_mode"); panic("invalid op_mode");
} }
......
...@@ -41,7 +41,7 @@ static inline bool amd64_has_addr_attr(const ir_node *node) ...@@ -41,7 +41,7 @@ static inline bool amd64_has_addr_attr(const ir_node *node)
return (amd64_has_binop_attr(node) return (amd64_has_binop_attr(node)
|| attr->op_mode == AMD64_OP_ADDR || attr->op_mode == AMD64_OP_ADDR
|| attr->op_mode == AMD64_OP_REG || attr->op_mode == AMD64_OP_REG
|| attr->op_mode == AMD64_OP_UNOP_IMM32) || attr->op_mode == AMD64_OP_IMM32)
&& !is_amd64_xor_0(node) && !is_amd64_xor_0(node)
&& !is_amd64_xorpd_0(node); && !is_amd64_xorpd_0(node);
} }
......
...@@ -51,7 +51,6 @@ typedef enum { ...@@ -51,7 +51,6 @@ typedef enum {
AMD64_OP_IMM64, AMD64_OP_IMM64,
AMD64_OP_ADDR_REG, AMD64_OP_ADDR_REG,
AMD64_OP_ADDR_IMM, AMD64_OP_ADDR_IMM,
AMD64_OP_UNOP_IMM32,
AMD64_OP_SHIFT_REG, AMD64_OP_SHIFT_REG,
AMD64_OP_SHIFT_IMM, AMD64_OP_SHIFT_IMM,
} amd64_op_mode_t; } amd64_op_mode_t;
......
...@@ -1315,7 +1315,7 @@ static ir_node *gen_IJmp(ir_node *node) ...@@ -1315,7 +1315,7 @@ static ir_node *gen_IJmp(ir_node *node)
ir_node *mem_proj = NULL; ir_node *mem_proj = NULL;
if (match_immediate_32(&addr.immediate, op, true, false)) { if (match_immediate_32(&addr.immediate, op, true, false)) {
// TODO: do we need a must_match_ip_relative in match_immediate_32 // TODO: do we need a must_match_ip_relative in match_immediate_32
op_mode = AMD64_OP_UNOP_IMM32; op_mode = AMD64_OP_IMM32;
arity = 0; arity = 0;
reqs = no_reqs; reqs = no_reqs;
} else { } else {
...@@ -1552,7 +1552,7 @@ static ir_node *gen_Call(ir_node *node) ...@@ -1552,7 +1552,7 @@ static ir_node *gen_Call(ir_node *node)
arch_register_req_t const **const in_req = be_allocate_in_reqs(irg, max_inputs); arch_register_req_t const **const in_req = be_allocate_in_reqs(irg, max_inputs);
if (match_immediate_32(&addr.immediate, callee, true, true)) { if (match_immediate_32(&addr.immediate, callee, true, true)) {
op_mode = AMD64_OP_UNOP_IMM32; op_mode = AMD64_OP_IMM32;
} else { } else {
ir_node *load = source_am_possible(block, callee); ir_node *load = source_am_possible(block, callee);
bool am_okay = false; bool am_okay = false;
......
Supports Markdown
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