X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fconfig%2Fdarwin.c;h=541b772a7a462d955fb0f2987bee323247a88958;hp=c20bc0e137cac4e17a73150567e64082e2d77015;hb=f13da317dd6b47dda5beac471ffe04cad10c06d3;hpb=0c44645a33ebe29725c31bc36e42aaf5197e82b9 diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index c20bc0e137c..541b772a7a4 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "config.h" #include "system.h" @@ -43,7 +43,7 @@ Boston, MA 02111-1307, USA. */ #include "langhooks.h" #include "target.h" #include "tm_p.h" -#include "errors.h" +#include "toplev.h" #include "hashtab.h" /* Darwin supports a feature called fix-and-continue, which is used @@ -53,29 +53,97 @@ Boston, MA 02111-1307, USA. */ able to do easily. These changes allow gdb to load in recompilation of a translation unit that has been changed into a running program and replace existing functions and methods of that - translation unit with with versions of those functions and methods + translation unit with versions of those functions and methods from the newly compiled translation unit. The new functions access - the existing static data from the old translation unit, if the data - existed in the unit to be replaced, and from the new translation - unit, for new data. + the existing static symbols from the old translation unit, if the + symbol existed in the unit to be replaced, and from the new + translation unit, otherwise. The changes are to insert 5 nops at the beginning of all functions - and to use indirection to get at static duration data. The 5 nops + and to use indirection to get at static symbols. The 5 nops are required by consumers of the generated code. Currently, gdb uses this to patch in a jump to the overriding function, this allows all uses of the old name to forward to the replacement, including existing function pointers and virtual methods. See rs6000_emit_prologue for the code that handles the nop insertions. - + The added indirection allows gdb to redirect accesses to static - duration data from the newly loaded translation unit to the - existing data, if any. @code{static} data is special and is - handled by setting the second word in the .non_lazy_symbol_pointer - data structure to the address of the data. See indirect_data for - the code that handles the extra indirection, and - machopic_output_indirection and its use of MACHO_SYMBOL_STATIC for - the code that handles @code{static} data indirection. */ + symbols from the newly loaded translation unit to the existing + symbol, if any. @code{static} symbols are special and are handled by + setting the second word in the .non_lazy_symbol_pointer data + structure to symbol. See indirect_data for the code that handles + the extra indirection, and machopic_output_indirection and its use + of MACHO_SYMBOL_STATIC for the code that handles @code{static} + symbol indirection. */ + +/* Section names. */ +section * darwin_sections[NUM_DARWIN_SECTIONS]; + +/* True if we're setting __attribute__ ((ms_struct)). */ +int darwin_ms_struct = false; + +/* A get_unnamed_section callback used to switch to an ObjC section. + DIRECTIVE is as for output_section_asm_op. */ + +static void +output_objc_section_asm_op (const void *directive) +{ + static bool been_here = false; + + if (! been_here) + { + static const enum darwin_section_enum tomark[] = + { + /* written, cold -> hot */ + objc_cat_cls_meth_section, + objc_cat_inst_meth_section, + objc_string_object_section, + objc_constant_string_object_section, + objc_selector_refs_section, + objc_selector_fixup_section, + objc_cls_refs_section, + objc_class_section, + objc_meta_class_section, + /* shared, hot -> cold */ + objc_cls_meth_section, + objc_inst_meth_section, + objc_protocol_section, + objc_class_names_section, + objc_meth_var_types_section, + objc_meth_var_names_section, + objc_category_section, + objc_class_vars_section, + objc_instance_vars_section, + objc_module_info_section, + objc_symbols_section + }; + size_t i; + + been_here = true; + for (i = 0; i < ARRAY_SIZE (tomark); i++) + switch_to_section (darwin_sections[tomark[i]]); + } + output_section_asm_op (directive); +} +/* Implement TARGET_ASM_INIT_SECTIONS. */ + +void +darwin_init_sections (void) +{ +#define DEF_SECTION(NAME, FLAGS, DIRECTIVE, OBJC) \ + darwin_sections[NAME] = \ + get_unnamed_section (FLAGS, (OBJC \ + ? output_objc_section_asm_op \ + : output_section_asm_op), \ + "\t" DIRECTIVE); +#include "config/darwin-sections.def" +#undef DEF_SECTION + + readonly_data_section = darwin_sections[const_section]; + exception_section = darwin_sections[darwin_exception_section]; + eh_frame_section = darwin_sections[darwin_eh_frame_section]; +} int name_needs_quotes (const char *name) @@ -125,10 +193,10 @@ machopic_classify_symbol (rtx sym_ref) flags = SYMBOL_REF_FLAGS (sym_ref); function_p = SYMBOL_REF_FUNCTION_P (sym_ref); if (machopic_symbol_defined_p (sym_ref)) - return (function_p + return (function_p ? MACHOPIC_DEFINED_FUNCTION : MACHOPIC_DEFINED_DATA); else - return (function_p + return (function_p ? MACHOPIC_UNDEFINED_FUNCTION : MACHOPIC_UNDEFINED_DATA); } @@ -191,8 +259,8 @@ void machopic_define_symbol (rtx mem) { rtx sym_ref; - if (GET_CODE (mem) != MEM) - abort (); + + gcc_assert (GET_CODE (mem) == MEM); sym_ref = XEXP (mem, 0); SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_DEFINED; } @@ -203,8 +271,7 @@ const char * machopic_function_base_name (void) { /* if dynamic-no-pic is on, we should not get here */ - if (MACHO_DYNAMIC_NO_PIC_P) - abort (); + gcc_assert (!MACHO_DYNAMIC_NO_PIC_P); if (function_base == NULL) function_base = @@ -223,11 +290,22 @@ machopic_function_base_sym (void) rtx sym_ref; sym_ref = gen_rtx_SYMBOL_REF (Pmode, machopic_function_base_name ()); - SYMBOL_REF_FLAGS (sym_ref) + SYMBOL_REF_FLAGS (sym_ref) |= (MACHO_SYMBOL_FLAG_VARIABLE | MACHO_SYMBOL_FLAG_DEFINED); return sym_ref; } +/* Return either ORIG or (const:P (minus:P ORIG PIC_BASE)), depending + on whether pic_base is NULL or not. */ +static inline rtx +gen_pic_offset (rtx orig, rtx pic_base) +{ + if (!pic_base) + return orig; + else + return gen_rtx_CONST (Pmode, gen_rtx_MINUS (Pmode, orig, pic_base)); +} + static GTY(()) const char * function_base_func_name; static GTY(()) int current_pic_label_num; @@ -237,8 +315,7 @@ machopic_output_function_base_name (FILE *file) const char *current_name; /* If dynamic-no-pic is on, we should not get here. */ - if (MACHO_DYNAMIC_NO_PIC_P) - abort (); + gcc_assert (!MACHO_DYNAMIC_NO_PIC_P); current_name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)); if (function_base_func_name != current_name) @@ -270,7 +347,7 @@ typedef struct machopic_indirection GTY (()) /* A table mapping stub names and non-lazy pointer names to SYMBOL_REFs for the stubbed-to and pointed-to entities. */ -static GTY ((param_is (struct machopic_indirection))) htab_t +static GTY ((param_is (struct machopic_indirection))) htab_t machopic_indirections; /* Return a hash value for a SLOT in the indirections hash table. */ @@ -302,50 +379,62 @@ machopic_indirection_name (rtx sym_ref, bool stub_p) size_t namelen = strlen (name); machopic_indirection *p; void ** slot; - - /* Construct the name of the non-lazy pointer or stub. */ - if (stub_p) + bool saw_star = false; + bool needs_quotes; + const char *suffix; + const char *prefix = user_label_prefix; + const char *quote = ""; + tree id; + + id = maybe_get_identifier (name); + if (id) { - int needs_quotes = name_needs_quotes (name); - buffer = alloca (strlen ("&L") - + namelen - + strlen (STUB_SUFFIX) - + 2 /* possible quotes */ - + 1 /* '\0' */); - - if (needs_quotes) + tree id_orig = id; + + while (IDENTIFIER_TRANSPARENT_ALIAS (id)) + id = TREE_CHAIN (id); + if (id != id_orig) { - if (name[0] == '*') - sprintf (buffer, "&\"L%s" STUB_SUFFIX "\"", name + 1); - else - sprintf (buffer, "&\"L%s%s" STUB_SUFFIX "\"", user_label_prefix, - name); + name = IDENTIFIER_POINTER (id); + namelen = strlen (name); } - else if (name[0] == '*') - sprintf (buffer, "&L%s" STUB_SUFFIX, name + 1); - else - sprintf (buffer, "&L%s%s" STUB_SUFFIX, user_label_prefix, name); } - else + + if (name[0] == '*') { - buffer = alloca (strlen ("&L") - + strlen (user_label_prefix) - + namelen - + strlen (NON_LAZY_POINTER_SUFFIX) - + 1 /* '\0' */); - if (name[0] == '*') - sprintf (buffer, "&L%s" NON_LAZY_POINTER_SUFFIX, name + 1); - else - sprintf (buffer, "&L%s%s" NON_LAZY_POINTER_SUFFIX, - user_label_prefix, name); + saw_star = true; + prefix = ""; + ++name; + --namelen; } + needs_quotes = name_needs_quotes (name); + if (needs_quotes) + { + quote = "\""; + } + + if (stub_p) + suffix = STUB_SUFFIX; + else + suffix = NON_LAZY_POINTER_SUFFIX; + + buffer = alloca (strlen ("&L") + + strlen (prefix) + + namelen + + strlen (suffix) + + 2 * strlen (quote) + + 1 /* '\0' */); + + /* Construct the name of the non-lazy pointer or stub. */ + sprintf (buffer, "&%sL%s%s%s%s", quote, prefix, name, suffix, quote); + if (!machopic_indirections) - machopic_indirections = htab_create_ggc (37, + machopic_indirections = htab_create_ggc (37, machopic_indirection_hash, machopic_indirection_eq, /*htab_del=*/NULL); - + slot = htab_find_slot_with_hash (machopic_indirections, buffer, htab_hash_string (buffer), INSERT); if (*slot) @@ -361,7 +450,7 @@ machopic_indirection_name (rtx sym_ref, bool stub_p) p->used = false; *slot = p; } - + return p->ptr_name; } @@ -383,15 +472,15 @@ void machopic_validate_stub_or_non_lazy_ptr (const char *name) { machopic_indirection *p; - - p = ((machopic_indirection *) + + p = ((machopic_indirection *) (htab_find_with_hash (machopic_indirections, name, htab_hash_string (name)))); if (p && ! p->used) { const char *real_name; tree id; - + p->used = true; /* Do what output_addr_const will do when we actually call it. */ @@ -399,7 +488,7 @@ machopic_validate_stub_or_non_lazy_ptr (const char *name) mark_decl_referenced (SYMBOL_REF_DECL (p->symbol)); real_name = targetm.strip_name_encoding (XSTR (p->symbol, 0)); - + id = maybe_get_identifier (real_name); if (id) mark_referenced (id); @@ -424,11 +513,13 @@ machopic_indirect_data_reference (rtx orig, rtx reg) if (defined && MACHO_DYNAMIC_NO_PIC_P) { #if defined (TARGET_TOC) - emit_insn (gen_macho_high (reg, orig)); - emit_insn (gen_macho_low (reg, reg, orig)); + /* Create a new register for CSE opportunities. */ + rtx hi_reg = (no_new_pseudos ? reg : gen_reg_rtx (Pmode)); + emit_insn (gen_macho_high (hi_reg, orig)); + emit_insn (gen_macho_low (reg, hi_reg, orig)); #else /* some other cpu -- writeme! */ - abort (); + gcc_unreachable (); #endif return reg; } @@ -436,15 +527,13 @@ machopic_indirect_data_reference (rtx orig, rtx reg) { #if defined (TARGET_TOC) || defined (HAVE_lo_sum) rtx pic_base = machopic_function_base_sym (); - rtx offset = gen_rtx_CONST (Pmode, - gen_rtx_MINUS (Pmode, orig, pic_base)); + rtx offset = gen_pic_offset (orig, pic_base); #endif #if defined (TARGET_TOC) /* i.e., PowerPC */ rtx hi_sum_reg = (no_new_pseudos ? reg : gen_reg_rtx (Pmode)); - if (reg == NULL) - abort (); + gcc_assert (reg); emit_insn (gen_rtx_SET (Pmode, hi_sum_reg, gen_rtx_PLUS (Pmode, pic_offset_table_rtx, @@ -455,7 +544,7 @@ machopic_indirect_data_reference (rtx orig, rtx reg) orig = reg; #else #if defined (HAVE_lo_sum) - if (reg == 0) abort (); + gcc_assert (reg); emit_insn (gen_rtx_SET (VOIDmode, reg, gen_rtx_HIGH (Pmode, offset))); @@ -470,10 +559,10 @@ machopic_indirect_data_reference (rtx orig, rtx reg) } ptr_ref = (gen_rtx_SYMBOL_REF - (Pmode, + (Pmode, machopic_indirection_name (orig, /*stub_p=*/false))); - SYMBOL_REF_DECL (ptr_ref) = SYMBOL_REF_DECL (orig); + SYMBOL_REF_DATA (ptr_ref) = SYMBOL_REF_DATA (orig); ptr_ref = gen_const_mem (Pmode, ptr_ref); machopic_define_symbol (ptr_ref); @@ -547,19 +636,18 @@ machopic_indirect_call_target (rtx target) if (GET_CODE (target) != MEM) return target; - if (MACHOPIC_INDIRECT + if (MACHOPIC_INDIRECT && GET_CODE (XEXP (target, 0)) == SYMBOL_REF && !(SYMBOL_REF_FLAGS (XEXP (target, 0)) & MACHO_SYMBOL_FLAG_DEFINED)) { rtx sym_ref = XEXP (target, 0); - const char *stub_name = machopic_indirection_name (sym_ref, + const char *stub_name = machopic_indirection_name (sym_ref, /*stub_p=*/true); enum machine_mode mode = GET_MODE (sym_ref); - tree decl = SYMBOL_REF_DECL (sym_ref); - + XEXP (target, 0) = gen_rtx_SYMBOL_REF (mode, stub_name); - SYMBOL_REF_DECL (XEXP (target, 0)) = decl; + SYMBOL_REF_DATA (XEXP (target, 0)) = SYMBOL_REF_DATA (sym_ref); MEM_READONLY_P (target) = 1; MEM_NOTRAP_P (target) = 1; } @@ -595,9 +683,9 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) return reg; } - /* if dynamic-no-pic then use 0 as the pic base */ + /* if dynamic-no-pic we don't have a pic base */ if (MACHO_DYNAMIC_NO_PIC_P) - pic_base = CONST0_RTX (Pmode); + pic_base = NULL; else pic_base = machopic_function_base_sym (); @@ -605,10 +693,8 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) { if (reg == 0) { - if (reload_in_progress) - abort (); - else - reg = gen_reg_rtx (Pmode); + gcc_assert (!reload_in_progress); + reg = gen_reg_rtx (Pmode); } #ifdef HAVE_lo_sum @@ -627,7 +713,7 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); #else /* Some other CPU -- WriteMe! but right now there are no other platform that can use dynamic-no-pic */ - abort (); + gcc_unreachable (); #endif pic_ref = reg; } @@ -635,10 +721,7 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) if (GET_CODE (XEXP (orig, 0)) == SYMBOL_REF || GET_CODE (XEXP (orig, 0)) == LABEL_REF) { - rtx offset = gen_rtx_CONST (Pmode, - gen_rtx_MINUS (Pmode, - XEXP (orig, 0), - pic_base)); + rtx offset = gen_pic_offset (XEXP (orig, 0), pic_base); #if defined (TARGET_TOC) /* i.e., PowerPC */ /* Generating a new reg may expose opportunities for common subexpression elimination. */ @@ -646,7 +729,7 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) rtx mem; rtx insn; rtx sum; - + sum = gen_rtx_HIGH (Pmode, offset); if (! MACHO_DYNAMIC_NO_PIC_P) sum = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, sum); @@ -654,21 +737,21 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) emit_insn (gen_rtx_SET (Pmode, hi_sum_reg, sum)); mem = gen_const_mem (GET_MODE (orig), - gen_rtx_LO_SUM (Pmode, + gen_rtx_LO_SUM (Pmode, hi_sum_reg, offset)); insn = emit_insn (gen_rtx_SET (VOIDmode, reg, mem)); - REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EQUAL, pic_ref, + REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EQUAL, pic_ref, REG_NOTES (insn)); pic_ref = reg; #else emit_insn (gen_rtx_USE (VOIDmode, - gen_rtx_REG (Pmode, + gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM))); emit_insn (gen_rtx_SET (VOIDmode, reg, gen_rtx_HIGH (Pmode, - gen_rtx_CONST (Pmode, + gen_rtx_CONST (Pmode, offset)))); emit_insn (gen_rtx_SET (VOIDmode, reg, gen_rtx_LO_SUM (Pmode, reg, @@ -688,16 +771,15 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) } #if 0 emit_insn (gen_rtx_USE (VOIDmode, - gen_rtx_REG (Pmode, + gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM))); #endif - pic_ref = gen_rtx_PLUS (Pmode, - pic, - gen_rtx_CONST (Pmode, - gen_rtx_MINUS (Pmode, - XEXP (orig, 0), - pic_base))); + if (reload_in_progress) + regs_ever_live[REGNO (pic)] = 1; + pic_ref = gen_rtx_PLUS (Pmode, pic, + gen_pic_offset (XEXP (orig, 0), + pic_base)); } #if !defined (TARGET_TOC) @@ -712,18 +794,14 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF) { - rtx offset = gen_rtx_CONST (Pmode, - gen_rtx_MINUS (Pmode, - orig, pic_base)); + rtx offset = gen_pic_offset (orig, pic_base); #if defined (TARGET_TOC) /* i.e., PowerPC */ rtx hi_sum_reg; if (reg == 0) { - if (reload_in_progress) - abort (); - else - reg = gen_reg_rtx (Pmode); + gcc_assert (!reload_in_progress); + reg = gen_reg_rtx (Pmode); } hi_sum_reg = reg; @@ -733,7 +811,7 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) ? gen_rtx_HIGH (Pmode, offset) : gen_rtx_PLUS (Pmode, pic_offset_table_rtx, - gen_rtx_HIGH (Pmode, + gen_rtx_HIGH (Pmode, offset)))); emit_insn (gen_rtx_SET (VOIDmode, reg, gen_rtx_LO_SUM (Pmode, @@ -768,11 +846,11 @@ machopic_legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg) emit_insn (gen_rtx_USE (VOIDmode, pic_offset_table_rtx)); #endif + if (reload_in_progress) + regs_ever_live[REGNO (pic)] = 1; pic_ref = gen_rtx_PLUS (Pmode, pic, - gen_rtx_CONST (Pmode, - gen_rtx_MINUS (Pmode, - orig, pic_base))); + gen_pic_offset (orig, pic_base)); } } } @@ -857,18 +935,30 @@ machopic_output_indirection (void **slot, void *data) rtx symbol; const char *sym_name; const char *ptr_name; - + if (!p->used) return 1; symbol = p->symbol; sym_name = XSTR (symbol, 0); ptr_name = p->ptr_name; - + if (p->stub_p) { char *sym; char *stub; + tree id; + + id = maybe_get_identifier (sym_name); + if (id) + { + tree id_orig = id; + + while (IDENTIFIER_TRANSPARENT_ALIAS (id)) + id = TREE_CHAIN (id); + if (id != id_orig) + sym_name = IDENTIFIER_POINTER (id); + } sym = alloca (strlen (sym_name) + 2); if (sym_name[0] == '*' || sym_name[0] == '&') @@ -890,7 +980,7 @@ machopic_output_indirection (void **slot, void *data) && (machopic_symbol_defined_p (symbol) || SYMBOL_REF_LOCAL_P (symbol))) { - data_section (); + switch_to_section (data_section); assemble_align (GET_MODE_ALIGNMENT (Pmode)); assemble_label (ptr_name); assemble_integer (gen_rtx_SYMBOL_REF (Pmode, sym_name), @@ -901,20 +991,20 @@ machopic_output_indirection (void **slot, void *data) { rtx init = const0_rtx; - machopic_nl_symbol_ptr_section (); + switch_to_section (darwin_sections[machopic_nl_symbol_ptr_section]); assemble_name (asm_out_file, ptr_name); fprintf (asm_out_file, ":\n"); - + fprintf (asm_out_file, "\t.indirect_symbol "); assemble_name (asm_out_file, sym_name); fprintf (asm_out_file, "\n"); - + /* Variables that are marked with MACHO_SYMBOL_STATIC need to have their symbol name instead of 0 in the second entry of the non-lazy symbol pointer data structure when they are defined. This allows the runtime to rebind newer instances of the translation unit with the original instance of the - data. */ + symbol. */ if ((SYMBOL_REF_FLAGS (symbol) & MACHO_SYMBOL_STATIC) && machopic_symbol_defined_p (symbol)) @@ -923,7 +1013,7 @@ machopic_output_indirection (void **slot, void *data) assemble_integer (init, GET_MODE_SIZE (Pmode), GET_MODE_ALIGNMENT (Pmode), 1); } - + return 1; } @@ -984,15 +1074,14 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED) if (!DECL_EXTERNAL (decl) && (!TREE_PUBLIC (decl) || !DECL_WEAK (decl)) + && ! lookup_attribute ("weakref", DECL_ATTRIBUTES (decl)) && ((TREE_STATIC (decl) && (!DECL_COMMON (decl) || !TREE_PUBLIC (decl))) || (!DECL_COMMON (decl) && DECL_INITIAL (decl) && DECL_INITIAL (decl) != error_mark_node))) SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_DEFINED; - if (TREE_CODE (decl) == VAR_DECL - && indirect_data (sym_ref) - && ! TREE_PUBLIC (decl)) + if (! TREE_PUBLIC (decl)) SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_STATIC; } @@ -1004,38 +1093,36 @@ darwin_mark_decl_preserved (const char *name) fputc ('\n', asm_out_file); } -void +section * machopic_select_section (tree exp, int reloc, unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED) { - void (*base_function)(void); - bool weak_p = DECL_P (exp) && DECL_WEAK (exp); - static void (* const base_funs[][2])(void) = { - { text_section, text_coal_section }, - { unlikely_text_section, text_unlikely_coal_section }, - { readonly_data_section, const_coal_section }, - { const_data_section, const_data_coal_section }, - { data_section, data_coal_section } - }; - - if (reloc == 0 - && (last_text_section == in_text_unlikely - || last_text_section == in_text_unlikely_coal)) - reloc = 1; - + section *base_section; + bool weak_p = (DECL_P (exp) && DECL_WEAK (exp) + && (lookup_attribute ("weak", DECL_ATTRIBUTES (exp)) + || ! lookup_attribute ("weak_import", + DECL_ATTRIBUTES (exp)))); + if (TREE_CODE (exp) == FUNCTION_DECL) - base_function = base_funs[reloc][weak_p]; + { + if (reloc == 1) + base_section = (weak_p + ? darwin_sections[text_unlikely_coal_section] + : unlikely_text_section ()); + else + base_section = weak_p ? darwin_sections[text_coal_section] : text_section; + } else if (decl_readonly_section_1 (exp, reloc, MACHOPIC_INDIRECT)) - base_function = base_funs[2][weak_p]; + base_section = weak_p ? darwin_sections[const_coal_section] : darwin_sections[const_section]; else if (TREE_READONLY (exp) || TREE_CONSTANT (exp)) - base_function = base_funs[3][weak_p]; + base_section = weak_p ? darwin_sections[const_data_coal_section] : darwin_sections[const_data_section]; else - base_function = base_funs[4][weak_p]; + base_section = weak_p ? darwin_sections[data_coal_section] : data_section; if (TREE_CODE (exp) == STRING_CST && ((size_t) TREE_STRING_LENGTH (exp) == strlen (TREE_STRING_POINTER (exp)) + 1)) - cstring_section (); + return darwin_sections[cstring_section]; else if ((TREE_CODE (exp) == INTEGER_CST || TREE_CODE (exp) == REAL_CST) && flag_merge_constants) { @@ -1044,13 +1131,13 @@ machopic_select_section (tree exp, int reloc, if (TREE_CODE (size) == INTEGER_CST && TREE_INT_CST_LOW (size) == 4 && TREE_INT_CST_HIGH (size) == 0) - literal4_section (); + return darwin_sections[literal4_section]; else if (TREE_CODE (size) == INTEGER_CST && TREE_INT_CST_LOW (size) == 8 && TREE_INT_CST_HIGH (size) == 0) - literal8_section (); + return darwin_sections[literal8_section]; else - base_function (); + return base_section; } else if (TREE_CODE (exp) == CONSTRUCTOR && TREE_TYPE (exp) @@ -1060,12 +1147,16 @@ machopic_select_section (tree exp, int reloc, tree name = TYPE_NAME (TREE_TYPE (exp)); if (TREE_CODE (name) == TYPE_DECL) name = DECL_NAME (name); - if (!strcmp (IDENTIFIER_POINTER (name), "NSConstantString")) - objc_constant_string_object_section (); - else if (!strcmp (IDENTIFIER_POINTER (name), "NXConstantString")) - objc_string_object_section (); + + if (!strcmp (IDENTIFIER_POINTER (name), "__builtin_ObjCString")) + { + if (flag_next_runtime) + return darwin_sections[objc_constant_string_object_section]; + else + return darwin_sections[objc_string_object_section]; + } else - base_function (); + return base_section; } else if (TREE_CODE (exp) == VAR_DECL && DECL_NAME (exp) && @@ -1076,111 +1167,89 @@ machopic_select_section (tree exp, int reloc, const char *name = IDENTIFIER_POINTER (DECL_NAME (exp)); if (!strncmp (name, "_OBJC_CLASS_METHODS_", 20)) - objc_cls_meth_section (); + return darwin_sections[objc_cls_meth_section]; else if (!strncmp (name, "_OBJC_INSTANCE_METHODS_", 23)) - objc_inst_meth_section (); + return darwin_sections[objc_inst_meth_section]; else if (!strncmp (name, "_OBJC_CATEGORY_CLASS_METHODS_", 20)) - objc_cat_cls_meth_section (); + return darwin_sections[objc_cat_cls_meth_section]; else if (!strncmp (name, "_OBJC_CATEGORY_INSTANCE_METHODS_", 23)) - objc_cat_inst_meth_section (); + return darwin_sections[objc_cat_inst_meth_section]; else if (!strncmp (name, "_OBJC_CLASS_VARIABLES_", 22)) - objc_class_vars_section (); + return darwin_sections[objc_class_vars_section]; else if (!strncmp (name, "_OBJC_INSTANCE_VARIABLES_", 25)) - objc_instance_vars_section (); + return darwin_sections[objc_instance_vars_section]; else if (!strncmp (name, "_OBJC_CLASS_PROTOCOLS_", 22)) - objc_cat_cls_meth_section (); + return darwin_sections[objc_cat_cls_meth_section]; else if (!strncmp (name, "_OBJC_CLASS_NAME_", 17)) - objc_class_names_section (); + return darwin_sections[objc_class_names_section]; else if (!strncmp (name, "_OBJC_METH_VAR_NAME_", 20)) - objc_meth_var_names_section (); + return darwin_sections[objc_meth_var_names_section]; else if (!strncmp (name, "_OBJC_METH_VAR_TYPE_", 20)) - objc_meth_var_types_section (); + return darwin_sections[objc_meth_var_types_section]; else if (!strncmp (name, "_OBJC_CLASS_REFERENCES", 22)) - objc_cls_refs_section (); + return darwin_sections[objc_cls_refs_section]; else if (!strncmp (name, "_OBJC_CLASS_", 12)) - objc_class_section (); + return darwin_sections[objc_class_section]; else if (!strncmp (name, "_OBJC_METACLASS_", 16)) - objc_meta_class_section (); + return darwin_sections[objc_meta_class_section]; else if (!strncmp (name, "_OBJC_CATEGORY_", 15)) - objc_category_section (); + return darwin_sections[objc_category_section]; else if (!strncmp (name, "_OBJC_SELECTOR_REFERENCES", 25)) - objc_selector_refs_section (); + return darwin_sections[objc_selector_refs_section]; else if (!strncmp (name, "_OBJC_SELECTOR_FIXUP", 20)) - objc_selector_fixup_section (); + return darwin_sections[objc_selector_fixup_section]; else if (!strncmp (name, "_OBJC_SYMBOLS", 13)) - objc_symbols_section (); + return darwin_sections[objc_symbols_section]; else if (!strncmp (name, "_OBJC_MODULES", 13)) - objc_module_info_section (); + return darwin_sections[objc_module_info_section]; else if (!strncmp (name, "_OBJC_IMAGE_INFO", 16)) - objc_image_info_section (); + return darwin_sections[objc_image_info_section]; else if (!strncmp (name, "_OBJC_PROTOCOL_INSTANCE_METHODS_", 32)) - objc_cat_inst_meth_section (); + return darwin_sections[objc_cat_inst_meth_section]; else if (!strncmp (name, "_OBJC_PROTOCOL_CLASS_METHODS_", 29)) - objc_cat_cls_meth_section (); + return darwin_sections[objc_cat_cls_meth_section]; else if (!strncmp (name, "_OBJC_PROTOCOL_REFS_", 20)) - objc_cat_cls_meth_section (); + return darwin_sections[objc_cat_cls_meth_section]; else if (!strncmp (name, "_OBJC_PROTOCOL_", 15)) - objc_protocol_section (); - else - base_function (); - } - /* ::operator new and ::operator delete must be coalesced, even - if not weak. There are 8 variants that we look for. */ - else if (TREE_CODE (exp) == FUNCTION_DECL - && ! DECL_ONE_ONLY (exp)) - { - const char * name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (exp)); - if (name[0] == '_' && name[1] == 'Z' - && ((name[2] == 'n' && (name[3] == 'a' || name[3] == 'w') - && name[4] == 'm') - || (name[2] == 'd' && (name[3] == 'a' || name[3] == 'l') - && name[4] == 'P' && name[5] == 'v'))) - { - bool delete_p = name[2] == 'd'; - if (name[5 + delete_p] == 0 - || strcmp (name + 5 + delete_p, "KSt9nothrow_t") == 0) - base_funs[reloc][1] (); - else - base_function (); - } + return darwin_sections[objc_protocol_section]; else - base_function (); + return base_section; } else - base_function (); + return base_section; } /* This can be called with address expressions as "rtx". They must go in "const". */ -void +section * machopic_select_rtx_section (enum machine_mode mode, rtx x, unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED) { if (GET_MODE_SIZE (mode) == 8 && (GET_CODE (x) == CONST_INT || GET_CODE (x) == CONST_DOUBLE)) - literal8_section (); + return darwin_sections[literal8_section]; else if (GET_MODE_SIZE (mode) == 4 && (GET_CODE (x) == CONST_INT || GET_CODE (x) == CONST_DOUBLE)) - literal4_section (); + return darwin_sections[literal4_section]; else if (MACHOPIC_INDIRECT && (GET_CODE (x) == SYMBOL_REF || GET_CODE (x) == CONST || GET_CODE (x) == LABEL_REF)) - const_data_section (); + return darwin_sections[const_data_section]; else - const_section (); + return darwin_sections[const_section]; } void machopic_asm_out_constructor (rtx symbol, int priority ATTRIBUTE_UNUSED) { if (MACHOPIC_INDIRECT) - mod_init_section (); + switch_to_section (darwin_sections[mod_init_section]); else - constructor_section (); + switch_to_section (darwin_sections[constructor_section]); assemble_align (POINTER_SIZE); assemble_integer (symbol, POINTER_SIZE / BITS_PER_UNIT, POINTER_SIZE, 1); @@ -1192,9 +1261,9 @@ void machopic_asm_out_destructor (rtx symbol, int priority ATTRIBUTE_UNUSED) { if (MACHOPIC_INDIRECT) - mod_term_section (); + switch_to_section (darwin_sections[mod_term_section]); else - destructor_section (); + switch_to_section (darwin_sections[destructor_section]); assemble_align (POINTER_SIZE); assemble_integer (symbol, POINTER_SIZE / BITS_PER_UNIT, POINTER_SIZE, 1); @@ -1210,14 +1279,14 @@ darwin_globalize_label (FILE *stream, const char *name) } void -darwin_asm_named_section (const char *name, +darwin_asm_named_section (const char *name, unsigned int flags ATTRIBUTE_UNUSED, tree decl ATTRIBUTE_UNUSED) { fprintf (asm_out_file, "\t.section %s\n", name); } -void +void darwin_unique_section (tree decl ATTRIBUTE_UNUSED, int reloc ATTRIBUTE_UNUSED) { /* Darwin does not use unique sections. */ @@ -1234,7 +1303,8 @@ darwin_handle_weak_import_attribute (tree *node, tree name, { if (TREE_CODE (*node) != FUNCTION_DECL && TREE_CODE (*node) != VAR_DECL) { - warning ("%qs attribute ignored", IDENTIFIER_POINTER (name)); + warning (OPT_Wattributes, "%qs attribute ignored", + IDENTIFIER_POINTER (name)); *no_add_attrs = true; } else @@ -1249,43 +1319,28 @@ no_dead_strip (FILE *file, const char *lab) fprintf (file, ".no_dead_strip %s\n", lab); } -/* Emit a label for an FDE, making it global and/or weak if appropriate. +/* Emit a label for an FDE, making it global and/or weak if appropriate. The third parameter is nonzero if this is for exception handling. The fourth parameter is nonzero if this is just a placeholder for an FDE that we are omitting. */ -void +void darwin_emit_unwind_label (FILE *file, tree decl, int for_eh, int empty) { tree id = DECL_ASSEMBLER_NAME (decl) ? DECL_ASSEMBLER_NAME (decl) : DECL_NAME (decl); - const char *prefix = "_"; - const int prefix_len = 1; - const char *base = IDENTIFIER_POINTER (id); - unsigned int base_len = IDENTIFIER_LENGTH (id); - - const char *suffix = ".eh"; - int need_quotes = name_needs_quotes (base); - int quotes_len = need_quotes ? 2 : 0; + bool need_quotes = name_needs_quotes (base); char *lab; if (! for_eh) - suffix = ".eh1"; - - lab = xmalloc (prefix_len + base_len + strlen (suffix) + quotes_len + 1); - lab[0] = '\0'; + return; - if (need_quotes) - strcat(lab, "\""); - strcat(lab, prefix); - strcat(lab, base); - strcat(lab, suffix); - if (need_quotes) - strcat(lab, "\""); + lab = concat (need_quotes ? "\"" : "", user_label_prefix, base, ".eh", + need_quotes ? "\"" : "", NULL); if (TREE_PUBLIC (decl)) fprintf (file, "\t%s %s\n", @@ -1313,15 +1368,25 @@ darwin_emit_unwind_label (FILE *file, tree decl, int for_eh, int empty) free (lab); } -/* Generate a PC-relative reference to a Mach-O non-lazy-symbol. */ +static GTY(()) unsigned long except_table_label_num; + +void +darwin_emit_except_table_label (FILE *file) +{ + char section_start_label[30]; + + ASM_GENERATE_INTERNAL_LABEL (section_start_label, "GCC_except_table", + except_table_label_num++); + ASM_OUTPUT_LABEL (file, section_start_label); +} +/* Generate a PC-relative reference to a Mach-O non-lazy-symbol. */ void darwin_non_lazy_pcrel (FILE *file, rtx addr) { const char *nlp_name; - if (GET_CODE (addr) != SYMBOL_REF) - abort (); + gcc_assert (GET_CODE (addr) == SYMBOL_REF); nlp_name = machopic_indirection_name (addr, /*stub_p=*/false); fputs ("\t.long\t", file); @@ -1335,7 +1400,7 @@ darwin_non_lazy_pcrel (FILE *file, rtx addr) extern". There is no MACH-O equivalent of ELF's VISIBILITY_INTERNAL or VISIBILITY_PROTECTED. */ -void +void darwin_assemble_visibility (tree decl, int vis) { if (vis == VISIBILITY_DEFAULT) @@ -1348,8 +1413,8 @@ darwin_assemble_visibility (tree decl, int vis) fputs ("\n", asm_out_file); } else - warning ("internal and protected visibility attributes not supported " - "in this configuration; ignored"); + warning (OPT_Wattributes, "internal and protected visibility attributes " + "not supported in this configuration; ignored"); } /* Output a difference of two labels that will be an assembly time @@ -1380,17 +1445,110 @@ darwin_asm_output_dwarf_delta (FILE *file, int size, fprintf (file, "\n\t%s L$set$%d", directive, darwin_dwarf_label_counter++); } +/* Output labels for the start of the DWARF sections if necessary. */ +void +darwin_file_start (void) +{ + if (write_symbols == DWARF2_DEBUG) + { + static const char * const debugnames[] = + { + DEBUG_FRAME_SECTION, + DEBUG_INFO_SECTION, + DEBUG_ABBREV_SECTION, + DEBUG_ARANGES_SECTION, + DEBUG_MACINFO_SECTION, + DEBUG_LINE_SECTION, + DEBUG_LOC_SECTION, + DEBUG_PUBNAMES_SECTION, + DEBUG_STR_SECTION, + DEBUG_RANGES_SECTION + }; + size_t i; + + for (i = 0; i < ARRAY_SIZE (debugnames); i++) + { + int namelen; + + switch_to_section (get_section (debugnames[i], SECTION_DEBUG, NULL)); + + gcc_assert (strncmp (debugnames[i], "__DWARF,", 8) == 0); + gcc_assert (strchr (debugnames[i] + 8, ',')); + + namelen = strchr (debugnames[i] + 8, ',') - (debugnames[i] + 8); + fprintf (asm_out_file, "Lsection%.*s:\n", namelen, debugnames[i] + 8); + } + } +} + +/* Output an offset in a DWARF section on Darwin. On Darwin, DWARF section + offsets are not represented using relocs in .o files; either the + section never leaves the .o file, or the linker or other tool is + responsible for parsing the DWARF and updating the offsets. */ + +void +darwin_asm_output_dwarf_offset (FILE *file, int size, const char * lab, + section *base) +{ + char sname[64]; + int namelen; + + gcc_assert (base->common.flags & SECTION_NAMED); + gcc_assert (strncmp (base->named.name, "__DWARF,", 8) == 0); + gcc_assert (strchr (base->named.name + 8, ',')); + + namelen = strchr (base->named.name + 8, ',') - (base->named.name + 8); + sprintf (sname, "*Lsection%.*s", namelen, base->named.name + 8); + darwin_asm_output_dwarf_delta (file, size, lab, sname); +} + void darwin_file_end (void) { machopic_finish (asm_out_file); if (strcmp (lang_hooks.name, "GNU C++") == 0) { - constructor_section (); - destructor_section (); + switch_to_section (darwin_sections[constructor_section]); + switch_to_section (darwin_sections[destructor_section]); ASM_OUTPUT_ALIGN (asm_out_file, 1); } fprintf (asm_out_file, "\t.subsections_via_symbols\n"); } +/* Cross-module name binding. Darwin does not support overriding + functions at dynamic-link time. */ + +bool +darwin_binds_local_p (tree decl) +{ + return default_binds_local_p_1 (decl, 0); +} + +#if 0 +/* See TARGET_ASM_OUTPUT_ANCHOR for why we can't do this yet. */ +/* The Darwin's implementation of TARGET_ASM_OUTPUT_ANCHOR. Define the + anchor relative to ".", the current section position. We cannot use + the default one because ASM_OUTPUT_DEF is wrong for Darwin. */ + +void +darwin_asm_output_anchor (rtx symbol) +{ + fprintf (asm_out_file, "\t.set\t"); + assemble_name (asm_out_file, XSTR (symbol, 0)); + fprintf (asm_out_file, ", . + " HOST_WIDE_INT_PRINT_DEC "\n", + SYMBOL_REF_BLOCK_OFFSET (symbol)); +} +#endif + +/* Set the darwin specific attributes on TYPE. */ +void +darwin_set_default_type_attributes (tree type) +{ + if (darwin_ms_struct + && TREE_CODE (type) == RECORD_TYPE) + TYPE_ATTRIBUTES (type) = tree_cons (get_identifier ("ms_struct"), + NULL_TREE, + TYPE_ATTRIBUTES (type)); +} + #include "gt-darwin.h"