X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_emitter.c;h=4667d3a34a27b4d84b3cf279539cc80324c97cb0;hb=822286302c8472f89a7e8492b11bd3a9c702c1fe;hp=e149ab4c17d78ab59dd55ed332c46a7a29ca141a;hpb=2bc2dd4bd4f64982e9c5d2f1ea70d63d0eb10044;p=libfirm diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c index e149ab4c1..4667d3a34 100644 --- a/ir/be/ia32/ia32_emitter.c +++ b/ir/be/ia32/ia32_emitter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -22,6 +22,22 @@ * @brief This file implements the ia32 node emitter. * @author Christian Wuerdig, Matthias Braun * @version $Id$ + * + * Summary table for x86 floatingpoint compares: + * pnc_Eq => !P && E + * pnc_Lt => !P && B + * pnc_Le => !P && BE + * pnc_Gt => A + * pnc_Ge => AE + * pnc_Lg => P || NE + * pnc_Leg => NP (ordered) + * pnc_Uo => P + * pnc_Ue => E + * pnc_Ul => B + * pnc_Ule => BE + * pnc_Ug => P || A + * pnc_Uge => P || AE + * pnc_Ne => NE */ #include "config.h" @@ -54,22 +70,19 @@ #include "../be_dbgout.h" #include "ia32_emitter.h" +#include "ia32_common_transform.h" #include "gen_ia32_emitter.h" #include "gen_ia32_regalloc_if.h" #include "ia32_nodes_attr.h" #include "ia32_new_nodes.h" -#include "ia32_map_regs.h" #include "ia32_architecture.h" #include "bearch_ia32_t.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define BLOCK_PREFIX ".L" - #define SNPRINTF_BUF_LEN 128 static const ia32_isa_t *isa; -static ia32_code_gen_t *cg; static char pic_base_label[128]; static ir_label_t exc_label_id; static int mark_spill_reload = 0; @@ -78,7 +91,7 @@ static int do_pic; /** Return the next block in Block schedule */ static ir_node *get_prev_block_sched(const ir_node *block) { - return get_irn_link(block); + return (ir_node*)get_irn_link(block); } /** Checks if the current block is a fall-through target. */ @@ -140,23 +153,9 @@ static const arch_register_t *get_in_reg(const ir_node *irn, int pos) assert(reg && "no in register found"); - if (reg == &ia32_gp_regs[REG_GP_NOREG]) + if (reg == &ia32_registers[REG_GP_NOREG]) panic("trying to emit noreg for %+F input %d", irn, pos); - /* in case of unknown register: just return a valid register */ - if (reg == &ia32_gp_regs[REG_GP_UKNWN]) { - const arch_register_req_t *req = arch_get_register_req(irn, pos); - - if (arch_register_req_is(req, limited)) { - /* in case of limited requirements: get the first allowed register */ - unsigned idx = rbitset_next(req->limited, 0, 1); - reg = arch_register_for_index(req->cls, idx); - } else { - /* otherwise get first register in class */ - reg = arch_register_for_index(req->cls, 0); - } - } - return reg; } @@ -201,30 +200,21 @@ static const arch_register_t *get_out_reg(const ir_node *irn, int pos) static char *get_unique_label(char *buf, size_t buflen, const char *prefix) { static unsigned long id = 0; - snprintf(buf, buflen, "%s%lu", prefix, ++id); + snprintf(buf, buflen, "%s%s%lu", be_gas_get_private_prefix(), prefix, ++id); return buf; } -/************************************************************* - * _ _ __ _ _ - * (_) | | / _| | | | | - * _ __ _ __ _ _ __ | |_| |_ | |__ ___| |_ __ ___ _ __ - * | '_ \| '__| | '_ \| __| _| | '_ \ / _ \ | '_ \ / _ \ '__| - * | |_) | | | | | | | |_| | | | | | __/ | |_) | __/ | - * | .__/|_| |_|_| |_|\__|_| |_| |_|\___|_| .__/ \___|_| - * | | | | - * |_| |_| - *************************************************************/ - /** * Emit the name of the 8bit low register */ static void emit_8bit_register(const arch_register_t *reg) { const char *reg_name = arch_register_get_name(reg); + assert(reg->index == REG_GP_EAX || reg->index == REG_GP_EBX + || reg->index == REG_GP_ECX || reg->index == REG_GP_EDX); be_emit_char('%'); - be_emit_char(reg_name[1]); + be_emit_char(reg_name[1]); /* get the basic name of the register */ be_emit_char('l'); } @@ -234,18 +224,20 @@ static void emit_8bit_register(const arch_register_t *reg) static void emit_8bit_register_high(const arch_register_t *reg) { const char *reg_name = arch_register_get_name(reg); + assert(reg->index == REG_GP_EAX || reg->index == REG_GP_EBX + || reg->index == REG_GP_ECX || reg->index == REG_GP_EDX); be_emit_char('%'); - be_emit_char(reg_name[1]); + be_emit_char(reg_name[1]); /* get the basic name of the register */ be_emit_char('h'); } static void emit_16bit_register(const arch_register_t *reg) { - const char *reg_name = ia32_get_mapped_reg_name(isa->regs_16bit, reg); + const char *reg_name = arch_register_get_name(reg); be_emit_char('%'); - be_emit_string(reg_name); + be_emit_string(reg_name+1); /* skip the 'e' prefix of the 32bit names */ } /** @@ -282,11 +274,10 @@ void ia32_emit_source_register(const ir_node *node, int pos) static void ia32_emit_entity(ir_entity *entity, int no_pic_adjust) { - set_entity_backend_marked(entity, 1); be_gas_emit_entity(entity); if (get_entity_owner(entity) == get_tls_type()) { - if (get_entity_linkage(entity) & IR_LINKAGE_EXTERN) { + if (get_entity_visibility(entity) == ir_visibility_external) { be_emit_cstring("@INDNTPOFF"); } else { be_emit_cstring("@NTPOFF"); @@ -421,13 +412,16 @@ void ia32_emit_x87_mode_suffix(const ir_node *node) if (mode_is_float(mode)) { switch (get_mode_size_bits(mode)) { - case 32: be_emit_char('s'); return; - case 64: be_emit_char('l'); return; - case 80: - case 96: be_emit_char('t'); return; + case 32: be_emit_char('s'); return; + case 64: be_emit_char('l'); return; + /* long doubles have different sizes due to alignment on different + * platforms. */ + case 80: + case 96: + case 128: be_emit_char('t'); return; } } else { - assert(mode_is_int(mode)); + assert(mode_is_int(mode) || mode_is_reference(mode)); switch (get_mode_size_bits(mode)) { case 16: be_emit_char('s'); return; case 32: be_emit_char('l'); return; @@ -442,7 +436,7 @@ void ia32_emit_x87_mode_suffix(const ir_node *node) static char get_xmm_mode_suffix(ir_mode *mode) { assert(mode_is_float(mode)); - switch(get_mode_size_bits(mode)) { + switch (get_mode_size_bits(mode)) { case 32: return 's'; case 64: return 'd'; default: panic("Invalid XMM mode"); @@ -491,21 +485,7 @@ void ia32_emit_source_register_or_immediate(const ir_node *node, int pos) static ir_node *get_cfop_target_block(const ir_node *irn) { assert(get_irn_mode(irn) == mode_X); - return get_irn_link(irn); -} - -/** - * Emits a block label for the given block. - */ -static void ia32_emit_block_name(const ir_node *block) -{ - if (has_Block_entity(block)) { - ir_entity *entity = get_Block_entity(block); - be_gas_emit_entity(entity); - } else { - be_emit_cstring(BLOCK_PREFIX); - be_emit_irprintf("%ld", get_irn_node_nr(block)); - } + return (ir_node*)get_irn_link(irn); } /** @@ -514,7 +494,7 @@ static void ia32_emit_block_name(const ir_node *block) static void ia32_emit_cfop_target(const ir_node *node) { ir_node *block = get_cfop_target_block(node); - ia32_emit_block_name(block); + be_gas_emit_block_name(block); } /* @@ -567,12 +547,14 @@ static void ia32_emit_cmp_suffix(int pnc) } typedef enum ia32_emit_mod_t { + EMIT_NONE = 0, EMIT_RESPECT_LS = 1U << 0, EMIT_ALTERNATE_AM = 1U << 1, EMIT_LONG = 1U << 2, EMIT_HIGH_REG = 1U << 3, EMIT_LOW_REG = 1U << 4 } ia32_emit_mod_t; +ENUM_BITSET(ia32_emit_mod_t) /** * Emits address mode. @@ -663,7 +645,7 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...) for (;;) { const char *start = fmt; - ia32_emit_mod_t mod = 0; + ia32_emit_mod_t mod = EMIT_NONE; while (*fmt != '%' && *fmt != '\n' && *fmt != '\0') ++fmt; @@ -683,8 +665,8 @@ static void ia32_emitf(const ir_node *node, const char *fmt, ...) break; ++fmt; - while (1) { - switch(*fmt) { + for (;;) { + switch (*fmt) { case '*': mod |= EMIT_ALTERNATE_AM; break; case '#': mod |= EMIT_RESPECT_LS; break; case 'l': mod |= EMIT_LONG; break; @@ -861,7 +843,7 @@ void ia32_emit_binop(const ir_node *node) */ void ia32_emit_x87_binop(const ir_node *node) { - switch(get_ia32_op_type(node)) { + switch (get_ia32_op_type(node)) { case ia32_Normal: { const ia32_x87_attr_t *x87_attr = get_ia32_x87_attr_const(node); @@ -997,22 +979,16 @@ static int determine_final_pnc(const ir_node *node, int flags_pos, int pnc) return pnc; } -static pn_Cmp ia32_get_negated_pnc(pn_Cmp pnc) +static int ia32_get_negated_pnc(int pnc) { ir_mode *mode = pnc & ia32_pn_Cmp_float ? mode_F : mode_Iu; return get_negated_pnc(pnc, mode); } -void ia32_emit_cmp_suffix_node(const ir_node *node, - int flags_pos) +void ia32_emit_cmp_suffix_node(const ir_node *node, int flags_pos) { - const ia32_attr_t *attr = get_ia32_attr_const(node); - - pn_Cmp pnc = get_ia32_condcode(node); - + int pnc = get_ia32_condcode(node); pnc = determine_final_pnc(node, flags_pos, pnc); - if (attr->data.ins_permuted) - pnc = ia32_get_negated_pnc(pnc); ia32_emit_cmp_suffix(pnc); } @@ -1064,8 +1040,7 @@ static void emit_ia32_Jcc(const ir_node *node) int need_parity_label = 0; const ir_node *proj_true; const ir_node *proj_false; - const ir_node *block; - pn_Cmp pnc = get_ia32_condcode(node); + int pnc = get_ia32_condcode(node); pnc = determine_final_pnc(node, 0, pnc); @@ -1076,8 +1051,6 @@ static void emit_ia32_Jcc(const ir_node *node) proj_false = get_proj(node, pn_ia32_Jcc_false); assert(proj_false && "Jcc without false Proj"); - block = get_nodes_block(node); - if (can_be_fallthrough(proj_true)) { /* exchange both proj's so the second one can be omitted */ const ir_node *t = proj_true; @@ -1147,8 +1120,8 @@ static void emit_ia32_Setcc(const ir_node *node) { const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res); - pn_Cmp pnc = get_ia32_condcode(node); - pnc = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc); + int pnc = get_ia32_condcode(node); + pnc = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc); if (pnc & ia32_pn_Cmp_float) { switch (pnc & 0x0f) { case pn_Cmp_Uo: @@ -1184,15 +1157,17 @@ static void emit_ia32_Setcc(const ir_node *node) static void emit_ia32_CMovcc(const ir_node *node) { - const ia32_attr_t *attr = get_ia32_attr_const(node); - const arch_register_t *out = arch_irn_get_register(node, pn_ia32_res); - pn_Cmp pnc = get_ia32_condcode(node); + const ia32_attr_t *attr = get_ia32_attr_const(node); + const arch_register_t *out = arch_irn_get_register(node, pn_ia32_res); + int pnc = get_ia32_condcode(node); const arch_register_t *in_true; const arch_register_t *in_false; pnc = determine_final_pnc(node, n_ia32_CMovcc_eflags, pnc); /* although you can't set ins_permuted in the constructor it might still - be set by memory operand folding */ + * be set by memory operand folding + * Permuting inputs of a cmov means the condition is negated! + */ if (attr->data.ins_permuted) pnc = ia32_get_negated_pnc(pnc); @@ -1235,25 +1210,15 @@ static void emit_ia32_CMovcc(const ir_node *node) ia32_emitf(node, "\tcmov%P %#AR, %#R\n", pnc, in_true, out); } -/********************************************************* - * _ _ _ - * (_) | (_) - * ___ _ __ ___ _| |_ _ _ _ _ __ ___ _ __ ___ - * / _ \ '_ ` _ \| | __| | | | | | '_ ` _ \| '_ \/ __| - * | __/ | | | | | | |_ | | |_| | | | | | | |_) \__ \ - * \___|_| |_| |_|_|\__| | |\__,_|_| |_| |_| .__/|___/ - * _/ | | | - * |__/ |_| - *********************************************************/ /* jump table entry (target and corresponding number) */ -typedef struct _branch_t { +typedef struct branch_t { ir_node *target; int value; } branch_t; /* jump table for switch generation */ -typedef struct _jmp_tbl_t { +typedef struct jmp_tbl_t { ir_node *defProj; /**< default target */ long min_value; /**< smallest switch case */ long max_value; /**< largest switch case */ @@ -1285,7 +1250,7 @@ static void generate_jump_table(jmp_tbl_t *tbl, const ir_node *node) const ir_edge_t *edge; /* fill the table structure */ - get_unique_label(tbl->label, SNPRINTF_BUF_LEN, ".TBL_"); + get_unique_label(tbl->label, SNPRINTF_BUF_LEN, "TBL_"); tbl->defProj = NULL; tbl->num_branches = get_irn_n_edges(node) - 1; tbl->branches = XMALLOCNZ(branch_t, tbl->num_branches); @@ -1403,17 +1368,16 @@ static const char* emit_asm_operand(const ir_node *node, const char *s) const arch_register_t *reg; const ia32_asm_reg_t *asm_regs = attr->register_map; const ia32_asm_reg_t *asm_reg; - const char *reg_name; char c; char modifier = 0; - int num = -1; + int num; int p; assert(*s == '%'); c = *(++s); /* parse modifiers */ - switch(c) { + switch (c) { case 0: ir_fprintf(stderr, "Warning: asm text (%+F) ends with %%\n", node); be_emit_char('%'); @@ -1447,8 +1411,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s) } /* parse number */ - sscanf(s, "%d%n", &num, &p); - if (num < 0) { + if (sscanf(s, "%d%n", &num, &p) != 1) { ir_fprintf(stderr, "Warning: Couldn't parse assembler operand (%+F)\n", node); return s; @@ -1456,7 +1419,7 @@ static const char* emit_asm_operand(const ir_node *node, const char *s) s += p; } - if (num < 0 || ARR_LEN(asm_regs) <= num) { + if (num < 0 || ARR_LEN(asm_regs) <= (size_t)num) { ir_fprintf(stderr, "Error: Custom assembler references invalid input/output (%+F)\n", node); @@ -1491,21 +1454,19 @@ static const char* emit_asm_operand(const ir_node *node, const char *s) /* emit it */ if (modifier != 0) { - be_emit_char('%'); - switch(modifier) { + switch (modifier) { case 'b': - reg_name = ia32_get_mapped_reg_name(isa->regs_8bit, reg); + emit_8bit_register(reg); break; case 'h': - reg_name = ia32_get_mapped_reg_name(isa->regs_8bit_high, reg); + emit_8bit_register_high(reg); break; case 'w': - reg_name = ia32_get_mapped_reg_name(isa->regs_16bit, reg); + emit_16bit_register(reg); break; default: panic("Invalid asm op modifier"); } - be_emit_string(reg_name); } else { emit_register(reg, asm_reg->mode); } @@ -1533,7 +1494,7 @@ static void emit_ia32_Asm(const ir_node *node) if (s[0] != '\t') be_emit_char('\t'); - while(*s != 0) { + while (*s != 0) { if (*s == '%') { s = emit_asm_operand(node, s); } else { @@ -1544,16 +1505,6 @@ static void emit_ia32_Asm(const ir_node *node) ia32_emitf(NULL, "\n#NO_APP\n"); } -/********************************** - * _____ ____ - * / ____| | _ \ - * | | ___ _ __ _ _| |_) | - * | | / _ \| '_ \| | | | _ < - * | |___| (_) | |_) | |_| | |_) | - * \_____\___/| .__/ \__, |____/ - * | | __/ | - * |_| |___/ - **********************************/ /** * Emit movsb/w instructions to make mov count divideable by 4 @@ -1593,17 +1544,6 @@ static void emit_ia32_CopyB_i(const ir_node *node) } - -/*************************** - * _____ - * / ____| - * | | ___ _ ____ __ - * | | / _ \| '_ \ \ / / - * | |___| (_) | | | \ V / - * \_____\___/|_| |_|\_/ - * - ***************************/ - /** * Emit code for conversions (I, FP), (FP, I) and (FP, FP). */ @@ -1658,16 +1598,6 @@ static void emit_ia32_Call(const ir_node *node) } -/******************************************* - * _ _ - * | | | | - * | |__ ___ _ __ ___ __| | ___ ___ - * | '_ \ / _ \ '_ \ / _ \ / _` |/ _ \/ __| - * | |_) | __/ | | | (_) | (_| | __/\__ \ - * |_.__/ \___|_| |_|\___/ \__,_|\___||___/ - * - *******************************************/ - /** * Emits code to increase stack pointer. */ @@ -1685,16 +1615,6 @@ static void emit_be_IncSP(const ir_node *node) } } -static inline bool is_unknown_reg(const arch_register_t *reg) -{ - if(reg == &ia32_gp_regs[REG_GP_UKNWN] - || reg == &ia32_xmm_regs[REG_XMM_UKNWN] - || reg == &ia32_vfp_regs[REG_VFP_UKNWN]) - return true; - - return false; -} - /** * Emits code for Copy/CopyKeep. */ @@ -1706,8 +1626,6 @@ static void Copy_emitter(const ir_node *node, const ir_node *op) if (in == out) { return; } - if (is_unknown_reg(in)) - return; /* copies of vf nodes aren't real... */ if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp]) return; @@ -1879,10 +1797,14 @@ static void emit_ia32_ClimbFrame(const ir_node *node) ia32_emitf(node, "\tmovl %S0, %D0\n"); ia32_emitf(node, "\tmovl $%u, %S1\n", attr->count); - ia32_emitf(NULL, BLOCK_PREFIX "%ld:\n", get_irn_node_nr(node)); + be_gas_emit_block_name(node); + be_emit_cstring(":\n"); + be_emit_write_line(); ia32_emitf(node, "\tmovl (%D0), %D0\n"); ia32_emitf(node, "\tdec %S1\n"); - ia32_emitf(node, "\tjnz " BLOCK_PREFIX "%ld\n", get_irn_node_nr(node)); + be_emit_cstring("\tjnz "); + be_gas_emit_block_name(node); + be_emit_finish_line_gas(node); } static void emit_be_Return(const ir_node *node) @@ -1902,16 +1824,6 @@ static void emit_Nothing(const ir_node *node) } -/*********************************************************************************** - * _ __ _ - * (_) / _| | | - * _ __ ___ __ _ _ _ __ | |_ _ __ __ _ _ __ ___ _____ _____ _ __| | __ - * | '_ ` _ \ / _` | | '_ \ | _| '__/ _` | '_ ` _ \ / _ \ \ /\ / / _ \| '__| |/ / - * | | | | | | (_| | | | | | | | | | | (_| | | | | | | __/\ V V / (_) | | | < - * |_| |_| |_|\__,_|_|_| |_| |_| |_| \__,_|_| |_| |_|\___| \_/\_/ \___/|_| |_|\_\ - * - ***********************************************************************************/ - /** * Enters the emitter functions for handled nodes into the generic * pointer of an opcode. @@ -1921,9 +1833,9 @@ static void ia32_register_emitters(void) #define IA32_EMIT2(a,b) op_ia32_##a->ops.generic = (op_func)emit_ia32_##b #define IA32_EMIT(a) IA32_EMIT2(a,a) #define EMIT(a) op_##a->ops.generic = (op_func)emit_##a -#define IGN(a) op_##a->ops.generic = (op_func)emit_Nothing +#define IGN(a) op_##a->ops.generic = (op_func)emit_Nothing #define BE_EMIT(a) op_be_##a->ops.generic = (op_func)emit_be_##a -#define BE_IGN(a) op_be_##a->ops.generic = (op_func)emit_Nothing +#define BE_IGN(a) op_be_##a->ops.generic = (op_func)emit_Nothing /* first clear the generic function pointer for all ops */ clear_irp_opcodes_generic_func(); @@ -2059,7 +1971,8 @@ static void ia32_emit_align_label(void) static int should_align_block(const ir_node *block) { static const double DELTA = .0001; - ir_exec_freq *exec_freq = cg->birg->exec_freq; + ir_graph *irg = get_irn_irg(block); + ir_exec_freq *exec_freq = be_get_irg_exec_freq(irg); ir_node *prev = get_prev_block_sched(block); double block_freq; double prev_freq = 0; /**< execfreq of the fallthrough block */ @@ -2076,7 +1989,7 @@ static int should_align_block(const ir_node *block) return 0; n_cfgpreds = get_Block_n_cfgpreds(block); - for(i = 0; i < n_cfgpreds; ++i) { + for (i = 0; i < n_cfgpreds; ++i) { const ir_node *pred = get_Block_cfgpred_block(block, i); double pred_freq = get_block_execfreq(exec_freq, pred); @@ -2106,7 +2019,7 @@ static void ia32_emit_block_header(ir_node *block) ir_graph *irg = current_ir_graph; int need_label = block_needs_label(block); int i, arity; - ir_exec_freq *exec_freq = cg->birg->exec_freq; + ir_exec_freq *exec_freq = be_get_irg_exec_freq(irg); if (block == get_irg_end_block(irg)) return; @@ -2138,14 +2051,14 @@ static void ia32_emit_block_header(ir_node *block) } if (need_label) { - ia32_emit_block_name(block); + be_gas_emit_block_name(block); be_emit_char(':'); be_emit_pad_comment(); be_emit_cstring(" /* "); } else { be_emit_cstring("\t/* "); - ia32_emit_block_name(block); + be_gas_emit_block_name(block); be_emit_cstring(": "); } @@ -2198,7 +2111,7 @@ typedef struct exc_entry { */ static void ia32_gen_labels(ir_node *block, void *data) { - exc_entry **exc_list = data; + exc_entry **exc_list = (exc_entry**)data; ir_node *pred; int n; @@ -2223,8 +2136,8 @@ static void ia32_gen_labels(ir_node *block, void *data) */ static int cmp_exc_entry(const void *a, const void *b) { - const exc_entry *ea = a; - const exc_entry *eb = b; + const exc_entry *ea = (const exc_entry*)a; + const exc_entry *eb = (const exc_entry*)b; if (get_ia32_exc_label_id(ea->exc_instr) < get_ia32_exc_label_id(eb->exc_instr)) return -1; @@ -2234,23 +2147,25 @@ static int cmp_exc_entry(const void *a, const void *b) /** * Main driver. Emits the code for one routine. */ -void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) +void ia32_gen_routine(ir_graph *irg) { - ir_entity *entity = get_irg_entity(irg); - exc_entry *exc_list = NEW_ARR_F(exc_entry, 0); + ir_entity *entity = get_irg_entity(irg); + exc_entry *exc_list = NEW_ARR_F(exc_entry, 0); + const arch_env_t *arch_env = be_get_irg_arch_env(irg); + ia32_irg_data_t *irg_data = ia32_get_irg_data(irg); + ir_node **blk_sched = irg_data->blk_sched; int i, n; - cg = ia32_cg; - isa = cg->isa; - do_pic = cg->birg->main_env->options->pic; + isa = (ia32_isa_t*) arch_env; + do_pic = be_get_irg_options(irg)->pic; be_gas_elf_type_char = '@'; ia32_register_emitters(); - get_unique_label(pic_base_label, sizeof(pic_base_label), ".PIC_BASE"); + get_unique_label(pic_base_label, sizeof(pic_base_label), "PIC_BASE"); - be_dbg_method_begin(entity, be_abi_get_stack_layout(cg->birg->abi)); + be_dbg_method_begin(entity); be_gas_emit_function_prolog(entity, ia32_cg_config.function_alignment); /* we use links to point to target blocks */ @@ -2258,16 +2173,16 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) irg_block_walk_graph(irg, ia32_gen_labels, NULL, &exc_list); /* initialize next block links */ - n = ARR_LEN(cg->blk_sched); + n = ARR_LEN(blk_sched); for (i = 0; i < n; ++i) { - ir_node *block = cg->blk_sched[i]; - ir_node *prev = i > 0 ? cg->blk_sched[i-1] : NULL; + ir_node *block = blk_sched[i]; + ir_node *prev = i > 0 ? blk_sched[i-1] : NULL; set_irn_link(block, prev); } for (i = 0; i < n; ++i) { - ir_node *block = cg->blk_sched[i]; + ir_node *block = blk_sched[i]; ia32_gen_block(block); } @@ -2283,14 +2198,14 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) Those are ascending with ascending addresses. */ qsort(exc_list, ARR_LEN(exc_list), sizeof(exc_list[0]), cmp_exc_entry); { - int i; + size_t i; for (i = 0; i < ARR_LEN(exc_list); ++i) { be_emit_cstring("\t.long "); ia32_emit_exc_label(exc_list[i].exc_instr); be_emit_char('\n'); be_emit_cstring("\t.long "); - ia32_emit_block_name(exc_list[i].block); + be_gas_emit_block_name(exc_list[i].block); be_emit_char('\n'); } } @@ -2312,14 +2227,14 @@ static unsigned char pnc_map_unsigned[8]; static void build_reg_map(void) { - reg_gp_map[REG_EAX] = 0x0; - reg_gp_map[REG_ECX] = 0x1; - reg_gp_map[REG_EDX] = 0x2; - reg_gp_map[REG_EBX] = 0x3; - reg_gp_map[REG_ESP] = 0x4; - reg_gp_map[REG_EBP] = 0x5; - reg_gp_map[REG_ESI] = 0x6; - reg_gp_map[REG_EDI] = 0x7; + reg_gp_map[REG_GP_EAX] = 0x0; + reg_gp_map[REG_GP_ECX] = 0x1; + reg_gp_map[REG_GP_EDX] = 0x2; + reg_gp_map[REG_GP_EBX] = 0x3; + reg_gp_map[REG_GP_ESP] = 0x4; + reg_gp_map[REG_GP_EBP] = 0x5; + reg_gp_map[REG_GP_ESI] = 0x6; + reg_gp_map[REG_GP_EDI] = 0x7; pnc_map_signed[pn_Cmp_Eq] = 0x04; pnc_map_signed[pn_Cmp_Lt] = 0x0C; @@ -2415,11 +2330,10 @@ static void bemit_entity(ir_entity *entity, bool entity_sign, int offset, be_emit_cstring("\t.long "); if (entity_sign) be_emit_char('-'); - set_entity_backend_marked(entity, 1); be_gas_emit_entity(entity); if (get_entity_owner(entity) == get_tls_type()) { - if (get_entity_linkage(entity) & IR_LINKAGE_EXTERN) { + if (get_entity_visibility(entity) == ir_visibility_external) { be_emit_cstring("@INDNTPOFF"); } else { be_emit_cstring("@NTPOFF"); @@ -2441,7 +2355,7 @@ static void bemit_entity(ir_entity *entity, bool entity_sign, int offset, static void bemit_jmp_destination(const ir_node *dest_block) { be_emit_cstring("\t.long "); - ia32_emit_block_name(dest_block); + be_gas_emit_block_name(dest_block); be_emit_cstring(" - . - 4\n"); be_emit_write_line(); } @@ -2644,7 +2558,7 @@ static void bemit_binop_with_imm( bemit_mod_am(ruval, node); } else { const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left); - if (reg->index == REG_EAX) { + if (reg->index == REG_GP_EAX) { bemit8(opcode_ax); } else { bemit8(opcode); @@ -2725,7 +2639,7 @@ static void bemit_copy(const ir_node *copy) const arch_register_t *in = get_in_reg(copy, 0); const arch_register_t *out = get_out_reg(copy, 0); - if (in == out || is_unknown_reg(in)) + if (in == out) return; /* copies of vf nodes aren't real... */ if (arch_register_get_class(in) == &ia32_reg_classes[CLASS_ia32_vfp]) @@ -2749,9 +2663,9 @@ static void bemit_perm(const ir_node *node) assert(cls0 == arch_register_get_class(in1) && "Register class mismatch at Perm"); if (cls0 == &ia32_reg_classes[CLASS_ia32_gp]) { - if (in0->index == REG_EAX) { + if (in0->index == REG_GP_EAX) { bemit8(0x90 + reg_gp_map[in1->index]); - } else if (in1->index == REG_EAX) { + } else if (in1->index == REG_GP_EAX) { bemit8(0x90 + reg_gp_map[in0->index]); } else { bemit8(0x87); @@ -2961,8 +2875,8 @@ static void bemit_setcc(const ir_node *node) { const arch_register_t *dreg = get_out_reg(node, pn_ia32_Setcc_res); - pn_Cmp pnc = get_ia32_condcode(node); - pnc = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc); + int pnc = get_ia32_condcode(node); + pnc = determine_final_pnc(node, n_ia32_Setcc_eflags, pnc); if (pnc & ia32_pn_Cmp_float) { switch (pnc & 0x0f) { case pn_Cmp_Uo: @@ -3030,7 +2944,7 @@ static void bemit_cmovcc(const ir_node *node) const ia32_attr_t *attr = get_ia32_attr_const(node); int ins_permuted = attr->data.ins_permuted; const arch_register_t *out = arch_irn_get_register(node, pn_ia32_res); - pn_Cmp pnc = get_ia32_condcode(node); + int pnc = get_ia32_condcode(node); const arch_register_t *in_true; const arch_register_t *in_false; @@ -3108,7 +3022,7 @@ static void bemit_cmp(const ir_node *node) bemit_mod_am(7, node); } else { const arch_register_t *reg = get_in_reg(node, n_ia32_binary_left); - if (reg->index == REG_EAX) { + if (reg->index == REG_GP_EAX) { bemit8(0x3D); } else { bemit8(0x81); @@ -3141,7 +3055,7 @@ static void bemit_cmp8bit(const ir_node *node) if (is_ia32_Immediate(right)) { if (get_ia32_op_type(node) == ia32_Normal) { const arch_register_t *out = get_in_reg(node, n_ia32_Cmp_left); - if (out->index == REG_EAX) { + if (out->index == REG_GP_EAX) { bemit8(0x3C); } else { bemit8(0x80); @@ -3170,7 +3084,7 @@ static void bemit_test8bit(const ir_node *node) if (is_ia32_Immediate(right)) { if (get_ia32_op_type(node) == ia32_Normal) { const arch_register_t *out = get_in_reg(node, n_ia32_Test8Bit_left); - if (out->index == REG_EAX) { + if (out->index == REG_GP_EAX) { bemit8(0xA8); } else { bemit8(0xF6); @@ -3240,7 +3154,7 @@ static void bemit_ldtls(const ir_node *node) const arch_register_t *out = get_out_reg(node, 0); bemit8(0x65); // gs: - if (out->index == REG_EAX) { + if (out->index == REG_GP_EAX) { bemit8(0xA1); // movl 0, %eax } else { bemit8(0x8B); // movl 0, %reg @@ -3291,9 +3205,9 @@ static void bemit_helper_sbb(const arch_register_t *src, const arch_register_t * /* helper function for bemit_minus64bit */ static void bemit_helper_xchg(const arch_register_t *src, const arch_register_t *dst) { - if (src->index == REG_EAX) { + if (src->index == REG_GP_EAX) { bemit8(0x90 + reg_gp_map[dst->index]); // xchgl %eax, %dst - } else if (dst->index == REG_EAX) { + } else if (dst->index == REG_GP_EAX) { bemit8(0x90 + reg_gp_map[src->index]); // xchgl %src, %eax } else { bemit8(0x87); // xchgl %src, %dst @@ -3401,7 +3315,7 @@ static void bemit_load(const ir_node *node) { const arch_register_t *out = get_out_reg(node, 0); - if (out->index == REG_EAX) { + if (out->index == REG_GP_EAX) { ir_node *base = get_irn_n(node, n_ia32_base); int has_base = !is_ia32_NoReg_GP(base); ir_node *index = get_irn_n(node, n_ia32_index); @@ -3446,7 +3360,7 @@ static void bemit_store(const ir_node *node) } else { const arch_register_t *in = get_in_reg(node, n_ia32_Store_val); - if (in->index == REG_EAX) { + if (in->index == REG_GP_EAX) { ir_node *base = get_irn_n(node, n_ia32_base); int has_base = !is_ia32_NoReg_GP(base); ir_node *index = get_irn_n(node, n_ia32_index); @@ -4305,13 +4219,15 @@ static void gen_binary_block(ir_node *block) } } -void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) +void ia32_gen_binary_routine(ir_graph *irg) { - ir_entity *entity = get_irg_entity(irg); - int i, n; + ir_entity *entity = get_irg_entity(irg); + const arch_env_t *arch_env = be_get_irg_arch_env(irg); + ia32_irg_data_t *irg_data = ia32_get_irg_data(irg); + ir_node **blk_sched = irg_data->blk_sched; + size_t i, n; - cg = ia32_cg; - isa = cg->isa; + isa = (ia32_isa_t*) arch_env; ia32_register_binary_emitters(); @@ -4322,16 +4238,16 @@ void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) irg_block_walk_graph(irg, ia32_gen_labels, NULL, NULL); /* initialize next block links */ - n = ARR_LEN(cg->blk_sched); + n = ARR_LEN(blk_sched); for (i = 0; i < n; ++i) { - ir_node *block = cg->blk_sched[i]; - ir_node *prev = i > 0 ? cg->blk_sched[i-1] : NULL; + ir_node *block = blk_sched[i]; + ir_node *prev = i > 0 ? blk_sched[i-1] : NULL; set_irn_link(block, prev); } for (i = 0; i < n; ++i) { - ir_node *block = cg->blk_sched[i]; + ir_node *block = blk_sched[i]; gen_binary_block(block); } @@ -4344,8 +4260,6 @@ void ia32_gen_binary_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) } - - void ia32_init_emitter(void) { lc_opt_entry_t *be_grp;