X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=ld%2Femultempl%2Fspuelf.em;fp=ld%2Femultempl%2Fspuelf.em;h=2ea760a7f0b3033ef5b3ffe0451a81bea5d98d57;hp=ccbc0f771e1393c794253f981bbe6583fd9ec98f;hb=d5da4f291af551c0b8b79e1d4a9b173d60e5c10e;hpb=7b5ea4fcdf2819e070665ab5610f8b48e3867c10 diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index ccbc0f7..2ea760a 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 Free Software Foundation, Inc. +# Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -26,29 +26,51 @@ fragment <> 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" + exit 1 +fi -/* Range of valid addresses for loadable sections. */ -static bfd_vma local_store_lo = 0; -static bfd_vma local_store_hi = 0x3ffff; +fragment <> e${EMULATION_NAME}.c +if ! cat ${srcdir}/emultempl/spu_icache.o_c >> 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 fragment <creator == &bfd_elf32_spu_vec; + return link_info.output_bfd->xvec == &bfd_elf32_spu_vec; } /* Create our note section. */ @@ -74,17 +99,29 @@ is_spu_target (void) static void spu_after_open (void) { - if (is_spu_target () - && !link_info.relocatable - && link_info.input_bfds != NULL - && !spu_elf_create_sections (output_bfd, &link_info, - stack_analysis, emit_stack_syms)) - einfo ("%X%P: can not create note section: %E\n"); + if (is_spu_target ()) + { + /* Pass params to backend. */ + if ((params.auto_overlay & AUTO_OVERLAY) == 0) + params.auto_overlay = 0; + 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)) + einfo ("%X%P: can not create note section: %E\n"); + } gld${EMULATION_NAME}_after_open (); } -/* Add section S at the end of output section OUTPUT_NAME. +/* 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, + 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 @@ -95,34 +132,66 @@ spu_after_open (void) overlay manager code somewhere else. */ static void -spu_place_special_section (asection *s, const char *output_name) +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); if (os == NULL) { - const char *save = s->name; - s->name = output_name; - gld${EMULATION_NAME}_place_orphan (s); - s->name = save; + 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); + *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_assop ('=', ".", e_size)); + pop_stat_ptr (); + } + lang_add_section (&os->children, s, os); + } s->output_section->size += s->size; } -/* Load built-in overlay manager, and tweak overlay section alignment. */ +/* Load built-in overlay manager. */ -static void +static bfd_size_type spu_elf_load_ovl_mgr (void) { - lang_output_section_statement_type *os; 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 @@ -131,7 +200,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 { @@ -141,7 +210,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 { @@ -150,28 +219,42 @@ 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)) - spu_place_special_section (in, ".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); + } } } - - /* Ensure alignment of overlay sections is sufficient. */ - for (os = &lang_output_section_statement.head->output_section_statement; - os != NULL; - os = os->next) - if (os->bfd_section != NULL - && spu_elf_section_data (os->bfd_section) != NULL - && spu_elf_section_data (os->bfd_section)->ovl_index != 0) - { - if (os->bfd_section->alignment_power < 4) - os->bfd_section->alignment_power = 4; - - /* Also ensure size rounds up. */ - os->block_value = 16; - } + return total; } /* Go find if we need to do anything special for overlays. */ @@ -183,6 +266,8 @@ spu_before_allocation (void) && !link_info.relocatable && !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; @@ -190,80 +275,169 @@ spu_before_allocation (void) one_lang_size_sections_pass (NULL, TRUE); /* Find overlays by inspecting section vmas. */ - if (spu_elf_find_overlays (output_bfd, &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) { - asection *stub, *ovtab; - - if (!spu_elf_size_stubs (output_bfd, &link_info, non_overlay_stubs, - stack_analysis, &stub, &ovtab, &toe)) - einfo ("%X%P: can not size overlay stubs: %E\n"); + lang_output_section_statement_type *os; - if (stub != NULL) + if (params.auto_overlay != 0) { - spu_place_special_section (stub, ".text"); - spu_place_special_section (ovtab, ".data"); - spu_place_special_section (toe, ".toe"); - - spu_elf_load_ovl_mgr (); + einfo ("%P: --auto-overlay ignored with user overlay script\n"); + params.auto_overlay = 0; } + + /* Ensure alignment of overlay sections is sufficient. */ + for (os = &lang_output_section_statement.head->output_section_statement; + os != NULL; + os = os->next) + if (os->bfd_section != NULL + && spu_elf_section_data (os->bfd_section) != NULL + && spu_elf_section_data (os->bfd_section)->u.o.ovl_index != 0) + { + if (os->bfd_section->alignment_power < 4) + os->bfd_section->alignment_power = 4; + + /* Also ensure size rounds up. */ + os->block_value = 16; + } + + ret = spu_elf_size_stubs (&link_info); + if (ret == 0) + 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 (); } -/* Final emulation specific call. */ +struct tflist { + struct tflist *next; + char name[9]; +}; -static void -gld${EMULATION_NAME}_finish (void) +static struct tflist *tmp_file_list; + +static void clean_tmp (void) { - int need_laying_out; + for (; tmp_file_list != NULL; tmp_file_list = tmp_file_list->next) + unlink (tmp_file_list->name); +} - need_laying_out = bfd_elf_discard_info (output_bfd, &link_info); +static int +new_tmp_file (char **fname) +{ + struct tflist *tf; + int fd; - gld${EMULATION_NAME}_map_segments (need_laying_out); + if (tmp_file_list == NULL) + atexit (clean_tmp); + tf = xmalloc (sizeof (*tf)); + tf->next = tmp_file_list; + tmp_file_list = tf; + memcpy (tf->name, "ldXXXXXX", sizeof (tf->name)); + *fname = tf->name; +#ifdef HAVE_MKSTEMP + fd = mkstemp (*fname); +#else + *fname = mktemp (*fname); + if (*fname == NULL) + return -1; + fd = open (fname, O_RDWR | O_CREAT | O_EXCL, 0600); +#endif + return fd; +} - if (is_spu_target () && local_store_lo < local_store_hi) +static FILE * +spu_elf_open_overlay_script (void) +{ + FILE *script = NULL; + + if (auto_overlay_file == NULL) { - asection *s; + int fd = new_tmp_file (&auto_overlay_file); + if (fd == -1) + goto file_err; + script = fdopen (fd, "w"); + } + else + script = fopen (auto_overlay_file, "w"); - s = spu_elf_check_vma (output_bfd, local_store_lo, local_store_hi); - if (s != NULL) - einfo ("%X%P: %A exceeds local store range\n", s); + if (script == NULL) + { + file_err: + einfo ("%F%P: can not open script: %E\n"); } + return script; +} + +static void +spu_elf_relink (void) +{ + char **argv = xmalloc ((my_argc + 4) * sizeof (*argv)); + + memcpy (argv, my_argv, my_argc * sizeof (*argv)); + argv[my_argc++] = "--no-auto-overlay"; + if (tmp_file_list->name == auto_overlay_file) + argv[my_argc - 1] = concat (argv[my_argc - 1], "=", + auto_overlay_file, (const char *) NULL); + 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); +} + +/* Final emulation specific call. */ + +static void +gld${EMULATION_NAME}_finish (void) +{ + if (is_spu_target ()) + { + if (params.local_store_lo < params.local_store_hi) + { + asection *s; - if (toe != NULL - && !spu_elf_build_stubs (&link_info, - emit_stub_syms || link_info.emitrelocations, - toe)) - einfo ("%X%P: can not build overlay stubs: %E\n"); + s = spu_elf_check_vma (&link_info); + if (s != NULL && !params.auto_overlay) + einfo ("%X%P: %A exceeds local store range\n", s); + } + else if (params.auto_overlay) + einfo ("%P: --auto-overlay ignored with zero local store range\n"); + } finish_default (); } +static char * +gld${EMULATION_NAME}_choose_target (int argc, char *argv[]) +{ + my_argc = argc; + my_argv = argv; + return ldemul_default_target (argc, argv); +} + EOF if grep -q 'ld_elf.*ppc.*_emulation' ldemul-list.h; then fragment < #include "filenames.h" -#include -#include - -struct tflist { - struct tflist *next; - char name[9]; -}; - -static struct tflist *tmp_file_list; - -static void clean_tmp (void) -{ - for (; tmp_file_list != NULL; tmp_file_list = tmp_file_list->next) - unlink (tmp_file_list->name); -} +#include "libiberty.h" static const char * base_name (const char *path) @@ -296,12 +470,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; - struct tflist *tf; char *oname; int fd; - pid_t pid; int status; union lang_statement_union **old_stat_tail; union lang_statement_union **old_file_tail; @@ -322,22 +495,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) if (!(ISALNUM (*p) || *p == '$' || *p == '.')) *p = '_'; - if (tmp_file_list == NULL) - atexit (clean_tmp); - tf = xmalloc (sizeof (*tf)); - tf->next = tmp_file_list; - tmp_file_list = tf; - oname = tf->name; - memcpy (tf->name, "ldXXXXXX", sizeof (tf->name)); - -#ifdef HAVE_MKSTEMP - fd = mkstemp (oname); -#else - oname = mktemp (oname); - if (oname == NULL) - return FALSE; - fd = open (oname, O_RDWR | O_CREAT | O_EXCL, 0600); -#endif + fd = new_tmp_file (&oname); if (fd == -1) return FALSE; close (fd); @@ -352,15 +510,13 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) if (strncmp (infile, "crtbegin", 8) == 0) { if (infile[8] == 'S') - flags = concat (flags, " -fPIC", NULL); + flags = concat (flags, " -fPIC", (const char *) NULL); else if (infile[8] == 'T') - flags = concat (flags, " -fpie", NULL); + flags = concat (flags, " -fpie", (const char *) NULL); break; } } - /* 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; @@ -374,37 +530,30 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags) 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; @@ -431,32 +580,80 @@ 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) #define OPTION_SPU_STACK_SYMS (OPTION_SPU_STACK_ANALYSIS + 1) +#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_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 }, { "stack-analysis", no_argument, NULL, OPTION_SPU_STACK_ANALYSIS }, { "emit-stack-syms", no_argument, NULL, OPTION_SPU_STACK_SYMS }, + { "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_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\ - --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\ - --stack-analysis Estimate maximum stack requirement.\n\ - --emit-stack-syms Add __stack_func giving stack needed for each func.\n" + --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\ + --stack-analysis Estimate maximum stack requirement.\n\ + --emit-stack-syms Add sym giving stack needed for each func.\n\ + --auto-overlay [=filename] Create an overlay script in filename if\n\ + executable does not fit in local store.\n\ + --auto-relink Rerun linker using auto-overlay script.\n\ + --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\ + --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" )); ' @@ -469,21 +666,25 @@ PARSE_AND_LIST_ARGS_CASES=' no_overlays = 1; break; + case OPTION_SPU_COMPACT_STUBS: + params.compact_stub = 1; + break; + case OPTION_SPU_STUB_SYMS: - emit_stub_syms = 1; + params.emit_stub_syms = 1; break; case OPTION_SPU_NON_OVERLAY_STUBS: - non_overlay_stubs = 1; + params.non_overlay_stubs = 1; break; case OPTION_SPU_LOCAL_STORE: { char *end; - local_store_lo = strtoul (optarg, &end, 0); + params.local_store_lo = strtoul (optarg, &end, 0); if (*end == '\'':'\'') { - local_store_hi = strtoul (end + 1, &end, 0); + params.local_store_hi = strtoul (end + 1, &end, 0); if (*end == 0) break; } @@ -492,14 +693,132 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_SPU_STACK_ANALYSIS: - stack_analysis = 1; + params.stack_analysis = 1; break; case OPTION_SPU_STACK_SYMS: - emit_stack_syms = 1; + params.emit_stack_syms = 1; + break; + + case OPTION_SPU_AUTO_OVERLAY: + params.auto_overlay |= 1; + if (optarg != NULL) + { + auto_overlay_file = optarg; + break; + } + /* Fall thru */ + + case OPTION_SPU_AUTO_RELINK: + params.auto_overlay |= 2; + break; + + case OPTION_SPU_OVERLAY_RODATA: + params.auto_overlay |= 4; + break; + + 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_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-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; + + case OPTION_SPU_FIXED_SPACE: + { + char *end; + params.auto_overlay_fixed = strtoul (optarg, &end, 0); + if (*end != 0) + einfo (_("%P%F: invalid --fixed-space value `%s'\''\n"), optarg); + } + break; + + case OPTION_SPU_RESERVED_SPACE: + { + char *end; + params.auto_overlay_reserved = strtoul (optarg, &end, 0); + if (*end != 0) + einfo (_("%P%F: invalid --reserved-space value `%s'\''\n"), optarg); + } + break; + + case OPTION_SPU_EXTRA_STACK: + { + char *end; + params.extra_stack_space = strtol (optarg, &end, 0); + if (*end != 0) + einfo (_("%P%F: invalid --extra-stack-space value `%s'\''\n"), optarg); + } + break; + + case OPTION_SPU_NO_AUTO_OVERLAY: + params.auto_overlay = 0; + if (optarg != NULL) + { + struct tflist *tf; + size_t len; + + if (tmp_file_list == NULL) + atexit (clean_tmp); + + len = strlen (optarg) + 1; + tf = xmalloc (sizeof (*tf) - sizeof (tf->name) + len); + memcpy (tf->name, optarg, len); + tf->next = tmp_file_list; + tmp_file_list = tf; + break; + } + break; + + case OPTION_SPU_EMIT_FIXUPS: + params.emit_fixups = 1; break; ' LDEMUL_AFTER_OPEN=spu_after_open LDEMUL_BEFORE_ALLOCATION=spu_before_allocation LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_CHOOSE_TARGET=gld${EMULATION_NAME}_choose_target