%{ /* deffilep.y - parser for .def files */
-/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of GNU Binutils.
#include <ctype.h>
#include "libiberty.h"
#include "bfd.h"
+#include "sysdep.h"
#include "ld.h"
+#include "ldmisc.h"
#include "deffile.h"
#define TRACE 0
+#define ROUND_UP(a, b) (((a)+((b)-1))&~((b)-1))
+
/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
as well as gratuitiously global symbol names, so we can have multiple
yacc generated parsers in ld. Note that these are only the variables
static void def_directive PARAMS ((char *));
static int def_parse PARAMS ((void));
static int def_error PARAMS ((const char *));
-static int def_debug;
static int def_lex PARAMS ((void));
static int lex_forced_token = 0;
int number;
};
-%token NAME, LIBRARY, DESCRIPTION, STACKSIZE, HEAPSIZE, CODE, DATA
-%token SECTIONS, EXPORTS, IMPORTS, VERSIONK, BASE, CONSTANT, PRIVATE
-%token READ WRITE EXECUTE SHARED NONAME DIRECTIVE
+%token NAME, LIBRARY, DESCRIPTION, STACKSIZE, HEAPSIZE, CODE, DATAU, DATAL
+%token SECTIONS, EXPORTS, IMPORTS, VERSIONK, BASE, CONSTANTU, CONSTANTL
+%token PRIVATEU, PRIVATEL
+%token READ WRITE EXECUTE SHARED NONAMEU NONAMEL DIRECTIVE
%token <id> ID
%token <number> NUMBER
%type <number> opt_base opt_ordinal
| STACKSIZE NUMBER opt_number { def_stacksize ($2, $3);}
| HEAPSIZE NUMBER opt_number { def_heapsize ($2, $3);}
| CODE attr_list { def_section ("CODE", $2);}
- | DATA attr_list { def_section ("DATA", $2);}
+ | DATAU attr_list { def_section ("DATA", $2);}
| SECTIONS seclist
| EXPORTS explist
| IMPORTS implist
;
expline:
- ID opt_equal_name opt_ordinal exp_opt_list
- { def_exports ($1, $2, $3, $4); }
+ /* The opt_comma is necessary to support both the usual
+ DEF file syntax as well as .drectve syntax which
+ mandates <expsym>,<expoptlist>. */
+ ID opt_equal_name opt_ordinal opt_comma exp_opt_list
+ { def_exports ($1, $2, $3, $5); }
;
exp_opt_list:
- exp_opt exp_opt_list { $$ = $1 | $2; }
+ /* The opt_comma is necessary to support both the usual
+ DEF file syntax as well as .drectve syntax which
+ allows for comma separated opt list. */
+ exp_opt opt_comma exp_opt_list { $$ = $1 | $3; }
| { $$ = 0; }
;
exp_opt:
- NONAME { $$ = 1; }
- | CONSTANT { $$ = 2; }
- | DATA { $$ = 4; }
- | PRIVATE { $$ = 8; }
+ NONAMEU { $$ = 1; }
+ | NONAMEL { $$ = 1; }
+ | CONSTANTU { $$ = 2; }
+ | CONSTANTL { $$ = 2; }
+ | DATAU { $$ = 4; }
+ | DATAL { $$ = 4; }
+ | PRIVATEU { $$ = 8; }
+ | PRIVATEL { $$ = 8; }
;
implist:
implist impline
;
opt_name: ID { $$ = $1; }
- | { $$ = 0; }
+ | ID '.' ID
+ {
+ char * name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1);
+ sprintf (name, "%s.%s", $1, $3);
+ $$ = name;
+ }
+ | { $$ = ""; }
;
opt_ordinal:
static const char *def_filename;
static int linenumber;
static def_file *def;
-static int max_exports, max_imports, max_sections;
static int saw_newline;
struct directive
{
def_file *rv = (def_file *) xmalloc (sizeof (def_file));
memset (rv, 0, sizeof (def_file));
- max_exports = max_imports = max_sections = 0;
rv->is_dll = -1;
rv->base_address = (bfd_vma) (-1);
rv->stack_reserve = rv->stack_commit = -1;
if (add_to)
{
def = add_to;
- max_exports = def->num_exports;
- max_imports = def->num_imports;
- max_sections = def->num_section_defs;
}
else
{
for (d = directives; d; d = d->next)
{
#if TRACE
- printf ("Adding directive `%s'\n", d->name);
+ printf ("Adding directive %08x `%s'\n", d->name, d->name);
#endif
def_file_add_directive (def, d->name, d->len);
}
free (def->imports[i].internal_name);
if (def->imports[i].name)
free (def->imports[i].name);
- if (def->imports[i].module)
- free (def->imports[i].module);
}
free (def->imports);
}
+ while (def->modules)
+ {
+ def_file_module *m = def->modules;
+ def->modules = def->modules->next;
+ free (m);
+ }
+
free (def);
}
int ordinal;
{
def_file_export *e;
+ int max_exports = ROUND_UP(def->num_exports, 32);
if (def->num_exports >= max_exports)
{
- max_exports = def->num_exports + 50;
+ max_exports = ROUND_UP(def->num_exports+1, 32);
if (def->exports)
def->exports = (def_file_export *) xrealloc (def->exports, max_exports * sizeof (def_file_export));
else
return e;
}
+static def_file_module *
+def_stash_module (def, name)
+ def_file *def;
+ char *name;
+{
+ def_file_module *s;
+ for (s=def->modules; s; s=s->next)
+ if (strcmp (s->name, name) == 0)
+ return s;
+ s = (def_file_module *) xmalloc (sizeof (def_file_module) + strlen (name));
+ s->next = def->modules;
+ def->modules = s;
+ s->user_data = 0;
+ strcpy (s->name, name);
+ return s;
+}
+
def_file_import *
def_file_add_import (def, name, module, ordinal, internal_name)
def_file *def;
const char *internal_name;
{
def_file_import *i;
+ int max_imports = ROUND_UP(def->num_imports, 16);
if (def->num_imports >= max_imports)
{
- max_imports = def->num_imports + 50;
+ max_imports = ROUND_UP(def->num_imports+1, 16);
if (def->imports)
def->imports = (def_file_import *) xrealloc (def->imports, max_imports * sizeof (def_file_import));
else
if (name)
i->name = xstrdup (name);
if (module)
- i->module = xstrdup (module);
+ i->module = def_stash_module(def, module);
i->ordinal = ordinal;
if (internal_name)
i->internal_name = xstrdup (internal_name);
{ 0, 0 }
};
-int
+void
def_file_add_directive (my_def, param, len)
def_file *my_def;
const char *param;
def_file *save_def = def;
const char *pend = param + len;
const char *tend = param;
- unsigned int sh_reserve, sh_commit;
- int i, j;
+ int i;
def = my_def;
int attr;
{
def_file_section *s;
+ int max_sections = ROUND_UP(def->num_section_defs, 4);
if (def->num_section_defs >= max_sections)
{
- max_sections = def->num_section_defs + 50;
+ max_sections = ROUND_UP(def->num_section_defs+1, 4);
if (def->section_defs)
def->section_defs = (def_file_section *) xrealloc (def->section_defs, max_sections * sizeof (def_file_import));
else
{
{ "BASE", BASE },
{ "CODE", CODE },
- { "CONSTANT", CONSTANT },
- { "DATA", DATA },
+ { "CONSTANT", CONSTANTU },
+ { "constant", CONSTANTL },
+ { "DATA", DATAU },
+ { "data", DATAL },
{ "DESCRIPTION", DESCRIPTION },
{ "DIRECTIVE", DIRECTIVE },
{ "EXECUTE", EXECUTE },
{ "IMPORTS", IMPORTS },
{ "LIBRARY", LIBRARY },
{ "NAME", NAME },
- { "NONAME", NONAME },
- { "PRIVATE", PRIVATE },
+ { "NONAME", NONAMEU },
+ { "noname", NONAMEL },
+ { "PRIVATE", PRIVATEU },
+ { "private", PRIVATEL },
{ "READ", READ },
{ "SECTIONS", SECTIONS },
{ "SEGMENTS", SECTIONS },
int c;
{
if (lex_parse_string)
- lex_parse_string--;
+ {
+ lex_parse_string--;
+ return c;
+ }
else
return ungetc (c, the_file);
}
if (isdigit (c))
{
bufptr = 0;
- while (c != EOF && isxdigit (c) || (c == 'x'))
+ while (c != EOF && (isxdigit (c) || (c == 'x')))
{
put_buf (c);
c = def_getc ();
if (isalpha (c) || strchr ("$:-_?", c))
{
bufptr = 0;
- while (c != EOF && isalnum (c) || strchr ("$:-_?/@", c))
+ while (c != EOF && (isalnum (c) || strchr ("$:-_?/@", c)))
{
put_buf (c);
c = def_getc ();
projects / deliverable / binutils-gdb.git / blobdiff