Merge branch 'dev' of https://github.com/purdue-aalp/gpgpu-sim_distribution into dev-aalp

1 files changed, 6 insertions, 3 deletions

diff --git a/libcuda/cuobjdump.l b/libcuda/cuobjdump.l
index 9359281..5a19d65 100644
--- a/libcuda/cuobjdump.l
+++ b/libcuda/cuobjdump.l
@@ -30,6 +30,7 @@
 %{
 #include <stdio.h>
 #include <string.h>
+#include "cuobjdump.h"
 #include "cuobjdump_parser.h"
 
 #define YY_NEVER_INTERACTIVE 1
@@ -38,7 +39,9 @@
 
 #define YYDEBUG 1
 
-void cuobjdump_error(yyscan_t yyscanner, const char* msg);
+void cuobjdump_error(yyscan_t yyscanner, struct cuobjdump_parser* parser, std::list<cuobjdumpSection*> &cuobjdumpSectionList, const char* msg);
+#define YY_DECL int cuobjdump_lex \
+	       (YYSTYPE * yylval_param , yyscan_t yyscanner, struct cuobjdump_parser* parser, std::list<cuobjdumpSection*> &cuobjdumpSectionList)
 %}
 
 %option stack
@@ -153,10 +156,10 @@ newlines	{newline}+
 <<EOF>> BEGIN(INITIAL);return 0;
 
 	/*No other rule matched. Throw an error*/
-.	cuobjdump_error(yyscanner, "Invalid token");
+.	cuobjdump_error(yyscanner, parser, cuobjdumpSectionList, "Invalid token");
 
 %%
-void cuobjdump_error(yyscan_t yyscanner, const char* msg)
+void cuobjdump_error(yyscan_t yyscanner, struct cuobjdump_parser* parser, std::list<cuobjdumpSection*> &cuobjdumpSectionList, const char* msg)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	printf("   %s near \"%s\"",msg, yytext);