X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbegnuas.c;h=6c2165bb1f0f28c53e016db398f44a26e7c7f21c;hb=f4069627a10d7c5d0ae49f184117cf6e23bfada0;hp=2aff928e7bca811f138d18766794d0cb79bdd8f1;hpb=5416fa0f45a541db5690b398d42a910889189b42;p=libfirm diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c index 2aff928e7..6c2165bb1 100644 --- a/ir/be/begnuas.c +++ b/ir/be/begnuas.c @@ -39,6 +39,7 @@ #include "irprog.h" #include "entity_t.h" #include "error.h" +#include "util.h" #include "be_t.h" #include "beemitter.h" @@ -57,7 +58,7 @@ static be_gas_section_t current_section = (be_gas_section_t) -1; * write it to the disk. This is an artifact from the old C-generating backend * and even there NOT needed. So we might change it in the future. */ -typedef struct _be_gas_decl_env { +typedef struct be_gas_decl_env { be_gas_section_t section; const be_main_env_t *main_env; } be_gas_decl_env_t; @@ -119,7 +120,7 @@ static void emit_section_sparc(be_gas_section_t section, const ir_entity *entity /* Part1: section-name */ if (flags & GAS_SECTION_FLAG_TLS) be_emit_char('t'); - assert(base < sizeof(basename)/sizeof(basename[0])); + assert(base < (be_gas_section_t)ARRAY_SIZE(basename)); be_emit_string(basename[base]); if (flags & GAS_SECTION_FLAG_COMDAT) { @@ -198,7 +199,7 @@ static void emit_section(be_gas_section_t section, const ir_entity *entity) } } - assert(base < sizeof(basename)/sizeof(basename[0])); + assert(base < (be_gas_section_t) ARRAY_SIZE(basename)); be_emit_cstring("\t.section\t."); /* section name */ if (flags & GAS_SECTION_FLAG_TLS) @@ -248,7 +249,7 @@ void be_gas_emit_switch_section(be_gas_section_t section) emit_section(section, NULL); } -static tarval *get_initializer_tarval(const ir_initializer_t *initializer) +static ir_tarval *get_initializer_tarval(const ir_initializer_t *initializer) { if (initializer->kind == IR_INITIALIZER_TARVAL) return initializer->tarval.value; @@ -261,40 +262,40 @@ static tarval *get_initializer_tarval(const ir_initializer_t *initializer) return get_tarval_undefined(); } -static int initializer_is_string_const(const ir_initializer_t *initializer) +static bool initializer_is_string_const(const ir_initializer_t *initializer) { size_t i, len; - int found_printable = 0; + bool found_printable = false; if (initializer->kind != IR_INITIALIZER_COMPOUND) - return 0; + return false; len = initializer->compound.n_initializers; if (len < 1) - return 0; + return false; for (i = 0; i < len; ++i) { int c; - tarval *tv; + ir_tarval *tv; ir_mode *mode; ir_initializer_t *sub_initializer = initializer->compound.initializers[i]; tv = get_initializer_tarval(sub_initializer); if (!tarval_is_constant(tv)) - return 0; + return false; mode = get_tarval_mode(tv); if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) - return 0; + return false; c = get_tarval_long(tv); if (isgraph(c) || isspace(c)) - found_printable = 1; + found_printable = true; else if (c != 0) - return 0; + return false; if (i == len - 1 && c != '\0') - return 0; + return false; } return found_printable; @@ -306,7 +307,7 @@ static bool initializer_is_null(const ir_initializer_t *initializer) case IR_INITIALIZER_NULL: return true; case IR_INITIALIZER_TARVAL: { - tarval *tv = initializer->tarval.value; + ir_tarval *tv = initializer->tarval.value; return tarval_is_null(tv); } case IR_INITIALIZER_CONST: { @@ -488,7 +489,8 @@ static void emit_visibility(const ir_entity *entity) } if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O - && (linkage & IR_LINKAGE_HIDDEN_USER)) { + && (linkage & IR_LINKAGE_HIDDEN_USER) + && get_entity_ld_name(entity)[0] != '\0') { be_emit_cstring("\t.no_dead_strip "); be_gas_emit_entity(entity); be_emit_char('\n'); @@ -575,7 +577,7 @@ void be_gas_emit_function_epilog(const ir_entity *entity) * @param tv the tarval * @param bytes the width of the tarvals value in bytes */ -static void emit_arith_tarval(tarval *tv, int bytes) +static void emit_arith_tarval(ir_tarval *tv, int bytes) { switch (bytes) { case 1: @@ -651,7 +653,7 @@ const char *be_gas_insn_label_prefix(void) * * @return the tarval */ -static tarval *get_atomic_init_tv(ir_node *init) +static ir_tarval *get_atomic_init_tv(ir_node *init) { for (;;) { ir_mode *mode = get_irn_mode(init); @@ -703,7 +705,7 @@ static void do_emit_atomic_init(be_gas_decl_env_t *env, ir_node *init) { ir_mode *mode = get_irn_mode(init); int bytes = get_mode_size_bytes(mode); - tarval *tv; + ir_tarval *tv; ir_entity *ent; init = skip_Id(init); @@ -898,7 +900,7 @@ static void emit_string_cst(const ir_entity *ent) } } -static void emit_string_initializer(const ir_initializer_t *initializer) +static size_t emit_string_initializer(const ir_initializer_t *initializer) { size_t i, len; @@ -914,8 +916,8 @@ static void emit_string_initializer(const ir_initializer_t *initializer) const ir_initializer_t *sub_initializer = get_initializer_compound_value(initializer, i); - tarval *tv = get_initializer_tarval(sub_initializer); - int c = get_tarval_long(tv); + ir_tarval *tv = get_initializer_tarval(sub_initializer); + int c = get_tarval_long(tv); switch (c) { case '"' : be_emit_cstring("\\\""); break; @@ -933,20 +935,24 @@ static void emit_string_initializer(const ir_initializer_t *initializer) } be_emit_cstring("\"\n"); be_emit_write_line(); + + return initializer->compound.n_initializers; } -enum normal_or_bitfield_kind { +typedef enum normal_or_bitfield_kind { NORMAL = 0, TARVAL, + STRING, BITFIELD -}; +} normal_or_bitfield_kind; typedef struct { - enum normal_or_bitfield_kind kind; + normal_or_bitfield_kind kind; union { - ir_node *value; - tarval *tarval; - unsigned char bf_val; + ir_node *value; + ir_tarval *tarval; + unsigned char bf_val; + const ir_initializer_t *string; } v; } normal_or_bitfield; @@ -1004,12 +1010,13 @@ static size_t max_vals; static void emit_bitfield(normal_or_bitfield *vals, size_t offset_bits, const ir_initializer_t *initializer, ir_type *type) { - unsigned char last_bits = 0; - ir_mode *mode = get_type_mode(type); - tarval *tv = NULL; - unsigned char curr_bits; - int value_len; - int j; + static const size_t BITS_PER_BYTE = 8; + ir_mode *mode = get_type_mode(type); + ir_tarval *tv = NULL; + int value_len; + size_t bit_offset; + size_t end; + bool big_endian = be_get_backend_param()->byte_order_big_endian; switch (get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: @@ -1033,22 +1040,41 @@ static void emit_bitfield(normal_or_bitfield *vals, size_t offset_bits, } tv = tarval_convert_to(tv, get_type_mode(type)); - /* normalize offset */ - vals += offset_bits >> 3; - offset_bits &= 7; - value_len = get_mode_size_bits(mode); - - /* combine bits with existing bits */ - for (j = 0; value_len + (int) offset_bits > 0; ++j) { - assert((size_t) (vals - glob_vals) + j < max_vals); - assert(vals[j].kind == BITFIELD || - (vals[j].kind == NORMAL && vals[j].v.value == NULL)); - vals[j].kind = BITFIELD; - curr_bits = get_tarval_sub_bits(tv, j); - vals[j].v.bf_val - |= (last_bits >> (8 - offset_bits)) | (curr_bits << offset_bits); - value_len -= 8; - last_bits = curr_bits; + value_len = get_type_size_bytes(get_primitive_base_type(type)); + bit_offset = 0; + end = get_mode_size_bits(mode); + while (bit_offset < end) { + size_t src_offset = bit_offset / BITS_PER_BYTE; + size_t src_offset_bits = bit_offset % BITS_PER_BYTE; + size_t dst_offset = (bit_offset+offset_bits) / BITS_PER_BYTE; + size_t dst_offset_bits = (bit_offset+offset_bits) % BITS_PER_BYTE; + size_t src_bits_len = end-bit_offset; + size_t dst_bits_len = BITS_PER_BYTE-dst_offset_bits; + unsigned char curr_bits; + normal_or_bitfield *val; + if (src_bits_len > dst_bits_len) + src_bits_len = dst_bits_len; + + if (big_endian) { + val = &vals[value_len - dst_offset - 1]; + } else { + val = &vals[dst_offset]; + } + + assert((val-glob_vals) < (ptrdiff_t) max_vals); + assert(val->kind == BITFIELD || + (val->kind == NORMAL && val->v.value == NULL)); + val->kind = BITFIELD; + curr_bits = get_tarval_sub_bits(tv, src_offset); + curr_bits = curr_bits >> src_offset_bits; + if (src_offset_bits + src_bits_len > 8) { + unsigned next_bits = get_tarval_sub_bits(tv, src_offset+1); + curr_bits |= next_bits << (8 - src_offset_bits); + } + curr_bits &= (1 << src_bits_len) - 1; + val->v.bf_val |= curr_bits << dst_offset_bits; + + bit_offset += dst_bits_len; } } @@ -1058,6 +1084,13 @@ static void emit_ir_initializer(normal_or_bitfield *vals, { assert((size_t) (vals - glob_vals) < max_vals); + if (initializer_is_string_const(initializer)) { + assert(vals->kind != BITFIELD); + vals->kind = STRING; + vals->v.string = initializer; + return; + } + switch (get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: return; @@ -1125,11 +1158,12 @@ static void emit_ir_initializer(normal_or_bitfield *vals, if (mode != NULL) { size_t offset_bits = get_entity_offset_bits_remainder(member); - size_t value_len = get_mode_size_bits(mode); + size_t value_len = get_mode_size_bits(mode); if (offset_bits != 0 || (value_len != 8 && value_len != 16 && value_len != 32 - && value_len != 64)) { + && value_len != 64) || + (is_Primitive_type(subtype) && get_primitive_base_type(subtype) != NULL)) { emit_bitfield(&vals[offset], offset_bits, sub_initializer, subtype); continue; @@ -1180,18 +1214,21 @@ static void emit_initializer(be_gas_decl_env_t *env, const ir_entity *entity) /* now write values sorted */ for (k = 0; k < size; ) { - int space = 0; - int elem_size = 1; - if (vals[k].kind == NORMAL) { + int space = 0; + int elem_size = 1; + normal_or_bitfield_kind kind = vals[k].kind; + switch (kind) { + case NORMAL: if (vals[k].v.value != NULL) { emit_atomic_init(env, vals[k].v.value); elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value)); - } else { - elem_size = 0; - } - } else if (vals[k].kind == TARVAL) { - tarval *tv = vals[k].v.tarval; - size_t size = get_mode_size_bytes(get_tarval_mode(tv)); + } else { + elem_size = 0; + } + break; + case TARVAL: { + ir_tarval *tv = vals[k].v.tarval; + size_t size = get_mode_size_bytes(get_tarval_mode(tv)); assert(tv != NULL); @@ -1200,10 +1237,15 @@ static void emit_initializer(be_gas_decl_env_t *env, const ir_entity *entity) emit_arith_tarval(tv, size); be_emit_char('\n'); be_emit_write_line(); - } else { - assert(vals[k].kind == BITFIELD); + break; + } + case STRING: + elem_size = emit_string_initializer(vals[k].v.string); + break; + case BITFIELD: be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val); be_emit_write_line(); + break; } k += elem_size; @@ -1269,7 +1311,7 @@ static void emit_compound_graph_init(be_gas_decl_env_t *env, if (offset_bits != 0 || (value_len != 8 && value_len != 16 && value_len != 32 && value_len != 64)) { - tarval *tv = get_atomic_init_tv(value); + ir_tarval *tv = get_atomic_init_tv(value); unsigned char curr_bits, last_bits = 0; if (tv == NULL) { panic("Couldn't get numeric value for bitfield initializer '%s'", @@ -1502,8 +1544,6 @@ static void emit_global(be_gas_decl_env_t *env, const ir_entity *entity) be_dbg_variable(entity); if (section == GAS_SECTION_BSS) { - ir_visibility visibility = get_entity_visibility(entity); - switch (visibility) { case ir_visibility_local: case ir_visibility_private: @@ -1544,7 +1584,8 @@ static void emit_global(be_gas_decl_env_t *env, const ir_entity *entity) emit_align(alignment); } if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF - && be_gas_emit_types) { + && be_gas_emit_types + && visibility != ir_visibility_private) { be_emit_cstring("\t.type\t"); be_gas_emit_entity(entity); be_emit_cstring(", ");