]> Git Repo - binutils.git/blobdiff - ld/ldlex.l
keep everything that's present now
[binutils.git] / ld / ldlex.l
index 2c21a5898f0fca1510dd8888581e358287ccf80d..d43cf498d1141776ab96cb82656b41b0d0fa5d95 100644 (file)
@@ -43,12 +43,15 @@ char *buystring();
 unsigned int lineno = 1;
 int old;
 
+static comment();
+
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input(buf, &result, max_size)
 #undef YY_FATAL_ERROR
 #define YY_FATAL_ERROR ;
 #define MAX_INCLUDE_DEPTH 10
 YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
+char *file_name_stack[MAX_INCLUDE_DEPTH];
 unsigned int include_stack_ptr = 0;
 
 
@@ -66,14 +69,17 @@ unsigned int include_stack_ptr = 0;
 %a 4000
 %o 5000
 
-CMDFILENAMECHAR   [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\-]
-CMDFILENAMECHAR1  [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>]
-FILENAMECHAR1  [_a-zA-Z\/\.\\]
+CMDFILENAMECHAR   [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\-\~]
+CMDFILENAMECHAR1  [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\~]
+FILENAMECHAR1  [_a-zA-Z\/\.\\\$\_\~]
 SYMBOLCHARN     [_a-zA-Z\/\.\\0-9]
-FILENAMECHAR   [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\]
+FILENAMECHAR   [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\\,\~]
 FILENAME       {FILENAMECHAR}+
 WHITE          [ \t\n]+ 
 
+NOCFILENAMECHAR        [_a-zA-Z0-9\/\.\-\_\+\$\:\[\]\\\~]
+
+
 %s COMMAND
 %s SCRIPT
 %s EXPRESSION
@@ -83,6 +89,10 @@ WHITE                [ \t\n]+
 %s MRI
 %%
 
+
+<BOTH,SCRIPT,EXPRESSION,COMMAND>"/*"   { comment(); }
+
+
 <DEFSYMEXP>"-"                  { RTOKEN('-');}
 <DEFSYMEXP>"+"                  { RTOKEN('+');}
 <DEFSYMEXP>{FILENAMECHAR1}{SYMBOLCHARN}*   { yylval.name = buystring(yytext); return NAME; }
@@ -162,13 +172,20 @@ WHITE             [ \t\n]+
                                 return OPTION_F;
                               }
 
+<COMMAND>"-y"{FILENAME}         {
+                                       yylval.name = buystring(yytext+2);
+                                       return OPTION_y;
+                               }
+                               
 <COMMAND>"-A"{FILENAME}        {
                                        yylval.name = buystring(yytext+2);
                                        return OPTION_Aarch;
                                }
 
+<COMMAND>"-retain-symbols-file"        { return OPTION_RETAIN_SYMBOLS_FILE; }
+
 <MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
-                               yylval.integer = strtoul(yytext+1, 0,16);       
+                               yylval.integer = strtoul(yytext+1, 0,16);
                                return INT;
                        }
 
@@ -262,7 +279,7 @@ WHITE               [ \t\n]+
 <BOTH,SCRIPT>"SEARCH_DIR"              { RTOKEN(SEARCH_DIR);}
 <BOTH,SCRIPT>"OUTPUT"          { RTOKEN(OUTPUT);}
 <BOTH,SCRIPT>"INPUT"                   { RTOKEN(INPUT);}
-<BOTH,SCRIPT>"DEFINED"         { RTOKEN(DEFINED);}
+<EXPRESSION,BOTH,SCRIPT>"DEFINED"              { RTOKEN(DEFINED);}
 <BOTH,SCRIPT>"CREATE_OBJECT_SYMBOLS"   { RTOKEN(CREATE_OBJECT_SYMBOLS);}
 <BOTH,SCRIPT>"CONSTRUCTORS"            { RTOKEN( CONSTRUCTORS);}
 <BOTH,SCRIPT>"FORCE_COMMON_ALLOCATION" { RTOKEN(FORCE_COMMON_ALLOCATION);}
@@ -278,7 +295,7 @@ WHITE               [ \t\n]+
 <BOTH,SCRIPT>"SHORT"                   { RTOKEN( SHORT);}
 <BOTH,SCRIPT>"BYTE"                    { RTOKEN( BYTE);}
 <BOTH,SCRIPT>"NOFLOAT"         { RTOKEN(NOFLOAT);}
-<BOTH,SCRIPT>"NOLOAD"          { RTOKEN(NOLOAD);}
+<EXPRESSION,BOTH,SCRIPT>"NOLOAD"               { RTOKEN(NOLOAD);}
 <BOTH,SCRIPT>"DSECT"                   { RTOKEN(DSECT);}
 <BOTH,SCRIPT>"COPY"                    { RTOKEN(COPY);}
 <BOTH,SCRIPT>"INFO"                    { RTOKEN(INFO);}
