Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc533240 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

genksyms: fix typeof() handling 



Recent increased use of typeof() throughout the tree resulted in a
number of symbols (25 in a typical distro config of ours) not getting a
proper CRC calculated for them anymore, due to the parser in genksyms
not coping with several of these uses (interestingly in the majority of
[if not all] cases the problem is due to the use of typeof() in code
preceding a certain export, not in the declaration/definition of the
exported function/object itself; I wasn't able to find a way to address
this more general parser shortcoming).

The use of parameter_declaration is a little more relaxed than would be
ideal (permitting not just a bare type specification, but also one with
identifier), but since the same code is being passed through an actual
compiler, there's no apparent risk of allowing through any broken code.

Otoh using parameter_declaration instead of the ad hoc
"decl_specifier_seq '*'" / "decl_specifier_seq" pair allows all types to
be handled rather than just plain ones and pointers to plain ones.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d507816b

scripts/genksyms/keywords.gperf

+3 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,8 @@ __inline, INLINE_KEYW 
__inline__, INLINE_KEYW

__inline__, INLINE_KEYW

__signed, SIGNED_KEYW

__signed, SIGNED_KEYW

__signed__, SIGNED_KEYW

__signed__, SIGNED_KEYW

__typeof, TYPEOF_KEYW

__typeof__, TYPEOF_KEYW

__volatile, VOLATILE_KEYW

__volatile, VOLATILE_KEYW

__volatile__, VOLATILE_KEYW

__volatile__, VOLATILE_KEYW

# According to rth, c99 defines _Bool, __restrict, __restrict__, restrict.  KAO

# According to rth, c99 defines _Bool, __restrict, __restrict__, restrict.  KAO
@@ -51,9 +53,8 @@ signed, SIGNED_KEYW 
static, STATIC_KEYW

static, STATIC_KEYW

struct, STRUCT_KEYW

struct, STRUCT_KEYW

typedef, TYPEDEF_KEYW

typedef, TYPEDEF_KEYW

typeof, TYPEOF_KEYW

union, UNION_KEYW

union, UNION_KEYW

unsigned, UNSIGNED_KEYW

unsigned, UNSIGNED_KEYW

void, VOID_KEYW

void, VOID_KEYW

volatile, VOLATILE_KEYW
 
volatile, VOLATILE_KEYW
 
typeof, TYPEOF_KEYW

__typeof__, TYPEOF_KEYW

scripts/genksyms/keywords.hash.c_shipped

+71 −62
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ struct resword; 
static const struct resword *is_reserved_word(register const char *str, register unsigned int len);

static const struct resword *is_reserved_word(register const char *str, register unsigned int len);

#line 8 "scripts/genksyms/keywords.gperf"

#line 8 "scripts/genksyms/keywords.gperf"

struct resword { const char *name; int token; };

struct resword { const char *name; int token; };

/* maximum key range = 64, duplicates = 0 */

/* maximum key range = 98, duplicates = 0 */





#ifdef __GNUC__

#ifdef __GNUC__

__inline

