X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fspuelf.em;h=1b4d72f0dfbae19b54104cd55f65b9733a9ecddb;hb=7341d5e22f1061016411734ba162d362ac5928db;hp=bfabb8b72ee68346f5a2148df38d5e2d52a43d4c;hpb=a3a219a90a59440cb2a29cee2a4cde87c6bfaf19;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index bfabb8b72e..1b4d72f0df 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -1,5 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -37,11 +37,14 @@ static struct spu_elf_params params = &spu_elf_load_ovl_mgr, &spu_elf_open_overlay_script, &spu_elf_relink, - 0, ovly_normal, 0, 0, 0, 0, + 0, ovly_normal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3ffff, - 1, 0, 0, 2000 + 1, 0, 16, 0, 0, 2000 }; - + +static unsigned int no_overlays = 0; +static unsigned int num_lines_set = 0; +static unsigned int line_size_set = 0; static char *auto_overlay_file = 0; int my_argc; char **my_argv; @@ -52,7 +55,20 @@ EOF if ! cat ${srcdir}/emultempl/spu_ovl.o_c >> e${EMULATION_NAME}.c then echo >&2 "Missing ${srcdir}/emultempl/spu_ovl.o_c" - echo >&2 "You must build gas/as-new with --target=spu to build spu_ovl.o" + echo >&2 "You must build gas/as-new with --target=spu" + exit 1 +fi + +fragment <> e${EMULATION_NAME}.c +then + echo >&2 "Missing ${srcdir}/emultempl/spu_icache.o_c" + echo >&2 "You must build gas/as-new with --target=spu" exit 1 fi @@ -64,13 +80,18 @@ static const struct _ovl_stream ovl_mgr_stream = { ovl_mgr + sizeof (ovl_mgr) }; +static const struct _ovl_stream icache_mgr_stream = { + icache_mgr, + icache_mgr + sizeof (icache_mgr) +}; + static int is_spu_target (void) { - extern const bfd_target bfd_elf32_spu_vec; + extern const bfd_target spu_elf32_vec; - return link_info.output_bfd->xvec == &bfd_elf32_spu_vec; + return link_info.output_bfd->xvec == &spu_elf32_vec; } /* Create our note section. */ @@ -86,6 +107,9 @@ spu_after_open (void) params.emit_stub_syms |= link_info.emitrelocations; spu_elf_setup (&link_info, ¶ms); + if (link_info.relocatable) + lang_add_unique (".text.ia.*"); + if (!link_info.relocatable && link_info.input_bfds != NULL && !spu_elf_create_sections (&link_info)) @@ -96,7 +120,8 @@ spu_after_open (void) } /* If O is NULL, add section S at the end of output section OUTPUT_NAME. - If O is not NULL, add section S at the beginning of output section O. + If O is not NULL, add section S at the beginning of output section O, + except for soft-icache which adds to the end. Really, we should be duplicating ldlang.c map_input_to_output_sections logic here, ie. using the linker script to find where the section @@ -112,21 +137,39 @@ spu_place_special_section (asection *s, asection *o, const char *output_name) lang_output_section_statement_type *os; if (o != NULL) - output_name = o->name; - os = lang_output_section_find (output_name); + os = lang_output_section_get (o); + else + os = lang_output_section_find (output_name); if (os == NULL) - gld${EMULATION_NAME}_place_orphan (s, output_name, 0); - else if (o != NULL && os->children.head != NULL) + { + os = gld${EMULATION_NAME}_place_orphan (s, output_name, 0); + os->addr_tree = NULL; + } + else if (params.ovly_flavour != ovly_soft_icache + && o != NULL && os->children.head != NULL) { lang_statement_list_type add; lang_list_init (&add); - lang_add_section (&add, s, os); + lang_add_section (&add, s, NULL, os); *add.tail = os->children.head; os->children.head = add.head; } else - lang_add_section (&os->children, s, os); + { + if (params.ovly_flavour == ovly_soft_icache && o != NULL) + { + /* Pad this stub section so that it finishes at the + end of the icache line. */ + etree_type *e_size; + + push_stat_ptr (&os->children); + e_size = exp_intop (params.line_size - s->size); + lang_add_assignment (exp_assign (".", e_size, FALSE)); + pop_stat_ptr (); + } + lang_add_section (&os->children, s, NULL, os); + } s->output_section->size += s->size; } @@ -137,10 +180,19 @@ static bfd_size_type spu_elf_load_ovl_mgr (void) { struct elf_link_hash_entry *h; + const char *ovly_mgr_entry; + const struct _ovl_stream *mgr_stream; bfd_size_type total = 0; + ovly_mgr_entry = "__ovly_load"; + mgr_stream = &ovl_mgr_stream; + if (params.ovly_flavour == ovly_soft_icache) + { + ovly_mgr_entry = "__icache_br_handler"; + mgr_stream = &icache_mgr_stream; + } h = elf_link_hash_lookup (elf_hash_table (&link_info), - "__ovly_load", FALSE, FALSE, FALSE); + ovly_mgr_entry, FALSE, FALSE, FALSE); if (h != NULL && (h->root.type == bfd_link_hash_defined @@ -149,7 +201,7 @@ spu_elf_load_ovl_mgr (void) { /* User supplied __ovly_load. */ } - else if (ovl_mgr_stream.start == ovl_mgr_stream.end) + else if (mgr_stream->start == mgr_stream->end) einfo ("%F%P: no built-in overlay manager\n"); else { @@ -159,7 +211,7 @@ spu_elf_load_ovl_mgr (void) lang_input_file_is_file_enum, NULL); - if (!spu_elf_open_builtin_lib (&ovl_is->the_bfd, &ovl_mgr_stream)) + if (!spu_elf_open_builtin_lib (&ovl_is->the_bfd, mgr_stream)) einfo ("%X%P: can not open built-in overlay manager: %E\n"); else { @@ -168,13 +220,38 @@ spu_elf_load_ovl_mgr (void) if (!load_symbols (ovl_is, NULL)) einfo ("%X%P: can not load built-in overlay manager: %E\n"); - /* Map overlay manager sections to output sections. */ + /* Map overlay manager sections to output sections. + First try for a matching output section name, if that + fails then try mapping .abc.xyz to .abc, otherwise map + to .text. */ for (in = ovl_is->the_bfd->sections; in != NULL; in = in->next) if ((in->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { - total += in->size; - spu_place_special_section (in, NULL, ".text"); + const char *oname = in->name; + if (strncmp (in->name, ".ovl.init", 9) != 0) + { + total += in->size; + if (!lang_output_section_find (oname)) + { + lang_output_section_statement_type *os = NULL; + char *p = strchr (oname + 1, '.'); + if (p != NULL) + { + size_t len = p - oname; + p = memcpy (xmalloc (len + 1), oname, len); + p[len] = '\0'; + os = lang_output_section_find (p); + free (p); + } + if (os != NULL) + oname = os->name; + else + oname = ".text"; + } + } + + spu_place_special_section (in, NULL, oname); } } } @@ -188,8 +265,10 @@ spu_before_allocation (void) { if (is_spu_target () && !link_info.relocatable - && params.ovly_flavour != ovly_none) + && !no_overlays) { + int ret; + /* Size the sections. This is premature, but we need to know the rough layout so that overlays can be found. */ expld.phase = lang_mark_phase_enum; @@ -197,9 +276,11 @@ spu_before_allocation (void) one_lang_size_sections_pass (NULL, TRUE); /* Find overlays by inspecting section vmas. */ - if (spu_elf_find_overlays (&link_info)) + ret = spu_elf_find_overlays (&link_info); + if (ret == 0) + einfo ("%X%P: can not find overlays: %E\n"); + else if (ret == 2) { - int ret; lang_output_section_statement_type *os; if (params.auto_overlay != 0) @@ -228,12 +309,18 @@ spu_before_allocation (void) einfo ("%X%P: can not size overlay stubs: %E\n"); else if (ret == 2) spu_elf_load_ovl_mgr (); + + spu_elf_place_overlay_data (&link_info); } /* We must not cache anything from the preliminary sizing. */ lang_reset_memory_regions (); } + if (is_spu_target () + && !link_info.relocatable) + spu_elf_size_sections (link_info.output_bfd, &link_info); + gld${EMULATION_NAME}_before_allocation (); } @@ -269,7 +356,7 @@ new_tmp_file (char **fname) *fname = mktemp (*fname); if (*fname == NULL) return -1; - fd = open (fname, O_RDWR | O_CREAT | O_EXCL, 0600); + fd = open (*fname, O_RDWR | O_CREAT | O_EXCL, 0600); #endif return fd; } @@ -297,9 +384,13 @@ spu_elf_open_overlay_script (void) return script; } +#include + static void spu_elf_relink (void) { + const char *pex_return; + int status; char **argv = xmalloc ((my_argc + 4) * sizeof (*argv)); memcpy (argv, my_argv, my_argc * sizeof (*argv)); @@ -310,9 +401,16 @@ spu_elf_relink (void) argv[my_argc++] = "-T"; argv[my_argc++] = auto_overlay_file; argv[my_argc] = 0; - execvp (argv[0], (char *const *) argv); - perror (argv[0]); - _exit (127); + + pex_return = pex_one (PEX_SEARCH | PEX_LAST, (const char *) argv[0], + (char * const *) argv, (const char *) argv[0], + NULL, NULL, & status, & errno); + if (pex_return != NULL) + { + perror (pex_return); + _exit (127); + } + exit (status); } /* Final emulation specific call. */ @@ -320,12 +418,6 @@ spu_elf_relink (void) static void gld${EMULATION_NAME}_finish (void) { - int need_laying_out; - - need_laying_out = bfd_elf_discard_info (link_info.output_bfd, &link_info); - - gld${EMULATION_NAME}_map_segments (need_laying_out); - if (is_spu_target ()) { if (params.local_store_lo < params.local_store_hi) @@ -338,9 +430,6 @@ gld${EMULATION_NAME}_finish (void) } else if (params.auto_overlay) einfo ("%P: --auto-overlay ignored with zero local store range\n"); - - if (!spu_elf_build_stubs (&link_info)) - einfo ("%F%P: can not build overlay stubs: %E\n"); } finish_default (); @@ -358,9 +447,9 @@ EOF if grep -q 'ld_elf.*ppc.*_emulation' ldemul-list.h; then fragment < -#include +#include "libiberty.h" static const char * base_name (const char *path) @@ -393,11 +482,11 @@ bfd_boolean embedded_spu_file (lang_input_statement_type *entry, const char *flags) { const char *cmd[6]; + const char *pex_return; const char *sym; char *handle, *p; char *oname; int fd; - pid_t pid; int status; union lang_statement_union **old_stat_tail; union lang_statement_union **old_file_tail; @@ -440,52 +529,43 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) } } - /* Use fork() and exec() rather than system() so that we don't - need to worry about quoting args. */ cmd[0] = EMBEDSPU; cmd[1] = flags; cmd[2] = handle; cmd[3] = entry->the_bfd->filename; cmd[4] = oname; cmd[5] = NULL; - if (trace_file_tries) + if (verbose) { info_msg (_("running: %s \"%s\" \"%s\" \"%s\" \"%s\"\n"), cmd[0], cmd[1], cmd[2], cmd[3], cmd[4]); fflush (stdout); } - pid = fork (); - if (pid == -1) - return FALSE; - if (pid == 0) - { - execvp (cmd[0], (char *const *) cmd); + pex_return = pex_one (PEX_SEARCH | PEX_LAST, cmd[0], (char *const *) cmd, + cmd[0], NULL, NULL, &status, &errno); + if (NULL != pex_return) { if (strcmp ("embedspu", EMBEDSPU) != 0) { cmd[0] = "embedspu"; - execvp (cmd[0], (char *const *) cmd); + pex_return = pex_one (PEX_SEARCH | PEX_LAST, cmd[0], (char *const *) cmd, + cmd[0], NULL, NULL, &status, &errno); } - perror (cmd[0]); - _exit (127); - } -#ifdef HAVE_WAITPID -#define WAITFOR(PID, STAT) waitpid (PID, STAT, 0) -#else -#define WAITFOR(PID, STAT) wait (STAT) -#endif - if (WAITFOR (pid, &status) != pid - || !WIFEXITED (status) - || WEXITSTATUS (status) != 0) + if (NULL != pex_return) { + perror (pex_return); + _exit (127); + } + } + if (status) return FALSE; -#undef WAITFOR + old_stat_tail = stat_ptr->tail; old_file_tail = input_file_chain.tail; if (lang_add_input_file (oname, lang_input_file_is_file_enum, NULL) == NULL) return FALSE; - /* lang_add_input_file put the new list entry at the end of the statement + /* lang_add_input_file puts the new list entry at the end of the statement and input file lists. Move it to just after the current entry. */ new_ent = *old_stat_tail; *old_stat_tail = NULL; @@ -499,7 +579,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) /* Ensure bfd sections are excluded from the output. */ bfd_section_list_clear (entry->the_bfd); - entry->loaded = TRUE; + entry->flags.loaded = TRUE; return TRUE; } @@ -512,7 +592,8 @@ fi PARSE_AND_LIST_PROLOGUE=' #define OPTION_SPU_PLUGIN 301 #define OPTION_SPU_NO_OVERLAYS (OPTION_SPU_PLUGIN + 1) -#define OPTION_SPU_STUB_SYMS (OPTION_SPU_NO_OVERLAYS + 1) +#define OPTION_SPU_COMPACT_STUBS (OPTION_SPU_NO_OVERLAYS + 1) +#define OPTION_SPU_STUB_SYMS (OPTION_SPU_COMPACT_STUBS + 1) #define OPTION_SPU_NON_OVERLAY_STUBS (OPTION_SPU_STUB_SYMS + 1) #define OPTION_SPU_LOCAL_STORE (OPTION_SPU_NON_OVERLAY_STUBS + 1) #define OPTION_SPU_STACK_ANALYSIS (OPTION_SPU_LOCAL_STORE + 1) @@ -520,16 +601,27 @@ PARSE_AND_LIST_PROLOGUE=' #define OPTION_SPU_AUTO_OVERLAY (OPTION_SPU_STACK_SYMS + 1) #define OPTION_SPU_AUTO_RELINK (OPTION_SPU_AUTO_OVERLAY + 1) #define OPTION_SPU_OVERLAY_RODATA (OPTION_SPU_AUTO_RELINK + 1) -#define OPTION_SPU_NUM_REGIONS (OPTION_SPU_OVERLAY_RODATA + 1) -#define OPTION_SPU_FIXED_SPACE (OPTION_SPU_NUM_REGIONS + 1) +#define OPTION_SPU_SOFT_ICACHE (OPTION_SPU_OVERLAY_RODATA + 1) +#define OPTION_SPU_LINE_SIZE (OPTION_SPU_SOFT_ICACHE + 1) +#define OPTION_SPU_NUM_LINES (OPTION_SPU_LINE_SIZE + 1) +#define OPTION_SPU_LRLIVE (OPTION_SPU_NUM_LINES + 1) +#define OPTION_SPU_NON_IA_TEXT (OPTION_SPU_LRLIVE + 1) +#define OPTION_SPU_FIXED_SPACE (OPTION_SPU_NON_IA_TEXT + 1) #define OPTION_SPU_RESERVED_SPACE (OPTION_SPU_FIXED_SPACE + 1) #define OPTION_SPU_EXTRA_STACK (OPTION_SPU_RESERVED_SPACE + 1) #define OPTION_SPU_NO_AUTO_OVERLAY (OPTION_SPU_EXTRA_STACK + 1) +#define OPTION_SPU_EMIT_FIXUPS (OPTION_SPU_NO_AUTO_OVERLAY + 1) ' PARSE_AND_LIST_LONGOPTS=' { "plugin", no_argument, NULL, OPTION_SPU_PLUGIN }, + { "soft-icache", no_argument, NULL, OPTION_SPU_SOFT_ICACHE }, + { "lrlive-analysis", no_argument, NULL, OPTION_SPU_LRLIVE }, + { "num-lines", required_argument, NULL, OPTION_SPU_NUM_LINES }, + { "line-size", required_argument, NULL, OPTION_SPU_LINE_SIZE }, + { "non-ia-text", no_argument, NULL, OPTION_SPU_NON_IA_TEXT }, { "no-overlays", no_argument, NULL, OPTION_SPU_NO_OVERLAYS }, + { "compact-stubs", no_argument, NULL, OPTION_SPU_COMPACT_STUBS }, { "emit-stub-syms", no_argument, NULL, OPTION_SPU_STUB_SYMS }, { "extra-overlay-stubs", no_argument, NULL, OPTION_SPU_NON_OVERLAY_STUBS }, { "local-store", required_argument, NULL, OPTION_SPU_LOCAL_STORE }, @@ -538,17 +630,20 @@ PARSE_AND_LIST_LONGOPTS=' { "auto-overlay", optional_argument, NULL, OPTION_SPU_AUTO_OVERLAY }, { "auto-relink", no_argument, NULL, OPTION_SPU_AUTO_RELINK }, { "overlay-rodata", no_argument, NULL, OPTION_SPU_OVERLAY_RODATA }, - { "num-regions", required_argument, NULL, OPTION_SPU_NUM_REGIONS }, + { "num-regions", required_argument, NULL, OPTION_SPU_NUM_LINES }, + { "region-size", required_argument, NULL, OPTION_SPU_LINE_SIZE }, { "fixed-space", required_argument, NULL, OPTION_SPU_FIXED_SPACE }, { "reserved-space", required_argument, NULL, OPTION_SPU_RESERVED_SPACE }, { "extra-stack-space", required_argument, NULL, OPTION_SPU_EXTRA_STACK }, { "no-auto-overlay", optional_argument, NULL, OPTION_SPU_NO_AUTO_OVERLAY }, + { "emit-fixups", optional_argument, NULL, OPTION_SPU_EMIT_FIXUPS }, ' PARSE_AND_LIST_OPTIONS=' fprintf (file, _("\ --plugin Make SPU plugin.\n\ --no-overlays No overlay handling.\n\ + --compact-stubs Use smaller and possibly slower call stubs.\n\ --emit-stub-syms Add symbols on overlay call stubs.\n\ --extra-overlay-stubs Add stubs on all calls out of overlay regions.\n\ --local-store=lo:hi Valid address range.\n\ @@ -560,11 +655,17 @@ PARSE_AND_LIST_OPTIONS=' --overlay-rodata Place read-only data with associated function\n\ code in overlays.\n\ --num-regions Number of overlay buffers (default 1).\n\ + --region-size Size of overlay buffers (default 0, auto).\n\ --fixed-space=bytes Local store for non-overlay code and data.\n\ --reserved-space=bytes Local store for stack and heap. If not specified\n\ ld will estimate stack size and assume no heap.\n\ --extra-stack-space=bytes Space for negative sp access (default 2000) if\n\ - --reserved-space not given.\n" + --reserved-space not given.\n\ + --soft-icache Generate software icache overlays.\n\ + --num-lines Number of soft-icache lines (default 32).\n\ + --line-size Size of soft-icache lines (default 1k).\n\ + --non-ia-text Allow non-icache code in icache lines.\n\ + --lrlive-analysis Scan function prologue for lr liveness.\n" )); ' @@ -574,7 +675,11 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_SPU_NO_OVERLAYS: - params.ovly_flavour = ovly_none; + no_overlays = 1; + break; + + case OPTION_SPU_COMPACT_STUBS: + params.compact_stub = 1; break; case OPTION_SPU_STUB_SYMS: @@ -624,13 +729,53 @@ PARSE_AND_LIST_ARGS_CASES=' params.auto_overlay |= 4; break; - case OPTION_SPU_NUM_REGIONS: + case OPTION_SPU_SOFT_ICACHE: + params.ovly_flavour = ovly_soft_icache; + /* Software i-cache stubs are always "compact". */ + params.compact_stub = 1; + if (!num_lines_set) + params.num_lines = 32; + else if ((params.num_lines & -params.num_lines) != params.num_lines) + einfo (_("%P%F: invalid --num-lines/--num-regions `%u'\''\n"), + params.num_lines); + if (!line_size_set) + params.line_size = 1024; + else if ((params.line_size & -params.line_size) != params.line_size) + einfo (_("%P%F: invalid --line-size/--region-size `%u'\''\n"), + params.line_size); + break; + + case OPTION_SPU_LRLIVE: + params.lrlive_analysis = 1; + break; + + case OPTION_SPU_NON_IA_TEXT: + params.non_ia_text = 1; + break; + + case OPTION_SPU_NUM_LINES: { char *end; - params.num_regions = strtoul (optarg, &end, 0); - if (*end == 0) + params.num_lines = strtoul (optarg, &end, 0); + num_lines_set = 1; + if (*end == 0 + && (params.ovly_flavour != ovly_soft_icache + || (params.num_lines & -params.num_lines) == params.num_lines)) break; - einfo (_("%P%F: invalid --num-regions `%s'\''\n"), optarg); + einfo (_("%P%F: invalid --num-lines/--num-regions `%s'\''\n"), optarg); + } + break; + + case OPTION_SPU_LINE_SIZE: + { + char *end; + params.line_size = strtoul (optarg, &end, 0); + line_size_set = 1; + if (*end == 0 + && (params.ovly_flavour != ovly_soft_icache + || (params.line_size & -params.line_size) == params.line_size)) + break; + einfo (_("%P%F: invalid --line-size/--region-size `%s'\''\n"), optarg); } break; @@ -679,6 +824,10 @@ PARSE_AND_LIST_ARGS_CASES=' break; } break; + + case OPTION_SPU_EMIT_FIXUPS: + params.emit_fixups = 1; + break; ' LDEMUL_AFTER_OPEN=spu_after_open