@@ -287,12 +304,17 @@ WHITE             [ \t\n]+
 <BOTH,SCRIPT>"org"                     { RTOKEN(ORIGIN);}
 <BOTH,SCRIPT>"l"                       { RTOKEN( LENGTH);}
 <BOTH,SCRIPT>"len"                     { RTOKEN( LENGTH);}
+<BOTH,SCRIPT>"INCLUDE"                 { RTOKEN(INCLUDE);}
 <MRI>"\n"                      { ++ lineno;  RTOKEN(NEWLINE); }
 <MRI>"*".*                     { /* Mri comment line */ }
 <MRI>"END"                      { RTOKEN(ENDWORD); }
+<MRI>"ALIGNMOD"                { RTOKEN(ALIGNMOD);}
+<MRI>"ALIGN"           { RTOKEN(ALIGN_K);}
+
 <MRI>"CHIP"                     { RTOKEN(CHIP); }
 <MRI>"BASE"                     { RTOKEN(BASE); }
 <MRI>"ALIAS"                     { RTOKEN(ALIAS); }
+<MRI>"TRUNCATE"                     { RTOKEN(TRUNCATE); }
 <MRI>"LOAD"                     { RTOKEN(LOAD); }
 <MRI>"PUBLIC"                   { RTOKEN(PUBLIC); }
 <MRI>"ORDER"                    { RTOKEN(ORDER); }
@@ -300,7 +322,7 @@ WHITE               [ \t\n]+
 <MRI>"FORMAT"                   { RTOKEN(FORMAT); }
 <MRI>"LIST".*                   { RTOKEN(LIST); /* LIST and ignore to end of line */ }
 <MRI>"SECT"                    { RTOKEN(SECT); }
-<MRI>"ABSOLUTE"                        { RTOKEN(ABSOLUTE); }
+<EXPRESSION,BOTH,SCRIPT,MRI>"ABSOLUTE"                 { RTOKEN(ABSOLUTE); }
 <MRI>"end"                      { RTOKEN(ENDWORD); }
 <MRI>"chip"                     { RTOKEN(CHIP); }
 <MRI>"load"                     { RTOKEN(LOAD); }
@@ -309,7 +331,7 @@ WHITE               [ \t\n]+
 <MRI>"format"                   { RTOKEN(FORMAT); }
 <MRI>"list".*                   { RTOKEN(LIST); /* LIST and ignore to end of line */ }
 <MRI>"sect"                    { RTOKEN(SECT); }
-<MRI>"absolute"                        { RTOKEN(ABSOLUTE); }
+<EXPRESSION,BOTH,SCRIPT,MRI>"absolute"                 { RTOKEN(ABSOLUTE); }
 
 <COMMAND>{CMDFILENAMECHAR1}{CMDFILENAMECHAR}*  {
                                 yylval.name = buystring(yytext); 
@@ -317,7 +339,14 @@ WHITE              [ \t\n]+
                                }
 
 
