Changeset 53699 in vbox for trunk

Timestamp:

Jan 2, 2015 12:42:54 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Debugging the parser. (r76)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

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

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

@@ -35 +35 @@
 VBoxDTrace_TEMPLATE = VBOXR3NPEXE
 VBoxDTrace_DEFS = RTMEM_WRAP_TO_EF_APIS
+#VBoxDTrace_DEFS += YYDEBUG
 VBoxDTrace_SDKS = VBOX_ZLIB
 ifn1of ($(KBUILD_TARGET), win)

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

@@ -2171 +2171 @@
          * 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\n");
+                xyerror(D_EMPTY, "empty D program translation unit (#1)\n");  /* REMOVE (#1) */
 
         yybegin(YYS_DONE);
@@ -2203 +2204 @@
                 if ((dnp = yypcb->pcb_root->dn_list) == NULL &&
                     !(yypcb->pcb_cflags & DTRACE_C_EMPTY))
-                        xyerror(D_EMPTY, "empty D program translation unit\n");
+                        xyerror(D_EMPTY, "empty D program translation unit (#2)\n"); /* REMOVE (#2) */
 
                 if ((yypcb->pcb_prog = dt_program_create(dtp)) == NULL)

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

@@ -59 +59 @@
                         size_t off = yypcb->pcb_strptr - yypcb->pcb_string; \
                         if (off < yypcb->pcb_strlen) { \
+            off = yypcb->pcb_strlen - off; \
                                 result = max_size; \
-                                if ((size_t)result > yypcb->pcb_strlen) \
-                                        result = (int)yypcb->pcb_strlen; \
+                                if ((size_t)result > off) \
+                                        result = (int)off; \
                                 memcpy(buf, yypcb->pcb_strptr, result); \
                                 yypcb->pcb_strptr += result; \
-                        } else \
-                                result = 0; \
+            fprintf(stderr, "yy_input -> %d '%.*s'\n", result, result, buf); /* REMOVE ME */ \
+         } else { \
+            buf[0] = '\0'; \
+            result = (YYSTATE) == S0; \
+            fprintf(stderr, "yy_input -> %d\n", result); /* REMOVE ME */ \
+         } \
                 } \
         } while (0)
@@ -594 +599 @@
 <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]);
 
 <S1>"/*"        yyerror("/* encountered inside a comment\n");
 <S1>"*/"        BEGIN(yypcb->pcb_cstate);
+ /* VBOX - START */
+<S1>"\0"        yyerror("end-of-file encountered before matching */\n");
+ /* VBOX - END */
 <S1>.|\n        ; /* discard */
 
@@ -657 +671 @@
 
 <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]);
 
@@ -686 +706 @@
                 }
 
+ /* VBOX - BEGIN */
+<S3>"\0"        yyerror("end-of-file encountered before end of control line\n");
+ /* VBOX - END */
 <S3>.           yyerror("syntax error near \"%c\"\n", yytext[0]);