GP-4303 Collapse STARTSYM, ENDSYM, NEXT2SYM, etc. into single token type

Author: caheckman

Ghidra/Features/Decompiler/src/decompile/cpp/pcodeparse.cc

@@ -38,9 +38,6 @@ extern int pcodeerror(const char *str );
   SpaceSymbol *spacesym;
   UserOpSymbol *useropsym;
   LabelSymbol *labelsym;
-  StartSymbol *startsym;
-  EndSymbol *endsym;
-  Next2Symbol *next2sym;
   OperandSymbol *operandsym;
   VarnodeSymbol *varsym;
   SpecificSymbol *specsym;
@@ -77,9 +74,7 @@ extern int pcodeerror(const char *str );
 %token <useropsym> USEROPSYM
 %token <varsym> VARSYM
 %token <operandsym> OPERANDSYM
-%token <startsym> STARTSYM
-%token <endsym> ENDSYM
-%token <next2sym> NEXT2SYM
+%token <specsym> JUMPSYM
 %token <labelsym> LABELSYM
 
 %type <param> paramlist
@@ -197,9 +192,7 @@ sizedstar: '*' '[' SPACESYM ']' ':' INTEGER { $$ = new StarQuality; $$->size = *
   | '*' ':' INTEGER		{ $$ = new StarQuality; $$->size = *$3; delete $3; $$->id=ConstTpl(pcode->getDefaultSpace()); }
   | '*'				{ $$ = new StarQuality; $$->size = 0; $$->id=ConstTpl(pcode->getDefaultSpace()); }
   ;
-jumpdest: STARTSYM		{ VarnodeTpl *sym = $1->getVarnode(); $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),sym->getOffset(),ConstTpl(ConstTpl::j_curspace_size)); delete sym; }
-  | ENDSYM			{ VarnodeTpl *sym = $1->getVarnode(); $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),sym->getOffset(),ConstTpl(ConstTpl::j_curspace_size)); delete sym; }
-  | NEXT2SYM		{ VarnodeTpl *sym = $1->getVarnode(); $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),sym->getOffset(),ConstTpl(ConstTpl::j_curspace_size)); delete sym; }
+jumpdest: JUMPSYM		{ VarnodeTpl *sym = $1->getVarnode(); $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),sym->getOffset(),ConstTpl(ConstTpl::j_curspace_size)); delete sym; }
   | INTEGER			{ $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),ConstTpl(ConstTpl::real,*$1),ConstTpl(ConstTpl::j_curspace_size)); delete $1; }
   | BADINTEGER                  { $$ = new VarnodeTpl(ConstTpl(ConstTpl::j_curspace),ConstTpl(ConstTpl::real,0),ConstTpl(ConstTpl::j_curspace_size)); yyerror("Parsed integer is too big (overflow)"); }
   | INTEGER '[' SPACESYM ']'	{ AddrSpace *spc = $3->getSpace(); $$ = new VarnodeTpl(ConstTpl(spc),ConstTpl(ConstTpl::real,*$1),ConstTpl(ConstTpl::real,spc->getAddrSize())); delete $1; }
@@ -224,9 +217,7 @@ label: '<' LABELSYM '>'         { $$ = $2; }
   ;
 specificsymbol: VARSYM		{ $$ = $1; }
   | OPERANDSYM			{ $$ = $1; }
-  | STARTSYM			{ $$ = $1; }
-  | ENDSYM			{ $$ = $1; }
-  | NEXT2SYM			{ $$ = $1; }
+  | JUMPSYM			{ $$ = $1; }
   ;
 paramlist: /* EMPTY */		{ $$ = new vector<ExprTree *>; }
   | expr			{ $$ = new vector<ExprTree *>; $$->push_back($1); }
@@ -750,14 +741,12 @@ int4 PcodeSnippet::lex(void)
 	yylval.operandsym = (OperandSymbol *)sym;
 	return OPERANDSYM;
       case SleighSymbol::start_symbol:
-	yylval.startsym = (StartSymbol *)sym;
-	return STARTSYM;
       case SleighSymbol::end_symbol:
-	yylval.endsym = (EndSymbol *)sym;
-	return ENDSYM;
-	case SleighSymbol::next2_symbol:
-	yylval.next2sym = (Next2Symbol *)sym;
-	return NEXT2SYM;
+      case SleighSymbol::next2_symbol:
+      case SleighSymbol::flowdest_symbol:
+      case SleighSymbol::flowref_symbol:
+	yylval.specsym = (SpecificSymbol *)sym;
+	return JUMPSYM;
       case SleighSymbol::label_symbol:
 	yylval.labelsym = (LabelSymbol *)sym;
 	return LABELSYM;