-<MRI,BOTH,EXPRESSION>{FILENAMECHAR1}{FILENAMECHAR}*    {
+<MRI>{FILENAMECHAR1}{NOCFILENAMECHAR}* {
+/* Filename without commas, needed to parse mri stuff */
+                                yylval.name = buystring(yytext); 
+                                 return NAME;
+                               }
+
+
+<BOTH,EXPRESSION>{FILENAMECHAR1}{FILENAMECHAR}*        {
                                 yylval.name = buystring(yytext); 
                                  return NAME;
                                }
@@ -335,42 +364,46 @@ WHITE             [ \t\n]+
 <BOTH,SCRIPT,EXPRESSION>"\n"           { lineno++;}
 <MRI,COMMAND,BOTH,SCRIPT,EXPRESSION>[ \t]
 
-"/*"                           { old = INITIAL; BEGIN(COMMENT); }
-<COMMAND>"/*"                  { old = COMMAND; BEGIN(COMMENT); }
-<BOTH>"/*"                     { old =BOTH; BEGIN(COMMENT); }
-<SCRIPT>"/*"                   { old = EXPRESSION; BEGIN(COMMENT); }
-<EXPRESSION>"/*"               { old = SCRIPT; BEGIN(COMMENT); }
-"/*"                           { old = INITIAL; BEGIN(COMMENT); }
-<COMMENT>[^*\\n]*
-<COMMENT>"*"+[^*/\\n]*
-<COMMENT>\\n                   { ++lineno;}
-<COMMENT>"*"+"/"               { BEGIN(old); }
 <<EOF>> {
-    include_stack_ptr--;
+  extern char *ldfile_input_filename;
+  include_stack_ptr--;
     
-    if (include_stack_ptr == 0) 
-    {
-      yyterminate();
-    }
-    else 
-    {
-      yy_switch_to_buffer(include_stack[include_stack_ptr]);
-    }
-       BEGIN(COMMAND);
-       return END;
+  if (include_stack_ptr == 0) 
+  {
+    yyterminate();
+  }
+  else 
+  {
+    yy_switch_to_buffer(include_stack[include_stack_ptr]);
+
   }
+  if (include_stack_ptr==1) 
+  {
+    BEGIN(COMMAND);
+  }
+  else 
+  {
+    ldfile_input_filename = file_name_stack[include_stack_ptr-1];
+  }
+
+  return END;
+}
     
 %%
 
 void
-DEFUN(lex_push_file,(file),
-     FILE *file)
+DEFUN(lex_push_file,(file,name),
+     FILE *file AND
+     char *name)
 {
   if (include_stack_ptr >= MAX_INCLUDE_DEPTH) 
   {
     einfo("%F:includes nested too deeply");
   }
-  include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
+  file_name_stack[include_stack_ptr] = name;
+  include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
+
+  include_stack_ptr++;
   yyin = file;
   yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 
@@ -422,18 +455,19 @@ DEFUN(lex_redirect,( string),
   YY_BUFFER_STATE tmp;
 
   int len = strlen(string);
-yy_init = 0  ;  
+  yy_init = 0  ;  
   if (include_stack_ptr >= MAX_INCLUDE_DEPTH) 
   {
     einfo("%F: macros nested too deeply");
   }
-  include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
-
+  file_name_stack[include_stack_ptr] = "redirect";
+  include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
+  include_stack_ptr++;
   tmp =   yy_create_string_buffer(string, len);
   
   yy_switch_to_buffer(tmp);
   BEGIN(COMMAND);
-yyout = stdout;
+  yyout = stdout;
 }
 
 int state_stack[20];
@@ -442,50 +476,50 @@ int *state_stack_p = state_stack;
 void
 DEFUN_VOID(ldlex_script)
 {
-*(state_stack_p)++ = yy_start;
+  *(state_stack_p)++ = yy_start;
 
-BEGIN(SCRIPT);
+  BEGIN(SCRIPT);
 }
 
 
 void
 DEFUN_VOID(ldlex_mri_script)
 {
-*(state_stack_p)++ = yy_start;
-BEGIN(MRI);
+  *(state_stack_p)++ = yy_start;
+  BEGIN(MRI);
 }
 
 void
 DEFUN_VOID(ldlex_defsym)
 {
-*(state_stack_p)++ = yy_start;
-BEGIN(DEFSYMEXP);
+  *(state_stack_p)++ = yy_start;
+  BEGIN(DEFSYMEXP);
 }
           
 void
 DEFUN_VOID(ldlex_expression)
 {
-*(state_stack_p)++ = yy_start;
-BEGIN(EXPRESSION);
+  *(state_stack_p)++ = yy_start;
+  BEGIN(EXPRESSION);
 
 }
 void
 DEFUN_VOID(ldlex_both)
 {
-*(state_stack_p)++ = yy_start;
-BEGIN(BOTH);
+  *(state_stack_p)++ = yy_start;
+  BEGIN(BOTH);
 }
 void
 DEFUN_VOID(ldlex_command)
 {
-*(state_stack_p)++ = yy_start;
-BEGIN(COMMAND);
+  *(state_stack_p)++ = yy_start;
+  BEGIN(COMMAND);
 }
 
 void
 DEFUN_VOID(ldlex_popstate)
 {
-yy_start = *(--state_stack_p);
+  yy_start = *(--state_stack_p);
 }
 
 yy_input(buf, result, max_size)
@@ -501,3 +535,34 @@ int max_size;
       YY_FATAL_ERROR( "read() in flex scanner failed" );
   }
 }
+
+static
+comment()
+{
+  int c;
+  while (1)
+  {
+    c = input();
+    while (c !='*' && c != EOF) 
+    {
+      if (c == '\n') lineno++;
+      c = input();
+    }
+
+
+    if (c == '*')
+    {
+      c = input();
+      while ( c == '*')
+       c = input();
+      if ( c == '/' )
+       break;                  /* found the end */
+    }
+
+    if ( c == EOF )
+    {
+      einfo( "%F%P :EOF in comment");
+      break;
+    }
+  }
+}
This page took 0.032017 seconds and 4 git commands to generate.