__inline
@@ -48,32 +48,32 @@ is_reserved_hash (register const char *str, register unsigned int len) 
{

{

  static const unsigned char asso_values[] =

  static const unsigned char asso_values[] =

    {

    {

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67,  0,

      101, 101, 101, 101, 101, 101, 101, 101, 101,   0,

      67, 67, 67, 67, 67, 67, 15, 67, 67, 67,

      101, 101, 101, 101, 101, 101,  15, 101, 101, 101,

       0, 67, 67, 67, 67, 67, 67, 67, 67, 67,

        0, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67,  0, 67,  0, 67,  5,

      101, 101, 101, 101, 101,   0, 101,   0, 101,   5,

      25, 20, 15, 30, 67, 15, 67, 67, 10,  0,

       25,  20,  55,  30, 101,  15, 101, 101,  10,   0,

      10, 40, 20, 67, 10,  5,  0, 10, 15, 67,

       10,  40,  10, 101,  10,   5,   0,  10,  15, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,

      101, 101, 101, 101, 101, 101, 101, 101, 101, 101,

      67, 67, 67, 67, 67, 67

      101, 101, 101, 101, 101, 101

    };

    };

  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];

  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];

}

}
@@ -89,17 +89,17 @@ is_reserved_word (register const char *str, register unsigned int len) 
{

{

  enum

  enum

    {

    {

      TOTAL_KEYWORDS = 45,

      TOTAL_KEYWORDS = 46,

      MIN_WORD_LENGTH = 3,

      MIN_WORD_LENGTH = 3,

      MAX_WORD_LENGTH = 24,

      MAX_WORD_LENGTH = 24,

      MIN_HASH_VALUE = 3,

      MIN_HASH_VALUE = 3,

      MAX_HASH_VALUE = 66

      MAX_HASH_VALUE = 100

    };

    };





  static const struct resword wordlist[] =

  static const struct resword wordlist[] =

    {

    {

      {""}, {""}, {""},

      {""}, {""}, {""},

#line 33 "scripts/genksyms/keywords.gperf"

#line 35 "scripts/genksyms/keywords.gperf"

      {"asm", ASM_KEYW},

      {"asm", ASM_KEYW},

      {""},

      {""},

#line 15 "scripts/genksyms/keywords.gperf"

#line 15 "scripts/genksyms/keywords.gperf"
@@ -108,7 +108,7 @@ is_reserved_word (register const char *str, register unsigned int len) 
#line 16 "scripts/genksyms/keywords.gperf"

#line 16 "scripts/genksyms/keywords.gperf"

      {"__asm__", ASM_KEYW},

      {"__asm__", ASM_KEYW},

      {""}, {""},

      {""}, {""},

#line 59 "scripts/genksyms/keywords.gperf"

#line 27 "scripts/genksyms/keywords.gperf"

      {"__typeof__", TYPEOF_KEYW},

      {"__typeof__", TYPEOF_KEYW},

      {""},

      {""},

#line 19 "scripts/genksyms/keywords.gperf"

#line 19 "scripts/genksyms/keywords.gperf"
@@ -119,31 +119,31 @@ is_reserved_word (register const char *str, register unsigned int len) 
      {"__const__", CONST_KEYW},

      {"__const__", CONST_KEYW},

#line 25 "scripts/genksyms/keywords.gperf"

#line 25 "scripts/genksyms/keywords.gperf"

      {"__signed__", SIGNED_KEYW},

      {"__signed__", SIGNED_KEYW},

#line 51 "scripts/genksyms/keywords.gperf"

#line 53 "scripts/genksyms/keywords.gperf"

      {"static", STATIC_KEYW},

      {"static", STATIC_KEYW},

      {""},

      {""},

#line 46 "scripts/genksyms/keywords.gperf"

#line 48 "scripts/genksyms/keywords.gperf"

      {"int", INT_KEYW},

      {"int", INT_KEYW},

#line 39 "scripts/genksyms/keywords.gperf"

#line 41 "scripts/genksyms/keywords.gperf"

      {"char", CHAR_KEYW},

      {"char", CHAR_KEYW},

#line 40 "scripts/genksyms/keywords.gperf"

#line 42 "scripts/genksyms/keywords.gperf"

      {"const", CONST_KEYW},

      {"const", CONST_KEYW},

#line 52 "scripts/genksyms/keywords.gperf"

#line 54 "scripts/genksyms/keywords.gperf"

      {"struct", STRUCT_KEYW},

      {"struct", STRUCT_KEYW},

#line 31 "scripts/genksyms/keywords.gperf"

#line 33 "scripts/genksyms/keywords.gperf"

      {"__restrict__", RESTRICT_KEYW},

      {"__restrict__", RESTRICT_KEYW},

#line 32 "scripts/genksyms/keywords.gperf"

#line 34 "scripts/genksyms/keywords.gperf"

      {"restrict", RESTRICT_KEYW},

      {"restrict", RESTRICT_KEYW},

#line 12 "scripts/genksyms/keywords.gperf"

#line 12 "scripts/genksyms/keywords.gperf"

      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},

      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},

#line 23 "scripts/genksyms/keywords.gperf"

#line 23 "scripts/genksyms/keywords.gperf"

      {"__inline__", INLINE_KEYW},

      {"__inline__", INLINE_KEYW},

      {""},

      {""},

#line 27 "scripts/genksyms/keywords.gperf"

#line 29 "scripts/genksyms/keywords.gperf"

      {"__volatile__", VOLATILE_KEYW},

      {"__volatile__", VOLATILE_KEYW},

#line 10 "scripts/genksyms/keywords.gperf"

#line 10 "scripts/genksyms/keywords.gperf"

      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},

      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},

#line 30 "scripts/genksyms/keywords.gperf"

#line 32 "scripts/genksyms/keywords.gperf"

      {"_restrict", RESTRICT_KEYW},

      {"_restrict", RESTRICT_KEYW},

      {""},

      {""},

#line 17 "scripts/genksyms/keywords.gperf"

#line 17 "scripts/genksyms/keywords.gperf"
@@ -152,56 +152,65 @@ is_reserved_word (register const char *str, register unsigned int len) 
      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},

      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},

#line 21 "scripts/genksyms/keywords.gperf"

#line 21 "scripts/genksyms/keywords.gperf"

      {"__extension__", EXTENSION_KEYW},

      {"__extension__", EXTENSION_KEYW},

#line 42 "scripts/genksyms/keywords.gperf"

