diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc index b788629352..bd0d84d504 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.cc @@ -278,8 +278,9 @@ void Range::restoreXml(const Element *el,const AddrSpaceManager *manage) { spc = (AddrSpace *)0; + bool seenLast = false; first = 0; - last = ~((uintb)0); + last = 0; for(int4 i=0;igetNumAttributes();++i) { if (el->getAttributeName(i) == "space") { spc = manage->getSpaceByName(el->getAttributeValue(i)); @@ -295,6 +296,7 @@ void Range::restoreXml(const Element *el,const AddrSpaceManager *manage) istringstream s(el->getAttributeValue(i)); s.unsetf(ios::dec | ios::hex | ios::oct); s >> last; + seenLast = true; } else if (el->getAttributeName(i) == "name") { const Translate *trans = manage->getDefaultCodeSpace()->getTrans(); @@ -302,12 +304,16 @@ void Range::restoreXml(const Element *el,const AddrSpaceManager *manage) spc = point.space; first = point.offset; last = (first-1) + point.size; - break; // There should be no (space,first,last) attributes + return; // There should be no (space,first,last) attributes } } if (spc == (AddrSpace *)0) - throw LowlevelError("No address space indicated in range tag"); - last = spc->wrapOffset(last); + throw LowlevelError("No address space indicated in range tag"); + if (!seenLast) { + last = spc->getHighest(); + } + if (first > spc->getHighest() || last > spc->getHighest() || last < first) + throw LowlevelError("Illegal range tag"); } /// Insert a new Range merging as appropriate to maintain the disjoint cover diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/consolemain.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/consolemain.cc index 9880890614..576dccbe74 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/consolemain.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/consolemain.cc @@ -98,7 +98,7 @@ void IfcLoadFile::execute(istream &s) if (capa->getName() == "xml") // If file is xml dcp->conf->readLoaderSymbols("::"); // Read in loader symbols #ifdef OPACTION_DEBUG - dcp->conf->setDebugStream(status->optr); + dcp->conf->setDebugStream(status->fileoptr); #endif *status->optr << filename << " successfully loaded: " << dcp->conf->getDescription() << endl; } @@ -160,7 +160,7 @@ void IfcRestore::execute(istream &s) } #ifdef OPACTION_DEBUG - dcp->conf->setDebugStream(status->optr); + dcp->conf->setDebugStream(status->fileoptr); #endif *status->optr << savefile << " successfully loaded: " << dcp->conf->getDescription() << endl; } diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.cc index ff5a40f614..1d7c98697d 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#line 2 "src/decompile/cpp/slghscan.cc" +#line 2 "slghscan.cc" -#line 4 "src/decompile/cpp/slghscan.cc" +#line 4 "slghscan.cc" #define YY_INT_ALIGNED short int @@ -23,8 +23,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -99,65 +99,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus +/* begin standard C++ headers. */ -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -174,15 +170,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -197,7 +194,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -212,12 +208,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -240,7 +236,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -268,7 +264,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -279,7 +275,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -287,11 +282,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -300,80 +295,77 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 164 #define YY_END_OF_BUFFER 165 /* This struct is not used in this scanner, @@ -383,7 +375,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[527] = +static const flex_int16_t yy_accept[527] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 165, 14, 7, 8, 6, 14, @@ -445,116 +437,116 @@ static yyconst flex_int16_t yy_accept[527] = 51, 139, 51, 51, 31, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 5, 6, 7, 8, 9, 1, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 21, 21, 21, 21, 21, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 29, 29, 29, 29, 29, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 31, 1, 32, 33, 34, 1, 35, 36, 37, 38, + 1, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 23, 23, 23, 23, 23, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 31, 31, 31, 31, 31, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 33, 11, 34, 35, 36, 11, 37, 38, 39, 40, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 1, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11 } ; -static yyconst flex_int32_t yy_meta[65] = +static const YY_CHAR yy_meta[67] = { 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 3, 1, 1, 1, 1, 4, 1, 5, 5, 5, - 5, 1, 1, 1, 1, 1, 1, 1, 5, 4, - 1, 1, 1, 4, 5, 5, 5, 5, 5, 5, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 1, 1 + 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 4, 3, 3, 3, 3, 5, 3, 6, + 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, + 6, 5, 3, 3, 3, 5, 6, 6, 6, 6, + 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[564] = +static const flex_int16_t yy_base[564] = { 0, - 0, 897, 64, 896, 128, 895, 192, 894, 256, 893, - 320, 892, 0, 382, 919, 926, 916, 926, 0, 907, - 926, 0, 926, 862, 876, 879, 870, 926, 909, 926, - 909, 926, 905, 0, 899, 926, 0, 350, 369, 926, - 862, 864, 857, 866, 856, 864, 859, 356, 861, 863, - 357, 350, 345, 864, 849, 894, 926, 894, 926, 885, - 926, 0, 926, 891, 926, 891, 926, 926, 887, 881, - 0, 926, 837, 886, 926, 886, 926, 862, 0, 385, - 926, 926, 870, 361, 393, 374, 376, 0, 926, 926, - 926, 839, 836, 926, 926, 880, 926, 880, 926, 856, + 0, 931, 66, 930, 132, 929, 198, 928, 264, 927, + 330, 926, 0, 394, 955, 962, 396, 962, 0, 942, + 962, 0, 962, 897, 911, 914, 905, 962, 946, 962, + 397, 962, 942, 0, 935, 962, 0, 365, 384, 962, + 898, 900, 893, 902, 892, 900, 895, 365, 897, 899, + 371, 365, 358, 900, 885, 932, 962, 409, 962, 922, + 962, 0, 962, 930, 962, 416, 962, 962, 926, 919, + 0, 962, 875, 926, 962, 419, 962, 901, 0, 402, + 962, 962, 909, 377, 406, 404, 405, 0, 962, 962, + 962, 878, 875, 962, 962, 921, 962, 432, 962, 896, - 0, 870, 926, 870, 0, 367, 397, 382, 853, 396, - 844, 840, 374, 389, 836, 816, 423, 824, 397, 823, - 391, 822, 393, 436, 818, 830, 806, 926, 864, 926, - 863, 926, 862, 862, 0, 0, 0, 809, 822, 824, - 806, 856, 926, 856, 852, 851, 0, 0, 0, 432, - 0, 436, 812, 392, 806, 421, 815, 794, 797, 803, - 809, 808, 798, 799, 804, 411, 809, 798, 792, 413, - 789, 837, 926, 837, 0, 0, 835, 926, 835, 831, - 830, 0, 0, 0, 831, 926, 831, 926, 0, 0, - 784, 779, 781, 813, 0, 445, 0, 458, 926, 926, + 0, 910, 962, 911, 0, 384, 420, 419, 893, 420, + 884, 880, 398, 413, 876, 856, 454, 864, 410, 863, + 420, 862, 415, 465, 858, 870, 846, 962, 906, 962, + 905, 962, 904, 468, 0, 0, 0, 850, 863, 865, + 847, 899, 962, 473, 895, 894, 0, 0, 0, 443, + 0, 465, 854, 395, 848, 437, 857, 836, 839, 845, + 851, 850, 840, 841, 846, 435, 851, 840, 834, 435, + 831, 881, 962, 488, 0, 0, 880, 962, 492, 876, + 875, 0, 0, 0, 877, 962, 496, 962, 0, 0, + 829, 824, 826, 858, 0, 487, 0, 489, 962, 962, - 926, 926, 779, 784, 823, 926, 823, 926, 0, 0, - 926, 0, 448, 0, 462, 926, 926, 926, 926, 926, - 926, 771, 771, 779, 422, 778, 771, 770, 772, 767, - 791, 926, 926, 926, 926, 790, 789, 788, 763, 757, - 0, 756, 772, 760, 750, 756, 751, 749, 926, 926, - 778, 459, 753, 766, 742, 747, 743, 739, 926, 793, - 926, 792, 926, 791, 926, 782, 757, 748, 738, 747, - 777, 470, 0, 746, 0, 734, 731, 0, 749, 740, - 0, 728, 742, 734, 726, 740, 743, 733, 727, 735, - 736, 733, 732, 715, 726, 730, 756, 755, 754, 726, + 962, 962, 824, 829, 870, 962, 497, 962, 0, 0, + 962, 0, 493, 0, 499, 962, 962, 962, 962, 962, + 962, 817, 817, 825, 469, 824, 817, 816, 818, 813, + 837, 962, 962, 962, 962, 836, 835, 834, 809, 803, + 0, 802, 818, 806, 796, 802, 797, 795, 962, 962, + 824, 488, 799, 812, 788, 793, 789, 785, 962, 841, + 962, 840, 962, 839, 962, 828, 803, 794, 784, 793, + 823, 504, 0, 792, 0, 780, 777, 0, 795, 786, + 0, 774, 788, 780, 772, 786, 789, 779, 773, 781, + 782, 779, 778, 761, 772, 776, 802, 801, 800, 772, - 926, 711, 0, 472, 0, 726, 714, 749, 474, 0, - 0, 707, 712, 711, 704, 709, 705, 700, 717, 702, - 926, 926, 926, 926, 451, 701, 729, 713, 0, 698, - 709, 690, 696, 926, 926, 926, 691, 690, 687, 686, - 691, 684, 926, 726, 699, 687, 685, 0, 926, 722, - 684, 696, 691, 674, 693, 681, 673, 676, 685, 684, - 669, 668, 681, 0, 680, 670, 0, 678, 681, 662, - 926, 703, 926, 702, 926, 701, 926, 926, 676, 660, - 926, 698, 659, 669, 0, 647, 0, 659, 651, 644, - 650, 647, 648, 0, 659, 652, 661, 647, 643, 656, + 962, 757, 0, 506, 0, 772, 760, 795, 508, 0, + 0, 753, 758, 757, 750, 755, 751, 746, 763, 748, + 962, 962, 962, 962, 493, 747, 775, 759, 0, 744, + 755, 736, 742, 962, 962, 962, 737, 736, 733, 732, + 737, 730, 962, 772, 745, 733, 731, 0, 962, 768, + 730, 742, 737, 720, 739, 727, 719, 722, 731, 730, + 715, 714, 727, 0, 726, 716, 0, 724, 727, 708, + 962, 749, 962, 748, 962, 747, 962, 962, 722, 706, + 962, 744, 705, 715, 0, 693, 0, 705, 697, 690, + 696, 693, 694, 0, 705, 698, 707, 693, 689, 702, - 641, 640, 0, 0, 654, 0, 648, 650, 0, 641, - 639, 628, 639, 636, 644, 0, 625, 627, 631, 629, - 624, 639, 0, 0, 623, 639, 631, 627, 626, 614, - 0, 0, 0, 634, 616, 614, 647, 0, 620, 0, - 621, 609, 615, 0, 613, 602, 0, 0, 0, 621, - 618, 604, 603, 0, 0, 0, 0, 606, 620, 615, - 0, 0, 607, 592, 598, 0, 0, 595, 603, 0, - 608, 598, 607, 597, 0, 587, 0, 595, 603, 0, - 0, 0, 604, 588, 600, 599, 598, 593, 586, 588, - 598, 595, 577, 0, 576, 0, 590, 594, 574, 0, + 687, 686, 0, 0, 700, 0, 694, 696, 0, 687, + 685, 674, 685, 682, 690, 0, 671, 673, 677, 675, + 670, 685, 0, 0, 669, 685, 677, 673, 672, 660, + 0, 0, 0, 680, 662, 660, 693, 0, 666, 0, + 667, 655, 661, 0, 659, 648, 0, 0, 0, 667, + 664, 650, 649, 0, 0, 0, 0, 652, 666, 661, + 0, 0, 653, 638, 644, 0, 0, 641, 649, 0, + 654, 644, 653, 643, 0, 633, 0, 641, 649, 0, + 0, 0, 650, 634, 646, 645, 644, 639, 632, 634, + 644, 641, 623, 0, 568, 0, 569, 540, 503, 0, - 572, 579, 570, 574, 518, 506, 0, 0, 0, 476, - 0, 0, 474, 0, 464, 0, 0, 448, 0, 443, - 461, 0, 458, 455, 0, 926, 500, 505, 510, 512, - 517, 522, 527, 529, 534, 536, 541, 546, 548, 553, - 558, 560, 565, 570, 572, 577, 582, 587, 589, 591, - 465, 593, 595, 597, 426, 599, 404, 602, 605, 608, - 611, 614, 617 + 487, 494, 485, 489, 483, 482, 0, 0, 0, 482, + 0, 0, 496, 0, 498, 0, 0, 482, 0, 477, + 495, 0, 492, 464, 0, 962, 544, 550, 556, 558, + 564, 568, 574, 576, 582, 584, 590, 594, 596, 602, + 608, 610, 616, 622, 624, 630, 636, 642, 644, 646, + 489, 648, 650, 652, 452, 654, 429, 657, 660, 663, + 666, 669, 672 } ; -static yyconst flex_int16_t yy_def[564] = +static const flex_int16_t yy_def[564] = { 0, 526, 1, 526, 3, 526, 5, 526, 7, 526, 9, 526, 11, 527, 528, 526, 526, 526, 526, 529, 526, @@ -620,119 +612,124 @@ static yyconst flex_int16_t yy_def[564] = 526, 526, 526 } ; -static yyconst flex_int16_t yy_nxt[991] = +static const flex_int16_t yy_nxt[1029] = { 0, - 16, 17, 18, 16, 16, 19, 20, 16, 16, 21, - 21, 16, 16, 21, 21, 22, 16, 16, 16, 16, - 16, 23, 16, 16, 16, 16, 16, 16, 22, 22, - 16, 16, 16, 22, 24, 22, 22, 25, 22, 22, - 22, 22, 22, 22, 22, 22, 26, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 27, 22, 22, 22, - 28, 16, 16, 16, 30, 31, 32, 30, 33, 34, - 35, 30, 30, 36, 36, 30, 30, 36, 30, 37, - 30, 38, 39, 39, 39, 36, 40, 30, 36, 30, - 30, 30, 37, 37, 36, 36, 30, 37, 41, 42, + 16, 17, 18, 17, 16, 16, 19, 20, 16, 16, + 16, 21, 21, 16, 16, 21, 21, 22, 16, 16, + 16, 16, 16, 23, 16, 16, 16, 16, 16, 16, + 22, 22, 16, 16, 16, 22, 24, 22, 22, 25, + 22, 22, 22, 22, 22, 22, 22, 22, 26, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 27, 22, + 22, 22, 28, 16, 16, 16, 30, 31, 32, 31, + 30, 33, 34, 35, 30, 30, 30, 36, 36, 30, + 30, 36, 30, 37, 30, 38, 39, 39, 39, 36, + 40, 30, 36, 30, 30, 30, 37, 37, 36, 36, - 43, 44, 45, 37, 37, 46, 37, 37, 37, 47, - 37, 48, 49, 50, 37, 51, 52, 53, 37, 54, - 55, 37, 37, 37, 30, 30, 30, 30, 57, 58, - 59, 57, 57, 57, 60, 57, 57, 61, 61, 57, - 57, 61, 57, 62, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 62, 62, 57, 57, - 57, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 30, 37, 41, 42, 43, 44, 45, 37, 37, 46, + 37, 37, 37, 47, 37, 48, 49, 50, 37, 51, + 52, 53, 37, 54, 55, 37, 37, 37, 30, 30, + 30, 30, 57, 58, 59, 58, 57, 57, 57, 60, + 57, 57, 57, 61, 61, 57, 57, 61, 57, 62, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 62, 62, 57, 57, 57, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 63, 57, - 57, 57, 65, 66, 67, 68, 69, 68, 70, 68, + 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, + 62, 62, 62, 62, 63, 57, 57, 57, 65, 66, - 68, 68, 68, 68, 68, 68, 68, 71, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 71, 71, 68, 68, 72, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 73, 71, 71, 71, 71, 71, + 67, 66, 68, 69, 68, 70, 68, 68, 65, 68, + 68, 68, 68, 68, 68, 71, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 71, 71, + 68, 68, 72, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 73, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 68, 68, 68, 68, 75, 76, 77, 78, - 75, 79, 80, 75, 81, 82, 82, 82, 82, 82, + 68, 68, 68, 68, 75, 76, 77, 76, 78, 75, + 79, 80, 75, 81, 75, 82, 82, 82, 82, 82, 82, 83, 82, 84, 85, 85, 85, 82, 82, 86, 82, 87, 75, 75, 88, 88, 89, 90, 91, 88, - 88, 88, 88, 88, 88, 88, 92, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 92, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 93, 88, 88, 88, 88, 88, 94, 95, 75, 82, - 97, 98, 99, 100, 97, 101, 102, 103, 104, 103, - 103, 103, 103, 103, 103, 105, 103, 106, 107, 107, - 107, 103, 103, 108, 109, 110, 97, 97, 105, 105, - 103, 103, 111, 105, 112, 113, 114, 115, 116, 117, - 118, 105, 119, 105, 105, 120, 105, 121, 105, 122, - 105, 123, 124, 125, 105, 105, 105, 105, 105, 126, - 97, 127, 128, 103, 132, 150, 152, 152, 152, 152, - 160, 164, 166, 168, 190, 165, 196, 199, 200, 167, + 97, 98, 99, 98, 100, 97, 101, 102, 103, 104, + 97, 103, 103, 103, 103, 103, 103, 105, 103, 106, + 107, 107, 107, 103, 103, 108, 109, 110, 97, 97, + 105, 105, 103, 103, 111, 105, 112, 113, 114, 115, + 116, 117, 118, 105, 119, 105, 105, 120, 105, 121, + 105, 122, 105, 123, 124, 125, 105, 105, 105, 105, + 105, 126, 97, 127, 128, 103, 132, 134, 144, 134, - 201, 202, 213, 169, 161, 216, 217, 151, 310, 133, - 198, 198, 198, 198, 215, 215, 215, 215, 197, 191, - 219, 220, 223, 225, 214, 244, 231, 226, 224, 245, - 305, 247, 275, 192, 232, 233, 241, 234, 227, 235, - 228, 248, 193, 249, 242, 276, 236, 237, 238, 272, - 272, 289, 250, 152, 152, 152, 152, 278, 294, 251, - 279, 252, 304, 304, 295, 309, 309, 314, 239, 273, - 290, 253, 254, 315, 255, 198, 198, 198, 198, 215, - 215, 215, 215, 335, 336, 392, 256, 272, 272, 304, - 304, 309, 309, 525, 524, 523, 522, 521, 520, 393, + 144, 160, 150, 152, 152, 152, 152, 164, 168, 166, + 174, 165, 174, 190, 196, 161, 167, 179, 169, 179, + 187, 213, 187, 133, 151, 198, 198, 198, 198, 199, + 200, 201, 202, 207, 310, 207, 197, 275, 191, 215, + 215, 215, 215, 214, 216, 217, 219, 220, 223, 225, + 276, 241, 192, 226, 224, 247, 244, 305, 231, 242, + 245, 193, 272, 272, 227, 248, 228, 232, 233, 134, + 234, 134, 235, 249, 144, 278, 144, 289, 279, 236, + 237, 238, 294, 250, 152, 152, 152, 152, 295, 174, + 251, 174, 252, 179, 273, 179, 290, 187, 207, 187, - 130, 130, 130, 130, 130, 131, 131, 131, 131, 131, - 135, 519, 135, 135, 135, 137, 137, 142, 142, 142, - 142, 142, 145, 145, 145, 145, 145, 147, 518, 147, - 147, 147, 149, 149, 172, 172, 172, 172, 172, 176, - 176, 177, 177, 177, 177, 177, 180, 180, 180, 180, - 180, 183, 183, 185, 185, 185, 185, 185, 189, 517, - 189, 189, 189, 195, 195, 205, 205, 205, 205, 205, - 209, 516, 209, 209, 209, 212, 212, 260, 260, 260, - 260, 260, 262, 262, 262, 262, 262, 264, 264, 264, - 264, 264, 266, 266, 271, 271, 297, 297, 298, 298, + 207, 239, 253, 254, 525, 255, 304, 304, 198, 198, + 198, 198, 309, 309, 335, 336, 314, 256, 215, 215, + 215, 215, 315, 272, 272, 304, 304, 309, 309, 392, + 524, 523, 522, 521, 520, 519, 518, 517, 516, 515, + 514, 513, 512, 393, 130, 130, 130, 130, 130, 130, + 131, 131, 131, 131, 131, 131, 135, 511, 135, 135, + 135, 135, 137, 137, 142, 142, 142, 142, 142, 142, + 145, 145, 145, 145, 147, 510, 147, 147, 147, 147, + 149, 149, 172, 172, 172, 172, 172, 172, 176, 176, + 177, 177, 177, 177, 177, 177, 180, 180, 180, 180, - 299, 299, 308, 308, 344, 344, 344, 350, 350, 350, - 372, 372, 372, 374, 374, 374, 376, 376, 376, 382, - 382, 382, 515, 514, 513, 512, 511, 510, 509, 508, - 507, 506, 505, 504, 503, 502, 501, 500, 499, 498, - 497, 496, 495, 494, 493, 492, 491, 490, 489, 488, - 487, 486, 485, 484, 483, 482, 481, 480, 479, 478, - 477, 476, 475, 474, 473, 472, 471, 470, 469, 468, - 467, 466, 465, 464, 463, 462, 461, 460, 459, 458, - 457, 456, 455, 454, 453, 452, 451, 450, 449, 448, - 447, 446, 445, 444, 443, 442, 441, 440, 439, 438, + 183, 183, 185, 185, 185, 185, 185, 185, 189, 509, + 189, 189, 189, 189, 195, 195, 205, 205, 205, 205, + 205, 205, 209, 508, 209, 209, 209, 209, 212, 212, + 260, 260, 260, 260, 260, 260, 262, 262, 262, 262, + 262, 262, 264, 264, 264, 264, 264, 264, 266, 266, + 271, 271, 297, 297, 298, 298, 299, 299, 308, 308, + 344, 344, 344, 350, 350, 350, 372, 372, 372, 374, + 374, 374, 376, 376, 376, 382, 382, 382, 507, 506, + 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, + 495, 494, 493, 492, 491, 490, 489, 488, 487, 486, - 437, 436, 435, 434, 433, 432, 431, 430, 381, 429, - 428, 375, 373, 371, 427, 426, 425, 424, 423, 422, - 421, 420, 419, 418, 417, 416, 415, 414, 413, 412, - 411, 410, 349, 409, 408, 407, 343, 406, 405, 404, - 403, 402, 401, 400, 399, 398, 397, 396, 395, 394, - 391, 390, 389, 388, 387, 386, 385, 384, 383, 381, - 380, 379, 378, 377, 375, 373, 371, 370, 369, 368, - 367, 366, 365, 364, 363, 362, 361, 360, 359, 358, - 357, 356, 355, 354, 353, 352, 351, 349, 348, 347, - 346, 345, 343, 265, 263, 261, 342, 341, 340, 339, + 485, 484, 483, 482, 481, 480, 479, 478, 477, 476, + 475, 474, 473, 472, 471, 470, 469, 468, 467, 466, + 465, 464, 463, 462, 461, 460, 459, 458, 457, 456, + 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, + 445, 444, 443, 442, 441, 440, 439, 438, 437, 436, + 435, 434, 433, 432, 431, 430, 381, 429, 428, 375, + 373, 371, 427, 426, 425, 424, 423, 422, 421, 420, + 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, + 349, 409, 408, 407, 343, 406, 405, 404, 403, 402, + 401, 400, 399, 398, 397, 396, 395, 394, 391, 390, - 338, 337, 334, 333, 332, 331, 330, 329, 328, 327, - 326, 325, 324, 323, 322, 321, 320, 319, 318, 317, - 316, 313, 312, 311, 207, 206, 307, 306, 303, 302, - 301, 300, 187, 186, 180, 181, 179, 178, 174, 173, - 296, 293, 292, 291, 288, 287, 286, 285, 284, 283, - 282, 281, 280, 277, 274, 145, 146, 144, 143, 270, - 269, 268, 267, 134, 265, 263, 261, 259, 258, 257, - 246, 243, 240, 230, 229, 222, 221, 218, 211, 210, - 208, 207, 206, 204, 203, 194, 188, 187, 186, 184, - 182, 181, 179, 178, 175, 174, 173, 171, 170, 163, + 389, 388, 387, 386, 385, 384, 383, 381, 380, 379, + 378, 377, 375, 373, 371, 370, 369, 368, 367, 366, + 365, 364, 363, 362, 361, 360, 359, 358, 357, 356, + 355, 354, 353, 352, 351, 349, 348, 347, 346, 345, + 343, 265, 263, 261, 342, 341, 340, 339, 338, 337, + 334, 333, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 323, 322, 321, 320, 319, 318, 317, 316, 313, + 312, 311, 206, 307, 306, 303, 302, 301, 300, 186, + 180, 181, 178, 173, 296, 293, 292, 291, 288, 287, + 286, 285, 284, 283, 282, 281, 280, 277, 274, 145, - 162, 159, 158, 157, 156, 155, 154, 153, 148, 146, - 144, 143, 141, 140, 139, 138, 136, 134, 526, 129, - 96, 74, 64, 56, 29, 15, 526, 526, 526, 526, + 146, 143, 270, 269, 268, 267, 265, 263, 261, 259, + 258, 257, 246, 243, 240, 230, 229, 222, 221, 218, + 211, 210, 208, 206, 204, 203, 194, 188, 186, 184, + 182, 181, 178, 175, 173, 171, 170, 163, 162, 159, + 158, 157, 156, 155, 154, 153, 148, 146, 143, 141, + 140, 139, 138, 136, 526, 129, 96, 74, 64, 56, + 29, 15, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, + 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, - 526, 526, 526, 526, 526, 526, 526, 526, 526, 526 + 526, 526, 526, 526, 526, 526, 526, 526 } ; -static yyconst flex_int16_t yy_chk[991] = +static const flex_int16_t yy_chk[1029] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -740,108 +737,113 @@ static yyconst flex_int16_t yy_chk[991] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, + 5, 5, 5, 5, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 14, 38, 39, 39, 39, 39, - 48, 51, 52, 53, 80, 51, 84, 86, 86, 52, + 11, 11, 11, 11, 11, 11, 14, 17, 31, 17, - 87, 87, 106, 53, 48, 108, 108, 38, 557, 14, - 85, 85, 85, 85, 107, 107, 107, 107, 84, 80, - 110, 110, 113, 114, 106, 121, 117, 114, 113, 121, - 555, 123, 154, 80, 117, 117, 119, 117, 114, 117, - 114, 123, 80, 124, 119, 154, 117, 117, 117, 150, - 150, 166, 124, 152, 152, 152, 152, 156, 170, 124, - 156, 124, 196, 196, 170, 213, 213, 225, 117, 551, - 166, 124, 124, 225, 124, 198, 198, 198, 198, 215, - 215, 215, 215, 252, 252, 325, 124, 272, 272, 304, - 304, 309, 309, 524, 523, 521, 520, 518, 515, 325, + 31, 48, 38, 39, 39, 39, 39, 51, 53, 52, + 58, 51, 58, 80, 84, 48, 52, 66, 53, 66, + 76, 106, 76, 14, 38, 85, 85, 85, 85, 86, + 86, 87, 87, 98, 557, 98, 84, 154, 80, 107, + 107, 107, 107, 106, 108, 108, 110, 110, 113, 114, + 154, 119, 80, 114, 113, 123, 121, 555, 117, 119, + 121, 80, 150, 150, 114, 123, 114, 117, 117, 134, + 117, 134, 117, 124, 144, 156, 144, 166, 156, 117, + 117, 117, 170, 124, 152, 152, 152, 152, 170, 174, + 124, 174, 124, 179, 551, 179, 166, 187, 207, 187, - 527, 527, 527, 527, 527, 528, 528, 528, 528, 528, - 529, 513, 529, 529, 529, 530, 530, 531, 531, 531, - 531, 531, 532, 532, 532, 532, 532, 533, 510, 533, - 533, 533, 534, 534, 535, 535, 535, 535, 535, 536, - 536, 537, 537, 537, 537, 537, 538, 538, 538, 538, - 538, 539, 539, 540, 540, 540, 540, 540, 541, 506, - 541, 541, 541, 542, 542, 543, 543, 543, 543, 543, - 544, 505, 544, 544, 544, 545, 545, 546, 546, 546, - 546, 546, 547, 547, 547, 547, 547, 548, 548, 548, - 548, 548, 549, 549, 550, 550, 552, 552, 553, 553, + 207, 117, 124, 124, 524, 124, 196, 196, 198, 198, + 198, 198, 213, 213, 252, 252, 225, 124, 215, 215, + 215, 215, 225, 272, 272, 304, 304, 309, 309, 325, + 523, 521, 520, 518, 515, 513, 510, 506, 505, 504, + 503, 502, 501, 325, 527, 527, 527, 527, 527, 527, + 528, 528, 528, 528, 528, 528, 529, 499, 529, 529, + 529, 529, 530, 530, 531, 531, 531, 531, 531, 531, + 532, 532, 532, 532, 533, 498, 533, 533, 533, 533, + 534, 534, 535, 535, 535, 535, 535, 535, 536, 536, + 537, 537, 537, 537, 537, 537, 538, 538, 538, 538, - 554, 554, 556, 556, 558, 558, 558, 559, 559, 559, - 560, 560, 560, 561, 561, 561, 562, 562, 562, 563, - 563, 563, 504, 503, 502, 501, 499, 498, 497, 495, - 493, 492, 491, 490, 489, 488, 487, 486, 485, 484, - 483, 479, 478, 476, 474, 473, 472, 471, 469, 468, - 465, 464, 463, 460, 459, 458, 453, 452, 451, 450, - 446, 445, 443, 442, 441, 439, 437, 436, 435, 434, - 430, 429, 428, 427, 426, 425, 422, 421, 420, 419, - 418, 417, 415, 414, 413, 412, 411, 410, 408, 407, - 405, 402, 401, 400, 399, 398, 397, 396, 395, 393, + 539, 539, 540, 540, 540, 540, 540, 540, 541, 497, + 541, 541, 541, 541, 542, 542, 543, 543, 543, 543, + 543, 543, 544, 495, 544, 544, 544, 544, 545, 545, + 546, 546, 546, 546, 546, 546, 547, 547, 547, 547, + 547, 547, 548, 548, 548, 548, 548, 548, 549, 549, + 550, 550, 552, 552, 553, 553, 554, 554, 556, 556, + 558, 558, 558, 559, 559, 559, 560, 560, 560, 561, + 561, 561, 562, 562, 562, 563, 563, 563, 493, 492, + 491, 490, 489, 488, 487, 486, 485, 484, 483, 479, + 478, 476, 474, 473, 472, 471, 469, 468, 465, 464, - 392, 391, 390, 389, 388, 386, 384, 383, 382, 380, - 379, 376, 374, 372, 370, 369, 368, 366, 365, 363, - 362, 361, 360, 359, 358, 357, 356, 355, 354, 353, - 352, 351, 350, 347, 346, 345, 344, 342, 341, 340, - 339, 338, 337, 333, 332, 331, 330, 328, 327, 326, - 320, 319, 318, 317, 316, 315, 314, 313, 312, 308, - 307, 306, 302, 300, 299, 298, 297, 296, 295, 294, - 293, 292, 291, 290, 289, 288, 287, 286, 285, 284, - 283, 282, 280, 279, 277, 276, 274, 271, 270, 269, - 268, 267, 266, 264, 262, 260, 258, 257, 256, 255, + 463, 460, 459, 458, 453, 452, 451, 450, 446, 445, + 443, 442, 441, 439, 437, 436, 435, 434, 430, 429, + 428, 427, 426, 425, 422, 421, 420, 419, 418, 417, + 415, 414, 413, 412, 411, 410, 408, 407, 405, 402, + 401, 400, 399, 398, 397, 396, 395, 393, 392, 391, + 390, 389, 388, 386, 384, 383, 382, 380, 379, 376, + 374, 372, 370, 369, 368, 366, 365, 363, 362, 361, + 360, 359, 358, 357, 356, 355, 354, 353, 352, 351, + 350, 347, 346, 345, 344, 342, 341, 340, 339, 338, + 337, 333, 332, 331, 330, 328, 327, 326, 320, 319, - 254, 253, 251, 248, 247, 246, 245, 244, 243, 242, - 240, 239, 238, 237, 236, 231, 230, 229, 228, 227, - 226, 224, 223, 222, 207, 205, 204, 203, 194, 193, - 192, 191, 187, 185, 181, 180, 179, 177, 174, 172, - 171, 169, 168, 167, 165, 164, 163, 162, 161, 160, - 159, 158, 157, 155, 153, 146, 145, 144, 142, 141, - 140, 139, 138, 134, 133, 131, 129, 127, 126, 125, - 122, 120, 118, 116, 115, 112, 111, 109, 104, 102, - 100, 98, 96, 93, 92, 83, 78, 76, 74, 73, - 70, 69, 66, 64, 60, 58, 56, 55, 54, 50, + 318, 317, 316, 315, 314, 313, 312, 308, 307, 306, + 302, 300, 299, 298, 297, 296, 295, 294, 293, 292, + 291, 290, 289, 288, 287, 286, 285, 284, 283, 282, + 280, 279, 277, 276, 274, 271, 270, 269, 268, 267, + 266, 264, 262, 260, 258, 257, 256, 255, 254, 253, + 251, 248, 247, 246, 245, 244, 243, 242, 240, 239, + 238, 237, 236, 231, 230, 229, 228, 227, 226, 224, + 223, 222, 205, 204, 203, 194, 193, 192, 191, 185, + 181, 180, 177, 172, 171, 169, 168, 167, 165, 164, + 163, 162, 161, 160, 159, 158, 157, 155, 153, 146, - 49, 47, 46, 45, 44, 43, 42, 41, 35, 33, - 31, 29, 27, 26, 25, 24, 20, 17, 15, 12, - 10, 8, 6, 4, 2, 526, 526, 526, 526, 526, + 145, 142, 141, 140, 139, 138, 133, 131, 129, 127, + 126, 125, 122, 120, 118, 116, 115, 112, 111, 109, + 104, 102, 100, 96, 93, 92, 83, 78, 74, 73, + 70, 69, 64, 60, 56, 55, 54, 50, 49, 47, + 46, 45, 44, 43, 42, 41, 35, 33, 29, 27, + 26, 25, 24, 20, 15, 12, 10, 8, 6, 4, + 2, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, + 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, - 526, 526, 526, 526, 526, 526, 526, 526, 526, 526 + 526, 526, 526, 526, 526, 526, 526, 526 } ; static yy_state_type yy_last_accepting_state; @@ -858,7 +860,7 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "src/decompile/cpp/slghscan.l" +#line 1 "slghscan.l" /* ### * IP: GHIDRA * NOTE: flex skeletons are NOT bound by flex's BSD license @@ -875,7 +877,7 @@ char *yytext; * See the License for the specific language governing permissions and * limitations under the License. */ -#line 18 "src/decompile/cpp/slghscan.l" +#line 18 "slghscan.l" #include "slgh_compile.hh" #include "slghparse.hh" #define yywrap() 1 @@ -1115,7 +1117,7 @@ int4 preprocess(int4 cur_state,int4 blank_state) if (yyin == (FILE *)0) preproc_error("Could not open included file "+fname); filebuffers.back().file = yyin; - yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE) ); + yy_switch_to_buffer( yy_create_buffer(yyin, YY_BUF_SIZE) ); check_to_endofline(s); } } @@ -1238,7 +1240,7 @@ void preproc_macroexpand(void) string value; if (!slgh->getPreprocValue(macro,value)) preproc_error("Unknown preprocessing macro "+macro); - yy_switch_to_buffer(yy_scan_string(value.c_str() ) ); + yy_switch_to_buffer( yy_scan_string( value.c_str() ) ); slgh->parsePreprocMacro(); } @@ -1340,13 +1342,9 @@ int4 scan_number(char *numtext,YYSTYPE *lval,bool signednum) return INTEGER; } +#line 1331 "slghscan.cc" - - - - - -#line 1335 "src/decompile/cpp/slghscan.cc" +#line 1333 "slghscan.cc" #define INITIAL 0 #define defblock 1 @@ -1368,36 +1366,36 @@ int4 scan_number(char *numtext,YYSTYPE *lval,bool signednum) #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1405,35 +1403,43 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + static void yyunput ( int c, char *buf_ptr ); + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1441,7 +1447,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1452,7 +1458,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1465,7 +1471,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1520,7 +1526,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1533,15 +1539,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 490 "src/decompile/cpp/slghscan.l" - - -#line 1529 "src/decompile/cpp/slghscan.cc" - if ( !(yy_init) ) { (yy_init) = 1; @@ -1562,13 +1563,19 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 490 "slghscan.l" + + +#line 1562 "slghscan.cc" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1585,7 +1592,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1595,12 +1602,12 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 527 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 926 ); + while ( yy_base[yy_current_state] != 962 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1627,832 +1634,830 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 492 "src/decompile/cpp/slghscan.l" +#line 492 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(INITIAL,preproc) ); } YY_BREAK case 2: YY_RULE_SETUP -#line 493 "src/decompile/cpp/slghscan.l" +#line 493 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 3: YY_RULE_SETUP -#line 494 "src/decompile/cpp/slghscan.l" +#line 494 "slghscan.l" { yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 4: YY_RULE_SETUP -#line 495 "src/decompile/cpp/slghscan.l" +#line 495 "slghscan.l" { BEGIN(print); slgh->calcContextLayout(); yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 5: YY_RULE_SETUP -#line 496 "src/decompile/cpp/slghscan.l" +#line 496 "slghscan.l" { BEGIN(sem); yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 6: YY_RULE_SETUP -#line 497 "src/decompile/cpp/slghscan.l" +#line 497 "slghscan.l" YY_BREAK case 7: YY_RULE_SETUP -#line 498 "src/decompile/cpp/slghscan.l" +#line 498 "slghscan.l" YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 499 "src/decompile/cpp/slghscan.l" +#line 499 "slghscan.l" { slgh->nextLine(); } YY_BREAK case 9: YY_RULE_SETUP -#line 500 "src/decompile/cpp/slghscan.l" +#line 500 "slghscan.l" { BEGIN(macroblock); return MACRO_KEY; } YY_BREAK case 10: YY_RULE_SETUP -#line 501 "src/decompile/cpp/slghscan.l" +#line 501 "slghscan.l" { BEGIN(defblock); return DEFINE_KEY; } YY_BREAK case 11: YY_RULE_SETUP -#line 502 "src/decompile/cpp/slghscan.l" +#line 502 "slghscan.l" { BEGIN(defblock); slgh->calcContextLayout(); return ATTACH_KEY; } YY_BREAK case 12: YY_RULE_SETUP -#line 503 "src/decompile/cpp/slghscan.l" +#line 503 "slghscan.l" { BEGIN(pattern); withsection = 1; slgh->calcContextLayout(); return WITH_KEY; } YY_BREAK case 13: YY_RULE_SETUP -#line 504 "src/decompile/cpp/slghscan.l" +#line 504 "slghscan.l" { return find_symbol(); } YY_BREAK case 14: YY_RULE_SETUP -#line 505 "src/decompile/cpp/slghscan.l" +#line 505 "slghscan.l" { return yytext[0]; } YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 507 "src/decompile/cpp/slghscan.l" +#line 507 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(macroblock,preproc) ); } YY_BREAK case 16: YY_RULE_SETUP -#line 508 "src/decompile/cpp/slghscan.l" +#line 508 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 17: YY_RULE_SETUP -#line 509 "src/decompile/cpp/slghscan.l" +#line 509 "slghscan.l" { yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 18: YY_RULE_SETUP -#line 510 "src/decompile/cpp/slghscan.l" +#line 510 "slghscan.l" { BEGIN(sem); return yytext[0]; } YY_BREAK case 19: YY_RULE_SETUP -#line 511 "src/decompile/cpp/slghscan.l" +#line 511 "slghscan.l" { yylval.str = new string(yytext); return STRING; } YY_BREAK case 20: YY_RULE_SETUP -#line 512 "src/decompile/cpp/slghscan.l" +#line 512 "slghscan.l" YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 513 "src/decompile/cpp/slghscan.l" +#line 513 "slghscan.l" { slgh->nextLine(); } YY_BREAK case 22: YY_RULE_SETUP -#line 514 "src/decompile/cpp/slghscan.l" +#line 514 "slghscan.l" { return yytext[0]; } YY_BREAK case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 516 "src/decompile/cpp/slghscan.l" +#line 516 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(defblock,preproc) ); } YY_BREAK case 24: YY_RULE_SETUP -#line 517 "src/decompile/cpp/slghscan.l" +#line 517 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 25: YY_RULE_SETUP -#line 518 "src/decompile/cpp/slghscan.l" +#line 518 "slghscan.l" { yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 26: YY_RULE_SETUP -#line 519 "src/decompile/cpp/slghscan.l" +#line 519 "slghscan.l" { BEGIN(INITIAL); yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 27: YY_RULE_SETUP -#line 520 "src/decompile/cpp/slghscan.l" +#line 520 "slghscan.l" { return SPACE_KEY; } YY_BREAK case 28: YY_RULE_SETUP -#line 521 "src/decompile/cpp/slghscan.l" +#line 521 "slghscan.l" { return TYPE_KEY; } YY_BREAK case 29: YY_RULE_SETUP -#line 522 "src/decompile/cpp/slghscan.l" +#line 522 "slghscan.l" { return RAM_KEY; } YY_BREAK case 30: YY_RULE_SETUP -#line 523 "src/decompile/cpp/slghscan.l" +#line 523 "slghscan.l" { return DEFAULT_KEY; } YY_BREAK case 31: YY_RULE_SETUP -#line 524 "src/decompile/cpp/slghscan.l" +#line 524 "slghscan.l" { return REGISTER_KEY; } YY_BREAK case 32: YY_RULE_SETUP -#line 525 "src/decompile/cpp/slghscan.l" +#line 525 "slghscan.l" { return TOKEN_KEY; } YY_BREAK case 33: YY_RULE_SETUP -#line 526 "src/decompile/cpp/slghscan.l" +#line 526 "slghscan.l" { return CONTEXT_KEY; } YY_BREAK case 34: YY_RULE_SETUP -#line 527 "src/decompile/cpp/slghscan.l" +#line 527 "slghscan.l" { return BITRANGE_KEY; } YY_BREAK case 35: YY_RULE_SETUP -#line 528 "src/decompile/cpp/slghscan.l" +#line 528 "slghscan.l" { return SIGNED_KEY; } YY_BREAK case 36: YY_RULE_SETUP -#line 529 "src/decompile/cpp/slghscan.l" +#line 529 "slghscan.l" { return NOFLOW_KEY; } YY_BREAK case 37: YY_RULE_SETUP -#line 530 "src/decompile/cpp/slghscan.l" +#line 530 "slghscan.l" { return HEX_KEY; } YY_BREAK case 38: YY_RULE_SETUP -#line 531 "src/decompile/cpp/slghscan.l" +#line 531 "slghscan.l" { return DEC_KEY; } YY_BREAK case 39: YY_RULE_SETUP -#line 532 "src/decompile/cpp/slghscan.l" +#line 532 "slghscan.l" { return ENDIAN_KEY; } YY_BREAK case 40: YY_RULE_SETUP -#line 533 "src/decompile/cpp/slghscan.l" +#line 533 "slghscan.l" { return ALIGN_KEY; } YY_BREAK case 41: YY_RULE_SETUP -#line 534 "src/decompile/cpp/slghscan.l" +#line 534 "slghscan.l" { return BIG_KEY; } YY_BREAK case 42: YY_RULE_SETUP -#line 535 "src/decompile/cpp/slghscan.l" +#line 535 "slghscan.l" { return LITTLE_KEY; } YY_BREAK case 43: YY_RULE_SETUP -#line 536 "src/decompile/cpp/slghscan.l" +#line 536 "slghscan.l" { return SIZE_KEY; } YY_BREAK case 44: YY_RULE_SETUP -#line 537 "src/decompile/cpp/slghscan.l" +#line 537 "slghscan.l" { return WORDSIZE_KEY; } YY_BREAK case 45: YY_RULE_SETUP -#line 538 "src/decompile/cpp/slghscan.l" +#line 538 "slghscan.l" { return OFFSET_KEY; } YY_BREAK case 46: YY_RULE_SETUP -#line 539 "src/decompile/cpp/slghscan.l" +#line 539 "slghscan.l" { return NAMES_KEY; } YY_BREAK case 47: YY_RULE_SETUP -#line 540 "src/decompile/cpp/slghscan.l" +#line 540 "slghscan.l" { return VALUES_KEY; } YY_BREAK case 48: YY_RULE_SETUP -#line 541 "src/decompile/cpp/slghscan.l" +#line 541 "slghscan.l" { return VARIABLES_KEY; } YY_BREAK case 49: YY_RULE_SETUP -#line 542 "src/decompile/cpp/slghscan.l" +#line 542 "slghscan.l" { return PCODEOP_KEY; } YY_BREAK case 50: YY_RULE_SETUP -#line 543 "src/decompile/cpp/slghscan.l" +#line 543 "slghscan.l" YY_BREAK case 51: YY_RULE_SETUP -#line 544 "src/decompile/cpp/slghscan.l" +#line 544 "slghscan.l" { return find_symbol(); } YY_BREAK case 52: YY_RULE_SETUP -#line 545 "src/decompile/cpp/slghscan.l" +#line 545 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 53: YY_RULE_SETUP -#line 546 "src/decompile/cpp/slghscan.l" +#line 546 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 54: YY_RULE_SETUP -#line 547 "src/decompile/cpp/slghscan.l" +#line 547 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 55: -/* rule 55 can match eol */ YY_RULE_SETUP -#line 548 "src/decompile/cpp/slghscan.l" +#line 548 "slghscan.l" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } YY_BREAK case 56: YY_RULE_SETUP -#line 549 "src/decompile/cpp/slghscan.l" +#line 549 "slghscan.l" YY_BREAK case 57: /* rule 57 can match eol */ YY_RULE_SETUP -#line 550 "src/decompile/cpp/slghscan.l" +#line 550 "slghscan.l" { slgh->nextLine(); } YY_BREAK case 58: YY_RULE_SETUP -#line 551 "src/decompile/cpp/slghscan.l" +#line 551 "slghscan.l" { return yytext[0]; } YY_BREAK case 59: /* rule 59 can match eol */ YY_RULE_SETUP -#line 554 "src/decompile/cpp/slghscan.l" +#line 554 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(print,preproc) ); } YY_BREAK case 60: YY_RULE_SETUP -#line 555 "src/decompile/cpp/slghscan.l" +#line 555 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 61: YY_RULE_SETUP -#line 556 "src/decompile/cpp/slghscan.l" +#line 556 "slghscan.l" { yylval.ch = yytext[0]; return CHAR; } YY_BREAK case 62: YY_RULE_SETUP -#line 557 "src/decompile/cpp/slghscan.l" +#line 557 "slghscan.l" { yylval.ch = '^'; return '^'; } YY_BREAK case 63: YY_RULE_SETUP -#line 558 "src/decompile/cpp/slghscan.l" +#line 558 "slghscan.l" { BEGIN(pattern); actionon=0; return IS_KEY; } YY_BREAK case 64: YY_RULE_SETUP -#line 559 "src/decompile/cpp/slghscan.l" +#line 559 "slghscan.l" { yylval.str = new string(yytext); return SYMBOLSTRING; } YY_BREAK case 65: -/* rule 65 can match eol */ YY_RULE_SETUP -#line 560 "src/decompile/cpp/slghscan.l" +#line 560 "slghscan.l" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } YY_BREAK case 66: YY_RULE_SETUP -#line 561 "src/decompile/cpp/slghscan.l" +#line 561 "slghscan.l" { yylval.ch = ' '; return ' '; } YY_BREAK case 67: /* rule 67 can match eol */ YY_RULE_SETUP -#line 562 "src/decompile/cpp/slghscan.l" +#line 562 "slghscan.l" { slgh->nextLine(); return ' '; } YY_BREAK case 68: YY_RULE_SETUP -#line 563 "src/decompile/cpp/slghscan.l" +#line 563 "slghscan.l" { return yytext[0]; } YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 565 "src/decompile/cpp/slghscan.l" +#line 565 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(pattern,preproc) ); } YY_BREAK case 70: YY_RULE_SETUP -#line 566 "src/decompile/cpp/slghscan.l" +#line 566 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 71: YY_RULE_SETUP -#line 567 "src/decompile/cpp/slghscan.l" +#line 567 "slghscan.l" { BEGIN((withsection==1) ? INITIAL:sem); withsection=0; yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 72: YY_RULE_SETUP -#line 568 "src/decompile/cpp/slghscan.l" +#line 568 "slghscan.l" { BEGIN(INITIAL); return OP_UNIMPL; } YY_BREAK case 73: YY_RULE_SETUP -#line 569 "src/decompile/cpp/slghscan.l" +#line 569 "slghscan.l" { return GLOBALSET_KEY; } YY_BREAK case 74: YY_RULE_SETUP -#line 570 "src/decompile/cpp/slghscan.l" +#line 570 "slghscan.l" { return OP_RIGHT; } YY_BREAK case 75: YY_RULE_SETUP -#line 571 "src/decompile/cpp/slghscan.l" +#line 571 "slghscan.l" { return OP_LEFT; } YY_BREAK case 76: YY_RULE_SETUP -#line 572 "src/decompile/cpp/slghscan.l" +#line 572 "slghscan.l" { return OP_NOTEQUAL; } YY_BREAK case 77: YY_RULE_SETUP -#line 573 "src/decompile/cpp/slghscan.l" +#line 573 "slghscan.l" { return OP_LESSEQUAL; } YY_BREAK case 78: YY_RULE_SETUP -#line 574 "src/decompile/cpp/slghscan.l" +#line 574 "slghscan.l" { return OP_GREATEQUAL; } YY_BREAK case 79: YY_RULE_SETUP -#line 575 "src/decompile/cpp/slghscan.l" +#line 575 "slghscan.l" { return OP_AND; } YY_BREAK case 80: YY_RULE_SETUP -#line 576 "src/decompile/cpp/slghscan.l" +#line 576 "slghscan.l" { return OP_OR; } YY_BREAK case 81: YY_RULE_SETUP -#line 577 "src/decompile/cpp/slghscan.l" +#line 577 "slghscan.l" { return OP_XOR; } YY_BREAK case 82: YY_RULE_SETUP -#line 578 "src/decompile/cpp/slghscan.l" +#line 578 "slghscan.l" { return ELLIPSIS_KEY; } YY_BREAK case 83: YY_RULE_SETUP -#line 579 "src/decompile/cpp/slghscan.l" +#line 579 "slghscan.l" { actionon = 1; yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 84: YY_RULE_SETUP -#line 580 "src/decompile/cpp/slghscan.l" +#line 580 "slghscan.l" { actionon = 0; yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 85: YY_RULE_SETUP -#line 581 "src/decompile/cpp/slghscan.l" +#line 581 "slghscan.l" { yylval.ch = yytext[0]; return (actionon==0) ? yytext[0] : OP_AND; } YY_BREAK case 86: YY_RULE_SETUP -#line 582 "src/decompile/cpp/slghscan.l" +#line 582 "slghscan.l" { yylval.ch = yytext[0]; return (actionon==0) ? yytext[0] : OP_OR; } YY_BREAK case 87: YY_RULE_SETUP -#line 583 "src/decompile/cpp/slghscan.l" +#line 583 "slghscan.l" { return OP_XOR; } YY_BREAK case 88: YY_RULE_SETUP -#line 584 "src/decompile/cpp/slghscan.l" +#line 584 "slghscan.l" { yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 89: YY_RULE_SETUP -#line 585 "src/decompile/cpp/slghscan.l" +#line 585 "slghscan.l" YY_BREAK case 90: YY_RULE_SETUP -#line 586 "src/decompile/cpp/slghscan.l" +#line 586 "slghscan.l" { return find_symbol(); } YY_BREAK case 91: YY_RULE_SETUP -#line 587 "src/decompile/cpp/slghscan.l" +#line 587 "slghscan.l" { return scan_number(yytext,&yylval,true); } YY_BREAK case 92: YY_RULE_SETUP -#line 588 "src/decompile/cpp/slghscan.l" +#line 588 "slghscan.l" { return scan_number(yytext,&yylval,true); } YY_BREAK case 93: YY_RULE_SETUP -#line 589 "src/decompile/cpp/slghscan.l" +#line 589 "slghscan.l" { return scan_number(yytext,&yylval,true); } YY_BREAK case 94: YY_RULE_SETUP -#line 590 "src/decompile/cpp/slghscan.l" +#line 590 "slghscan.l" YY_BREAK case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 591 "src/decompile/cpp/slghscan.l" +#line 591 "slghscan.l" { slgh->nextLine(); } YY_BREAK case 96: YY_RULE_SETUP -#line 592 "src/decompile/cpp/slghscan.l" +#line 592 "slghscan.l" { return yytext[0]; } YY_BREAK case 97: /* rule 97 can match eol */ YY_RULE_SETUP -#line 594 "src/decompile/cpp/slghscan.l" +#line 594 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(sem,preproc) ); } YY_BREAK case 98: YY_RULE_SETUP -#line 595 "src/decompile/cpp/slghscan.l" +#line 595 "slghscan.l" { preproc_macroexpand(); } YY_BREAK case 99: YY_RULE_SETUP -#line 596 "src/decompile/cpp/slghscan.l" +#line 596 "slghscan.l" { BEGIN(INITIAL); yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 100: YY_RULE_SETUP -#line 597 "src/decompile/cpp/slghscan.l" +#line 597 "slghscan.l" { return OP_BOOL_OR; } YY_BREAK case 101: YY_RULE_SETUP -#line 598 "src/decompile/cpp/slghscan.l" +#line 598 "slghscan.l" { return OP_BOOL_AND; } YY_BREAK case 102: YY_RULE_SETUP -#line 599 "src/decompile/cpp/slghscan.l" +#line 599 "slghscan.l" { return OP_BOOL_XOR; } YY_BREAK case 103: YY_RULE_SETUP -#line 600 "src/decompile/cpp/slghscan.l" +#line 600 "slghscan.l" { return OP_RIGHT; } YY_BREAK case 104: YY_RULE_SETUP -#line 601 "src/decompile/cpp/slghscan.l" +#line 601 "slghscan.l" { return OP_LEFT; } YY_BREAK case 105: YY_RULE_SETUP -#line 602 "src/decompile/cpp/slghscan.l" +#line 602 "slghscan.l" { return OP_EQUAL; } YY_BREAK case 106: YY_RULE_SETUP -#line 603 "src/decompile/cpp/slghscan.l" +#line 603 "slghscan.l" { return OP_NOTEQUAL; } YY_BREAK case 107: YY_RULE_SETUP -#line 604 "src/decompile/cpp/slghscan.l" +#line 604 "slghscan.l" { return OP_LESSEQUAL; } YY_BREAK case 108: YY_RULE_SETUP -#line 605 "src/decompile/cpp/slghscan.l" +#line 605 "slghscan.l" { return OP_GREATEQUAL; } YY_BREAK case 109: YY_RULE_SETUP -#line 606 "src/decompile/cpp/slghscan.l" +#line 606 "slghscan.l" { return OP_SDIV; } YY_BREAK case 110: YY_RULE_SETUP -#line 607 "src/decompile/cpp/slghscan.l" +#line 607 "slghscan.l" { return OP_SREM; } YY_BREAK case 111: YY_RULE_SETUP -#line 608 "src/decompile/cpp/slghscan.l" +#line 608 "slghscan.l" { return OP_SRIGHT; } YY_BREAK case 112: YY_RULE_SETUP -#line 609 "src/decompile/cpp/slghscan.l" +#line 609 "slghscan.l" { return OP_SLESS; } YY_BREAK case 113: YY_RULE_SETUP -#line 610 "src/decompile/cpp/slghscan.l" +#line 610 "slghscan.l" { return OP_SGREAT; } YY_BREAK case 114: YY_RULE_SETUP -#line 611 "src/decompile/cpp/slghscan.l" +#line 611 "slghscan.l" { return OP_SLESSEQUAL; } YY_BREAK case 115: YY_RULE_SETUP -#line 612 "src/decompile/cpp/slghscan.l" +#line 612 "slghscan.l" { return OP_SGREATEQUAL; } YY_BREAK case 116: YY_RULE_SETUP -#line 613 "src/decompile/cpp/slghscan.l" +#line 613 "slghscan.l" { return OP_FADD; } YY_BREAK case 117: YY_RULE_SETUP -#line 614 "src/decompile/cpp/slghscan.l" +#line 614 "slghscan.l" { return OP_FSUB; } YY_BREAK case 118: YY_RULE_SETUP -#line 615 "src/decompile/cpp/slghscan.l" +#line 615 "slghscan.l" { return OP_FMULT; } YY_BREAK case 119: YY_RULE_SETUP -#line 616 "src/decompile/cpp/slghscan.l" +#line 616 "slghscan.l" { return OP_FDIV; } YY_BREAK case 120: YY_RULE_SETUP -#line 617 "src/decompile/cpp/slghscan.l" +#line 617 "slghscan.l" { return OP_FEQUAL; } YY_BREAK case 121: YY_RULE_SETUP -#line 618 "src/decompile/cpp/slghscan.l" +#line 618 "slghscan.l" { return OP_FNOTEQUAL; } YY_BREAK case 122: YY_RULE_SETUP -#line 619 "src/decompile/cpp/slghscan.l" +#line 619 "slghscan.l" { return OP_FLESS; } YY_BREAK case 123: YY_RULE_SETUP -#line 620 "src/decompile/cpp/slghscan.l" +#line 620 "slghscan.l" { return OP_FGREAT; } YY_BREAK case 124: YY_RULE_SETUP -#line 621 "src/decompile/cpp/slghscan.l" +#line 621 "slghscan.l" { return OP_FLESSEQUAL; } YY_BREAK case 125: YY_RULE_SETUP -#line 622 "src/decompile/cpp/slghscan.l" +#line 622 "slghscan.l" { return OP_FGREATEQUAL; } YY_BREAK case 126: YY_RULE_SETUP -#line 623 "src/decompile/cpp/slghscan.l" +#line 623 "slghscan.l" { return OP_ZEXT; } YY_BREAK case 127: YY_RULE_SETUP -#line 624 "src/decompile/cpp/slghscan.l" +#line 624 "slghscan.l" { return OP_CARRY; } YY_BREAK case 128: YY_RULE_SETUP -#line 625 "src/decompile/cpp/slghscan.l" +#line 625 "slghscan.l" { return OP_BORROW; } YY_BREAK case 129: YY_RULE_SETUP -#line 626 "src/decompile/cpp/slghscan.l" +#line 626 "slghscan.l" { return OP_SEXT; } YY_BREAK case 130: YY_RULE_SETUP -#line 627 "src/decompile/cpp/slghscan.l" +#line 627 "slghscan.l" { return OP_SCARRY; } YY_BREAK case 131: YY_RULE_SETUP -#line 628 "src/decompile/cpp/slghscan.l" +#line 628 "slghscan.l" { return OP_SBORROW; } YY_BREAK case 132: YY_RULE_SETUP -#line 629 "src/decompile/cpp/slghscan.l" +#line 629 "slghscan.l" { return OP_NAN; } YY_BREAK case 133: YY_RULE_SETUP -#line 630 "src/decompile/cpp/slghscan.l" +#line 630 "slghscan.l" { return OP_ABS; } YY_BREAK case 134: YY_RULE_SETUP -#line 631 "src/decompile/cpp/slghscan.l" +#line 631 "slghscan.l" { return OP_SQRT; } YY_BREAK case 135: YY_RULE_SETUP -#line 632 "src/decompile/cpp/slghscan.l" +#line 632 "slghscan.l" { return OP_CEIL; } YY_BREAK case 136: YY_RULE_SETUP -#line 633 "src/decompile/cpp/slghscan.l" +#line 633 "slghscan.l" { return OP_FLOOR; } YY_BREAK case 137: YY_RULE_SETUP -#line 634 "src/decompile/cpp/slghscan.l" +#line 634 "slghscan.l" { return OP_ROUND; } YY_BREAK case 138: YY_RULE_SETUP -#line 635 "src/decompile/cpp/slghscan.l" +#line 635 "slghscan.l" { return OP_INT2FLOAT; } YY_BREAK case 139: YY_RULE_SETUP -#line 636 "src/decompile/cpp/slghscan.l" +#line 636 "slghscan.l" { return OP_FLOAT2FLOAT; } YY_BREAK case 140: YY_RULE_SETUP -#line 637 "src/decompile/cpp/slghscan.l" +#line 637 "slghscan.l" { return OP_TRUNC; } YY_BREAK case 141: YY_RULE_SETUP -#line 638 "src/decompile/cpp/slghscan.l" +#line 638 "slghscan.l" { return OP_CPOOLREF; } YY_BREAK case 142: YY_RULE_SETUP -#line 639 "src/decompile/cpp/slghscan.l" +#line 639 "slghscan.l" { return OP_NEW; } YY_BREAK case 143: YY_RULE_SETUP -#line 640 "src/decompile/cpp/slghscan.l" +#line 640 "slghscan.l" { return OP_POPCOUNT; } YY_BREAK case 144: YY_RULE_SETUP -#line 641 "src/decompile/cpp/slghscan.l" +#line 641 "slghscan.l" { return IF_KEY; } YY_BREAK case 145: YY_RULE_SETUP -#line 642 "src/decompile/cpp/slghscan.l" +#line 642 "slghscan.l" { return GOTO_KEY; } YY_BREAK case 146: YY_RULE_SETUP -#line 643 "src/decompile/cpp/slghscan.l" +#line 643 "slghscan.l" { return CALL_KEY; } YY_BREAK case 147: YY_RULE_SETUP -#line 644 "src/decompile/cpp/slghscan.l" +#line 644 "slghscan.l" { return RETURN_KEY; } YY_BREAK case 148: YY_RULE_SETUP -#line 645 "src/decompile/cpp/slghscan.l" +#line 645 "slghscan.l" { return DELAYSLOT_KEY; } YY_BREAK case 149: YY_RULE_SETUP -#line 646 "src/decompile/cpp/slghscan.l" +#line 646 "slghscan.l" { return CROSSBUILD_KEY; } YY_BREAK case 150: YY_RULE_SETUP -#line 647 "src/decompile/cpp/slghscan.l" +#line 647 "slghscan.l" { return EXPORT_KEY; } YY_BREAK case 151: YY_RULE_SETUP -#line 648 "src/decompile/cpp/slghscan.l" +#line 648 "slghscan.l" { return BUILD_KEY; } YY_BREAK case 152: YY_RULE_SETUP -#line 649 "src/decompile/cpp/slghscan.l" +#line 649 "slghscan.l" { return LOCAL_KEY; } YY_BREAK case 153: YY_RULE_SETUP -#line 650 "src/decompile/cpp/slghscan.l" +#line 650 "slghscan.l" { yylval.ch = yytext[0]; return yytext[0]; } YY_BREAK case 154: YY_RULE_SETUP -#line 651 "src/decompile/cpp/slghscan.l" +#line 651 "slghscan.l" YY_BREAK case 155: YY_RULE_SETUP -#line 652 "src/decompile/cpp/slghscan.l" +#line 652 "slghscan.l" { return find_symbol(); } YY_BREAK case 156: YY_RULE_SETUP -#line 653 "src/decompile/cpp/slghscan.l" +#line 653 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 157: YY_RULE_SETUP -#line 654 "src/decompile/cpp/slghscan.l" +#line 654 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 158: YY_RULE_SETUP -#line 655 "src/decompile/cpp/slghscan.l" +#line 655 "slghscan.l" { return scan_number(yytext,&yylval,false); } YY_BREAK case 159: YY_RULE_SETUP -#line 656 "src/decompile/cpp/slghscan.l" +#line 656 "slghscan.l" YY_BREAK case 160: /* rule 160 can match eol */ YY_RULE_SETUP -#line 657 "src/decompile/cpp/slghscan.l" +#line 657 "slghscan.l" { slgh->nextLine(); } YY_BREAK case 161: YY_RULE_SETUP -#line 658 "src/decompile/cpp/slghscan.l" +#line 658 "slghscan.l" { return yytext[0]; } YY_BREAK case 162: /* rule 162 can match eol */ YY_RULE_SETUP -#line 660 "src/decompile/cpp/slghscan.l" +#line 660 "slghscan.l" { slgh->nextLine(); BEGIN( preprocess(preproc,preproc) ); } YY_BREAK case 163: /* rule 163 can match eol */ YY_RULE_SETUP -#line 661 "src/decompile/cpp/slghscan.l" +#line 661 "slghscan.l" { slgh->nextLine(); } YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2462,11 +2467,11 @@ case YY_STATE_EOF(print): case YY_STATE_EOF(pattern): case YY_STATE_EOF(sem): case YY_STATE_EOF(preproc): -#line 663 "src/decompile/cpp/slghscan.l" -{ yy_delete_buffer(YY_CURRENT_BUFFER ); +#line 663 "slghscan.l" +{ yy_delete_buffer( YY_CURRENT_BUFFER ); if (filebuffers.empty()) yyterminate(); - yy_switch_to_buffer(filebuffers.back().lastbuffer ); + yy_switch_to_buffer( filebuffers.back().lastbuffer ); FILE *curfile = filebuffers.back().file; if (curfile != (FILE *)0) fclose(curfile); @@ -2476,10 +2481,10 @@ case YY_STATE_EOF(preproc): YY_BREAK case 164: YY_RULE_SETUP -#line 673 "src/decompile/cpp/slghscan.l" +#line 673 "slghscan.l" ECHO; YY_BREAK -#line 2468 "src/decompile/cpp/slghscan.cc" +#line 2473 "slghscan.cc" case YY_END_OF_BUFFER: { @@ -2555,7 +2560,7 @@ ECHO; { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -2608,6 +2613,7 @@ ECHO; "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -2619,9 +2625,9 @@ ECHO; */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2650,7 +2656,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2663,7 +2669,7 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -2677,7 +2683,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -2686,11 +2692,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -2718,7 +2725,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -2732,12 +2739,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -2753,15 +2763,15 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); yy_current_state += YY_AT_BOL(); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2771,9 +2781,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 527 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -2786,10 +2796,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2799,17 +2809,19 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 527 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 526); return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -2819,10 +2831,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -2831,7 +2843,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -2844,6 +2856,8 @@ static int yy_get_next_buffer (void) (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2868,7 +2882,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2885,14 +2899,14 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return EOF; + if ( yywrap( ) ) + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -2931,11 +2945,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -2963,7 +2977,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2991,7 +3005,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -3000,13 +3014,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -3025,9 +3039,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -3039,7 +3053,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -3082,7 +3096,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -3113,7 +3127,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -3132,7 +3146,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -3150,15 +3164,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -3167,7 +3181,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -3187,7 +3201,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -3197,23 +3211,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -3226,10 +3240,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -3239,7 +3253,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -3247,8 +3261,8 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -3257,7 +3271,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -3273,9 +3287,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -3303,7 +3317,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -3326,7 +3340,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -3341,29 +3355,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -3371,9 +3385,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -3382,10 +3396,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -3394,8 +3408,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -3410,7 +3424,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -3431,18 +3445,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -3452,11 +3467,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -3464,14 +3480,14 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 673 "src/decompile/cpp/slghscan.l" +#line 673 "slghscan.l" diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.l b/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.l index 9897fc3531..35210a9c0d 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.l +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/slghscan.l @@ -545,7 +545,7 @@ with { BEGIN(pattern); withsection = 1; slgh->calcContextLayout(); return WITH [0-9]|[1-9][0-9]+ { return scan_number(yytext,&yylval,false); } 0x[0-9a-fA-F]+ { return scan_number(yytext,&yylval,false); } 0b[01]+ { return scan_number(yytext,&yylval,false); } -\"([^\"]|\"\")*\" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } +\"([^\"[:cntrl:]]|\"\")*\" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } [\r\ \t\v]+ \n { slgh->nextLine(); } . { return yytext[0]; } @@ -557,7 +557,7 @@ with { BEGIN(pattern); withsection = 1; slgh->calcContextLayout(); return WITH \^ { yylval.ch = '^'; return '^'; } is { BEGIN(pattern); actionon=0; return IS_KEY; } [a-zA-Z_.][a-zA-Z0-9_.]* { yylval.str = new string(yytext); return SYMBOLSTRING; } -\"([^\"]|\"\")*\" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } +\"([^\"[:cntrl:]]|\"\")*\" { yylval.str = new string(yytext+1,strlen(yytext)-2); return STRING; } [\r\ \t\v]+ { yylval.ch = ' '; return ' '; } \n { slgh->nextLine(); return ' '; } . { return yytext[0]; } diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java index 1779fd65af..20967c0837 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileCallback.java @@ -1058,13 +1058,13 @@ public class DecompileCallback { Address last = range.getMaxAddress(); boolean readonly = true; // Treat function body as readonly return buildHoleXML(first.getAddressSpace().getPhysicalSpace().getName(), - first.getOffset(), last.getOffset(), readonly, false); + first.getUnsignedOffset(), last.getUnsignedOffset(), readonly, false); } } // There is probably some sort of error, just return a block // containing the single queried address - return buildHoleXML(addr.getAddressSpace().getPhysicalSpace().getName(), addr.getOffset(), - addr.getOffset(), true, false); + return buildHoleXML(addr.getAddressSpace().getPhysicalSpace().getName(), + addr.getUnsignedOffset(), addr.getUnsignedOffset(), true, false); } private int getExtraPopOverride(Function func, Address addr) { @@ -1175,8 +1175,8 @@ public class DecompileCallback { // after.getOffset(),readonly,isVolatile); boolean readonly = isReadOnlyNoData(addr); boolean isvolatile = isVolatileNoData(addr); - return buildHoleXML(addr.getAddressSpace().getPhysicalSpace().getName(), addr.getOffset(), - addr.getOffset(), readonly, isvolatile); + return buildHoleXML(addr.getAddressSpace().getPhysicalSpace().getName(), + addr.getUnsignedOffset(), addr.getUnsignedOffset(), readonly, isvolatile); } private String buildExternalRef(Address addr, ExternalReference ref) { diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/util/exporter/CppExporter.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/util/exporter/CppExporter.java index 2092362f5e..6163b27955 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/util/exporter/CppExporter.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/util/exporter/CppExporter.java @@ -516,7 +516,8 @@ public class CppExporter extends Exporter { Address entryPoint = function.getEntryPoint(); CodeUnit codeUnitAt = function.getProgram().getListing().getCodeUnitAt(entryPoint); if (codeUnitAt == null || !(codeUnitAt instanceof Instruction)) { - return new CPPResult(entryPoint, function.getPrototypeString(false, false), null); + return new CPPResult(entryPoint, function.getPrototypeString(false, false) + ';', + null); } monitor.setMessage("Decompiling " + function.getName()); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpec.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpec.java index c17ef05542..2ac2147f71 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpec.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/BasicCompilerSpec.java @@ -808,7 +808,7 @@ public class BasicCompilerSpec implements CompilerSpec { seenLast = true; } if (!seenLast) { - last = addressSpace.getMaxAddress().getOffset(); + last = addressSpace.getMaxAddress().getUnsignedOffset(); } if (extraRanges == null) { extraRanges = new ArrayList<>();