Changeset 53701 in vbox for trunk

Timestamp:

Jan 2, 2015 12:43:14 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Fixes for dtrace -lv - id_or_type() would unput(EOF). (r78)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTrace/Makefile.kmk (modified) (2 diffs)
• onnv/lib/libdtrace/common/dt_cc.c (modified) (3 diffs)
• onnv/lib/libdtrace/common/dt_lex.l (modified) (11 diffs)
• onnv/lib/libdtrace/common/dt_pcb.c (modified) (1 diff)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTrace/Makefile.kmk

@@ -101 +101 @@
  VBoxDTrace_USES     += yacc
  VBoxDTrace_YACCTOOL  = BISON
- VBoxDTrace_YACCFLAGS = -d
+ VBoxDTrace_YACCFLAGS = -d -y
  VBoxDTrace_SOURCES  += \
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_grammar.y
@@ -113 +113 @@
  VBoxDTrace_USES     += lex
  VBoxDTrace_LEXTOOL   = FLEX
- VBoxDTrace_LEXFLAGS  = -l
+ VBoxDTrace_LEXFLAGS  = -l -B #-d -T
  VBoxDTrace_DEFS     += USING_FLEX
  VBoxDTrace_SOURCES  += \

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -2145 +2145 @@
         pcb.pcb_token = context;
 
+#ifdef USING_FLEX /* In case flex starts work too early. Moved from dt_pcb_push. */
+        yyinit(&pcb);
+#endif
         if (context != DT_CTX_DPROG)
                 yybegin(YYS_EXPR);
@@ -2171 +2174 @@
          * we optionally display the parse tree if debugging is enabled.
          */
-fprintf(stderr, "debug: calling yyparse\n"); /* REMOVE ME */
         if (yyparse() != 0 || yypcb->pcb_root == NULL)
-                xyerror(D_EMPTY, "empty D program translation unit (#1)\n");  /* REMOVE (#1) */
+                xyerror(D_EMPTY, "empty D program translation unit\n");
 
         yybegin(YYS_DONE);
@@ -2204 +2206 @@
                 if ((dnp = yypcb->pcb_root->dn_list) == NULL &&
                     !(yypcb->pcb_cflags & DTRACE_C_EMPTY))
-                        xyerror(D_EMPTY, "empty D program translation unit (#2)\n"); /* REMOVE (#2) */
+                        xyerror(D_EMPTY, "empty D program translation unit\n");
 
                 if ((yypcb->pcb_prog = dt_program_create(dtp)) == NULL)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l

@@ -55 +55 @@
                         result = (int)fread(buf, 1, max_size, yypcb->pcb_fileptr); \
                         if (!result && ferror(yypcb->pcb_fileptr)) \
-                                YY_FATAL_ERROR("input in flex scanner failed"); \
+                      longjmp(yypcb->pcb_jmpbuf, EDT_FIO); \
+                                /*YY_FATAL_ERROR("input in flex scanner failed");*/ \
                 } else { \
                         size_t off = yypcb->pcb_strptr - yypcb->pcb_string; \
@@ -65 +66 @@
                                 memcpy(buf, yypcb->pcb_strptr, result); \
                                 yypcb->pcb_strptr += result; \
-            fprintf(stderr, "yy_input -> %d '%.*s'\n", result, result, buf); /* REMOVE ME */ \
+            /*fprintf(stderr, "yy_input -> %d '%.*s'\n", result, result, buf);*/ \
          } else { \
             buf[0] = '\0'; \
-            result = (YYSTATE) == S0; \
-            fprintf(stderr, "yy_input -> %d\n", result); /* REMOVE ME */ \
+            result = 0; \
+            /*fprintf(stderr, "yy_input -> %d\n", result);*/ \
          } \
                 } \
@@ -519 +520 @@
                                 tok = DT_TOK_DIV;
 
-                        unput(c);
+                        if (c != EOF) unput(c);
                         return (tok);
                 }
@@ -599 +600 @@
 <S0>{RGX_WS}    ; /* discard */
 <S0>"\\"\n      ; /* discard */
-    /* VBOX - START */
-<S0>"\0" {
-            fprintf(stderr, "<S0>\\0\n");
-            return (DT_TOK_EOF);
-         }
-    /* VBOX - END */
 <S0>.           yyerror("syntax error near \"%c\"\n", yytext[0]);
 
@@ -610 +605 @@
 <S1>"*/"        BEGIN(yypcb->pcb_cstate);
  /* VBOX - START */
-<S1>"\0"        yyerror("end-of-file encountered before matching */\n");
+<S1><<EOF>>     yyerror("end-of-file encountered before matching */\n");
  /* VBOX - END */
 <S1>.|\n        ; /* discard */
@@ -671 +666 @@
 
 <S2>{RGX_WS}    ; /* discard */
- /* VBOX - START */
-<S2>"\0" {
-            fprintf(stderr, "<S2>\\0\n");
-            return (DT_TOK_EOF);
-         }
- /* VBOX - END */
 <S2>.           yyerror("syntax error near \"%c\"\n", yytext[0]);
 
@@ -707 +696 @@
 
  /* VBOX - BEGIN */
-<S3>"\0"        yyerror("end-of-file encountered before end of control line\n");
+<S3><<EOF>>     yyerror("end-of-file encountered before end of control line\n");
  /* VBOX - END */
 <S3>.           yyerror("syntax error near \"%c\"\n", yytext[0]);
@@ -767 +756 @@
 #ifndef USING_FLEX
         yysptr = yysbuf;
+#else
+   yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 #endif
 }
@@ -838 +829 @@
                 if ((c1 = input()) == c0)
                         ttok = DT_TOK_IDENT;
-                unput(c1);
+                if (c1 != EOF) unput(c1);
                 break;
 
@@ -844 +835 @@
                 if ((c1 = input()) != c0)
                         ttok = DT_TOK_IDENT;
-                unput(c1);
+                if (c1 != EOF) unput(c1);
                 break;
         case '[':
@@ -859 +850 @@
         }
 
-        unput(c0);
+        if (c0 != EOF) unput(c0);
         return (ttok);
 }

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_pcb.c

@@ -91 +91 @@
         dtp->dt_gen++;
 
+#ifndef USING_FLEX /* In case flex starts work too early. Moved to dt_compile. */
         yyinit(pcb);
+#endif
 }