#line 44 "scripts/genksyms/keywords.gperf"

      {"enum", ENUM_KEYW},

      {"enum", ENUM_KEYW},

#line 13 "scripts/genksyms/keywords.gperf"

#line 13 "scripts/genksyms/keywords.gperf"

      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},

      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},

#line 43 "scripts/genksyms/keywords.gperf"

#line 45 "scripts/genksyms/keywords.gperf"

      {"extern", EXTERN_KEYW},

      {"extern", EXTERN_KEYW},

      {""},

      {""},

#line 24 "scripts/genksyms/keywords.gperf"

#line 24 "scripts/genksyms/keywords.gperf"

      {"__signed", SIGNED_KEYW},

      {"__signed", SIGNED_KEYW},

#line 14 "scripts/genksyms/keywords.gperf"

#line 14 "scripts/genksyms/keywords.gperf"

      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},

      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},

#line 54 "scripts/genksyms/keywords.gperf"

#line 57 "scripts/genksyms/keywords.gperf"

      {"union", UNION_KEYW},

      {"union", UNION_KEYW},

#line 58 "scripts/genksyms/keywords.gperf"

      {""}, {""},

      {"typeof", TYPEOF_KEYW},

#line 53 "scripts/genksyms/keywords.gperf"

      {"typedef", TYPEDEF_KEYW},

#line 22 "scripts/genksyms/keywords.gperf"

#line 22 "scripts/genksyms/keywords.gperf"

      {"__inline", INLINE_KEYW},

      {"__inline", INLINE_KEYW},

#line 38 "scripts/genksyms/keywords.gperf"

#line 40 "scripts/genksyms/keywords.gperf"

      {"auto", AUTO_KEYW},

      {"auto", AUTO_KEYW},

#line 26 "scripts/genksyms/keywords.gperf"

#line 28 "scripts/genksyms/keywords.gperf"

      {"__volatile", VOLATILE_KEYW},

      {"__volatile", VOLATILE_KEYW},

      {""}, {""},

      {""}, {""},

#line 55 "scripts/genksyms/keywords.gperf"

#line 58 "scripts/genksyms/keywords.gperf"

      {"unsigned", UNSIGNED_KEYW},

      {"unsigned", UNSIGNED_KEYW},

      {""},

      {""},

#line 49 "scripts/genksyms/keywords.gperf"

#line 51 "scripts/genksyms/keywords.gperf"

      {"short", SHORT_KEYW},

      {"short", SHORT_KEYW},

#line 45 "scripts/genksyms/keywords.gperf"

#line 47 "scripts/genksyms/keywords.gperf"

      {"inline", INLINE_KEYW},

      {"inline", INLINE_KEYW},

      {""},

      {""},

#line 57 "scripts/genksyms/keywords.gperf"

#line 60 "scripts/genksyms/keywords.gperf"

      {"volatile", VOLATILE_KEYW},

      {"volatile", VOLATILE_KEYW},

#line 47 "scripts/genksyms/keywords.gperf"

#line 49 "scripts/genksyms/keywords.gperf"

      {"long", LONG_KEYW},

      {"long", LONG_KEYW},

#line 29 "scripts/genksyms/keywords.gperf"

#line 31 "scripts/genksyms/keywords.gperf"

      {"_Bool", BOOL_KEYW},

      {"_Bool", BOOL_KEYW},

      {""}, {""},

      {""}, {""},

#line 48 "scripts/genksyms/keywords.gperf"

#line 50 "scripts/genksyms/keywords.gperf"

      {"register", REGISTER_KEYW},

      {"register", REGISTER_KEYW},

#line 56 "scripts/genksyms/keywords.gperf"

#line 59 "scripts/genksyms/keywords.gperf"

      {"void", VOID_KEYW},

      {"void", VOID_KEYW},

#line 44 "scripts/genksyms/keywords.gperf"

      {""},

      {"float", FLOAT_KEYW},

#line 43 "scripts/genksyms/keywords.gperf"

#line 41 "scripts/genksyms/keywords.gperf"

      {"double", DOUBLE_KEYW},

      {"double", DOUBLE_KEYW},

      {""},

#line 26 "scripts/genksyms/keywords.gperf"

      {"__typeof", TYPEOF_KEYW},

      {""}, {""},

#line 52 "scripts/genksyms/keywords.gperf"

      {"signed", SIGNED_KEYW},

      {""}, {""}, {""}, {""},

      {""}, {""}, {""}, {""},

#line 50 "scripts/genksyms/keywords.gperf"

#line 56 "scripts/genksyms/keywords.gperf"

      {"signed", SIGNED_KEYW}

      {"typeof", TYPEOF_KEYW},

#line 55 "scripts/genksyms/keywords.gperf"

      {"typedef", TYPEDEF_KEYW},

      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},

      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},

      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},

#line 46 "scripts/genksyms/keywords.gperf"

      {"float", FLOAT_KEYW}

    };

    };





  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

scripts/genksyms/lex.l

+49 −2
Original line number Original line Diff line number Diff line
@@ -129,8 +129,9 @@ int 
yylex(void)

yylex(void)

{

{

  static enum {

  static enum {

    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_BRACKET, ST_BRACE,

    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,

    ST_EXPRESSION, ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,

    ST_BRACKET, ST_BRACE, ST_EXPRESSION,

    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,

    ST_TABLE_5, ST_TABLE_6

    ST_TABLE_5, ST_TABLE_6

  } lexstate = ST_NOTSTARTED;

  } lexstate = ST_NOTSTARTED;
@@ -198,6 +199,10 @@ repeat: 
		    lexstate = ST_ASM;

		    lexstate = ST_ASM;

		    count = 0;

		    count = 0;

		    goto repeat;

		    goto repeat;

		  case TYPEOF_KEYW:

		    lexstate = ST_TYPEOF;

		    count = 0;

		    goto repeat;





		  case STRUCT_KEYW:

		  case STRUCT_KEYW:

		  case UNION_KEYW:

		  case UNION_KEYW:
@@ -284,6 +289,48 @@ repeat: 
	}

	}

      break;

      break;





    case ST_TYPEOF:

      switch (token)

	{

	case '(':

	  if ( ++count == 1 )

	    lexstate = ST_TYPEOF_1;

	  else

	    APP;

	  goto repeat;

	case ')':

	  APP;

	  if (--count == 0)

	    {

	      lexstate = ST_NORMAL;

	      token = TYPEOF_PHRASE;

	      break;

	    }

	  goto repeat;

	default:

	  APP;

	  goto repeat;

	}

      break;



    case ST_TYPEOF_1:

      if (token == IDENT)

	{

	  if (is_reserved_word(yytext, yyleng)

	      || find_symbol(yytext, SYM_TYPEDEF, 1))

	    {

	      yyless(0);

	      unput('(');

	      lexstate = ST_NORMAL;

	      token = TYPEOF_KEYW;

	      break;

	    }

	  _APP("(", 1);

	}

	APP;

	lexstate = ST_TYPEOF;

	goto repeat;



    case ST_BRACKET:

    case ST_BRACKET:

      APP;

      APP;

      switch (token)

      switch (token)

scripts/genksyms/lex.lex.c_shipped

+49 −2
Original line number Original line Diff line number Diff line
@@ -1938,8 +1938,9 @@ int 
yylex(void)

yylex(void)

{

{

  static enum {

  static enum {

    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_BRACKET, ST_BRACE,

    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,

    ST_EXPRESSION, ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,

    ST_BRACKET, ST_BRACE, ST_EXPRESSION,

    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,

    ST_TABLE_5, ST_TABLE_6

    ST_TABLE_5, ST_TABLE_6

  } lexstate = ST_NOTSTARTED;

  } lexstate = ST_NOTSTARTED;
@@ -2007,6 +2008,10 @@ repeat: 
		    lexstate = ST_ASM;

		    lexstate = ST_ASM;

		    count = 0;

		    count = 0;

		    goto repeat;

		    goto repeat;

		  case TYPEOF_KEYW:

		    lexstate = ST_TYPEOF;

		    count = 0;

		    goto repeat;





		  case STRUCT_KEYW:

		  case STRUCT_KEYW:

		  case UNION_KEYW:

		  case UNION_KEYW:
@@ -2093,6 +2098,48 @@ repeat: 
	}

	}

      break;

      break;





    case ST_TYPEOF:

      switch (token)

	{

	case '(':

	  if ( ++count == 1 )

	    lexstate = ST_TYPEOF_1;

	  else

	    APP;

	  goto repeat;

	case ')':

	  APP;

	  if (--count == 0)

	    {

	      lexstate = ST_NORMAL;

	      token = TYPEOF_PHRASE;

	      break;

	    }

	  goto repeat;

	default:

	  APP;

	  goto repeat;

	}

      break;



    case ST_TYPEOF_1:

      if (token == IDENT)

	{

	  if (is_reserved_word(yytext, yyleng)

	      || find_symbol(yytext, SYM_TYPEDEF, 1))

	    {

	      yyless(0);

	      unput('(');

	      lexstate = ST_NORMAL;

	      token = TYPEOF_KEYW;

	      break;

	    }

	  _APP("(", 1);

	}

	APP;

	lexstate = ST_TYPEOF;

	goto repeat;



    case ST_BRACKET:

    case ST_BRACKET:

      APP;

      APP;

      switch (token)

      switch (token)

scripts/genksyms/parse.tab.c_shipped

+308 −300

File changed.

Preview size limit exceeded, changes collapsed.